Merge https://salsa.debian.org/dpkg-team/dpkg

503 files changed, 68153 insertions, 42164 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 000000000..20368a2e2
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,54 @@
+image: debian:sid
+
+before_script:
+  - apt update -qq
+  - apt install -qq -y eatmydata
+  - eatmydata apt install -qq -y --no-install-recommends
+    git ca-certificates
+  - eatmydata apt build-dep -qq -y .
+  - ./autogen
+
+# Test whether the release can be done.
+dist-check:
+  stage: test
+  script:
+    - eatmydata apt install -qq -y --no-install-recommends
+      libmodule-build-perl
+    - ./configure
+    - make distcheck
+
+# Test whether the unit tests pass.
+unit-tests:
+  stage: test
+  script:
+    - eatmydata apt install -qq -y --no-install-recommends
+      fakeroot gpg cppcheck shellcheck aspell aspell-en codespell i18nspector
+      libtest-strict-perl libtest-minimumversion-perl libtest-perl-critic-perl
+      libtest-pod-perl libtest-pod-coverage-perl libtest-spelling-perl
+      libtest-synopsis-perl
+    - ./configure
+    - make check TESTSUITEFLAGS=--verbose TEST_PARALLEL=$(nproc)
+                 AUTHOR_TESTING=1
+
+# Test whether the unit tests pass on a VPATH build.
+vpath-tests:
+  stage: test
+  script:
+    - mkdir -p build-tree
+    - cd build-tree
+    - ../configure
+    - make check TESTSUITEFLAGS=--verbose TEST_PARALLEL=$(nproc)
+
+# Test whether the external functional tests pass.
+func-tests:
+  stage: test
+  script:
+    - ./configure
+    - make
+    - git clone https://git.dpkg.org/git/dpkg/dpkg-tests.git
+    - cd dpkg-tests
+    - echo "DPKG_SERIES = 1.18.x" >>.pkg-tests.conf
+    - echo "DPKG_TESTSUITE_OPTIONS = debug not-root" >>.pkg-tests.conf
+    - echo "DPKG_BUILDTREE = $(realpath ..)" >>.pkg-tests.conf
+    - ./db-regen
+    - eatmydata make test
diff --git a/ChangeLog.old b/ChangeLog.old
index 770c9d630..1889f112f 100644
--- a/ChangeLog.old
+++ b/ChangeLog.old
@@ -1361,7 +1361,7 @@
 
 2008-08-05  Guillem Jover  <guillem@debian.org>
 
-	* scripts/dpkg-distaddfile.pl: Use _g() instead of mispelled gettext().
+	* scripts/dpkg-distaddfile.pl: Use _g() instead of misspelled gettext().
 
 2008-08-03  Guillem Jover  <guillem@debian.org>
 
@@ -7444,7 +7444,7 @@
 
 2006-02-08  Guillem Jover  <guillem@debian.org>
 
-	* debian/contrl (Build-Depends): Depend on version >= 1.28-4 of
+	* debian/control (Build-Depends): Depend on version >= 1.28-4 of
 	libselinux1-dev as it has pkg-config support. Remove libsepol1-dev,
 	now dragged by libselinux1-dev. Add pkg-config.
 	* m4/libs.m4 (DPKG_LIB_SELINUX): Use pkg-config to get the static
@@ -7689,7 +7689,7 @@
 2006-01-23  Bart Martens  <bart.martens@advalvas.be>,
 	    Guillem Jover  <guillem@debian.org>
 
-	* debian/contrl (Build-Depends): Add libsepol1-dev as a temporary
+	* debian/control (Build-Depends): Add libsepol1-dev as a temporary
 	workaround until libselinux1-dev has pkg-config support.
 	* m4/libs.m4 (DPKG_LIB_SELINUX): Explicitly statically link against
 	libsepol.
@@ -8312,7 +8312,7 @@
 	packages, sort that (rather than the complete list) and use that
 	when calling list1package.  This means we only expand to the
 	longest field in the result, not the database.  Hopefully the
-	speed gain of only sorting a filtered list outweighs the slighty
+	speed gain of only sorting a filtered list outweighs the slightly
 	extra computation time.
 
 2005-03-18  Scott James Remnant  <scott@netsplit.com>
@@ -11001,7 +11001,7 @@ Sun May 19 04:09:25 CDT 2002 Adam Heath <doogie@debian.org>
 
   * debian/rules: Fix targets, so that if configure fails, but actually
     succeeds in creating config.status(as might happen if one has a
-    c-style comment in configure.in, and the shell trys running /foo), then
+    c-style comment in configure.in, and the shell tries running /foo), then
     the build will actually fail correctly.
 
 Sun May 19 02:31:11 CDT 2002 Adam Heath <doogie@debian.org>
@@ -12463,7 +12463,7 @@ Wed Apr 18 23:42:16 CDT 2001 Adam Heath <doogie@debian.org>
 Wed Apr 18 18:01:21 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * scripts/install-info.{8,pl}: modify install-info to take relative
-    filesnames, and add a --remove-exactly option to only remove exact
+    filenames, and add a --remove-exactly option to only remove exact
     matches (Rob Browning)
 
 Sun Apr 15 22:42:11 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
@@ -13728,9 +13728,9 @@ Sat Feb 12 17:11:33 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 Tue Feb  8 21:33:58 EST 2000 Ben Collins <bcollins@debian.org>
 
   * main/{processarc,archive}.c: Make the conflictor an array of structs and
-    make sure that check_conflicts uses that and increments a global indexs
+    make sure that check_conflicts uses that and increments a global indexes
     for the array. The reason that multiple conflicts/replaces were getting
-    borked had something to do with thre first one in the hash not being
+    borked had something to do with the first one in the hash not being
     processed. This was the result of bad pointer games, so this makes it a
     lot cleaner.
 
@@ -16705,7 +16705,7 @@ Changes in dpkg 0.93.15:
 * Put packages in `purge' state even if `deinstall' requested if
   they have no postrm and no conffiles.
 * Version number comparisons fixed.
-* insert-version.pl now installes lib.pl filename too.
+* insert-version.pl now installs lib.pl filename too.
 * Strip trailing slashes when reading files from file lists.
 
 Changes in dpkg 0.93.14:
diff --git a/Makefile.am b/Makefile.am
index 31e82a7a8..86bc59184 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,20 @@ SUBDIRS = \
 
 ACLOCAL_AMFLAGS = -I m4
 
+aclocaldir = $(datadir)/aclocal
+
+dist_aclocal_DATA = \
+	m4/dpkg-arch.m4 \
+	m4/dpkg-build.m4 \
+	m4/dpkg-compiler.m4 \
+	m4/dpkg-coverage.m4 \
+	m4/dpkg-funcs.m4 \
+	m4/dpkg-libs.m4 \
+	m4/dpkg-linker.m4 \
+	m4/dpkg-progs.m4 \
+	m4/dpkg-types.m4 \
+	m4/dpkg-unicode.m4 \
+	$(nil)
 
 dist_pkgdata_DATA = \
 	data/pie-compile.specs \
@@ -31,9 +45,11 @@ dist_pkgdata_DATA = \
 	$(nil)
 
 EXTRA_DIST = \
+	.gitlab-ci.yml \
 	.mailmap \
 	ChangeLog.old \
 	README.l10n \
+	autogen \
 	get-version \
 	run-script \
 	doc/README.api \
@@ -43,6 +59,7 @@ EXTRA_DIST = \
 	doc/lcov-inject.pl \
 	doc/rootless-builds.txt \
 	doc/triggers.txt \
+	debian/bug-script \
 	debian/changelog \
 	debian/compat \
 	debian/control \
@@ -50,7 +67,6 @@ EXTRA_DIST = \
 	debian/dpkg-dev.docs \
 	debian/dpkg-dev.install \
 	debian/dpkg-dev.manpages \
-	debian/dpkg-dev.lintian-overrides \
 	debian/dpkg.alternatives.logrotate \
 	debian/dpkg.cfg \
 	debian/dpkg.cron.daily \
@@ -61,23 +77,24 @@ EXTRA_DIST = \
 	debian/dpkg.postrm \
 	debian/dpkg.logrotate \
 	debian/dpkg.lintian-overrides \
+	debian/dpkg.lintian-profile \
 	debian/dselect.cfg \
 	debian/dselect.docs \
 	debian/dselect.install \
 	debian/dselect.manpages \
-	debian/dselect.lintian-overrides \
+	debian/dselect.postrm \
 	debian/libdpkg-dev.docs \
 	debian/libdpkg-dev.install \
-	debian/libdpkg-dev.lintian-overrides \
 	debian/libdpkg-perl.docs \
 	debian/libdpkg-perl.install \
-	debian/libdpkg-perl.lintian-overrides \
-	debian/source/lintian-overrides \
 	debian/source/format \
 	debian/usertags \
 	debian/rules \
 	debian/shlibs.default \
 	debian/shlibs.override \
+	debian/tests/control \
+	debian/tests/test-not-root \
+	debian/tests/test-root \
 	po/its/polkit.its \
 	po/its/polkit.loc \
 	$(test_scripts) \
@@ -148,6 +165,7 @@ coverage-clean:
 endif
 
 test_scripts = \
+	t/po.t \
 	t/pod.t \
 	t/pod-spell.t \
 	t/pod-coverage.t \
@@ -157,10 +175,15 @@ test_scripts = \
 	t/syntax.t \
 	t/strict.t \
 	t/critic.t \
+	t/codespell.t \
+	t/shellcheck.t \
+	t/cppcheck.t \
 	$(nil)
 
 test_data = \
 	t/critic/perlcriticrc \
+	t/codespell/stopwords \
+	t/cppcheck/cppcheck.supp \
 	$(nil)
 
 # We need to use absolute paths here due to strict.t invoking a sub-perl,
@@ -179,9 +202,11 @@ update-po:
 	$(MAKE) -C dselect/po update-po
 	$(MAKE) -C man update-po
 
+include $(top_srcdir)/cpan.am
+
 # If we create the dist tarball from the git repository, make sure
 # that we're not forgetting some files...
-dist-hook:
+dist-hook: dist-cpan
 	echo $(VERSION) >$(distdir)/.dist-version
 	if [ -e .git ]; then \
 	  for file in `git ls-files | grep -v .gitignore`; do \
diff --git a/README b/README
index 348f8e700..6a26e87fb 100644
--- a/README
+++ b/README
@@ -32,7 +32,7 @@ The mailing list address is (no subscription required to post):
 Source Repository
 -----------------
 
-  <https://anonscm.debian.org/cgit/dpkg/dpkg.git>
+  <https://git.dpkg.org/cgit/dpkg/dpkg.git>
 
 
 Building from git source
@@ -44,12 +44,13 @@ some required software needs to be installed:
   GNU autoconf >= 2.60
   GNU automake >= 1.11
   GNU libtool >= 2.0
-  GNU gettext >= 0.19.7 (or just autopoint if using --disable-nls)
+  GNU autopoint >= 0.19.7 (from GNU gettext)
+  GNU gettext >= 0.19.7 (only with --enable-nls)
 
 After installing the needed software, and running the following command on
 the git tree:
 
-  $ autoreconf -f -i
+  $ ./autogen
 
 the source should be roughly equivalent to the distributed tar source.
 
@@ -81,12 +82,19 @@ To run the test suite («make check»):
 
   Test::MinimumVersion perl module (optional, author)
   Test::Pod perl module (optional)
+  Test::Pod::Coverage perl module (optional, author)
   Test::Spelling perl module (optional, author)
   Test::Strict perl module (optional)
   Test::Synopsis perl module (optional, author)
   Test::Perl::Critic perl module (optional, author)
   aspell (optional, author)
   aspell-en (optional, author)
+  codespell (optional, author)
+  cppcheck (optional, author)
+  fakeroot (optional)
+  gpg (optional)
+  i18nspector (optional, author)
+  shellcheck (optional, author)
 
   Define the environment variable DPKG_DEVEL_MODE or AUTHOR_TESTING to run
   the test suite in development mode, to include tests that might not be
diff --git a/TODO b/TODO
index bc2dee0a9..2b8a68dbf 100644
--- a/TODO
+++ b/TODO
@@ -6,7 +6,7 @@ RoadMap
 TODO
 ====
 
-1.19.x
+1.20.x
 ~~~~~~
 
  * Review this file and remove or update the old entries.
@@ -28,7 +28,6 @@ TODO
    - Do more unused header include removal.
    - Add needed includes to all header files.
    - Get rid of useless "unsigned" modifiers.
-   - Use internerr instead of assert, and print more meaningful messages.
    - Use enums for currently hardcoded literals (replacingfilesandsaid,
      filetriggers_edited, etc).
    - Do not use nfmalloc (and friends) for non in-core db memory.
diff --git a/autogen b/autogen
new file mode 100755
index 000000000..99ca3fe41
--- /dev/null
+++ b/autogen
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+autoreconf -f -i
diff --git a/configure.ac b/configure.ac
index d6c80d7fb..a0bc4cf0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,19 +3,32 @@
 m4_pattern_forbid([^_?DPKG_])
 
 AC_PREREQ(2.60)
-AC_INIT([dpkg], m4_esyscmd([./get-version]), [debian-dpkg@lists.debian.org])
+AC_INIT([dpkg], m4_esyscmd([./get-version]), [debian-dpkg@lists.debian.org],
+        [dpkg], [https://wiki.debian.org/Teams/Dpkg])
+DPKG_DIST_IS_RELEASE
 AC_SUBST([PACKAGE_COPYRIGHT_HOLDER], ['Dpkg Developers'])
+AC_SUBST([PACKAGE_VCS_TYPE], [git])
+AC_SUBST([PACKAGE_VCS_URL], [https://git.dpkg.org/git/dpkg/dpkg.git])
+AC_SUBST([PACKAGE_VCS_WEB], [https://git.dpkg.org/cgit/dpkg/dpkg.git])
+AC_SUBST([PACKAGE_BUG_WEB], [https://bugs.debian.org/src:dpkg])
+AC_SUBST([PACKAGE_CPAN_NAME], [Dpkg])
 AC_CONFIG_SRCDIR([lib/dpkg/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
 
 AC_USE_SYSTEM_EXTENSIONS
 
-AM_INIT_AUTOMAKE([1.11 -Wall foreign nostdinc no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE(
+  [1.11]
+  [-Wall]
+  [foreign]
+  [nostdinc]
+  [tar-ustar no-dist-gzip dist-xz]
+)
 AM_SILENT_RULES([yes])
 
 # Require at least this gettext version, but will take any later version too.
-AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.7])
+AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8])
 # XXX: We cannot remove the following macro due to backwards compatibility
 # reasons. The above macro is set unconditionally to the minimal version
 # required, and the below is set to 0.19.6, the first version introducing
@@ -124,7 +137,6 @@ AC_C_VOLATILE
 AC_TYPE_MODE_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
-DPKG_TYPES_U_INT_T
 DPKG_TYPE_PTRDIFF_T
 AC_CHECK_SIZEOF([unsigned int])
 AC_CHECK_SIZEOF([unsigned long])
@@ -147,6 +159,7 @@ DPKG_CHECK_COMPAT_FUNCS([\
   getopt \
   getopt_long \
   obstack_free \
+  strchrnul \
   strnlen \
   strndup \
   strerror \
@@ -169,6 +182,7 @@ AC_CHECK_FUNCS([\
   fallocate \
   posix_fallocate \
   posix_fadvise \
+  uselocale \
 ])
 
 AS_IF([test "x$build_dselect" = "xyes"], [
@@ -209,6 +223,7 @@ AC_CONFIG_FILES([
   doc/Doxyfile
   man/Makefile
   po/Makefile.in
+  scripts/Build.PL
   scripts/Makefile
   scripts/mk/Makefile
   scripts/po/Makefile.in
diff --git a/cpan.am b/cpan.am
new file mode 100644
index 000000000..7c30f1f3f
--- /dev/null
+++ b/cpan.am
@@ -0,0 +1,48 @@
+CPAN_DIST_NAME = $(PACKAGE_CPAN_NAME)
+CPAN_DIST_VERSION = $(PACKAGE_VERSION)
+if !PACKAGE_DIST_IS_RELEASE
+CPAN_DIST_SUFFIX = -TRIAL
+endif
+CPAN_DIST = $(CPAN_DIST_NAME)-$(CPAN_DIST_VERSION)$(CPAN_DIST_SUFFIX)
+CPAN_DIST_ARCHIVE = $(CPAN_DIST).tar.gz
+
+dist-cpan:
+	: # Create the CPAN source tree.
+	mkdir -p $(CPAN_DIST)
+	mkdir -p $(CPAN_DIST)/lib
+	mkdir -p $(CPAN_DIST)/t
+	cp -fpR $(top_srcdir)/COPYING $(CPAN_DIST)/LICENSE
+	cp -fpR $(top_srcdir)/data $(CPAN_DIST)
+	cp -fpR $(top_srcdir)/t/* \
+	         $(top_srcdir)/scripts/t/Dpkg* \
+	         $(top_srcdir)/scripts/t/origins \
+	         $(CPAN_DIST)/t
+	cp -fpR $(top_srcdir)/scripts/Dpkg.pm $(CPAN_DIST)/lib/
+	cp -fpR $(top_srcdir)/scripts/Dpkg $(CPAN_DIST)/lib/
+	cp -fpR $(top_srcdir)/scripts/Test $(CPAN_DIST)/lib/
+	cp -fpR $(top_builddir)/scripts/Build.PL $(CPAN_DIST)
+
+	: # Fix permissions of the distributed files.
+	find $(CPAN_DIST) \
+	       -type d ! -perm 755 -exec chmod u+rwx,go+rx {} ';' -o \
+	     ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	     ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	     ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; || \
+	  chmod -R a+r $(CPAN_DIST)
+
+	: # Prepare the CPAN distribution.
+	cd $(CPAN_DIST) && $(PERL) Build.PL
+	cd $(CPAN_DIST) && ./Build manifest
+	cd $(CPAN_DIST) && ./Build distdir
+
+	: # Pack the CPAN distribution.
+	$(TAR) -caf $(CPAN_DIST_ARCHIVE) -C $(CPAN_DIST) -Hustar \
+	  --sort=name --owner=root:0 --group=root:0 $(CPAN_DIST)
+
+	: # Cleanup the CPAN source tree.
+	find $(CPAN_DIST) -type d ! -perm -200 -exec chmod u+w {} ';'
+	rm -rf $(CPAN_DIST)
+
+# Ignore the CPAN archive for distcleancheck.
+distcleancheck_listfiles = \
+	find -type f \( -name $(CPAN_DIST_ARCHIVE) -o -print \)
diff --git a/data/cputable b/data/cputable
index a2bd7d687..9f2a8e0e4 100644
--- a/data/cputable
+++ b/data/cputable
@@ -41,6 +41,7 @@ powerpc		powerpc		(powerpc|ppc)		32	big
 powerpcel	powerpcle	powerpcle		32	little
 ppc64		powerpc64	(powerpc|ppc)64		64	big
 ppc64el		powerpc64le	powerpc64le		64	little
+riscv64		riscv64		riscv64			64	little
 s390		s390		s390			32	big
 s390x		s390x		s390x			64	big
 sh3		sh3		sh3			32	little
diff --git a/data/tupletable b/data/tupletable
index 6fadf11ef..b83c4bf8d 100644
--- a/data/tupletable
+++ b/data/tupletable
@@ -2,6 +2,21 @@
 #
 # Bidirectional mapping between a Debian arch tuple and a Debian arch name.
 #
+# Debian arch tuple names are formed as a combination of the Debian system
+# name (from the ostable) and the Debian CPU name (from the cputable) after
+# applying the variable substitutions. Debian arch names are the result of
+# historical naming conventions in Debian, where the predominant system
+# architectures have many of their parts in implicit form, by only exposing
+# the CPU with the ABI bolted on, where less common architectures have their
+# OS part spelled out, and where even less common ones, have their libc
+# spelled out. This table maps between the ideal architecture tuple, with
+# the current messy reality.
+#
+# - Column 1 is the Debian arch tuple name, as the normalized form of the
+#   architecture names, used as the internal representation.
+# - Column 2 is the Debian arch name, as the abbreviated form of the
+#   architecture names, used as the public interface.
+#
 # Supported variables: <cpu>
 #
 # <Debian arch tuple>		<Debian arch name>
diff --git a/debian/bug-script b/debian/bug-script
new file mode 100644
index 000000000..56d654818
--- /dev/null
+++ b/debian/bug-script
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+for d in /bin /sbin /lib /lib32 /libo32 /libx32 /lib64; do
+  if [ "$(readlink $d)" = "usr$d" ]; then
+    echo "System tainted due to merged-usr-via-symlinks." >&3
+    break
+  fi
+done
diff --git a/debian/changelog b/debian/changelog
index e9fe90886..13e06809c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,571 @@
-dpkg (1.19.1~dyson2) unstable; urgency=medium
+dpkg (1.20.0) UNRELEASED; urgency=medium
 
-  * Fix crash in dpkg-deb/build.c cause by old code for charset.alias
+  [ Guillem Jover ]
+  * libdpkg: Do not generate a backup file for the available database.
+    Closes: #343578
+  * perl: Switch Getopt::Long from bundling to bundling_values. This means
+    the few scripts using Getopt::Long will stop accepting options in the
+    form «-ab» for «-a -b», which is not future-proof, as it does not allow
+    these options to get new arguments without making them abiguous.
+  * dpkg-buildpackage: Remove transient backwards R³ compatibility code.
+  * buildtools.mk: Add support for nostrip in DEB_BUILD_OPTIONS when setting
+    the STRIP variable.
+  * dpkg-genbuildinfo: Do not include irrelevant packages in the Binary field.
+  * dpkg: Do not clear selections for unknown packages. Closes: #927752
+  * dpkg-shlibdeps: Add support for new Build-Depends-Packages, to be able
+    to specify multiple packages. Closes: #926669
+    Based on a patch by Frank Schaefer <kelledin@gmail.com>.
+  * perl: Remove support for versioned GnuPG 2 program and packages.
+  * libdpkg: Clarify lock contender error message. Print the PID of the lock
+    contender, and add a warning explaining that removing the lock file is
+    never the correct solution.
+  * dpkg-genchanges, dpkg-mergechangelogs: Remove support for ~vola
+    versioning, as volatile.debian.org was decommissioned some time ago.
+  * dpkg-genchanges, dpkg-mergechangelogs: Match ~deb also as a backport
+    marker in versions. Closes: #934980
+  * libdpkg, dpkg: Use new versiondescribe_c() for non-localizable call sites,
+    such as when writing to a log, which should not be localized.
+    Reported by Julien Cristau <jcristau@debian.org>.
+  * dpkg-query: Try to use the package synopsis from the available file if
+    not installed. Closes: #43573
+  * dpkg-gencontrol: Take into account hardlinks when computing the
+    Installed-Size substvar. Closes: #923475
+    Patch co-authored with Sven Joachim <svenjoac@gmx.de>.
+  * dpkg: Fix and clarify behavior for packages marked to be on “hold”. These
+    need to be processed for configuration and triggers. Closes: #926472
+  * dpkg: Use DPKG_ADMINDIR to set the admindir. Closes: #900071
+  * dpkg-source: Remove backwards compatibility code for legacy build-profiles.
+  * Perl modules:
+    - Dpkg::Source::Package: Verify original tarball signatures at build time.
+    - Dpkg::BuildFlags: Add new unset() method.
+      Requested by Daniel Schepler <dschepler@gmail.com>.
+    - Dpkg::Source::Package::V2: Emit a special patch header on
+      single-debian-patch. Closes: #933152
+    - Dpkg::Vendor::Debian: Only scan /usr/local/ directories that exist.
+      Closes: #932967
+    - Dpkg::Vendor::Debian: Do not set -Werror=implicit-function-declaration
+      for C++. Closes: #939969
+    - Dpkg::Deps: Check for valid virtual package version relations. Do not
+      allow non-equal version relations in virtual provides. Closes: #930317
+    - Dpkg: Remove internal lowercase variables $version, $progname,
+      $admindir, $dpkglibdir and $pkgdatadir.
+    - Dpkg::Changelog: Remove obsolete methods dpkg() and rfc822().
+    - Dpkg::Changelog::Entry::Debian: Remove obsolete methods check_header()
+      and check_trailer(). Hide variables $regex_header and $regex_trailer.
+    - Dpkg::Changelog::Parse: Remove warnings of obsolete options forceplugin
+      and libdir. Remove obsolete functions changelog_parse_debian() and
+      changelog_parse_plugin().
+    - Dpkg::Compression: Hide internal lowercase variables
+      $default_compression, $default_compression_level and
+      $compression_re_file_ext.
+    - Dpkg::Deps::KnownFacts: Remove obsolete check_package() method.
+    - Dpkg::Exit: Hide internal lowercase @handlers variable.
+    - Dpkg::Gettext: Remove obsolete _g() function.
+    - Dpkg::Source::Package: Hide internal lowercase variable
+      @tar_ignore_default_pattern. Remove iternal lowercase variable alias
+      $diff_ignore_default_regexp.
+    - Dpkg::Substvars: Remove obsolete no_warn() method.
+    - Dpkg::Index: Change default value for unique_tuple_key to 1.
+    - Dpkg::Version: Remove deprecation warning from semantic change in
+      bool overload.
+    - Dpkg::Checksums: Remove obsolete 'program' property warning.
+    - Dpkg::Conf: Remove obsolete methods and obsolete croak for method option.
+    - Dpkg::Vendor: Remove obsolete 'keyrings' hook.
+    - Dpkg::Exit: Unregister all signal handlers once we have executed them.
+      Closes: #932841
+    - Dpkg::Exit: Register exit handlers also for __DIE__.
+    - Dpkg::Source::Package::V3::Native: Do not say v1.0 for 3.0 formats.
+  * Documentation:
+    - man: Fix uncommon wording constructs.
+    - man: Use a minus sign for a literal string.
+    - man: Clarify that the pager is called via «$SHELL -c».
+    - dpkg-shlibdeps: Document split_soname() function.
+      Prompted by Christopher Crim <christopher.crim@quoininc.com>.
+    - Dpkg::Changelog: Document methods provided by subclasses.
+      Reported by Felix Lechner <felix.lechner@lease-up.com>.
+    - man: Globally adjust left and disable hyphenation.
+    - man: Split dselect(1) --color from --colour option items.
+    - man: Describe the SONAME formats supported in deb-shlibs(5).
+    - man: Move template symbol documentation into new deb-src-symbols(5).
+    - Dpkg::Changelog::Parse: Remove $ sigil from option names in POD.
+    - Dpkg: Say class instead of object when appropriate.
+    - Dpkg::Changelog: Clarify that these classes inherit from some other
+      base class, which will contain the missing documentation.
+      Prompted by intrigeri <intrigeri@debian.org>.
+  * Code internals:
+    - Dpkg::Source::Package: Refactor original tarball handling.
+    - perl: Use File::Copy instead of spawning mv/cp commands.
+    - Dpkg::OpenPGP: Refactor signature verification into a new function.
+    - Dpkg::OpenPGP: Make it possible to verify detached signatures.
+    - Dpkg::OpenPGP: Add support for importing an OpenPGP key into a keyring.
+    - Dpkg::BuildFlags: Remove unused hash keys.
+    - libdpkg: Use the variable instead of a type as sizeof() argument.
+    - libdpkg: Use the totalwritten variable for a consistency check.
+    - dselect: Reduce scope of variable, to avoid it being unused in a branch.
+    - dpkg-deb: Fold two adjacent if conditionals into a single one.
+    - dpkg: Initialize flagdeppossi in check_conflict().
+    - libdpkg: Add new C locale switch over support.
+    - libdpkg: Add new versiondescribe_c() to force a C locale.
+    - dselect: Make baselist::draw_column_*() col arguments const.
+    - libdpkg: Use p instead of name in dpkg_arch_name_is_illegal().
+    - dpkg: Remove redudant condition for sourcefile in updateavailable().
+    - dpkg, update-alternatives: Make variables static.
+    - libdpkg: Add missing symbols to the version map.
+  * Build system:
+    - Bump minimal Perl version to 5.24.1.
+    - Add a serial versioning to the m4 files.
+    - Install m4 files into system aclocal directory.
+    - Bump minimal gettext version to 0.19.8, to get the m4 files that can
+      cross-build for musl-based systems.
+  * Packaging:
+    - Remove obsolete Breaks satisfied since oldstable.
+    - Replace custom rule for 'configure' with call to dh_autoreconf.
+      Thanks to Dan Streetman <ddstreet@canonical.com>. Closes: #939516
+    - dselect: Remove methods state files on purge.
+      Spotted by Sven Joachim <svenjoac@gmx.de>.
+  * Test suite:
+    - Remove perlcritic Documentation::RequirePodLinksIncludeText suppression.
+    - Clarify cppcheck va_list_usedBeforeStarted suppression.
+    - Skip build directories from codespell check.
+    - Update stopwords for codespell 1.16.0.
+    - Suppress new bogus cppcheck 1.89 false positives.
 
- -- Igor Pashev <pashev.igor@gmail.com>  Sun, 19 Nov 2017 17:15:25 +0300
+  [ Updated programs translations ]
+  * German (Sven Joachim).
+  * Portuguese (Miguel Figueiredo). Closes: #935695
+  * Simplified Chinese (Mo Zhou). Closes: #942195
 
-dpkg (1.19.1~dyson1) unstable; urgency=medium
+  [ Updated scripts translations ]
+  * German (Helge Kreutzmann).
+
+  [ Updated man pages translations ]
+  * German (Helge Kreutzmann). Closes: #931135
+
+ -- Guillem Jover <guillem@debian.org>  Fri, 07 Jun 2019 18:00:53 +0200
+
+dpkg (1.19.7) unstable; urgency=medium
+
+  [ Guillem Jover ]
+  * dpkg: Fix off-by-one error in dpkg --abort-error. Closes: #924886
+    Thanks to Tom Goulet <tomg@sentex.ca>.
+  * dpkg: Set the force defaults before loading the config file, otherwise we
+    incorrectly override them. Regression introduced in dpkg 1.19.5.
+    Closes: #928671
+  * dpkg: Split the trigger dependtry into two, the second of which will be
+    the one checking trigger cycles when deferring trigger processing due to
+    unsatisfiable dependencies. Closes: #928429
+  * dpkg-deb: Validate ar member magic before normalizing any of its fields.
+  * dpkg-deb: Honor --nocheck when building packages with newlines in
+    filenames. Regression introduced in dpkg 1.18.1. Closes: #929727
+  * Documentation:
+    - rootless-builds.txt: Expand what the builder means. Mention the
+      dpkg-deb option to use to set the owner and group to root. And reword
+      the prototyping section to be less confusing with what is currently
+      implemented. Closes: #929019
+    - README: Clarify when autopoint is needed. Closes: #929601
+    - Fix typos in docs and output strings. Warned by codespell.
+
+  [ Updated programs translations ]
+  * Catalan (Guillem Jover).
+
+  [ Updated dselect translations ]
+  * Catalan (Guillem Jover).
+
+  [ Updated scripts translations ]
+  * Catalan (Guillem Jover).
+
+  [ Updated man pages translations ]
+  * Dutch (Frans Spiesschaert). Closes: #926665
+  * French (Jean-Pierre Giraud). Closes: #929664
+
+ -- Guillem Jover <guillem@debian.org>  Mon, 03 Jun 2019 23:22:35 +0200
+
+dpkg (1.19.6) unstable; urgency=medium
+
+  [ Guillem Jover ]
+  * libdpkg: Add a new TAR_FORMAT_UNKNOWN enum value.
+  * libdpkg: Set tar_entry to zero on tar_entry_destroy(), to avoid double
+    free()s and the subsequent crashes.
+  * libdpkg: Handle non end-of-tape errors from tar_header_decode().
+  * libdpkg: Use ERANGE instead of EINVAL for tar_atol8() out-of-range error.
+  * dpkg-gencontrol: Check presence of package build dir before traversing it.
+  * Perl modules:
+    - Dpkg::Source::Package::V1: Change default build option style to -sa.
+      Using -sA by default means the user might lose data on overwrite if
+      there is already a directory with the same name laying around.
+      Closes: #910737
+    - Dpkg::Source::Package: Handle Format field being undefined. On source
+      format 1.0, the default is for the debian/source/format file not being
+      present, which means we'll start with an empty Format field name.
+      Regression introduced in dpkg 1.19.3.
+  * Packaging:
+    - Update usertags.
+    - Install a lintian profile for dpkg based on the debian profile, so that
+      we can suppress Debian-specific tags, such as the controversial one on
+      vendor-specific patch series files.
+    - Add Breaks on lsb-base due to start-stop-daemon exposing breakage in
+      the killproc function from /lib/lsb/init-functions. Closes: #923861
+  * Test suite:
+    - Stop requiring (pseudo-)root in the functional test suite.
+    - Export and move TESTDATA definition close to the PATH definition.
+    - Quote the 'yes' command to make a comment clearer.
+
+  [ Updated programs translations ]
+  * Dutch (Frans Spiesschaert). Closes: #924776
+
+  [ Updated scripts translations ]
+  * German (Helge Kreutzmann).
+
+  [ Updated man pages translations ]
+  * Dutch (Frans Spiesschaert). Closes: #924777
+  * German (Helge Kreutzmann).
+
+ -- Guillem Jover <guillem@debian.org>  Mon, 25 Mar 2019 15:08:26 +0100
+
+dpkg (1.19.5) unstable; urgency=medium
+
+  [ Guillem Jover ]
+  * start-stop-daemon: Make sure that we get a meaningful errno on
+    parse_unsigned(), so that the error messages always make sense.
+  * start-stop-daemon: Add new fatalv() and fatale() functions and use the
+    latter for system errors, so that we are explicit on whether we want to
+    use errno for error reporting or not.
+  * start-stop-daemon: Always refuse to parse a world-writable pidfile,
+    except when that is /dev/null.
+  * dpkg: Print the current set of enabled force options on --force-help.
+  * dpkg: Parse and set new DPKG_FORCE environment variable for subprocesses.
+    Closes: #666147
+  * dpkg-statoverride: Add support for --force-* options.
+  * dpkg-statoverride: Switch from --force option to new --force-<thing>
+    options. Deprecate --force option which will be considered an alias for
+    --force-all for now.
+  * dpkg, dpkg-statoverride: Add new option --refuse-security-mac to control
+    SELinux. See #811037.
+  * dpkg: Clarify error on unknown system user/group in statoverride database.
+    Closes: #920880
+  * dpkg-buildpackage: Clarify the warning/error on short OpenPGP key IDs.
+    Closes: #922039
+  * dpkg-maintscript-helper: Restrict find for dir-to-symlink move to
+    -maxdepth 1. Thanks to Ralf Treinen <treinen@free.fr>. Closes: #922799
+  * dpkg-genbuildinfo: Add support for a new Build-Tainted-By field in
+    .buildinfo files. Suggested by Alexander E. Patrakov <patrakov@gmail.com>.
+  * libdpkg: Clarify field names in error and warning messages.
+  * libdpkg: Optimize error handling. Move the error reporting outside the
+    involved functions so that we do not need to call gettext if there is no
+    error, which has a significant performance cost.
+  * libdpkg: Merge nicknames table into fieldinfos, to stop penalizing the
+    lookup of non-obsolete fieldnames.
+  * libdpkg: Print a more accurate warning for Revision nicknames.
+  * libdpkg: Increase the pkg-hash bins size to 65521, to improve hash table
+    performance at the cost of a bit more memory usage.
+  * libdpkg: Blank packages that are not-installed with unknown selection.
+    Closes: #922410
+  * libdpkg, dpkg: Print the dpkg database directory on access errors.
+    Closes: #883700
+  * Perl modules:
+    - Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted
+      tag. Suggested by Alexander E. Patrakov <patrakov@gmail.com>.
+    - Dpkg::Vendor::Debian: Add support for usr-local-has-* tainted tags.
+    - Dpkg::Source::Package: Add a missing use Dpkg::Source::Format.
+      Diagnosed by Ian Jackson <ijackson@chiark.greenend.org.uk>.
+      Closes: #921031
+  * Documentation:
+    - start-stop-daemon(1): Document behavior of --pidfile security checks.
+      Closes: #921557
+    - dpkg(1): Document the unknown selection state. Closes: #922407
+  * Code internals:
+    - dpkg: Move SELinux fallback label to the SELinux specific code path.
+    - dpkg: Simplify maintscript_set_exec_context().
+    - dpkg: Move force options support into its own file.
+    - dpkg: Do not hardcode the program name in the --force-help output.
+    - dpkg: Switch force options from individual variables to bit fields.
+    - dpkg: Switch from a char to an enum to track the force options types.
+    - dpkg: Switch to set the default force option from the forceinfos array.
+    - libdpkg: New benchmark programs and infrastructure.
+    - libdpkg: Add new dpkg_error_move() function.
+    - libdpkg: Add new dpkg_has_error() function.
+    - libdpkg: Move status names from parse errors to arguments.
+    - libdpkg: Use va_arg copy instead of the original on a vasprintf() call.
+    - libdpkg: Include <string.h> in pager.c.
+      Reported by Y <sevener@cock.li>. Closes: #922212
+    - libdpkg: Use pkg_set_want() instead of a direct assignment.
+  * Build system:
+    - Check whether this dist is a release, based only on the version format.
+      This will avoid having to do a two staged release to get a proper perl
+      distribution tarball.
+  * Packaging:
+    - autopkgtest: Add file to Depends fields.
+    - autopkgtest: Clarify behavior on root/non-root requirement.
+    - Bump Standards-Version to 4.3.0 (no changes required).
+    - Remove now unused assert usertag description.
+    - Remove trailing whitespace from changelog.
+    - Remove Origin and Bugs fields from control file.
+    - Include a bug-script to report on tainted merged-usr-via-symlinks.
+  * Test suite:
+    - libdpkg: Fix unit test for file_slurp(). Closes: #920974
+      Diagnosed by Frank Schaefer <kelledin@gmail.com>.
+
+  [ Updated programs translations ]
+  * Dutch (Frans Spiesschaert). Closes: #921942
+  * German (Sven Joachim).
+  * Simplified Chinese (Zhou Mo). Closes: #920972
+
+  [ Updated scripts translations ]
+  * German (Helge Kreutzmann).
+
+  [ Updated man pages translations ]
+  * Dutch (Frans Spiesschaert). Closes: #921943
+  * French (Jean-Pierre Giraud). Closes: #920905
+  * German (Helge Kreutzmann).
 
+ -- Guillem Jover <guillem@debian.org>  Sat, 23 Feb 2019 18:00:54 +0100
+
+dpkg (1.19.4) unstable; urgency=medium
+
+  * start-stop-daemon: Do not sanity check the pidfile when it is specified as
+    /dev/null, as that implies the caller wants to start the program no matter
+    what. Closes: #920242
+  * Portability:
+    - start-stop-daemon: Only use SO_PASSCRED if defined. Fixes build failure
+      at least on GNU/Hurd.
+  * Packaging:
+    - autopkgtest: Pass --disable-nls and --disable-dselect to configure.
+    - autopkgtest: Change Depends to «build-essential, autoconf, pkg-config».
+
+ -- Guillem Jover <guillem@debian.org>  Wed, 23 Jan 2019 13:06:39 +0100
+
+dpkg (1.19.3) unstable; urgency=medium
+
+  [ Guillem Jover ]
+  * dpkg-source: Stop filtering @builddeps@ from Testsuite-Triggers field.
+    Closes: #910734
+  * dpkg-genchanges: Only reference binary packages being uploaded, which
+    means that for a source-only upload, the Binary and Description fields
+    should be empty. Closes: #818618
+  * dpkg-scanpackages: Do not compute unnecessary checksums when using the
+    --hash argument. Based on a patch by Chris Lamb <lamby@debian.org>.
+    Closes: #916456
+  * dpkg-scanpackages: Emit a warning with the list of repeat packages.
+    Prompted by Johannes Schauer <josch@debian.org>.
+  * start-stop-daemon: Check whether standalone --pidfile use is secure.
+    Prompted by Michael Orlitzky <michael@orlitzky.com>.
+  * start-stop-daemon: Print complete verbose lines, instead of partial lines
+    with no newlines and a final print with a newline.
+  * start-stop-daemon: Add new --notify-await and --notify-timeout options,
+    which implement the systemd readiness protocol for services.
+    Closes: #910707
+  * update-alternatives: Add new --debug option.
+  * update-alternatives: Fix removal of obsolete slaves from the linked list.
+    Reported by Andreas Beckmann <anbe@debian.org>. Closes: #916799
+  * vendor.mk: Fix dpkg_vendor_derives_from macro documentation.
+    Thanks to Colin Watson <cjwatson@debian.org>. Closes: #913816
+  * vendor.mk: Add support for an improved dpkg_vendor_derives_from macro.
+    Version the macros so that both can be used, and default the unversioned
+    one to the version 0 macro.
+  * dpkg: Mark the package we are giving up on a trigger cycle as "istobe"
+    normal, so that the dependency checks know they cannot expect this package
+    to be processed anymore. Otherwise we ended up never detecting that we
+    were not making progress, as we expected to process this package at a later
+    point, when that would never happen anymore. This then was causing asserts
+    in the process queue loop. Closes: #901127, #910819
+  * dpkg: Reset progress_bytrigproc once we have injected it into the current
+    package process queue iteration, so that we do not keep trying to process
+    it, which might end up generating artificial trigger cycles, if
+    dependencies are not satisfied yet.
+  * dpkg: Convert one trigger processing required type into the new try-queued
+    one, so that we stop skipping unsatisfiable dependency checks.
+  * dpkg: Move trigproc cycle reset inside try-deferred conditional. We should
+    only reset the cycle detection in case we are not bailing out from the
+    processing with an error, otherwise we could come back to this package and
+    detect an artificial trigger cycle.
+  * dpkg: Introduce a new dependency try level for trigger processing. This
+    completely defers trigger processing until after the dependency cycle
+    breaking level, so to avoid generating artificial trigger cycles, when we
+    end up trying to process triggers with yet unsatisifiable dependencies.
+    Closes: #810724, #854478, #911620
+  * dpkg: Fix --help output, to clarify which arguments are optional.
+  * libdpkg: Add proper tar error handling. This makes the tar extractor
+    track and report back parse errors, so that we can give more descriptive
+    messages.
+  * libdpkg: Detect unsupported tar entry types to give better error messages.
+  * libdpkg: Add new db-fsys:Files and db-fsys:Last-Modified virtual fields.
+  * Perl modules:
+    - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056
+      Thanks to Chris Lamb <lamby@debian.org> for initial test cases.
+    - Dpkg::File: Make file_slurp() also accept pathnames in addition to
+      filehandles.
+    - Dpkg::Vendor::Ubuntu: Fix buildflags override after default setting move.
+      Based on a patch by Iain Lane <laney@ubuntu.com> and
+      Adam Conrad <adconrad@ubuntu.com>. Closes: #915881
+    - Dpkg::Shlibs::Objdump: Remove unused Dpkg::IPC import.
+    - Dpkg::Shlibs::Objdump: Only select objdump program when going to use it.
+    - Dpkg::Source::Package: Do not reinitialize fields member in constructor.
+    - Dpkg::Source::Patch: Do not recommend --include-removal when not
+      supported. Closes: #913012
+    - Dpkg::Source::Package::V3::Bzr: Fix format name in output message.
+    - Dpkg::Source::Package: Add a new format option to the new constructor.
+      Prompted by James McCoy <jamesan@debian.org>.
+    - Dpkg::Source::Package: Improve debian/source/format parsing and
+      validation.
+    - Dpkg::Source::Format: New public module.
+      Prompted by Mattia Rizzolo <mattia@debian.org>.
+  * Documentation:
+    - dpkg(1): Clarify --remove action. Closes: #914478
+    - dpkg-query(1): Clarify --list option behavior when no arguments are
+      specified. Closes: #917098
+    - deb-control(5): Clarify by adding a reference to deb-src-control(5) and
+      removing an invalid comment in the example.
+      Prompted by Helmut Grohne <helmut@subdivi.de>.
+    - dpkg(1): Clarify databases used by --yet-to-unpack and --predep-package.
+      Prompted by Johannes Schauer <josch@debian.org>.
+    - Clarify character classes for various formats in man pages, by
+      explicitly listing the character ranges within parenthesis.
+      Prompted by Ian Jackson <ijackson@chiark.greenend.org.uk>.
+    - dpkg-query(1): Document the version introducing the -f option.
+    - dpkg-architecture(1): Add reference to the TERMS section in the
+      VARIABLES section. Prompted by Axel Beckert <abe@debian.org>.
+    - Fix POD for Dpkg::Interface::Storable derived method implementations.
+    - Dpkg::Deps::Simple(3): Fix POD signature for new constructor.
+  * Code internals:
+    - dpkg-maintscript-helper: Use an explicit escape instead of a literal
+      backslash.
+    - Quote shell variables. Reported by Johannes Schauer <josch@debian.org>.
+    - Switch perl code to use the new Dpkg::Source::Format module.
+    - dpkg-source: Move source format selection earlier in the build.
+    - dpkg-source: Use new format argument for Dpkg::Source::Package->new().
+    - dpkg-shlibdeps: Remove unused variable.
+    - dpkg-scanpackages: Unroll a single iteration loop.
+    - start-stop-daemon: Compare foundany against 0 instead of treating it
+      like a boolean.
+    - start-stop-daemon: Switch code to use new info() and debug() functions.
+    - update-alternatives: Use enums for actions instead of strings.
+    - update-alternatives: Switch verbose selection into an enum.
+    - dpkg: Negate tortoise_not_in_hare() function name and return value.
+    - dpkg: Initialize trigcyclenode's next member once.
+    - dpkg: Use common pattern of assigning as an iterator.
+    - dpkg: Factor trigproc_new_cyclenode() out from check_trigger_cycle().
+    - dpkg: Switch dependtry from an int to an enum.
+    - dpkg: Move dependtry description from deferred_configure() to its
+      declaration.
+    - dpkg: Split trigger processing types into required, try-queued and
+      try-deferred.
+    - dpkg-query: Rename variable to avoid shadowing a local function.
+    - When allocating use the variable instead of the type in sizeof().
+    - dselect: Rename variable r to pkgbin.
+    - libdpkg, dpkg: Rename r variables to fnn.
+    - libdpkg: Rename ret variable to next.
+    - libdpkg: Cleanup fsys module symbol names.
+    - libdpkg: Rename pkg_db symbols to pkg_hash.
+    - libdpkg: Add new warning printer setter function.
+      Prompted by Julian Andres Klode <jak@debian.org>.
+    - libdpkg: Add new DPKG_ERROR_OBJECT macro.
+  * Build system:
+    - get-version: Use a format string with printf.
+    - run-script: Use $() instead of deprecated ``.
+    - run-script: Remove unused PERL_PROFILE variable, PERL5OPT can be used
+      instead, and does not require leaving an unquoted variable around.
+    - run-script: Add «set -e».
+    - Build.PL: Set environment variables only for CPAN tests.
+    - Build.PL: Set locale for CPAN tests to C. Fixes CPAN#127314.
+    - configure: Split AM_INIT_AUTOMAKE arguments into different lines.
+  * Packaging:
+    - Bump Standards-Version to 4.2.1 (no changes needed).
+    - Switch to debhelper compatibility level 11.
+    - Create the log file in postinst only if it does not exist.
+      Prompted by Johannes Schauer <josch@debian.org>.
+    - Add superficial autopkgtest functional tests.
+  * Test suite:
+    - Add new shellcheck author test.
+    - Add descriptions for the shellcheck exclude codes.
+    - Update cppcheck suppressions.
+
+  [ Updated programs translations ]
+  * Dutch (Frans Spiesschaert). Closes: #912023
+  * German (Sven Joachim).
+  * Italian (Milo Casagrande). Closes: #915610
+  * Portuguese (Miguel Figueiredo). Closes: #917813
+  * Simplified Chinese (Zhou Mo). Closes: #919040
+
+  [ Updated scripts translations ]
+  * German (Helge Kreutzmann).
+
+  [ Updated man pages translations ]
+  * Dutch (Frans Spiesschaert). Closes: #912024
+  * German (Helge Kreutzmann).
+
+ -- Guillem Jover <guillem@debian.org>  Tue, 22 Jan 2019 14:26:04 +0100
+
+dpkg (1.19.2) unstable; urgency=medium
+
+  [ Guillem Jover ]
+  * dpkg: Fix --force-not-root for chown() and chmod() based syscalls, and
+    give a more meaningful error message on chroot(). Closes: #614126
+  * dpkg-divert, dpkg-statoverride: Add new --instdir and --root options,
+    and make the commands honor the DPKG_ROOT environment variable.
+    Closes: #487108
+  * libdpkg: Call the pager with «$SHELL -c» to respect POSIX. Closes: #910009
+  * libdpkg: Do not spawn a pager if we are going to call «cat».
+  * libdpkg: Honor DPKG_PAGER when spawning a pager.
+    Suggested by Craig Sanders <cas@taz.net.au>.
+  * libdpkg: Set LESS to “-FRSXMQ” if not already set, when spawning a pager.
+  * libdpkg: Ignore SIGPIPE when setting up a pager, and then ignore EPIPE
+    errors when writing to stdout, otherwise if we quit the pager early, the
+    program will exit with an error code.
+  * libdpkg: Set stdout to be fully buffered when using a pager.
+  * dpkg, dpkg-query: Add new --no-pager option. For dpkg this is also a
+    configuration option. Closes: #909754
+  * Perl modules:
+    - Dpkg::OpenPGP: Ignore Version field in enarmored output.
+      Fixes CPAN#127217.
+    - Dpkg::OpenPGP: Do not read the gpg user configuration file.
+    - Dpkg::Source::Functions: Reimplement is_binary() w/o using diff(1).
+    - Dpkg::Source::Package::V2: Split the BinaryFiles module into its own
+      file, and give it a more generic name (Dpkg::Source::BinaryFiles).
+    - Dpkg::Source::Package::V2: Move binary file detection to BinaryFiles
+      module.
+  * Documentation:
+    - dpkg-buildpackage(1): Clarify --build=source explanation.
+    - dsc(5): Clarify what “flattened” means in Testsuite-Triggers.
+      Prompted by Mattia Rizzolo <mattia@debian.org>.
+    - dsc(5): Add a reference to where the source formats are described.
+      Prompted by Manuel A. Fernandez Montecelo <mafm@debian.org>.
+    - dpkg-source(1): Improve documentation on vendor-specific series files.
+    - deb-control(5): Document Build-Ids field.
+      Prompted by Stuart Prescott <stuart@debian.org>.
+    - dpkg(1): Clarify which fields are affected by dependency options.
+      Prompted by James Clarke <jrtc27@debian.org>.
+    - dpkg-query(1): Document the PAGER environment variable usage.
+    - Dpkg(1): Add POD documentation about the module hierarchy and API.
+  * Code internals:
+    - dpkg-split: Use nfstrnsave() instead of nfmalloc() + memcpy().
+    - libdpkg: Add new fsys-dir module.
+    - libdpkg: Pass the file contents to the pager instead of the filename.
+    - libdpkg: Add a pager kill switch, so that it can be forcefully disabled.
+  * Build system:
+    - Distribute a LICENSE file on CPAN.
+    - Do not make the Build.PL script executable.
+    - Generalize PACKAGE_CPAN_SIGN by setting PACKAGE_DIST_IS_RELEASE instead.
+    - Add a release_status key to the CPAN metadata.
+    - Fix typo in CPAN recommends key.
+    - Improve test and author CPAN dependencies.
+  * Packaging:
+    - Break libapt-pkg5.0 instead of apt. Closes: #909959
+      Analysis by Sven Joachim <svenjoac@gmx.de>.
+  * Test suite:
+    - Skip version checks involving «dpkg --compare-versions» if not available.
+      This is relevant on CPAN or on non-dpkg-based systems.
+
+  [ Updated programs translations ]
+  * Polish (Łukasz Dulny).
+
+  [ Updated man pages translations ]
+  * German (Helge Kreutzmann).
+
+ -- Guillem Jover <guillem@debian.org>  Mon, 08 Oct 2018 11:43:48 +0200
+
+dpkg (1.19.1) unstable; urgency=medium
+
+  [ Guillem Jover ]
   * Fix logic in dpkg-buildpackage to decide whether to run build targets,
     which broke tons of packages that are violating Debian policy MUSTs.
     Thanks to James Clarke <jrtc27@debian.org>. Closes: #878899
@@ -18,22 +578,257 @@ dpkg (1.19.1~dyson1) unstable; urgency=medium
   * Setup and check rootcommand in dpkg-buildpackage only if it is going to
     be needed. Reported by Niels Thykier <niels@thykier.net>.
   * Add color support to dpkg-maintscript-helper (a shell script).
+  * Fix warning by including <sys/sysmacros.h> for makedev() in libdpkg.
+  * Fix directory traversal with dpkg-deb --raw-extract, by guaranteeing
+    that the DEBIAN pathname does not exist. Closes: #879982
+    Reported by Jakub Wilk <jwilk@jwilk.net>.
+  * Add new AS, STRIP, OBJCOPY, OBJDUMP, NM, AR and RANLIB buildtools
+    variables to buildtools.mk. Prompted by Helmut Grohne <helmut@subdivi.de>.
+  * Restore rejecting negated architectures in Architecture field in
+    dpkg-gencontrol and dpkg-genchanges. Regression introduced in dpkg 1.18.5.
+  * Fix dpkg-gensymbols to print "error" instead of "warning" when these
+    are fatal. Closes: #881488
+  * Rename DPKG_GAIN_ROOT_CMD to DEB_GAIN_ROOT_CMD in the R³ support, as
+    the variable is expected to be set by any builder, not just dpkg. And
+    introduce ephemeral backwards compatibility even though there are no
+    known users.
+  * Do not set DEB_GAIN_ROOT_CMD in dpkg-buildpackage when the R³ value is
+    <implementations-keywords>, following the specification.
+  * Specify that DEB_GAIN_ROOT_CMD in R³ should preserve the environment.
+    Proposed by Josh Triplett <josh@joshtriplett.org>.
+  * Specify new DEB_RULES_REQUIRES_ROOT variable for R³ support.
+  * Add new --rules-requires-root option to dpkg-buildpackage.
+  * Declare R³ specification as "recommendation, stable" with version 1.0.
+  * Export architecture variables by default from architecture.mk, as
+    documented in dpkg-architecture(1). Closes: #888964
+    Thanks to Jack Bates <wdz7eo@nottheoilrig.com>
+  * Increment the line number on dpkg --set-selections on unknown packages.
+    Reported by Heinz Repp <heinz.repp@arcor.de>. Closes: #888983
+  * Switch a DEBIAN/conffile parsing assert() in dpkg due to empty lines
+    into an ohshit(), because this is really a run-time error.
+  * Fix assert() in dselect to expect the method lock file descriptor to be
+    initialized, instead of non-zero.
+  * Switch a fatal() call in start-stop-daemon into the new BUG() macro,
+    because it is really an internal error.
+  * Switch all assert() calls (except in update-alternatives) into internerr()
+    or BUG() calls, to get way better reporting with variable contents and
+    descriptions, and to make them always present independent of NDEBUG.
+  * Add a new --no-rename option to dpkg-divert. This is the current default
+    behavior, but it will make it possible to do a default switch in 1.20.x.
+  * Warn when using dpkg-divert --add or --remove w/o --rename or --no-rename.
+  * Warn when using dpkg-divert --rename on a file from an Essential package.
+  * Use a single “struct filenamenode” definition for the entire code base.
+    Closes: #746766
+  * Add support for frontend locking. This makes it possible for frontends
+    using this new protocol, to safely lock the dpkg database w/o risk of
+    race conditions with other dpkg instances or frontends supporting the
+    same protocol. Thanks to Julian Andres Klode <jak@debian.org>.
+    Closes: #850417, #851984
+  * Do not emit perl warnings in dpkg-source --help on source formats w/o
+    options.
+  * Make dpkg-buildpackage validate OpenPGP signing key IDs length. Error out
+    for short key IDs and warn for long key IDs.
+  * On the dpkg conffile prompt, print the set of environment variables setup
+    for the conffile shell, for easier discoverability.
+  * Fix dpkg-buildpackage option --rules-file parsing. It was trying to parse
+    it as --rules-target, which due to the ordering was a no-op.
+  * Only check for fallback build targets presence on binary builds in
+    dpkg-buildpackage.
+  * Only check required build dependencies for known targets specified with
+    dpkg-buildpackage --rules-target option.
+    Reported by Johannes Schauer <josch@debian.org>.
+  * Track package status dirtiness in dpkg to only log and report in status-fd
+    when it has changed, removing duplication in output. Closes: #365921
+  * Use Synopsis instead of Summary for the short Description, to unify the
+    nomenclature and to make it more descriptive. Add a new binary:Synopsis
+    virtual field to dpkg-query show format.
+  * Add new dpkg-buildpackage --no-post-clean option, to be able to explicitly
+    select the current default behavior.
+  * Dump database package records in alphabetical order. This will give
+    reproducible status and available database files, and make it possible
+    to output other deb822 formatted data in a deterministic way.
+  * Require both standard input and output to be connected to a terminal to
+    use a pager.
+  * Run dpkg-query --list output through a pager if we are on a terminal,
+    instead of truncating it, to avoid data loss. Closes: #898603
+  * Fix use after free in dpkg maintainer script handling. Regression
+    introduced in dpkg 1.19.0.
+  * Flush output for dpkg-query --status, --print-avail and --listfiles at
+    the end, instead of after each stanza.
+  * Add support for dumping all dpkg-query --status and --print-avail records
+    from the database when no arguments are specified. Closes: #616342
+  * Add new dpkg-gensymbols -l option to avoid having to abuse LD_LIBRARY_PATH
+    for cross-build paths.
+  * Check that DPKG_MAINTSCRIPT_PACKAGE is defined in dpkg-maintscript-helper.
+    Closes: #907772
+  * Switch dpkg-gencontrol and dpkg-genchanges to track automatically
+    generated artifacts by using the Auto-Built-Package field from the binary
+    package instead of hardcoding package name patterns (such as «-dbgsym$»).
+  * Add new --reverse option to dpkg-parsechangelog, to list the changelog
+    entries in reverse order.
+  * Architecture support:
+    - Add support for riscv64 CPU. Closes: #822914
+      Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
+    - Document the purpose and columns in the tupletable file.
+  * Portability:
+    - Add libcompat md5 module to the libcompat-test library, so that we
+      always make sure it builds, even when we use an external implementation.
+    - Convert libcompat md5 module to use C99 int types, instead of mapping
+      them from the BSD types at configure time.
+    - Use MD5_CTX instead of struct MD5Context, as the prevalent more portable
+      type on system's <md5.h> headers.
+    - Check for ldconfig command in dpkg only on platforms that do have it.
+    - Fix file descriptor leak in start-stop-daemon on AIX.
+    - libcompat: Add new strchrnul() implementation.
   * Perl modules:
-    - Check that $tarname is defined before use in Dpkg::Source::Package::V1.
+    - Dpkg::Source::Package::V1: Check that $tarname is defined before use.
       Thanks to Christoph Biedl <debian.axhn@manchmal.in-ulm.de>.
       Closes: #879124
+    - Dpkg::Vendor::Debian: Use proper %use_feature key. This was causing perl
+      errors on paths not accepted for fixdebugpath.
+      Reported by Mattia Rizzolo <mattia@debian.org>, on IRC. Closes: #881051
+    - Dpkg::Changelog: Print versions for incorrect changelog range warnings.
+      Thanks to Paul Wise <pabs@debian.org>.
+    - Dpkg::Shlibs::SymbolFile: Check that $state->{seen} exists instead of
+      $state being just defined. Fixes regression in dpkg-gensymbols symbols
+      output. Thanks to Dmitry Shachnev <mitya57@debian.org>. Closes: #880166
+    - Dpkg::Arch: Add new positive options argument to arch validators.
+    - Dpkg::Vendor::Debian: Mark hurd-i386 as having gcc builtin PIE.
+      Requested by Samuel Thibault <sthibault@debian.org>.
+    - Dpkg::Source::Package::V2: Print one building line per existing tarball.
+    - Dpkg::Source::Package: Print building lines for upstream tarball
+      signatures. Closes: #888787
+    - Dpkg::Deps: Turn virtualpkg tracking from an arrayyref into a hashref.
+    - Dpkg::Vendor::Debian: Mark riscv64 as having gcc builtin PIE.
+    - Dpkg::Shlibs::Objdump: Fix ELF program detection, for PIE binaries and
+      executable libraries.
+    - Dpkg::Version: Fix bool overload behavior back to be an is_valid()
+      alias. Emit a specific perl warning until 1.20.x so that users can check
+      whether the semantic change has any impact on the code, which can then
+      be quiesced. Closes: #895004
+    - Dpkg::Changelog::Parse: When detecting the changelog format, read the
+      last 4KiB of the file instead of using «tail -n40», which should be
+      both faster and more portable, as the default tail(1) is not POSIX
+      compliant on all systems (c.f. Solaris).
+    - Dpkg::Build::Types: Add new set_build_type_from_targets() function.
+    - Dpkg::Shlibs::SymbolFile: Always assign a proper Dpkg::Version to the
+      deprecated variable, otherwise the scalar value 0 can get confused
+      on scalar context to denote it is *not* deprecated instead of being
+      version 0.
+    - Dpkg::Shlibs: Disable bool overload Dpkg::Version warnings.
+    - Dpkg::Vendor::Debian: Inline _parse_feature_area() into
+      _add_build_flags(), for a small speed up and line count reduction.
+    - Dpkg::BuildFlags: Move default flags setting into the Dpkg::Vendor
+      modules.
+    - Dpkg::Gettext: Fix fallback textdomain() to honor its expected interface.
+    - Dpkg::Deps: Split subpackages into their own separate modules.
+    - Dpkg::Source: Do not change patch permissions if not necessary.
+      Closes: #898010
+    - Dpkg::Substvars: Reword used/unused warnings to clarify their meaning.
+      Closes: #904258
+    - Dpkg::Shlibs: Warn when using LD_LIBRARY_PATH with a private library
+      directory which is a descendent of the current working directory.
+    - Dpkg::Source::Package::V3::Quilt: Print series file used when applying
+      patches.
+    - Dpkg::OpenPGP: Return the destination path on successful ASCII armor
+      conversion.
+    - Dpkg::Control::Fields: Do not use & sigil for function calls.
+    - Dpkg::Shlibs: Ignore nonexistent directories present in LD_LIBRARY_PATH.
+    - Dpkg::Deps::KnownFacts: Satisfy :native with arch:all packages too.
+      These are treated as native packages everywhere else in the multi-arch
+      design, this was the only exception, which has become a source of
+      packaging problems as of late. This was apparently an oversight in
+      the original implementation. Closes: #854438
+    - Dpkg::Vendor::Debian: Add fixfilepath support to reproducible feature.
+    - Dpkg::Dist::Files: Add support for file attributes.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
       Spotted by Helge Kreutzmann <debian@helgefjell.de>.
     - Document DPKG_COLORS environment variable for all programs using it.
     - Document DPKG_NLS environment variable for all programs using it.
+    - Document the Testsuite and Testsuite-Triggers fields in
+      deb-src-control(5). Prompted by Mattia Rizzolo <mattia@debian.org>.
+    - Update git URLs for move away from alioth.debian.org.
+    - Fix set_build_type_from_options() description in Dpkg::Build::Types.
+    - Clarify PIE build flag feature semantics. Closes: #900088
+    - Clarify dpkg-buildpackage pre and post-clean options and their default
+      state.
+    - Add --build option equivalents for dpkg-buildpackage short build type
+      options in --help output.
+    - Fold dpkg-buildpackage --[no-]check-builddeps in --help into both -D
+      and -d option descriptions.
+    - Mark profiles as a replaceable item in dpkg-buildpackage --help output.
+    - Update test suite requirements in README.
+    - Document textdomain() and ngettext() replacement functions in
+      Dpkg::Gettext POD.
+    - Clarify arch-qualified dependency simplification in Dpkg::Deps POD.
+    - Improve Dpkg::Deps modules and methods documentation.
+    - Fix typo in deb-changes(5). Closes: #902616
+    - Clarify awaiting state for interest and activate directives.
+      Closes: #904060
+    - Fix man page markup. Closes: #900033, #900035, #900040
+      Thanks to Bjarni Ingi Gislason <bjarniig@rhi.hi.is>.
+    - Fix Doxygen comment for libdpkg dpkg_arch_find() function.
+    - Document the dangers of using start-stop-daemon(8) only with --pidfile
+      as matching option with the pid file owned by a non-privileged user.
+  * Code internals:
+    - Do not use stringy eval to define different sub implementations,
+      just assign an anonymous sub to the typeglob.
+    - Use memccpy() instead of strncpy() to quiesce a gcc-8 warning.
+    - Change pkgbin_name_needs_arch() to never arch-qualify packages that
+      have an empty or no architecture, which was already handled as part
+      of varbuf_add_archqual().
+    - libdpkg: Factor out cached arch-qualified package name generation into
+      new pkgbin_name_archqual() function.
+    - libdpkg: Add new pkg_name() and pkgbin_name() const variants.
+    - libdpkg, dselect: Use new pkg_name_const() and pkgbin_name_const().
+    - libdpkg: Rename struct pkginfo files member to archives.
+    - dpkg: Call ensure_package_clientdata() defensively.
+    - dpkg: For read-only state functions, check that clientdata is allocated
+      before using it.
+    - libdpkg: Move files list information from dpkg clientdata to pkginfo.
+    - dpkg: Move ensure_package_clientdata() into its own file.
+    - libdpkg: Move db-fsys code from src to lib/dpkg.
+    - libdpkg: Rename pkg-db module to pkg-hash.
+    - libdpkg: Simplify pkg_files_blank() by using a pointer to pointer to
+      track the previous entry.
+    - libdpkg: Factor out package files handling into its own module.
+    - libdpkg: Switch to a new tiny struct to track file on-disk identity.
+      This should reduce the run-time memory used.
+    - libdpkg: Reset nfiles in files_db_reset().
+    - libdpkg: Split push_cleanup() into push_cleanup_fallback().
+    - Switch from strchr() + strlen() to strchrnul().
+    - libdpkg: Change dpkg_error to track errno values.
+    - libdpkg: Add new varbuf_new() and varbuf_free() functions.
+    - libdpkg: Add new file_slurp() function.
+    - libdpkg: Switch db-fsys to use the new file_slurp() function.
+    - libdpkg: Add new pkg_infodb_reset_dir().
+    - libdpkg: Add new m_dup() function.
+    - libdpkg: Factor out package stanza printing into its own function.
+    - libdpkg: Split pager specific code into its own module.
+    - libdpkg: Add pager spawning and reaping support.
+    - Use new pager spawning support instead of open-coding it, or piping it
+      via a shell invocation, which required metacharacter escaping.
+    - dpkg-query: Split enqperpackage() into each different action.
+  * Build system:
+    - Set distribution tarball format to ustar, instead of default v7 format.
+    - Mark PO4A and POD2MAN as precious variables.
+    - Automatically replace -Wno- with -W when testing compiler flags,
+      instead of passing the positive form manually.
+    - Enable clang -Wdocumentation warning if available.
+    - Enable gcc-7 -Wregister warning if available.
+    - Add CPAN distribution machinery for the perl modules. Closes: #821177
+    - Add an autogen script to help people bootstrap the project.
+    - Distribute the man.stamp from VPATH.
+    - Preserve timestamps when distributing man pages.
+    - Add a GitLab CI configuration file.
+    - Disable C optimization levels when configuring for code coverage.
   * Packaging:
     - Install update-alternatives policykit-1 file.
     - Add Breaks to libdpkg-perl against pkg-kde-tools (<< 0.15.28~), as
       that package is using private modules with no API guarantees, that
       obviously broke due to recent changes in 1.19.0. Closes: #878919
-    - Comment out Rules-Requires-Root field until debhelper supports it.
     - Add Breaks on debhelper << 10.10.1~ to dpkg-dev, so that debhelper users
       wanting to use R³ support do not need a versioned dependency on dpkg-dev.
     - Add Breaks dgit << 3.13~ to libdpkg-perl, as older dgit versions assumed
@@ -41,20 +836,65 @@ dpkg (1.19.1~dyson1) unstable; urgency=medium
       from Dpkg::Source::Package.
       Reported by Ian Jackson <ijackson@chiark.greenend.org.uk>.
     - Bump Standards-Version to 4.1.1 (no changes needed).
+    - Add bzip2 and xz-utils to Build-Depends, required by the functional test
+      suite, but shadowed by dpkg-dev from the build system pulling those in.
+    - Add versioned libncurses-dev as the first Build-Depends alternative.
+      Thanks to Sven Joachim <svenjoac@gmx.de>.
+    - Do not pass VERBOSE to test suite, as we are not using any automake
+      test driver, so it does not get honored.
+    - Rename maintainer-build DEB_BUILD_OPTIONS to new standardized terse.
+    - Enable verbose test suite only in non-terse builds.
+    - Add a Suggests on sensible-utils to libdpkg-perl.
+    - Switch libdpkg-perl again to depend on perl:any, now that debootstrap
+      in stable (stretch) supports arch-qualified dependencies.
+    - Update libdpkg-perl public module list in package description.
+    - Add Breaks on apt (<< 1.7~b) for --status-fd duplicate removals.
   * Test suite:
     - Skip Dpkg::OpenPGP test if gpg is not present.
+    - Check POD in all perl scripts.
+    - Consider *.PL also to be perl files.
+    - Infer automatically the unit test data directory.
+    - Infer automatically the unit test temp directory.
+    - Add new po author test case (use i18nspector if available).
+    - Add new test cases to clarify arch-qualified dependency simplification.
+    - Add several TODO tests cases for dependency simplification.
+    - Add new cppcheck author test.
+    - Add support for new test_get_srcdir() test_get_builddir().
+    - Add new unit tests for namevalue, fsys-hash and pkg-hash libdpkg modules.
+    - Improve coverage of perl unit tests.
+    - Delete fixup lines from i18nspector output instead of emptying them.
+    - Add new codespell author test.
+    - Add new test that the public libdpkg headers can be compiled with C++.
+
+  [ Josh Triplett ]
+  * Perl: Replace all calls to Cwd::cwd with Cwd::getcwd; the former calls
+    /bin/pwd, while the latter uses the getcwd() syscall directly.
 
   [ Updated programs translations ]
+  * Dutch (Frans Spiesschaert). Closes: #881401
   * German (Sven Joachim).
+  * Italian (Milo Casagrande). Closes: #883085
+  * Polish (Łukasz Dulny).
+  * Simplified Chinese (Zhou Mo, Boyuan Yang). Closes: #900547, #890806
   * Spanish (Javier Fernández-Sanguino).
+  * Traditional Chinese (Buo-ren Lin). Closes: #905887
+  * Turkish (Mert Dirik). Closes: #886252
 
   [ Updated scripts translations ]
   * German (Helge Kreutzmann).
 
   [ Updated man pages translations ]
+  * Dutch (Frans Spiesschaert). Closes: #881403
   * German (Helge Kreutzmann).
+  * Simplified Chinese (Zhou Mo).
 
-  [ Igor Pashev ]
+dpkg (1.19.1~dyson2) unstable; urgency=medium
+
+  * Fix crash in dpkg-deb/build.c caused by old code for charset.alias
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 19 Nov 2017 17:15:25 +0300
+
+dpkg (1.19.1~dyson1) unstable; urgency=medium
   * Package for Dyson
 
  -- Igor Pashev <pashev.igor@gmail.com>  Sun, 19 Nov 2017 14:15:25 +0300
@@ -107,7 +947,7 @@ dpkg (1.19.0) unstable; urgency=medium
   * Make --uniform-compression the new default dpkg-deb behavior. Add support
     for negating the option via --no-uniform-compression.
   * Clarify subprocess error message by shuffling words around.
-  * Print the package name on maintainter script errors. Closes: #877521
+  * Print the package name on maintainer script errors. Closes: #877521
   * Fix capitalization of Debian in dpkg-deb output messages.
   * Add a policikit file for running update-alternatives via pkexec.
     Propose by Boyuan Yang <073plan@gmail.com>.
@@ -324,7 +1164,7 @@ dpkg (1.18.24) unstable; urgency=medium
       on not cleaning the source tree.
   * Documentation:
     - Many spelling fixes. Thanks to Josh Soref <jsoref@gmail.com>.
-    - Do not include mispellings in changelogs, as that makes detecting them
+    - Do not include misspellings in changelogs, as that makes detecting them
       more difficult.
   * Build system:
     - Use libexec variable for auxiliary internal programs, and set it to
@@ -2642,6 +3482,7 @@ dpkg (1.17.11) unstable; urgency=low
   * Do not write to the available file when unpacking binary packages. This
     information is not useful as dpkg has never recorded the archive path,
     so it has never been truly available for re-installation anyway.
+    Closes: #241768
   * Add versioned Provides support:
     - Add a new dpkg --assert-versioned-provides command.
     - Packages can provide a specific version, “virtual (= 1.0)” which will
@@ -3012,13 +3853,9 @@ dpkg (1.17.7) unstable; urgency=low
     Thanks to Andreas Beckmann <anbe@debian.org>. Closes: #735159
   * Be verbose on «make check» errors by printing the test suite log.
 
-<<<<<<< HEAD
 dpkg (1.17.7~dyson1) unstable; urgency=low
 
-  [ Updated dpkg translations ]
-=======
   [ Updated programs translations ]
->>>>>>> 3ed0cc75a0113a5eda762b9a19448e78ce43097e
   * German (Sven Joachim).
   * Swedish (Peter Krefting).
   * Thai (Theppitak Karoonboonyanan). Closes: #745032
@@ -5299,7 +6136,7 @@ dpkg (1.15.6) experimental; urgency=low
     in a way consistent with the rest of the tools.
   * Recognize --help in addition to -h in dpkg-checkbuilddeps.
   * Add a --version option to dpkg-checkbuilddeps.
-  * Improve and mark more messages in writedb() to make translators lifes
+  * Improve and mark more messages in writedb() to make translators lives
     easier. Closes: #408525
   * Improve update-alternatives --display output to use two leading spaces
     for current link and slave information. Use single quotes for both “best”
@@ -12697,7 +13534,7 @@ Changes in dpkg 0.93.15:
 * Put packages in `purge' state even if `deinstall' requested if
   they have no postrm and no conffiles.
 * Version number comparisons fixed.
-* insert-version.pl now installes lib.pl filename too.
+* insert-version.pl now installs lib.pl filename too.
 * Strip trailing slashes when reading files from file lists.
 
 Changes in dpkg 0.93.14:
@@ -12915,4 +13752,3 @@ Thu Aug 25 11:46:27 1994  Ian Murdock  (imurdock@debra.debian.org)
         link never being removed at all.
 
 ChangeLog begins Thu Aug 25 11:46:27 1994 for dpkg 0.93.5.
-
diff --git a/debian/compat b/debian/compat
index f599e28b8..b4de39476 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index c73f79762..d0333d8ea 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,13 @@ Section: admin
 Priority: required
 Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
 Uploaders: Guillem Jover <guillem@debian.org>
-Origin: debian
-Bugs: debbugs://bugs.debian.org
 Homepage: https://wiki.debian.org/Teams/Dpkg
-Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git
-Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git
-Standards-Version: 4.1.1
-# We cannot enable R³ until debhelper supports it.
-#Rules-Requires-Root: no
+Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git
+Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git
+Standards-Version: 4.3.0
+Rules-Requires-Root: no
 Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
  pkg-config,
 # Needed for ITS support.
  gettext (>= 0.19.7),
@@ -22,7 +19,10 @@ Build-Depends:
  libbz2-dev,
  liblzma-dev,
  libselinux1-dev [linux-any],
- libncursesw5-dev,
+ libncurses-dev (>= 6.1+20180210) | libncursesw5-dev,
+# Needed for the functional test.
+ bzip2 <!nocheck>,
+ xz-utils <!nocheck>,
 
 Package: dpkg
 Architecture: any
@@ -38,21 +38,10 @@ Suggests:
  apt,
  debsig-verify,
 Breaks:
-# Due to removal of dpkg-divert compat symlink.
- amule (<< 2.3.1+git1a369e47-3),
-# Due to removal of dpkg-statoverride compat symlink.
- acidbase (<= 1.4.5-4),
- beep (<< 1.3-4),
- im (<< 1:151-4),
- netselect (<< 0.3.ds1-27),
- pconsole (<< 1.0-12),
- phpgacl (<< 3.3.7-7.3),
- pure-ftpd (<< 1.0.43-1),
- systemtap (<< 2.8-1),
- terminatorx (<< 4.0.1-1),
- xvt (<= 2.1-20.1),
-# Due to renaming of triplettable to tupletable.
- libdpkg-perl (<< 1.18.11),
+# Due to --status-fd not duplicating output.
+ libapt-pkg5.0 (<< 1.7~b),
+# Due to s-s-d requiring secure usage of --pidfile.
+ lsb-base (<< 10.2019031300),
 Description: Debian package management system
  This package provides the low-level infrastructure for handling the
  installation and removal of Debian software packages.
@@ -97,8 +86,8 @@ Recommends:
  build-essential,
  gcc | c-compiler,
  fakeroot,
- gnupg | gnupg2,
- gpgv | gpgv2,
+ gnupg,
+ gpgv,
 # Used by dpkg-mergechangelogs.
  libalgorithm-merge-perl,
 Suggests:
@@ -120,10 +109,7 @@ Architecture: all
 Multi-Arch: foreign
 Depends:
  ${misc:Depends},
-# XXX: This needs to be perl:any, but that breaks debootstrap in jessie
-# (the current stable), it could be fixed once and iff stretch is stable
-# and contains a fixed debootstrap.
- perl,
+ perl:any,
 # Needed for arch tuples.
  dpkg (>= 1.18.11),
 Recommends:
@@ -135,18 +121,18 @@ Recommends:
  xz-utils,
 Suggests:
  debian-keyring,
- gnupg | gnupg2,
- gpgv | gpgv2,
+ gnupg,
+ gpgv,
  gcc | c-compiler,
  binutils,
  patch,
+# Used (if available) by Dpkg::Source::Package::V2.
+ sensible-utils,
 # Needed by Dpkg::Source::Package::V3::Git
  git,
 # Needed by Dpkg::Source::Package::V3::Bzr
  bzr,
 Breaks:
-# Needed for git-style diffs.
- patch (<< 2.7),
 # Uses the private Dpkg::Shlibs::SymbolFile module with no API stability
 # guarantees! Which obviously broke with 1.19.0.
  pkg-kde-tools (<< 0.15.28~),
@@ -163,14 +149,14 @@ Description: Dpkg perl modules
   - Dpkg::Build::Info: build information functions
   - Dpkg::BuildFlags: set, modify and query compilation build flags
   - Dpkg::BuildOptions: parse and manipulate DEB_BUILD_OPTIONS
-  - Dpkg::BuildProfile: parse and manipulate build profiles
+  - Dpkg::BuildProfiles: parse and manipulate build profiles
   - Dpkg::Changelog: parse changelogs
   - Dpkg::Changelog::Entry: represents a changelog entry
   - Dpkg::Changelog::Parse: generic changelog parser for dpkg-parsechangelog
   - Dpkg::Checksums: generate and parse checksums
   - Dpkg::Compression: simple database of available compression methods
-  - Dpkg::Compression::Process: wrapper around compression tools
   - Dpkg::Compression::FileHandle: transparently (de)compress files
+  - Dpkg::Compression::Process: wrapper around compression tools
   - Dpkg::Conf: parse dpkg configuration files
   - Dpkg::Control: parse and manipulate Debian control information
     (.dsc, .changes, Packages/Sources entries, etc.)
@@ -179,7 +165,14 @@ Description: Dpkg perl modules
   - Dpkg::Control::Hash: parse and manipulate a block of RFC822-like fields
   - Dpkg::Control::Info: parse files like debian/control
   - Dpkg::Control::Tests: parse files like debian/tests/control
+  - Dpkg::Control::Tests::Entry: represents a debian/tests/control stanza
   - Dpkg::Deps: parse and manipulate dependencies
+  - Dpkg::Deps::Simple: represents a single dependency statement
+  - Dpkg::Deps::Multiple: base module to represent multiple dependencies
+  - Dpkg::Deps::Union: list of unrelated dependencies
+  - Dpkg::Deps::AND: list of AND dependencies
+  - Dpkg::Deps::OR: list of OR dependencies
+  - Dpkg::Deps::KnownFacts: list of installed and virtual packages
   - Dpkg::Exit: push, pop and run exit handlers
   - Dpkg::Gettext: wrapper around Locale::gettext
   - Dpkg::IPC: spawn sub-processes and feed/retrieve data
@@ -187,6 +180,7 @@ Description: Dpkg perl modules
     example)
   - Dpkg::Interface::Storable: base object serializer
   - Dpkg::Path: common path handling functions
+  - Dpkg::Source::Format: manipulate debian/source/format files
   - Dpkg::Source::Package: extract Debian source packages
   - Dpkg::Substvars: substitute variables in strings
   - Dpkg::Vendor: identify current distribution vendor
diff --git a/debian/dpkg-dev.lintian-overrides b/debian/dpkg-dev.lintian-overrides
deleted file mode 100644
index f6fcd08c5..000000000
--- a/debian/dpkg-dev.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-dpkg-dev: redundant-origin-field
-dpkg-dev: redundant-bugs-field
diff --git a/debian/dpkg.cron.daily b/debian/dpkg.cron.daily
index 0a6b05e1d..62da81727 100644
--- a/debian/dpkg.cron.daily
+++ b/debian/dpkg.cron.daily
@@ -9,16 +9,16 @@ if cd /var/backups ; then
     dbchanged=no
     dbfiles="arch status diversions statoverride"
     for db in $dbfiles ; do
-        if ! cmp -s dpkg.${db}.0 $dbdir/$db ; then
+        if ! cmp -s "dpkg.${db}.0" "$dbdir/$db"; then
             dbchanged=yes
             break;
         fi
     done
     if [ "$dbchanged" = "yes" ] ; then
         for db in $dbfiles ; do
-            [ -e $dbdir/$db ] || continue
-            cp -p $dbdir/$db dpkg.$db
-            savelog -c 7 dpkg.$db >/dev/null
+            [ -e "$dbdir/$db" ] || continue
+            cp -p "$dbdir/$db" "dpkg.$db"
+            savelog -c 7 "dpkg.$db" >/dev/null
         done
     fi
 
diff --git a/debian/dpkg.install b/debian/dpkg.install
index e1b36914b..ec89564d2 100644
--- a/debian/dpkg.install
+++ b/debian/dpkg.install
@@ -16,6 +16,7 @@ usr/bin/dpkg-statoverride
 usr/bin/dpkg-trigger
 usr/bin/update-alternatives
 usr/share/dpkg/*table
+usr/share/lintian/profiles
 usr/share/locale/*/LC_MESSAGES/dpkg.mo
 usr/share/polkit-1/actions
 var/lib/dpkg/alternatives
diff --git a/debian/dpkg.lintian-overrides b/debian/dpkg.lintian-overrides
index 66f96247a..2ee72d62a 100644
--- a/debian/dpkg.lintian-overrides
+++ b/debian/dpkg.lintian-overrides
@@ -1,3 +1 @@
-dpkg: redundant-origin-field
-dpkg: redundant-bugs-field
 dpkg: arch-dep-package-has-big-usr-share
diff --git a/debian/dpkg.lintian-profile b/debian/dpkg.lintian-profile
new file mode 100644
index 000000000..44f2614c0
--- /dev/null
+++ b/debian/dpkg.lintian-profile
@@ -0,0 +1,7 @@
+# This is the dpkg pseudo-vendor profile.
+Profile: dpkg/main
+# It has all the checks and settings from the "debian" profile.
+Extends: debian/main
+# Except the ones that are bogus for the non-Debian distributions.
+Disable-Tags:
+ package-uses-vendor-specific-patch-series,
diff --git a/debian/dpkg.postinst b/debian/dpkg.postinst
index e762b8a2c..7b2582dda 100755
--- a/debian/dpkg.postinst
+++ b/debian/dpkg.postinst
@@ -18,9 +18,12 @@ create_database() {
 # Create log file and set default permissions if possible
 create_logfile() {
     logfile=$DPKG_ROOT/var/log/dpkg.log
-    touch $logfile
-    chmod 644 $logfile
-    chown root:root $logfile 2>/dev/null || chown 0:0 $logfile
+
+    if [ ! -f "$logfile" ]; then
+        touch "$logfile"
+        chmod 644 "$logfile"
+        chown root:root "$logfile" 2>/dev/null || chown 0:0 "$logfile"
+    fi
 }
 
 
diff --git a/debian/dpkg.postrm b/debian/dpkg.postrm
index e5658ceaa..175080e86 100755
--- a/debian/dpkg.postrm
+++ b/debian/dpkg.postrm
@@ -7,8 +7,8 @@ set -e
 remove_logfile() {
     logdir=$DPKG_ROOT/var/log
 
-    rm -f $logdir/dpkg.log $logdir/dpkg.log.* 2>/dev/null
-    rm -f $logdir/alternatives.log $logdir/alternatives.log.* 2>/dev/null
+    rm -f "$logdir"/dpkg.log "$logdir"/dpkg.log.* 2>/dev/null
+    rm -f "$logdir"/alternatives.log "$logdir"/alternatives.log.* 2>/dev/null
 }
 
 case "$1" in
diff --git a/debian/dselect.lintian-overrides b/debian/dselect.lintian-overrides
deleted file mode 100644
index 2243de2cd..000000000
--- a/debian/dselect.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-dselect: redundant-origin-field
-dselect: redundant-bugs-field
diff --git a/debian/dselect.postrm b/debian/dselect.postrm
new file mode 100755
index 000000000..7376dd672
--- /dev/null
+++ b/debian/dselect.postrm
@@ -0,0 +1,34 @@
+#!/bin/sh
+# See deb-postrm(5).
+
+set -e
+
+# Remove dselect methods state.
+purge_state() {
+  admindir=${DPKG_ADMINDIR:-/var/lib/dpkg}
+
+  rm -f $admindir/cmethopt 2>/dev/null
+  for method in disk ftp mnt multicd; do
+    rm -rf $admindir/methods/$method/* 2>/dev/null
+  done
+}
+
+case "$1" in
+remove)
+  ;;
+purge)
+  purge_state
+  ;;
+upgrade)
+  ;;
+failed-upgrade|disappear|abort-install|abort-upgrade)
+  ;;
+*)
+  echo "$0 called with unknown argument '$1'" 1>&2
+  exit 1
+  ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/libdpkg-dev.lintian-overrides b/debian/libdpkg-dev.lintian-overrides
deleted file mode 100644
index 83ff3f4e6..000000000
--- a/debian/libdpkg-dev.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libdpkg-dev: redundant-origin-field
-libdpkg-dev: redundant-bugs-field
diff --git a/debian/libdpkg-perl.lintian-overrides b/debian/libdpkg-perl.lintian-overrides
deleted file mode 100644
index d7cd8a07b..000000000
--- a/debian/libdpkg-perl.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-libdpkg-perl: redundant-origin-field
-libdpkg-perl: redundant-bugs-field
diff --git a/debian/rules b/debian/rules
index 01957755a..d79545ec7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,12 @@
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>
 # Copyright © 2006-2012 Guillem Jover <guillem@debian.org>
 
-WFLAGS := -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers
+WFLAGS := \
+	-Wall -Wextra \
+	-Wno-missing-field-initializers \
+	-Wno-nonnull-compare \
+	-Wno-unused-parameter \
+	$(nil)
 
 # Use the in-tree dpkg-buildflags
 dpkg_buildflags = \
@@ -34,8 +39,9 @@ endif
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 	confflags += --with-libselinux
 endif
-ifeq (,$(filter maintainer-build,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
 	confflags += --disable-silent-rules
+	testflags += TESTSUITEFLAGS=--verbose
 endif
 
 ifeq ($(with_start_stop_daemon),no)
@@ -51,15 +57,10 @@ endif
 
 D := $(CURDIR)/debian/tmp
 
-# Create configure script if necessary, automake handles rebuilding it.
-configure:
-	dh_testdir
-
-	autoreconf -v -i -f
-
 # Configure the build tree
-build-tree/config.status: configure
+build-tree/config.status:
 	dh_testdir
+	dh_autoreconf
 
 	install -d build-tree
 	cd build-tree && ../configure $(confflags) \
@@ -88,8 +89,7 @@ check: build
 	dh_testdir
 
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	cd build-tree && $(MAKE) VERBOSE=1 TESTSUITEFLAGS=--verbose \
-	                         TEST_PARALLEL=$(NUMJOBS) check
+	cd build-tree && $(MAKE) $(testflags) TEST_PARALLEL=$(NUMJOBS) check
 endif
 
 # Install the package underneath debian/tmp
@@ -101,6 +101,11 @@ install: check
 
 	cd build-tree && $(MAKE) DESTDIR=$(D) install
 
+	# Special-case the lintian profile, as dh cannot rename on install.
+	mkdir -p $(D)/usr/share/lintian/profiles/dpkg
+	cp debian/dpkg.lintian-profile \
+	   $(D)/usr/share/lintian/profiles/dpkg/main.profile
+
 define dpkg-installmanl10n
 for f in `sed -e 's:\*:*/*:' debian/$(1).manpages`; do \
 	test -e $$f && \
@@ -128,6 +133,7 @@ endif
 	$(call dpkg-installmanl10n,dselect)
 	dh_installman -a
 	dh_link -a
+	dh_bugfiles -a -A
 	dh_lintian -a
 	dh_strip -a
 	dh_compress -a
@@ -149,6 +155,7 @@ binary-indep: install
 	$(call dpkg-installmanl10n,dpkg-dev)
 	dh_installman -i
 	dh_link -i
+	dh_bugfiles -i -A
 	dh_lintian -i
 	# The perl modules should not depend on a specific interpreter.
 	dh_perl -i -Nlibdpkg-perl
@@ -168,6 +175,7 @@ clean:
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -rf build-tree
+	dh_autoreconf_clean
 	dh_clean
 
 
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index 30cef6ffd..000000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-dpkg source: redundant-origin-field
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 000000000..bba379db1
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,7 @@
+Tests: test-not-root
+Depends: build-essential, autoconf, pkg-config, file
+Restrictions: superficial skippable rw-build-tree
+
+Tests: test-root
+Depends: build-essential, autoconf, pkg-config, file
+Restrictions: superficial rw-build-tree needs-root breaks-testbed
diff --git a/debian/tests/test-not-root b/debian/tests/test-not-root
new file mode 100644
index 000000000..211de1eb6
--- /dev/null
+++ b/debian/tests/test-not-root
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$(id -u)" = '0' ]; then
+  # Skip, we cannot declare we do not want root.
+  exit 77
+fi
+
+t=test-not-root
+
+mkdir -p $t
+cd $t
+../configure --disable-nls --disable-dselect
+make installcheck
diff --git a/debian/tests/test-root b/debian/tests/test-root
new file mode 100644
index 000000000..c3cb1c257
--- /dev/null
+++ b/debian/tests/test-root
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$(id -u)" != '0' ]; then
+  # Fail, we declared needing root as a restriction.
+  exit 1
+fi
+
+t=test-root
+
+mkdir -p $t
+cd $t
+../configure --disable-nls --disable-dselect
+make installcheck
diff --git a/debian/usertags b/debian/usertags
index 5ef5a449a..9d5f9eeff 100644
--- a/debian/usertags
+++ b/debian/usertags
@@ -15,10 +15,10 @@ Generic tags
 usertag			description
 -------			-----------
 
-assert			Errors caused by assert().
 segfault		Errors that cause segmentation faults.
 conffile		Issues with configuration file handling.
 symlink			Issues related to symlink handling.
+diversion		Issues related to diversions.
 depends			Issues with dependency relationship handling.
 maint-script		Errors related to maintainer scripts.
 db			Issues handling the database.
@@ -31,6 +31,7 @@ deb-format		Changes to the binary (.deb) format.
 dsc-format		Changes to the source (.dsc) format.
 arch			Updates to ‘cputable’, ‘ostable’ and porting patches.
 vendor			Vendor support and needed modifications.
+frontend		Issues or request affecting or required by frontends.
 build			Project build system issues.
 i18n			Conversion to the UTF-8 encoding.
 i18n			Internationalization problems.
@@ -40,15 +41,6 @@ l10n			New or updated translations and bugs affecting
 doc			Documentation bugs, including --help, program output
 			  and manpages.
 
-Being considered tags
-=====================
-
-usertag			description
--------			-----------
-
-diversion		Issues related to diversions.
-apt-feature		??
-
 Program tags
 ============
 
@@ -63,6 +55,7 @@ dpkg-checkbuilddeps
 dpkg-deb
 dpkg-distaddfile
 dpkg-divert
+dpkg-genbuildinfo
 dpkg-genchanges
 dpkg-gencontrol
 dpkg-gensymbols
@@ -79,6 +72,7 @@ dpkg-split
 dpkg-statoverride
 dpkg-trigger
 dpkg-vendor
+make-fragment		*.mk
 s-s-d			start-stop-daemon
 u-a			update-alternatives
 
@@ -102,7 +96,7 @@ usercategory dpkg-status [hidden]
    + Unknown Pending Status []
 
 usercategory dpkg-program [hidden]
- * Dpkg Program
+ * Dpkg by Program
   + dpkg program [tag=dpkg]
   + dpkg-deb [tag=dpkg-deb]
   + dpkg-divert [tag=dpkg-divert]
@@ -111,14 +105,15 @@ usercategory dpkg-program [hidden]
   + dpkg-statoverride [tag=dpkg-statoverride]
   + dpkg-trigger [tag=dpkg-trigger]
   + dpkg-maintscript-helper [tag=dpkg-maintscript-helper]
-  + start-stop-daemon [tag=s-s-d]
   + update-alternatives [tag=u-a]
+  + start-stop-daemon [tag=s-s-d]
   + libdpkg [package=libdpkg-dev]
   + dpkg-architecture [tag=dpkg-architecture]
   + dpkg-buildflags [tag=dpkg-buildflags]
   + dpkg-buildpackage [tag=dpkg-buildpackage]
   + dpkg-checkbuilddeps [tag=dpkg-checkbuilddeps]
   + dpkg-distaddfile [tag=dpkg-distaddfile]
+  + dpkg-genbuildinfo [tag=dpkg-genbuildinfo]
   + dpkg-genchanges [tag=dpkg-genchanges]
   + dpkg-gencontrol [tag=dpkg-gencontrol]
   + dpkg-gensymbols [tag=dpkg-gensymbols]
@@ -131,21 +126,17 @@ usercategory dpkg-program [hidden]
   + dpkg-source [tag=dpkg-source]
   + dpkg-vendor [tag=dpkg-vendor]
   + Dpkg perl modules [package=libdpkg-perl]
+  + Dpkg make fragment [tag=make-fragment]
   + dselect [package=dselect]
   + Other [0:]
 
-usercategory dpkg-program-view
- * dpkg-status
- * dpkg-program
- * severity
-
 usercategory dpkg-class [hidden]
- * Dpkg Classification [tag=]
+ * Dpkg by Classification [tag=]
   + Segfault [segfault]
-  + Assertion failure [assert]
   + Dependency relationship handling [depends]
   + Conffile handling [conffile]
   + Symlink handling [symlink]
+  + Diversion handling [diversion]
   + Database handling [db]
   + File metadata tracking [file-metadata]
   + Maintainer script handling [maint-script]
@@ -157,24 +148,38 @@ usercategory dpkg-class [hidden]
   + Source package format [dsc-format]
   + Architecture specific issue [arch]
   + Vendor specific issue [vendor]
+  + Frontend features [frontend]
   + Own build system [build]
   + Internationalization [i18n]
   + Localization [l10n]
   + Documentation [doc]
   + Other [0:]
 
+usercategory dpkg-program-view
+ * status
+ * dpkg-program
+ * severity
+ * classification
+
 usercategory dpkg-class-view
- * dpkg-status
+ * status
  * dpkg-class
  * severity
+ * classification
 
-# Change default view
-usercategory normal
+usercategory dpkg-detail-view
  * dpkg-status
  * severity
  * dpkg-program
  * dpkg-class
 
+# Change default view
+usercategory normal
+ * status
+ * dpkg-program
+ * severity
+ * classification
+
 usercategory old-normal
  * status
  * severity
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 8253b4dc8..22b4ed053 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.9.1
+# Doxyfile 1.8.13
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -293,6 +293,15 @@ EXTENSION_MAPPING      = l=C
 
 MARKDOWN_SUPPORT       = YES
 
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -343,6 +352,13 @@ IDL_PROPERTY_SUPPORT   = YES
 
 DISTRIBUTE_GROUP_DOC   = NO
 
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
 # Set the SUBGROUPING tag to YES to allow class member groups of the same type
 # (for instance a group of public functions) to be put as a subgroup of that
 # type (e.g. under the Public Functions section). Set it to NO to prevent
@@ -732,6 +748,12 @@ WARN_IF_DOC_ERROR      = YES
 
 WARN_NO_PARAMDOC       = NO
 
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
 # will be replaced by the file and line number from which the warning originated
@@ -755,7 +777,7 @@ WARN_LOGFILE           =
 # The INPUT tag is used to specify the files and/or directories that contain
 # documented source files. You may enter file names like myfile.cpp or
 # directories like /usr/src/myproject. Separate the files or directories with
-# spaces.
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
 INPUT                  = lib/dpkg \
@@ -775,12 +797,17 @@ INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
 # FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
-# *.h) to filter out the source-files in the directories. If left blank the
-# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
-# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
-# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
-# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
-# *.qsf, *.as and *.js.
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
 
 FILE_PATTERNS          = *.c \
                          *.h
@@ -867,6 +894,10 @@ IMAGE_PATH             =
 # Note that the filter must not add or remove lines; it is applied before the
 # code is scanned, but not when the output code is generated. If lines are added
 # or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 INPUT_FILTER           =
 
@@ -876,6 +907,10 @@ INPUT_FILTER           =
 # (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
 # filters are used. If the FILTER_PATTERNS tag is empty or if none of the
 # patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
 
 FILTER_PATTERNS        =
 
@@ -993,7 +1028,7 @@ VERBATIM_HEADERS       = YES
 # rich C++ code for which doxygen's built-in parser lacks the necessary type
 # information.
 # Note: The availability of this option depends on whether or not doxygen was
-# compiled with the --with-libclang option.
+# generated with the -Duse-libclang=ON option for CMake.
 # The default value is: NO.
 
 CLANG_ASSISTED_PARSING = NO
@@ -1629,9 +1664,12 @@ COMPACT_LATEX          = NO
 PAPER_TYPE             = a4wide
 
 # The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
-# that should be included in the LaTeX output. To get the times font for
-# instance you can specify
-# EXTRA_PACKAGES=times
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
 # If left blank no extra packages will be included.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
@@ -1734,6 +1772,14 @@ LATEX_SOURCE_CODE      = NO
 
 LATEX_BIB_STYLE        = plain
 
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -2232,7 +2278,8 @@ INCLUDED_BY_GRAPH      = YES
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable call graphs for selected
-# functions only using the \callgraph command.
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2243,7 +2290,8 @@ CALL_GRAPH             = YES
 #
 # Note that enabling this option will significantly increase the time of a run.
 # So in most cases it will be better to enable caller graphs for selected
-# functions only using the \callergraph command.
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2266,13 +2314,17 @@ GRAPHICAL_HIERARCHY    = YES
 DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot.
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
 # Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
 # to make the SVG files visible in IE 9+ (other browsers do not have this
 # requirement).
 # Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
 # png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
-# gif:cairo:gd, gif:gd, gif:gd:gd and svg.
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
 # The default value is: png.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
@@ -2323,6 +2375,11 @@ DIAFILE_DIRS           =
 
 PLANTUML_JAR_PATH      =
 
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 
diff --git a/doc/coding-style.txt b/doc/coding-style.txt
index 5e00ddaa6..d2e2b9071 100644
--- a/doc/coding-style.txt
+++ b/doc/coding-style.txt
@@ -287,7 +287,7 @@ see what operation is being done:
 		foo();
 
 
-Dpkg Perl coding style 2017-05-18
+Dpkg Perl coding style 2019-03-27
 ======================
 
 General
@@ -326,7 +326,7 @@ Perl version
 
 We don't want to impose a too-recent Perl version, so only use features
 supported by the Perl version that is currently in Debian oldstable when
-possible. Currently that means Perl 5.20.2.
+possible. Currently that means Perl 5.24.1.
 
 Object methods
 ~~~~~~~~~~~~~~
diff --git a/doc/frontend.txt b/doc/frontend.txt
index 66280860c..9ea1e20f6 100644
--- a/doc/frontend.txt
+++ b/doc/frontend.txt
@@ -10,15 +10,15 @@ Database Locking
 ----------------
 
 Any frontend needing to make sure no write operation is currently happening,
-should lock the dpkg database by locking the file «<admindir>/lock» using
-file record locks (i.e. fcntl(2) advisory locking). The whole file should
-be locked, as that's the most portable way to perform this operation; this
-can be achieved by using start=0, len=0 and whence=SEEK_SET.
+and no other frontend is running should first acquire the frontend lock at
+«<admindir>/lock-frontend», and then acquire the dpkg database lock at
+«<admindir>/lock». When the frontend invokes dpkg, it should set the
+environment variable DPKG_FRONTEND_LOCKED (to prevent dpkg from acquiring
+the frontend lock), and then release the dpkg database lock, which will be
+acquired by dpkg itself. This way no other frontend following this protocol
+can race to perform operations while another one has one in progress.
 
-Take into account there will be a race condition between the frontend
-unlocking the database and the invoked dpkg locking it again, in which
-another process could lock it.
-
-In the future this functionality will be available through a shared libdpkg
-library, and all frontends will be expected to switch to that instead,
-because this will fix the aforementioned race condition.
+These locks must be file record locks (i.e. fcntl(2) advisory locking), and
+the whole file should be locked, as that's the most portable way to perform
+this operation; this can be achieved by using start=0, len=0 and
+whence=SEEK_SET.
diff --git a/doc/lcov-inject.pl b/doc/lcov-inject.pl
index a74c8010d..12b78bd9a 100755
--- a/doc/lcov-inject.pl
+++ b/doc/lcov-inject.pl
@@ -25,7 +25,7 @@ use Cwd;
 use Devel::Cover::DB;
 
 my $dir = 'scripts';
-my $cwd = cwd();
+my $cwd = getcwd();
 
 chdir $dir or die "cannot switch to $dir\n";
 
diff --git a/doc/rootless-builds.txt b/doc/rootless-builds.txt
index 98e387709..3298768ec 100644
--- a/doc/rootless-builds.txt
+++ b/doc/rootless-builds.txt
@@ -1,7 +1,8 @@
 Supporting rootless builds
 ==========================
 
-Status: draft, experimental
+Status: recommendation, stable
+Version: 1.0
 
 Background
 ----------
@@ -47,10 +48,20 @@ The values are defined as:
      (See also "Implementation provided keywords".)
 
    - When "Rules-Requires-Root" is set to <implementations-keywords>, the
-     builder will expose an interface that is used to run a command under
-     (fake)root via the "Gain Root API". If the builder cannot provide such
-     a command, it MUST behave like "Rules-Requires-Root" was set to
-     "binary-targets", i.e. run "debian/rules binary" under (fake)root.
+     builder (i.e. whatever is executing debian/rules) will expose an
+     interface that is used to run a command under (fake)root via the
+     "Gain Root API". If the builder cannot provide such a command, it
+     MUST behave like "Rules-Requires-Root" was set to "binary-targets",
+     i.e. run "debian/rules binary" under (fake)root.
+
+When the builder supports this specification, it MUST notify this fact to
+the rules file via the "DEB_RULES_REQUIRES_ROOT" environment variable, with
+the value it has obtained from the Rules-Requires-Root field or some builder
+specific override mechanism, which will denote the level of support the
+builder has chosen to commit to take effect during the build. When set,
+it MUST be a valid value for the Rules-Requires-Root field. If unset,
+the build system SHOULD assume that the builder does not recognize the
+Rules-Requires-Root field at all.
 
 It is always permissible for a builder to ignore this field and fall back to
 running the binary targets under (fake)root. This is to ensure backwards
@@ -93,21 +104,26 @@ Gain Root API
 -------------
 
 The builder will provide a command to promote a given command to (fake)root
-by exposing it in the environment variable "DPKG_GAIN_ROOT_CMD". Tools that
+by exposing it in the environment variable "DEB_GAIN_ROOT_CMD". Tools that
 need this promotion will then use it like the following:
 
-    $DPKG_GAIN_ROOT_CMD cmd-that-needs-root ...
+    $DEB_GAIN_ROOT_CMD cmd-that-needs-root ...
 
 This command is subject to the same requirements as the "gain-root-command"
 that dpkg-buildpackage accepts via its "-r/--root-command" option, which
 means that it can contain space-separated parameters. If dpkg-buildpackage is
 called with "-r/--root-command", then dpkg-buildpackage shall use that value
-as the value for DPKG_GAIN_ROOT_CMD.
+as the value for "DEB_GAIN_ROOT_CMD". The command SHOULD preserve all the
+environment variables, unmodified.
 
 The variable SHOULD only be provided when there is a need for it. Notably
 when "Rules-Requires-Root" is either "no" or "binary-targets" the variable
 SHOULD NOT be defined.
 
+(The "DEB_GAIN_ROOT_CMD" variable used to be named "DPKG_GAIN_ROOT_CMD"
+starting with dpkg 1.19.0 and before dpkg 1.19.1 when this specification
+got released as stable. The old name MUST not be used.)
+
 Common cases
 ------------
 
@@ -124,12 +140,12 @@ Prototyping/preparation
 dpkg side
 ---------
 
-dpkg-deb --build must either default to resetting all owner/group values to
-0:0 when not run under (fake)root OR provide an interface so dh_builddeb can
-provide the owner/group value to dpkg-deb --build.
+dpkg-deb --build provides the --root-owner-group option so that dh_builddeb
+or direct calls can control the owner/group file values w/o requiring
+(fake)root.
 
-dpkg-buildpackage must export DPKG_GAIN_ROOT_CMD (for starters, doing this
-unconditionally would be fine).
+dpkg-buildpackage must export DEB_GAIN_ROOT_CMD when necessary (for
+prototyping, doing this unconditionally would be fine).
 
 
 debhelper side
@@ -143,7 +159,7 @@ When the field is present:
  * dh_testroot will be a no-op when Rules-Requires-Root is set to "no".
 
  * Otherwise, dh_testroot will either verify that it is run under (fake)root
-   (as usual) OR assert that DPKG_GAIN_ROOT_CMD is defined.
+   (as usual) OR assert that DEB_GAIN_ROOT_CMD is defined.
 
  * debhelper build systems will be patched to check for the
    "debhelper/upstream-make-install" keyword and use the "Gain Root API"
diff --git a/dpkg-deb/build.c b/dpkg-deb/build.c
index b88c6e50f..b9cc0ad22 100644
--- a/dpkg-deb/build.c
+++ b/dpkg-deb/build.c
@@ -168,7 +168,7 @@ file_treewalk_feed(const char *dir, int fd_out)
 
     nodename = str_fmt("./%s", virtname);
 
-    if (strchr(nodename, '\n'))
+    if (!nocheckflag && strchr(nodename, '\n'))
       ohshit(_("newline not allowed in pathname '%s'"), nodename);
 
     /* We need to reorder the files so we can make sure that symlinks
@@ -318,8 +318,8 @@ check_conffiles(const char *ctrldir, const char *rootdir)
 /**
  * Check the control file.
  *
- * @param dir	The directory from where to build the binary package.
- * @return	The pkginfo struct from the parsed control file.
+ * @param ctrldir The directory from where to build the binary package.
+ * @return The pkginfo struct from the parsed control file.
  */
 static struct pkginfo *
 check_control_file(const char *ctrldir)
@@ -348,8 +348,8 @@ check_control_file(const char *ctrldir)
 /**
  * Perform some sanity checks on the to-be-built package control area.
  *
- * @param dir	The directory from where to build the binary package.
- * @return	The pkginfo struct from the parsed control file.
+ * @param ctrldir The directory from where to build the binary package.
+ * @return The pkginfo struct from the parsed control file.
  */
 static struct pkginfo *
 check_control_area(const char *ctrldir, const char *rootdir)
diff --git a/dpkg-deb/dpkg-deb.h b/dpkg-deb/dpkg-deb.h
index 6fd8f2b0a..a5e8d39ce 100644
--- a/dpkg-deb/dpkg-deb.h
+++ b/dpkg-deb/dpkg-deb.h
@@ -54,6 +54,8 @@ enum dpkg_tar_options {
 	DPKG_TAR_PERMS = DPKG_BIT(2),
 	/** Do not set tar mtime on extract. */
 	DPKG_TAR_NOMTIME = DPKG_BIT(3),
+	/** Guarantee extraction into a new directory, abort if it exists. */
+	DPKG_TAR_CREATE_DIR = DPKG_BIT(4),
 };
 
 void extracthalf(const char *debar, const char *dir,
diff --git a/dpkg-deb/extract.c b/dpkg-deb/extract.c
index ddb8709cd..605a18440 100644
--- a/dpkg-deb/extract.c
+++ b/dpkg-deb/extract.c
@@ -137,10 +137,11 @@ extracthalf(const char *debar, const char *dir,
       if (r != sizeof(arh))
         read_fail(r, debar, _("archive member header"));
 
-      dpkg_ar_normalize_name(&arh);
-
       if (dpkg_ar_member_is_illegal(&arh))
         ohshit(_("file '%.250s' is corrupt - bad archive header magic"), debar);
+
+      dpkg_ar_normalize_name(&arh);
+
       memberlen = dpkg_ar_member_get_size(ar, &arh);
       if (!header_done) {
         char *infobuf;
@@ -302,9 +303,10 @@ extracthalf(const char *debar, const char *dir,
   }
   close(p1[0]);
   dpkg_ar_close(ar);
-  if (taroption) close(p2[1]);
 
   if (taroption) {
+    close(p2[1]);
+
     c3 = subproc_fork();
     if (!c3) {
       struct command cmd;
@@ -336,15 +338,15 @@ extracthalf(const char *debar, const char *dir,
       unsetenv("TAR_OPTIONS");
 
       if (dir) {
-        if (chdir(dir)) {
-          if (errno != ENOENT)
-            ohshite(_("failed to chdir to directory"));
-
-          if (mkdir(dir, 0777))
+        if (mkdir(dir, 0777) != 0) {
+          if (errno != EEXIST)
             ohshite(_("failed to create directory"));
-          if (chdir(dir))
-            ohshite(_("failed to chdir to directory after creating it"));
+
+          if (taroption & DPKG_TAR_CREATE_DIR)
+            ohshite(_("unexpected pre-existing pathname %s"), dir);
         }
+        if (chdir(dir) != 0)
+          ohshite(_("failed to chdir to directory"));
       }
 
       command_exec(&cmd);
@@ -490,7 +492,7 @@ do_raw_extract(const char *const *argv)
     data_options |= DPKG_TAR_LIST;
 
   extracthalf(debar, dir, data_options, 0);
-  extracthalf(debar, control_dir, DPKG_TAR_EXTRACT, 1);
+  extracthalf(debar, control_dir, DPKG_TAR_EXTRACT | DPKG_TAR_CREATE_DIR, 1);
 
   free(control_dir);
 
diff --git a/dpkg-deb/info.c b/dpkg-deb/info.c
index 07caecfd5..794eeb051 100644
--- a/dpkg-deb/info.c
+++ b/dpkg-deb/info.c
@@ -71,7 +71,7 @@ static void info_prepare(const char *const **argvp,
     ohshite(_("unable to create temporary directory"));
   *dirp = dbuf;
 
-  push_cleanup(cu_info_prepare, -1, NULL, 0, 1, (void *)dbuf);
+  push_cleanup(cu_info_prepare, -1, 1, (void *)dbuf);
   extracthalf(*debarp, dbuf, DPKG_TAR_EXTRACT | DPKG_TAR_NOMTIME, admininfo);
 }
 
@@ -160,7 +160,8 @@ info_list(const char *debar, const char *dir)
         ohshite(_("failed to read '%.255s' (in '%.255s')"), cdep->d_name, dir);
       fclose(cc);
       printf(_(" %7jd bytes, %5d lines   %c  %-20.127s %.127s\n"),
-             (intmax_t)stab.st_size, lines, S_IXUSR & stab.st_mode ? '*' : ' ',
+             (intmax_t)stab.st_size, lines,
+             (S_IXUSR & stab.st_mode) ? '*' : ' ',
              cdep->d_name, interpreter);
     } else {
       printf(_("     not a plain file          %.255s\n"), cdep->d_name);
@@ -206,7 +207,7 @@ info_field(const char *debar, const char *dir, const char *const *fields,
   int i;
 
   controlfile = str_fmt("%s/%s", dir, CONTROLFILE);
-  parsedb(controlfile, pdb_parse_binary | pdb_ignorefiles, &pkg);
+  parsedb(controlfile, pdb_parse_binary | pdb_ignore_archives, &pkg);
   free(controlfile);
 
   for (i = 0; fields[i]; i++) {
@@ -251,7 +252,7 @@ do_showinfo(const char *const *argv)
   info_prepare(&argv, &debar, &dir, 1);
 
   controlfile  = str_fmt("%s/%s", dir, CONTROLFILE);
-  parsedb(controlfile, pdb_parse_binary | pdb_ignorefiles, &pkg);
+  parsedb(controlfile, pdb_parse_binary | pdb_ignore_archives, &pkg);
   pkg_format_show(fmt, pkg, &pkg->available);
   pkg_format_free(fmt);
   free(controlfile);
diff --git a/dpkg-deb/main.c b/dpkg-deb/main.c
index 52e9ce67d..3420e44b7 100644
--- a/dpkg-deb/main.c
+++ b/dpkg-deb/main.c
@@ -252,6 +252,7 @@ int main(int argc, const char *const *argv) {
   ret = cipaction->action(argv);
 
   dpkg_program_done();
+  dpkg_locales_done();
 
   return ret;
 }
diff --git a/dpkg-split/join.c b/dpkg-split/join.c
index 0a61bc921..40afb378e 100644
--- a/dpkg-split/join.c
+++ b/dpkg-split/join.c
@@ -21,7 +21,6 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <limits.h>
 #include <string.h>
 #include <fcntl.h>
@@ -64,7 +63,7 @@ void reassemble(struct partinfo **partlist, const char *outputfile) {
              pi->filename, outputfile, err.str);
     close(fd_in);
 
-    printf("%d ",i+1);
+    printf("%u ", i + 1);
   }
   if (fsync(fd_out))
     ohshite(_("unable to sync file '%s'"), outputfile);
@@ -110,7 +109,7 @@ do_join(const char *const *argv)
     badusage(_("--%s requires one or more part file arguments"),
              cipaction->olong);
   while ((thisarg= *argv++)) {
-    pq= nfmalloc(sizeof(struct partqueue));
+    pq = nfmalloc(sizeof(*pq));
 
     mustgetpartinfo(thisarg,&pq->info);
 
@@ -120,8 +119,10 @@ do_join(const char *const *argv)
   refi= NULL;
   for (pq= queue; pq; pq= pq->nextinqueue)
     if (!refi || pq->info.thispartn < refi->thispartn) refi= &pq->info;
-  assert(refi);
-  partlist= nfmalloc(sizeof(struct partinfo*)*refi->maxpartn);
+  if (refi == NULL)
+    internerr("empty deb part queue");
+
+  partlist = nfmalloc(sizeof(*partlist) * refi->maxpartn);
   for (i = 0; i < refi->maxpartn; i++)
     partlist[i] = NULL;
   for (pq= queue; pq; pq= pq->nextinqueue) {
diff --git a/dpkg-split/main.c b/dpkg-split/main.c
index bcc1dc7b6..e807329a3 100644
--- a/dpkg-split/main.c
+++ b/dpkg-split/main.c
@@ -173,6 +173,7 @@ int main(int argc, const char *const *argv) {
   m_output(stderr, _("<standard error>"));
 
   dpkg_program_done();
+  dpkg_locales_done();
 
   return ret;
 }
diff --git a/dpkg-split/queue.c b/dpkg-split/queue.c
index 8ea2a30b4..6f9688035 100644
--- a/dpkg-split/queue.c
+++ b/dpkg-split/queue.c
@@ -62,23 +62,25 @@ decompose_filename(const char *filename, struct partqueue *pq)
   if (strspn(filename, "0123456789abcdef") != MD5HASHLEN ||
       filename[MD5HASHLEN] != '.')
     return false;
-  q = nfmalloc(MD5HASHLEN + 1);
-  memcpy(q, filename, MD5HASHLEN);
-  q[MD5HASHLEN] = '\0';
-  pq->info.md5sum= q;
+
+  pq->info.md5sum = nfstrnsave(filename, MD5HASHLEN);
+
   p = filename + MD5HASHLEN + 1;
   errno = 0;
   pq->info.maxpartlen = strtoimax(p, &q, 16);
   if (q == p || *q++ != '.' || errno != 0)
     return false;
+
   p = q;
   pq->info.thispartn = (int)strtol(p, &q, 16);
   if (q == p || *q++ != '.' || errno != 0)
     return false;
+
   p = q;
   pq->info.maxpartn = (int)strtol(p, &q, 16);
   if (q == p || *q || errno != 0)
     return false;
+
   return true;
 }
 
@@ -97,7 +99,7 @@ scandepot(void)
     char *p;
 
     if (de->d_name[0] == '.') continue;
-    pq= nfmalloc(sizeof(struct partqueue));
+    pq = nfmalloc(sizeof(*pq));
     pq->info.fmtversion.major = 0;
     pq->info.fmtversion.minor = 0;
     pq->info.package = NULL;
@@ -146,7 +148,7 @@ do_auto(const char *const *argv)
   if (partfile == NULL || *argv)
     badusage(_("--auto requires exactly one part file argument"));
 
-  refi= nfmalloc(sizeof(struct partqueue));
+  refi = nfmalloc(sizeof(*refi));
   part = dpkg_ar_open(partfile);
   if (!part)
     ohshite(_("unable to read part file '%.250s'"), partfile);
@@ -159,14 +161,14 @@ do_auto(const char *const *argv)
   dpkg_ar_close(part);
 
   queue = scandepot();
-  partlist= nfmalloc(sizeof(struct partinfo*)*refi->maxpartn);
+  partlist = nfmalloc(sizeof(*partlist) * refi->maxpartn);
   for (i = 0; i < refi->maxpartn; i++)
     partlist[i] = NULL;
   for (pq= queue; pq; pq= pq->nextinqueue) {
     struct partinfo *npi, *pi = &pq->info;
 
     if (!partmatches(pi,refi)) continue;
-    npi= nfmalloc(sizeof(struct partinfo));
+    npi = nfmalloc(sizeof(*npi));
     mustgetpartinfo(pi->filename,npi);
     addtopartlist(partlist,npi,refi);
   }
diff --git a/dselect/baselist.cc b/dselect/baselist.cc
index d74ed439d..4fa7f22b5 100644
--- a/dselect/baselist.cc
+++ b/dselect/baselist.cc
@@ -25,7 +25,6 @@
 
 #include <sys/ioctl.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <termios.h>
@@ -102,7 +101,7 @@ baselist::setupsigwinch()
   if (sigaction(SIGWINCH, nullptr, osigactp))
     ohshite(_("failed to get old SIGWINCH sigact"));
 
-  push_cleanup(cu_sigwinch, ~0, nullptr, 0, 2, osigactp, oblockedp);
+  push_cleanup(cu_sigwinch, ~0, 2, osigactp, oblockedp);
 
   sigwinch_mask(SIG_BLOCK);
 
@@ -136,26 +135,29 @@ baselist::end_column(column &col, const char *title)
 }
 
 void
-baselist::draw_column_head(column &col)
+baselist::draw_column_head(const column &col)
 {
   mvwaddnstr(colheadspad, 0, col.x, col.title, col.width);
 }
 
 void
-baselist::draw_column_sep(column &col, int y)
+baselist::draw_column_sep(const column &col, int y)
 {
   mvwaddch(listpad, y, col.x - 1, ' ');
 }
 
 void
-baselist::draw_column_item(column &col, int y, const char *item)
+baselist::draw_column_item(const column &col, int y, const char *item)
 {
   mvwprintw(listpad, y, col.x, "%-*.*s", col.width, col.width, item);
 }
 
 void baselist::setheights() {
   int y= ymax - (title_height + colheads_height + thisstate_height);
-  assert(y>=1);
+
+  if (y < 1)
+    internerr("widget y=%d < 1", y);
+
   if (showinfo==2 && y>=7) {
     list_height= 5;
     whatinfo_height= 1;
@@ -408,8 +410,8 @@ void baselist::wordwrapinfo(int offset, const char *m) {
 
   for (;;) {
     int offleft=offset; while (*m == ' ' && offleft>0) { m++; offleft--; }
-    const char *p= strchr(m,'\n');
-    int l= p ? (int)(p-m) : strlen(m);
+    const char *p = strchrnul(m, '\n');
+    int l = (int)(p - m);
     while (l && c_isspace(m[l - 1]))
       l--;
     if (!l || (*m == '.' && l == 1)) {
@@ -450,7 +452,8 @@ void baselist::wordwrapinfo(int offset, const char *m) {
       }
       wrapping = true;
     }
-    if (!p) break;
+    if (*p == '\0')
+      break;
     if (getcury(infopad) == (MAX_DISPLAY_INFO - 1)) {
       waddstr(infopad,
               "[The package description is too long and has been truncated...]");
diff --git a/dselect/cxx-support.cc b/dselect/cxx-support.cc
index 35f2543f2..dc3b36d34 100644
--- a/dselect/cxx-support.cc
+++ b/dselect/cxx-support.cc
@@ -24,7 +24,6 @@
 
 #include <sys/types.h>
 
-#include <assert.h>
 #include <stdlib.h>
 #ifdef HAVE_CXXABI_H
 #include <cxxabi.h>
@@ -37,23 +36,13 @@
 extern void *
 operator new(size_t size) DPKG_ATTR_THROW(std::bad_alloc)
 {
-	void *p;
-
-	p = m_malloc(size);
-	assert(p);
-
-	return p;
+	return m_malloc(size);
 }
 
 extern void *
 operator new[](size_t size) DPKG_ATTR_THROW(std::bad_alloc)
 {
-	void *p;
-
-	p = m_malloc(size);
-	assert(p);
-
-	return p;
+	return m_malloc(size);
 }
 
 extern void
diff --git a/dselect/dselect.h b/dselect/dselect.h
index 383fb9516..e620f5af8 100644
--- a/dselect/dselect.h
+++ b/dselect/dselect.h
@@ -87,9 +87,9 @@ protected:
 
   void add_column(column &col, const char *title, int width);
   void end_column(column &col, const char *title);
-  void draw_column_head(column &col);
-  void draw_column_sep(column &col, int y);
-  void draw_column_item(column &col, int y, const char *item);
+  void draw_column_head(const column &col);
+  void draw_column_sep(const column &col, int y);
+  void draw_column_item(const column &col, int y, const char *item);
 
   // (n)curses stuff
   WINDOW *listpad, *infopad, *colheadspad, *thisstatepad;
diff --git a/dselect/helpmsgs.cc b/dselect/helpmsgs.cc
index d1641dd11..b101fc8bc 100644
--- a/dselect/helpmsgs.cc
+++ b/dselect/helpmsgs.cc
@@ -38,7 +38,7 @@ Motion keys: Next/Previous, Top/End, Up/Down, Backwards/Forwards:\n\
   ^b                    ^f                      pan display by 1 character\n\n\
 \
 Mark packages for later processing:\n\
- +, Insert  install or upgrade      =, H  hold in present state\n\
+ +, Insert  install or upgrade      =, H  hold in present version\n\
  -, Delete  remove                  :, G  unhold: upgrade or leave uninstalled\n\
  _          remove & purge config\n\
                                              Miscellaneous:\n\
@@ -140,7 +140,7 @@ four columns for its current status on the system and mark.  In terse mode (use\
  Mark: what is requested for this package:\n\
   '*': marked for installation or upgrade;\n\
   '-': marked for removal, but any configuration files will remain;\n\
-  '=': on hold: package will not be processed at all;\n\
+  '=': on hold: package will not be installed, upgraded or removed;\n\
   '_': marked for purge completely - even remove configuration;\n\
   'n': package is new and has yet to be marked for install/remove/&c.\n\n\
 \
diff --git a/dselect/main.cc b/dselect/main.cc
index 55ced3351..32b53cbb0 100644
--- a/dselect/main.cc
+++ b/dselect/main.cc
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #if HAVE_LOCALE_H
@@ -533,6 +532,7 @@ main(int, const char *const *argv)
 
   cursesoff();
   dpkg_program_done();
+  dpkg_locales_done();
 
   return(0);
 }
diff --git a/dselect/methlist.cc b/dselect/methlist.cc
index 331bf0562..6cc280cf4 100644
--- a/dselect/methlist.cc
+++ b/dselect/methlist.cc
@@ -22,7 +22,6 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
@@ -129,10 +128,16 @@ methodlist::methodlist() : baselist(&methodlistbindings) {
 
   struct dselect_option *opt, **ip;
   for (opt=options, ip=table, nitems=0; opt; opt=opt->next, nitems++) {
-    if (opt == coption) { assert(newcursor==-1); newcursor= nitems; }
+    if (opt == coption) {
+      if (newcursor != -1)
+        internerr("multiple methods with same index");
+      newcursor = nitems;
+    }
     *ip++= opt;
   }
-  assert(nitems==noptions);
+  if (nitems != noptions)
+    internerr("inconsistent number of items: ntimes=%d != noptions=%d",
+              nitems, noptions);
 
   if (newcursor==-1) newcursor= 0;
   setcursor(newcursor);
diff --git a/dselect/method.cc b/dselect/method.cc
index ef5c4c344..0f17431b5 100644
--- a/dselect/method.cc
+++ b/dselect/method.cc
@@ -27,7 +27,6 @@
 #include <sys/file.h>
 #include <sys/wait.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <string.h>
@@ -71,8 +70,10 @@ sthfailed(const char * reasoning)
 static void cu_unlockmethod(int, void**) {
   struct flock fl;
 
-  assert(methodlockfile);
-  assert(methlockfd);
+  if (methodlockfile == NULL)
+    internerr("method lock file is NULL");
+  if (methlockfd < 0)
+    internerr("method lock fd is %d < 0", methlockfd);
   fl.l_type=F_UNLCK; fl.l_whence= SEEK_SET; fl.l_start=fl.l_len=0;
   if (fcntl(methlockfd,F_SETLK,&fl) == -1)
     sthfailed(_("cannot unlock access method area"));
@@ -124,7 +125,7 @@ static enum urqresult lockmethod(void) {
     sthfailed(_("cannot lock access method area"));
     return urqr_fail;
   }
-  push_cleanup(cu_unlockmethod, ~0, nullptr, 0, 0);
+  push_cleanup(cu_unlockmethod, ~0, 0);
   return urqr_normal;
 }
 
diff --git a/dselect/method.h b/dselect/method.h
index ac6c2cb6f..415325c59 100644
--- a/dselect/method.h
+++ b/dselect/method.h
@@ -58,22 +58,19 @@ protected:
   // Table of methods
   struct dselect_option **table;
 
-  // Misc.
-  char searchstring[50];
-
   // Information displays
   void itd_description();
 
   // Define these virtuals
-  void redraw1itemsel(int index, int selected);
-  void redrawcolheads();
-  void redrawthisstate();
-  void redrawinfo();
-  void redrawtitle();
-  void setwidths();
-  void setheights();
-  const char *itemname(int index);
-  const struct helpmenuentry *helpmenulist();
+  void redraw1itemsel(int index, int selected) override;
+  void redrawcolheads() override;
+  void redrawthisstate() override;
+  void redrawinfo() override;
+  void redrawtitle() override;
+  void setwidths() override;
+  void setheights() override;
+  const char *itemname(int index) override;
+  const struct helpmenuentry *helpmenulist() override;
 
  public:
   // Keybinding functions */
@@ -81,6 +78,8 @@ protected:
   void kd_abort();
 
   methodlist();
+  methodlist(const methodlist &) = delete;
+  methodlist &operator =(const methodlist &) = delete;
   quitaction display();
   ~methodlist();
 };
diff --git a/dselect/methods/multicd/install b/dselect/methods/multicd/install
index 577348075..e4d772c6a 100755
--- a/dselect/methods/multicd/install
+++ b/dselect/methods/multicd/install
@@ -295,8 +295,8 @@ done
 		if ($?) {
 			print "\nThe dpkg run produced errors.  Please tell me, if I should\n",
 				  "continue with the next CD. [Y/n]: ";
-			$ans = <STDIN>;
-			exit 1 if $ans =~ /^n/i;
+			$answer = <STDIN>;
+			exit 1 if $answer =~ /^n/i;
 			$ouch = $?;
 		}
 	}
diff --git a/dselect/methparse.cc b/dselect/methparse.cc
index 131e79fbf..a1ab31a8b 100644
--- a/dselect/methparse.cc
+++ b/dselect/methparse.cc
@@ -26,7 +26,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <string.h>
@@ -292,7 +291,9 @@ void getcurrentopt() {
 void writecurrentopt() {
   struct atomic_file *file;
 
-  assert(methoptfile);
+  if (methoptfile == NULL)
+    internerr("method options filename is NULL");
+
   file = atomic_file_new(methoptfile, (enum atomic_file_flags)0);
   atomic_file_open(file);
   if (fprintf(file->fp, "%s %s\n", coption->meth->name, coption->name) == EOF)
diff --git a/dselect/pkgcmds.cc b/dselect/pkgcmds.cc
index 340c60a06..78f549138 100644
--- a/dselect/pkgcmds.cc
+++ b/dselect/pkgcmds.cc
@@ -104,7 +104,7 @@ packagelist::reallywant(pkgwant nwarg, struct perpackagestate *pkgstate)
 void
 packagelist::setwant(pkgwant nwarg)
 {
-  int index, top, bot;
+  int index, bot;
   pkgwant nw;
 
   if (modstatdb_get_status() == msdbrw_readonly) {
@@ -116,9 +116,10 @@ packagelist::setwant(pkgwant nwarg)
     redrawitemsrange(cursorline,cursorline+1);
     table[cursorline]->selected= reallywant(nwarg,table[cursorline]);
     redraw1item(cursorline);
-    top= cursorline;
     bot= cursorline+1;
   } else {
+    int top;
+
     packagelist *sub = new packagelist(bindings, nullptr);
 
     affectedrange(&top,&bot);
diff --git a/dselect/pkgdepcon.cc b/dselect/pkgdepcon.cc
index 87886ffb6..3b54e7f89 100644
--- a/dselect/pkgdepcon.cc
+++ b/dselect/pkgdepcon.cc
@@ -22,7 +22,6 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <string.h>
 #include <stdio.h>
 
@@ -51,12 +50,13 @@ packagelist::useavailable(pkginfo *pkg)
 pkgbin *
 packagelist::find_pkgbin(pkginfo *pkg)
 {
-  pkgbin *r;
-  r= useavailable(pkg) ? &pkg->available : &pkg->installed;
+  pkgbin *pkgbin;
+
+  pkgbin = useavailable(pkg) ? &pkg->available : &pkg->installed;
   debug(dbg_general, "packagelist[%p]::find_pkgbin(%s) useavailable=%d",
-        this, pkgbin_name(pkg, r, pnaw_always), useavailable(pkg));
+        this, pkgbin_name(pkg, pkgbin, pnaw_always), useavailable(pkg));
 
-  return r;
+  return pkgbin;
 }
 
 int packagelist::checkdependers(pkginfo *pkg, int changemade) {
@@ -401,7 +401,8 @@ packagelist::deppossatisfied(deppossi *possi, perpackagestate **fixbyupgrade)
     // been specified, in which case we don't need to look at the rest
     // anyway.
     if (useavailable(&possi->ed->pkg)) {
-      assert(want == PKG_WANT_INSTALL);
+      if (want != PKG_WANT_INSTALL)
+        internerr("depossi package is not want-install, is %d", want);
       return versionsatisfied(&possi->ed->pkg.available, possi);
     } else {
       if (versionsatisfied(&possi->ed->pkg.installed, possi))
diff --git a/dselect/pkginfo.cc b/dselect/pkginfo.cc
index e11067fdf..31a45994f 100644
--- a/dselect/pkginfo.cc
+++ b/dselect/pkginfo.cc
@@ -114,14 +114,14 @@ void packagelist::itd_description() {
       m = table[cursorline]->pkg->installed.description;
     if (str_is_unset(m))
       m = _("No description available.");
-    const char *p= strchr(m,'\n');
-    int l= p ? (int)(p-m) : strlen(m);
+    const char *p = strchrnul(m, '\n');
+    int l = (int)(p - m);
     wattrset(infopad, part_attr[info_head]);
     waddstr(infopad, table[cursorline]->pkg->set->name);
     waddstr(infopad," - ");
     waddnstr(infopad,m,l);
     wattrset(infopad, part_attr[info_body]);
-    if (p) {
+    if (*p) {
       waddstr(infopad,"\n\n");
       wordwrapinfo(1,++p);
     }
diff --git a/dselect/pkglist.cc b/dselect/pkglist.cc
index 105f3c1aa..9882802bb 100644
--- a/dselect/pkglist.cc
+++ b/dselect/pkglist.cc
@@ -23,7 +23,6 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
@@ -113,7 +112,10 @@ void packagelist::addheading(enum ssavailval ssavail,
                              pkgpriority priority,
                              const char *otherpriority,
                              const char *section) {
-  assert(nitems <= nallocated);
+  if (nitems > nallocated)
+    internerr("inconsistent state: ntimes=%d > nallocated=%d",
+              nitems, nallocated);
+
   if (nitems == nallocated) {
     nallocated += nallocated+50;
     struct perpackagestate **newtable= new struct perpackagestate*[nallocated];
@@ -266,7 +268,9 @@ void packagelist::sortmakeheads() {
   discardheadings();
   ensurestatsortinfo();
   sortinplace();
-  assert(nitems);
+
+  if (nitems == 0)
+    internerr("cannot sort 0 items");
 
   debug(dbg_general,
         "packagelist[%p]::sortmakeheads() sortorder=%d statsortorder=%d",
@@ -275,7 +279,9 @@ void packagelist::sortmakeheads() {
   int nrealitems= nitems;
   addheading(ssa_none, sss_none, PKG_PRIO_UNSET, nullptr, nullptr);
 
-  assert(sortorder != so_unsorted);
+  if (sortorder == so_unsorted)
+    internerr("cannot sort unsorted order");
+
   if (sortorder == so_alpha && statsortorder == sso_unsorted) { sortinplace(); return; }
 
   // Important: do not save pointers into table in this function, because
@@ -287,7 +293,8 @@ void packagelist::sortmakeheads() {
   int a;
   for (a=0; a<nrealitems; a++) {
     thispkg= table[a]->pkg;
-    assert(thispkg->set->name);
+    if (thispkg->set->name == NULL)
+      internerr("package set has no name at table index %d", a);
     int ssdiff= 0;
     ssavailval ssavail= ssa_none;
     ssstateval ssstate= sss_none;
@@ -358,7 +365,7 @@ void packagelist::sortmakeheads() {
 void packagelist::initialsetup() {
   debug(dbg_general, "packagelist[%p]::initialsetup()", this);
 
-  int allpackages = pkg_db_count_pkg();
+  int allpackages = pkg_hash_count_pkg();
   datatable= new struct perpackagestate[allpackages];
 
   nallocated= allpackages+150; // will realloc if necessary, so 150 not critical
@@ -383,17 +390,17 @@ void packagelist::finalsetup() {
 packagelist::packagelist(keybindings *kb) : baselist(kb) {
   // nonrecursive
   initialsetup();
-  struct pkgiterator *iter;
+  struct pkg_hash_iter *iter;
   struct pkginfo *pkg;
 
   nitems = 0;
 
-  iter = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(iter))) {
+  iter = pkg_hash_iter_new();
+  while ((pkg = pkg_hash_iter_next_pkg(iter))) {
     struct perpackagestate *state= &datatable[nitems];
     state->pkg= pkg;
     if (pkg->status == PKG_STAT_NOTINSTALLED &&
-        !pkg->files &&
+        !pkg->archives &&
         pkg->want != PKG_WANT_INSTALL) {
       pkg->clientdata = nullptr;
       continue;
@@ -419,7 +426,7 @@ packagelist::packagelist(keybindings *kb) : baselist(kb) {
     table[nitems]= state;
     nitems++;
   }
-  pkg_db_iter_free(iter);
+  pkg_hash_iter_free(iter);
 
   if (!nitems)
     ohshit(_("there are no packages"));
@@ -456,11 +463,13 @@ perpackagestate::free(bool recursive)
   if (pkg->set->name) {
     if (modstatdb_get_status() == msdbrw_write) {
       if (uprec) {
-        assert(recursive);
+        if (!recursive)
+          internerr("unexpected non-recursive free requested");
         uprec->selected= selected;
         pkg->clientdata= uprec;
       } else {
-        assert(!recursive);
+        if (recursive)
+          internerr("unexpected recursive free requested");
         if (pkg->want != selected &&
             !(pkg->want == PKG_WANT_UNKNOWN && selected == PKG_WANT_PURGE)) {
           pkg->want= selected;
diff --git a/dselect/pkglist.h b/dselect/pkglist.h
index 1c39f04b4..3d46dcfd8 100644
--- a/dselect/pkglist.h
+++ b/dselect/pkglist.h
@@ -149,16 +149,16 @@ protected:
   int deselect_one_of(pkginfo *er, pkginfo *ed, dependency *dep);
 
   // Define these virtuals
-  bool checksearch(char *str);
-  bool matchsearch(int index);
-  void redraw1itemsel(int index, int selected);
-  void redrawcolheads();
-  void redrawthisstate();
-  void redrawinfo();
-  void redrawtitle();
-  void setwidths();
-  const char *itemname(int index);
-  const struct helpmenuentry *helpmenulist();
+  bool checksearch(char *str) override;
+  bool matchsearch(int index) override;
+  void redraw1itemsel(int index, int selected) override;
+  void redrawcolheads() override;
+  void redrawthisstate() override;
+  void redrawinfo() override;
+  void redrawtitle() override;
+  void setwidths() override;
+  const char *itemname(int index) override;
+  const struct helpmenuentry *helpmenulist() override;
 
   // Miscellaneous internal routines
 
@@ -210,9 +210,9 @@ protected:
   void kd_archdisplay();
   void kd_versiondisplay();
 
-  packagelist(keybindings *kb); // nonrecursive
+  explicit packagelist(keybindings *kb); // nonrecursive
   packagelist(keybindings *kb, pkginfo **pkgltab); // recursive
-  void add(pkginfo **arry) { while (*arry) add(*arry++); }
+  void add(pkginfo **array) { while (*array) add(*array++); }
   void add(pkginfo*);
   void add(pkginfo *, pkgwant);
   void add(pkginfo*, const char *extrainfo, showpriority displayimportance);
diff --git a/dselect/pkgsublist.cc b/dselect/pkgsublist.cc
index 30b202f7d..d25334f4b 100644
--- a/dselect/pkgsublist.cc
+++ b/dselect/pkgsublist.cc
@@ -22,7 +22,6 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <string.h>
 #include <stdio.h>
 
@@ -102,8 +101,12 @@ void packagelist::addunavailable(deppossi *possi) {
   if (!recursive) return;
   if (alreadydone(&unavdone,possi)) return;
 
-  assert(possi->up->up->clientdata);
-  assert(possi->up->up->clientdata->uprec);
+  if (possi->up->up->clientdata == nullptr)
+    internerr("deppossi from package %s has nullptr clientdata",
+              pkg_name(possi->up->up, pnaw_always));
+  if (possi->up->up->clientdata->uprec == nullptr)
+    internerr("deppossi from package %s has nullptr clientdata's uprec",
+              pkg_name(possi->up->up, pnaw_always));
 
   varbuf& vb= possi->up->up->clientdata->relations;
   vb(possi->ed->name);
diff --git a/dselect/pkgtop.cc b/dselect/pkgtop.cc
index 0da1f109d..b8a644ca5 100644
--- a/dselect/pkgtop.cc
+++ b/dselect/pkgtop.cc
@@ -22,7 +22,6 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <string.h>
 #include <stdio.h>
 
@@ -42,7 +41,9 @@ pkgprioritystring(const struct pkginfo *pkg)
   } else if (pkg->priority == PKG_PRIO_OTHER) {
     return pkg->otherpriority;
   } else {
-    assert(pkg->priority <= PKG_PRIO_UNKNOWN);
+    if (pkg->priority > PKG_PRIO_UNKNOWN)
+      internerr("package %s has out-of-range priority %d",
+                pkg_name_const(pkg, pnaw_always), pkg->priority);
     return gettext(prioritystrings[pkg->priority]);
   }
 }
diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index 5fde53330..79730de24 100644
--- a/dselect/po/bs.po
+++ b/dselect/po/bs.po
@@ -1,13 +1,13 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# translation of dselect to Bosnian.
+# Copyright © 2004 Dpkg Developers
+# This file is distributed under the same license as the dpkg package.
+# Safir Šećerović <sapphire@linux.org.ba>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2006-02-17 08:55+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -813,14 +813,6 @@ msgid "No explanation available."
 msgstr ""
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index 4f66df9ac..0dbdd77f6 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -2,14 +2,14 @@
 # Copyright © 2001, 2002, 2003, 2004, 2005, 2006, 2010 Software in the Public Interest, Inc.
 # Antoni Bella <bella5@teleline.es>, 2001, 2002.
 # Jordi Mallach <jordi@debian.org>, 2002, 2003, 2004, 2005, 2006, 2010.
-# Guillem Jover <guillem@debian.org>, 2010, 2012, 2014.
+# Guillem Jover <guillem@debian.org>, 2010, 2012, 2014-2015, 2017, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dselect 1.17.23\n"
+"Project-Id-Version: dselect 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2017-04-28 04:22+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
+"PO-Revision-Date: 2019-05-09 05:34+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
 "Language: ca\n"
@@ -974,7 +974,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"Mogueu-vos amb les tecles del cursor ^P i ^N, lletres inicials o dígits;\n"
+"Moveu-vos amb les tecles del cursor ^P i ^N, lletres inicials o dígits;\n"
 "Premeu <enter> per a confirmar la selecció.   ^L redibuixa la pantalla.\n"
 "\n"
 
@@ -1039,17 +1039,6 @@ msgid "No explanation available."
 msgstr "No hi ha explicació disponible."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1649,6 +1638,15 @@ msgstr "Paquets %s %s en la secció %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (era: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "no s'ha pogut tornar a blocar SIGWINCH"
 
diff --git a/dselect/po/cs.po b/dselect/po/cs.po
index a5acf9af7..880ec126c 100644
--- a/dselect/po/cs.po
+++ b/dselect/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2017-05-06 13:12+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -1018,17 +1018,6 @@ msgid "No explanation available."
 msgstr "Vysvětlení není k dispozici."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1624,6 +1613,15 @@ msgstr "%s %s balíky v sekci %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s; %s (bylo: %s). %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "nepovedlo se znovu zablokovat SIGWINCH"
 
diff --git a/dselect/po/da.po b/dselect/po/da.po
index 4fa14809c..f87f08abd 100644
--- a/dselect/po/da.po
+++ b/dselect/po/da.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2014-11-27 02:33+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -1044,17 +1044,6 @@ msgid "No explanation available."
 msgstr "Ingen tilgængelig forklaring."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1667,6 +1656,15 @@ msgstr "%s %s pakker i %s-gruppen"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (var: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "kunne ikke genblokere SIGWINCH"
 
diff --git a/dselect/po/de.po b/dselect/po/de.po
index a90fb49c7..1218abacd 100644
--- a/dselect/po/de.po
+++ b/dselect/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.18.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-05-30 02:59+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1060,17 +1060,6 @@ msgid "No explanation available."
 msgstr "Keine Beschreibung verfügbar."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1686,6 +1675,15 @@ msgstr "%s %s Pakete im Bereich %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (war: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "SIGWINCH konnte nicht erneut blockiert werden"
 
diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index 47c90beb8..58a6f1c60 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.0\n"
+"Project-Id-Version: dpkg 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -806,14 +806,6 @@ msgid "No explanation available."
 msgstr ""
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
diff --git a/dselect/po/el.po b/dselect/po/el.po
index 0f9acba76..4aa0aff98 100644
--- a/dselect/po/el.po
+++ b/dselect/po/el.po
@@ -1,8 +1,6 @@
-# translation of dpkg_po_el.po to Greek
-# translation of dpkg.po.orig.po to Greek
-# translation of dpkg.po to Greek
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# translation of dselect to Greek
+# Copyright © 2003-2005 Dpkg Developers
+# This file is distributed under the same license as the dpkg package.
 # Konstantinos Margaritis <markos@debian.org>, 2003.
 # George Papamichelakis <george@step.gr>, 2004.
 # George Papamichelakis <debian-l10n-greek@lists.debian.org>, 2004.
@@ -13,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2006-02-17 08:56+0200\n"
 "Last-Translator: quad-nrg.net <galaxico@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -1051,17 +1049,6 @@ msgid "No explanation available."
 msgstr "Καμία διαθέσιμη εξήγηση."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1690,6 +1677,15 @@ msgstr "%s %s πακέτα στον τομέα %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (ήταν: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "απέτυχε η επανεμπλοκή του SIGWINCH"
 
diff --git a/dselect/po/es.po b/dselect/po/es.po
index 5522e8065..46ae7f5b7 100644
--- a/dselect/po/es.po
+++ b/dselect/po/es.po
@@ -41,7 +41,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.16\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2017-11-08 01:05+0100\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -919,7 +919,9 @@ msgstr "<salida estándar>"
 msgid ""
 "Usage: %s [<option>...] [<command>...]\n"
 "\n"
-msgstr "Modo de uso: %s [<opción> ...] [<orden> ...]\n\n"
+msgstr ""
+"Modo de uso: %s [<opción> ...] [<orden> ...]\n"
+"\n"
 
 #: dselect/main.cc
 #, c-format
@@ -940,7 +942,8 @@ msgstr ""
 "Ociones:\n"
 "  --admindir <directorio>          Utiliza <directorio> en lugar de %s.\n"
 "  --expert                         Activa el modo experto.\n"
-"  -D, --debug <fichero>            Activa la depuración y envía la salida a <fichero>.\n"
+"  -D, --debug <fichero>            Activa la depuración y envía la salida a "
+"<fichero>.\n"
 "  --color <color-spec>             Configura los colores de la pantalla.\n"
 "  --colour <color-spec>            Configura los colores de la pantalla.\n"
 "\n"
@@ -961,7 +964,9 @@ msgstr ""
 msgid ""
 "<color-spec> is <screen-part>:[<foreground>],[<background>][:"
 "<attr>[+<attr>]...]\n"
-msgstr "<color-spec> is <screen-part>:[<primer_plano>],[<fondo>][:<attr>[+<attr>]...]\n"
+msgstr ""
+"<color-spec> is <screen-part>:[<primer_plano>],[<fondo>][:"
+"<attr>[+<attr>]...]\n"
 
 #: dselect/main.cc
 #, c-format
@@ -1099,20 +1104,6 @@ msgstr "Explicación"
 msgid "No explanation available."
 msgstr "No hay explicación disponible."
 
-# FIXME: May not be translated properly without context.
-# Or else: Does not need to be translated.
-# It seems first %s is "dselect", second %s is an error message. sv
-#: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
 #: dselect/method.cc
 msgid ""
 "\n"
@@ -1718,6 +1709,18 @@ msgstr "Paquetes %s %s en la sección %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (era: %s).  %s"
 
+# FIXME: May not be translated properly without context.
+# Or else: Does not need to be translated.
+# It seems first %s is "dselect", second %s is an error message. sv
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "fallo al rebloquear SIGWINCH"
 
diff --git a/dselect/po/et.po b/dselect/po/et.po
index cf4dfc2cd..79394406b 100644
--- a/dselect/po/et.po
+++ b/dselect/po/et.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2007-07-13 08:22+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -958,17 +958,6 @@ msgid "No explanation available."
 msgstr "Selgitust pole saadaval."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1585,6 +1574,15 @@ msgstr "%s %s pakid jaotises %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (oli: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "tõrge SIGWINCH signaali uuesti blokkimisel"
 
diff --git a/dselect/po/eu.po b/dselect/po/eu.po
index c4d7fee7c..6b1a79223 100644
--- a/dselect/po/eu.po
+++ b/dselect/po/eu.po
@@ -1,5 +1,5 @@
-# Copyright (C) YEAR Software in the Public Interest, Inc.
-# This file is distributed under the same license as the PACKAGE package.
+# Copyright © 2004-2012 Dpkg Developers
+# This file is distributed under the same license as the dpkg package.
 #
 # Jordi Blasi <valpur@euskalnet.net>, 2004.
 # Piarres Beobide <pi@beobide.net>, 2004, 2005, 2006, 2008, 2009.
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2012-09-01 12:21+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
@@ -1088,17 +1088,6 @@ msgid "No explanation available."
 msgstr "Ez dago azalpen erabilgarririk."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1720,6 +1709,15 @@ msgstr "%s %s pakete %s sekzioan"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (lehen: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "huts egin du SIGWINCH birblokeatzean"
 
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index 6b2f3989c..7b92cf0f2 100644
--- a/dselect/po/fr.po
+++ b/dselect/po/fr.po
@@ -50,7 +50,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-09-08 11:04+0200\n"
 "Last-Translator: Sébastien Poher <sbphr@volted.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1107,17 +1107,6 @@ msgid "No explanation available."
 msgstr "Aucune explication n'est disponible."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s : %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1728,6 +1717,15 @@ msgstr "Paquets %s %s dans la section %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s ;  %s (précédemment : %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s : %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "échec du reblocage de SIGWINCH"
 
diff --git a/dselect/po/gl.po b/dselect/po/gl.po
index 0dc152f88..859a75a44 100644
--- a/dselect/po/gl.po
+++ b/dselect/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2008-12-27 15:56+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -1097,17 +1097,6 @@ msgid "No explanation available."
 msgstr "Non hai nengunha explicación dispoñíbel."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1733,6 +1722,15 @@ msgstr "%s paquetes %s na sección %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (era: %s). %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "non foi posíbel volver bloquear SIGWINCH"
 
diff --git a/dselect/po/hu.po b/dselect/po/hu.po
index f9d20573f..fb30ed13e 100644
--- a/dselect/po/hu.po
+++ b/dselect/po/hu.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2006-10-06 03:48+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -883,14 +883,6 @@ msgid "No explanation available."
 msgstr ""
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
diff --git a/dselect/po/id.po b/dselect/po/id.po
index 563973e10..e3e6a6c74 100644
--- a/dselect/po/id.po
+++ b/dselect/po/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2006-10-06 20:20+0700\n"
 "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
 "Language-Team: Indonesian <debian-l10n-indonesian@lists.debian.org>\n"
@@ -1101,17 +1101,6 @@ msgid "No explanation available."
 msgstr "Tidak ada penjelasan tersedia."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1740,6 +1729,15 @@ msgstr "%s %s paket di bagian %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s; %s (tadinya: %s). %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "gagal melakukan 're-block' SIGWINCH"
 
diff --git a/dselect/po/it.po b/dselect/po/it.po
index d60db5554..6cb21820a 100644
--- a/dselect/po/it.po
+++ b/dselect/po/it.po
@@ -43,7 +43,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.10.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2006-10-06 22:01+0200\n"
 "Last-Translator: Stefano Canepa <sc@linux.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1119,17 +1119,6 @@ msgid "No explanation available."
 msgstr "Nessuna spiegazione disponibile"
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1760,6 +1749,15 @@ msgstr "Pacchetti %2$s %1$s nella sezione %3$s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (era: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "impossibile ribloccare SIGWINCH"
 
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index 69d8bb9df..41136fd6f 100644
--- a/dselect/po/ja.po
+++ b/dselect/po/ja.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2016-03-31 12:44+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1027,17 +1027,6 @@ msgid "No explanation available."
 msgstr "説明がありません。"
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1632,6 +1621,15 @@ msgstr "%3$s セクションの %1$s%2$s パッケージ"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (前回: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "SIGWINCH のリブロックに失敗しました"
 
diff --git a/dselect/po/ko.po b/dselect/po/ko.po
index 6a4c1c140..a90564dc7 100644
--- a/dselect/po/ko.po
+++ b/dselect/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2007-09-16 22:55-0400\n"
 "Last-Translator: Sunjae Park <darehanl@gmail.com>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -1071,17 +1071,6 @@ msgid "No explanation available."
 msgstr "설명 없습니다."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1710,6 +1699,15 @@ msgstr "%s %s 꾸러미 (%s 섹션)"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s,  %s (이전상태: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "SIGWINCH 시그널을 블록을 다시 설정하는 데 실패했습니다"
 
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index 66c8d7e57..bbd503769 100644
--- a/dselect/po/nb.po
+++ b/dselect/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2014-12-05 13:25+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -1047,17 +1047,6 @@ msgid "No explanation available."
 msgstr "Ingen forklaring tilgjengelig."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1669,6 +1658,15 @@ msgstr "%s %s pakker i delen %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (var: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "klarte ikke reblokkere SIGWINCH"
 
diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index bfe862512..34d1dd9c5 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -1,5 +1,5 @@
 # Dutch translation for deselect.
-# Copyright (C) 2008,2011 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright (C) 2008,2011 Dpkg Developers
 # This file is distributed under the same license as the dpkg package.
 # Bart Cornelis <cobaco@skolelinux.no>, 2008.
 # Jeroen Schot <schot@a-eskwadraat.nl>, 2011.
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.18.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-06-25 17:44+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1045,17 +1045,6 @@ msgid "No explanation available."
 msgstr "Geen uitleg beschikbaar."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1654,6 +1643,15 @@ msgstr "%s %s pakketten in sectie %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (was: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "kon SIGWINCH niet opnieuw blokkeren"
 
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index 07f1cb38a..e82386337 100644
--- a/dselect/po/nn.po
+++ b/dselect/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2006-02-17 08:57+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -1023,17 +1023,6 @@ msgid "No explanation available."
 msgstr "Ingen forklaring tilgjengeleg."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1662,6 +1651,15 @@ msgstr "%s %s pakkar i delen %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (var: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "klarte ikkje reblokkera SIGWINCH"
 
diff --git a/dselect/po/pl.po b/dselect/po/pl.po
index bb9d6fc16..73ed3f0bd 100644
--- a/dselect/po/pl.po
+++ b/dselect/po/pl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2014-12-21 20:58+0100\n"
 "Last-Translator: Łukasz Dulny <bartekchom@poczta.onet.pl>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -1060,17 +1060,6 @@ msgid "No explanation available."
 msgstr "Brak dostępnego wyjaśnienia."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1682,6 +1671,15 @@ msgstr "%s %s pakiety w sekcji %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (był: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "nie można ponownie zablokować SIGWINCH"
 
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index 5ee1e5933..5d97d51bb 100644
--- a/dselect/po/pt.po
+++ b/dselect/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2014-11-30 13:28+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -1046,17 +1046,6 @@ msgid "No explanation available."
 msgstr "Sem explicação disponível."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1672,6 +1661,15 @@ msgstr "%s %s pacotes na secção %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (foi: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "falhou re-bloquear SIGWINCH"
 
diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po
index d3e24b4de..84996e2a5 100644
--- a/dselect/po/pt_BR.po
+++ b/dselect/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2008-06-09 02:53-0300\n"
 "Last-Translator: Felipe Augusto van de Wiel <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -1098,17 +1098,6 @@ msgid "No explanation available."
 msgstr "Sem explicação disponível"
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1733,6 +1722,15 @@ msgstr "Pacotes %s %s na seção %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (era: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "falhou ao re-bloquear SIGWINCH"
 
diff --git a/dselect/po/ro.po b/dselect/po/ro.po
index cb3ec4a65..d27fb36ba 100644
--- a/dselect/po/ro.po
+++ b/dselect/po/ro.po
@@ -9,7 +9,7 @@
 #   - numele funcților și a argumentelor acestora
 #   - numele și opțiunile programelor
 #
-# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright © 2005-2008 Dpkg Developers
 #
 # Rușeț Zeno <rzeno@cwazy.co.uk>, 2005.
 # Eddy Petrișor <eddy.petrisor@gmail.com>, 2005, 2006, 2007, 2008.
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2008-06-28 19:11+0300\n"
 "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -1118,17 +1118,6 @@ msgid "No explanation available."
 msgstr "Nici o explicație disponibilă."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1753,6 +1742,15 @@ msgstr "%s %s pachete în secțiunea %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (a fost: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "eșec la reblocarea lui SIGWINCH"
 
diff --git a/dselect/po/ru.po b/dselect/po/ru.po
index 6c688e5d3..d6cd454c3 100644
--- a/dselect/po/ru.po
+++ b/dselect/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2014-12-01 19:18+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1070,17 +1070,6 @@ msgid "No explanation available."
 msgstr "Нет описания."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1697,6 +1686,15 @@ msgstr "%s пакеты приоритета %s в разделе %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (было: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "не удалось заново блокировать сигнал SIGWINCH"
 
diff --git a/dselect/po/sk.po b/dselect/po/sk.po
index 0da6095c3..b8d8ee092 100644
--- a/dselect/po/sk.po
+++ b/dselect/po/sk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2012-07-03 01:09+0100\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n"
@@ -1097,17 +1097,6 @@ msgid "No explanation available."
 msgstr "Nie je dostupné žiadne vysvetlenie."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1729,6 +1718,15 @@ msgstr " %s %s balíky v sekcii %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s; %s (bolo: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "zlyhalo opätovné zablokovanie premennej SIGWINCH"
 
diff --git a/dselect/po/sv.po b/dselect/po/sv.po
index 156999aba..57fb3dbc4 100644
--- a/dselect/po/sv.po
+++ b/dselect/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2014-10-30 15:07+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\n"
@@ -1047,17 +1047,6 @@ msgid "No explanation available."
 msgstr "Ingen förklaring finns."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1669,6 +1658,15 @@ msgstr "%s %s paket i avdelning %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (var: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "kunde inte åter blockera fönsteruppdatering"
 
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index 219e8fda7..18f0370ad 100644
--- a/dselect/po/tl.po
+++ b/dselect/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2006-02-17 08:58+0200\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -1072,17 +1072,6 @@ msgid "No explanation available."
 msgstr "Walang paliwanag na maibigay."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1716,6 +1705,15 @@ msgstr "%s %s na pakete sa seksyon %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s; %s (dati ay: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "bigo sa pag-re-block ng SIGWINCH"
 
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index ffe1a3ecd..8aa81900c 100644
--- a/dselect/po/vi.po
+++ b/dselect/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2014-12-01 08:20+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n"
@@ -1035,17 +1035,6 @@ msgid "No explanation available."
 msgstr "Không có giải thích sẵn sàng."
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s: %s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1656,6 +1645,15 @@ msgstr "%s %s gói trong phần %s"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (đã là: %s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "việc ngăn chặn lại SIGWINCH bị lỗi"
 
diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 7fd77a210..d89c2f6c6 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.po
@@ -1,6 +1,6 @@
-# Simplified Chinese translation to dpkg.
-# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Simplified Chinese translation to dselect.
+# Copyright (C) 2004 Dpkg Developers
+# This file is distributed under the same license as the dpkg package.
 #
 # Copyrights:
 # Kov Chai <tchaikov@sjtu.edu.cn>, 2005,2006.
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2006-05-06 20:11+0800\n"
 "Last-Translator: Kov Chai <tchaikov@sjtu.edu.cn>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -1035,17 +1035,6 @@ msgid "No explanation available."
 msgstr "没有发现相应的说明。"
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s：%s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1673,6 +1662,15 @@ msgstr "在 %3$s 大类中 %1$s %2$s 软件包"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (曾为：%s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s：%s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "重新阻塞 SIGWINCH 信号失败"
 
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index f462396c6..1d44030b3 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -1,13 +1,12 @@
-# Traditional Chinese translation to dpkg.
-# Copyright (C) 2004 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-#
+# Traditional Chinese translation for dselect.
+# Copyright © 2004 Dpkg Developers
+# This file is distributed under the same license as the dpkg package.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-07-28 05:56+0200\n"
 "Last-Translator: Asho Yeh <ashoyeh@gmail.com>\n"
 "Language-Team: Chinese (traditional) <debian-l10n-chinese@lists.debian.org>\n"
@@ -1049,17 +1048,6 @@ msgid "No explanation available."
 msgstr "沒有發現相關說明。"
 
 #: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-"\n"
-"\n"
-"%s：%s\n"
-
-#: dselect/method.cc
 msgid ""
 "\n"
 "Press <enter> to continue."
@@ -1680,6 +1668,15 @@ msgstr "在 %3$s 類別中 %1$s %2$s 套件"
 msgid "%-*s %s%s%s;  %s (was: %s).  %s"
 msgstr "%-*s %s%s%s;  %s (曾為：%s).  %s"
 
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "%s: %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "%s：%s\n"
+
 #~ msgid "failed to re-block SIGWINCH"
 #~ msgstr "重新阻塞 SIGWINCH 信號失敗"
 
diff --git a/get-version b/get-version
index 6bfdcb1ad..3bc3c1bc0 100755
--- a/get-version
+++ b/get-version
@@ -38,4 +38,4 @@ else
 fi
 
 # Use printf to avoid the trailing new line that m4_esyscmd would not handle.
-printf "$version"
+printf "%s" "$version"
diff --git a/lib/compat/Makefile.am b/lib/compat/Makefile.am
index 1d5840a25..4477c27b4 100644
--- a/lib/compat/Makefile.am
+++ b/lib/compat/Makefile.am
@@ -10,6 +10,8 @@ noinst_LTLIBRARIES = libcompat-test.la libcompat.la
 libcompat_test_la_CPPFLAGS = $(AM_CPPFLAGS) -DTEST_LIBCOMPAT=1
 libcompat_test_la_SOURCES = \
 	compat.h \
+	md5.c md5.h \
+	strchrnul.c \
 	strnlen.c \
 	strndup.c \
 	strsignal.c \
@@ -56,6 +58,10 @@ if !HAVE_STRNLEN
 libcompat_la_SOURCES += strnlen.c
 endif
 
+if !HAVE_STRCHRNUL
+libcompat_la_SOURCES += strchrnul.c
+endif
+
 if !HAVE_STRNDUP
 libcompat_la_SOURCES += strndup.c
 endif
diff --git a/lib/compat/compat.h b/lib/compat/compat.h
index 320ffdbc9..c1aa60180 100644
--- a/lib/compat/compat.h
+++ b/lib/compat/compat.h
@@ -109,6 +109,8 @@ extern "C" {
 #define asprintf test_asprintf
 #undef vasprintf
 #define vasprintf test_vasprintf
+#undef strchrnul
+#define strchrnul test_strchrnul
 #undef strndup
 #define strndup test_strndup
 #undef strnlen
@@ -139,6 +141,10 @@ int vasprintf(char **str, const char *fmt, va_list args)
 	LIBCOMPAT_ATTR_VPRINTF(2);
 #endif
 
+#if TEST_LIBCOMPAT || !defined(HAVE_STRCHRNUL)
+char *strchrnul(const char *s, int c);
+#endif
+
 #if TEST_LIBCOMPAT || !defined(HAVE_STRNLEN)
 size_t strnlen(const char *s, size_t n);
 #endif
diff --git a/lib/compat/getopt.c b/lib/compat/getopt.c
index 4c52b8b82..b13f81454 100644
--- a/lib/compat/getopt.c
+++ b/lib/compat/getopt.c
@@ -88,7 +88,7 @@ USA.  */
 #endif
 
 /* XXX: Disable intl support, because we do not carry the translations anyway
- * and this pulls indirectly libintl, wich we do not want to impose. */
+ * and this pulls indirectly libintl, which we do not want to impose. */
 #ifndef _
 #define _(msgid)	(msgid)
 #endif
diff --git a/lib/compat/md5.c b/lib/compat/md5.c
index 3da18c98e..7da974635 100644
--- a/lib/compat/md5.c
+++ b/lib/compat/md5.c
@@ -41,7 +41,7 @@
 	(cp)[1] = (value) >> 8;						\
 	(cp)[0] = (value); } while (0)
 
-static u_int8_t PADDING[MD5_BLOCK_LENGTH] = {
+static uint8_t PADDING[MD5_BLOCK_LENGTH] = {
 	0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
@@ -75,7 +75,7 @@ MD5Update(MD5_CTX *ctx, const unsigned char *input, size_t len)
 	need = MD5_BLOCK_LENGTH - have;
 
 	/* Update bitcount */
-	ctx->count += (u_int64_t)len << 3;
+	ctx->count += (uint64_t)len << 3;
 
 	if (len >= need) {
 		if (have != 0) {
@@ -106,7 +106,7 @@ MD5Update(MD5_CTX *ctx, const unsigned char *input, size_t len)
 void
 MD5Pad(MD5_CTX *ctx)
 {
-	u_int8_t count[8];
+	uint8_t count[8];
 	size_t padlen;
 
 	/* Convert count to 8 bytes in little endian order. */
@@ -156,19 +156,19 @@ MD5Final(unsigned char digest[MD5_DIGEST_LENGTH], MD5_CTX *ctx)
  * the data and converts bytes into longwords for this routine.
  */
 void
-MD5Transform(u_int32_t state[4], const u_int8_t block[MD5_BLOCK_LENGTH])
+MD5Transform(uint32_t state[4], const uint8_t block[MD5_BLOCK_LENGTH])
 {
-	u_int32_t a, b, c, d, in[MD5_BLOCK_LENGTH / 4];
+	uint32_t a, b, c, d, in[MD5_BLOCK_LENGTH / 4];
 
 #ifndef WORDS_BIGENDIAN
 	memcpy(in, block, sizeof(in));
 #else
 	for (a = 0; a < MD5_BLOCK_LENGTH / 4; a++) {
-		in[a] = (u_int32_t)(
-		    (u_int32_t)(block[a * 4 + 0]) |
-		    (u_int32_t)(block[a * 4 + 1]) <<  8 |
-		    (u_int32_t)(block[a * 4 + 2]) << 16 |
-		    (u_int32_t)(block[a * 4 + 3]) << 24);
+		in[a] = (uint32_t)(
+		    (uint32_t)(block[a * 4 + 0]) |
+		    (uint32_t)(block[a * 4 + 1]) <<  8 |
+		    (uint32_t)(block[a * 4 + 2]) << 16 |
+		    (uint32_t)(block[a * 4 + 3]) << 24);
 	}
 #endif
 
diff --git a/lib/compat/md5.h b/lib/compat/md5.h
index f6243603d..b5247d527 100644
--- a/lib/compat/md5.h
+++ b/lib/compat/md5.h
@@ -15,20 +15,22 @@
 #ifndef _MD5_H_
 #define _MD5_H_
 
+#include <stdint.h>
+
 #define	MD5_BLOCK_LENGTH		64
 #define	MD5_DIGEST_LENGTH		16
 #define	MD5_DIGEST_STRING_LENGTH	(MD5_DIGEST_LENGTH * 2 + 1)
 
 typedef struct MD5Context {
-	u_int32_t state[4];			/* state */
-	u_int64_t count;			/* number of bits, mod 2^64 */
-	u_int8_t buffer[MD5_BLOCK_LENGTH];	/* input buffer */
+	uint32_t state[4];			/* state */
+	uint64_t count;			/* number of bits, mod 2^64 */
+	uint8_t buffer[MD5_BLOCK_LENGTH];	/* input buffer */
 } MD5_CTX;
 
 void	 MD5Init(MD5_CTX *);
-void	 MD5Update(MD5_CTX *, const u_int8_t *, size_t);
+void	 MD5Update(MD5_CTX *, const uint8_t *, size_t);
 void	 MD5Pad(MD5_CTX *);
-void	 MD5Final(u_int8_t [MD5_DIGEST_LENGTH], MD5_CTX *);
-void	 MD5Transform(u_int32_t [4], const u_int8_t [MD5_BLOCK_LENGTH]);
+void	 MD5Final(uint8_t [MD5_DIGEST_LENGTH], MD5_CTX *);
+void	 MD5Transform(uint32_t [4], const uint8_t [MD5_BLOCK_LENGTH]);
 
 #endif /* _MD5_H_ */
diff --git a/lib/compat/scandir.c b/lib/compat/scandir.c
index 4765d7dcb..8771de093 100644
--- a/lib/compat/scandir.c
+++ b/lib/compat/scandir.c
@@ -72,13 +72,13 @@ scandir(const char *dir, struct dirent ***namelist,
 				avail *= 2;
 			else
 				avail = 20;
-			newlist = realloc(list, avail * sizeof(struct dirent *));
+			newlist = realloc(list, avail * sizeof(*newlist));
 			if (!newlist)
 				return cleanup(d, list, used);
 			list = newlist;
 		}
 
-		m = malloc(sizeof(struct dirent) + strlen(e->d_name));
+		m = malloc(sizeof(*m) + strlen(e->d_name));
 		if (!m)
 			return cleanup(d, list, used);
 		*m = *e;
@@ -91,7 +91,7 @@ scandir(const char *dir, struct dirent ***namelist,
 	closedir(d);
 
 	if (list != NULL && cmp != NULL)
-		qsort(list, used, sizeof(struct dirent *), cmp);
+		qsort(list, used, sizeof(list[0]), cmp);
 
 	*namelist = list;
 
diff --git a/lib/compat/strchrnul.c b/lib/compat/strchrnul.c
new file mode 100644
index 000000000..b072e1ad3
--- /dev/null
+++ b/lib/compat/strchrnul.c
@@ -0,0 +1,37 @@
+/*
+ * libcompat - system compatibility library
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "compat.h"
+
+char *
+strchrnul(const char *s, int c)
+{
+	char *match;
+
+	match = strchr(s, c);
+	if (match)
+		return match;
+
+	return (char *)s + strlen(s);
+}
diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am
index 215d12ffb..3a3bd64b4 100644
--- a/lib/dpkg/Makefile.am
+++ b/lib/dpkg/Makefile.am
@@ -53,6 +53,13 @@ libdpkg_la_SOURCES = \
 	compress.c \
 	dbdir.c \
 	dbmodify.c \
+	db-ctrl-access.c \
+	db-ctrl-format.c \
+	db-ctrl-upgrade.c \
+	db-fsys-digest.c \
+	db-fsys-divert.c \
+	db-fsys-files.c \
+	db-fsys-override.c \
 	deb-version.c \
 	debug.c \
 	depcon.c \
@@ -63,6 +70,9 @@ libdpkg_la_SOURCES = \
 	fdio.c \
 	file.c \
 	fields.c \
+	fsys-dir.c\
+	fsys-iter.c \
+	fsys-hash.c \
 	glob.c \
 	i18n.c i18n.h \
 	log.c \
@@ -71,14 +81,17 @@ libdpkg_la_SOURCES = \
 	nfmalloc.c \
 	options.c \
 	options-parsers.c \
+	pager.c \
 	parse.c \
 	parsehelp.c \
 	path.c \
 	path-remove.c \
+	perf.h \
 	pkg.c \
-	pkg-db.c \
 	pkg-array.c \
+	pkg-files.c \
 	pkg-format.c \
+	pkg-hash.c \
 	pkg-list.c \
 	pkg-namevalue.c \
 	pkg-queue.c \
@@ -112,6 +125,8 @@ pkginclude_HEADERS = \
 	color.h \
 	command.h \
 	compress.h \
+	db-ctrl.h \
+	db-fsys.h \
 	deb-version.h \
 	debug.h \
 	dir.h \
@@ -121,14 +136,17 @@ pkginclude_HEADERS = \
 	error.h \
 	fdio.h \
 	file.h \
+	fsys.h \
 	glob.h \
 	macros.h \
 	namevalue.h \
 	options.h \
+	pager.h \
 	parsedump.h \
 	path.h \
 	pkg.h \
 	pkg-array.h \
+	pkg-files.h \
 	pkg-format.h \
 	pkg-list.h \
 	pkg-queue.h \
diff --git a/lib/dpkg/ar.h b/lib/dpkg/ar.h
index 116703d84..55bfa6e99 100644
--- a/lib/dpkg/ar.h
+++ b/lib/dpkg/ar.h
@@ -1,6 +1,6 @@
 /*
  * libdpkg - Debian packaging suite library routines
- * ar.c - primitives for ar handling
+ * ar.h - primitives for ar handling
  *
  * Copyright © 2010 Guillem Jover <guillem@debian.org>
  *
diff --git a/lib/dpkg/arch.c b/lib/dpkg/arch.c
index 099957170..96f261704 100644
--- a/lib/dpkg/arch.c
+++ b/lib/dpkg/arch.c
@@ -23,7 +23,6 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <limits.h>
 #include <string.h>
 #include <stdbool.h>
@@ -59,7 +58,8 @@ dpkg_arch_name_is_illegal(const char *name)
 	static char buf[150];
 	const char *p = name;
 
-	assert(name);
+	if (p == NULL)
+		internerr("arch name argument is NULL");
 	if (!*p)
 		return _("may not be empty string");
 	if (!c_isalnum(*p))
@@ -124,10 +124,11 @@ dpkg_arch_new(const char *name, enum dpkg_arch_type type)
 /**
  * Retrieve the struct dpkg_arch for the given architecture.
  *
- * Create a new structure for the architecture if it's not yet known from
- * the system, in that case it will have arch->type == arch_unknown, if the
- * architecture is illegal it will have arch->type == arch_illegal and if
- * name is NULL or an empty string then it will have arch->type == arch_none.
+ * Create a new structure for the architecture if it is not yet known from
+ * the system, in that case it will have type == DPKG_ARCH_UNKNOWN, if the
+ * architecture is illegal it will have type == DPKG_ARCH_ILLEGAL, if name
+ * is an empty string it will have type == DPKG_ARCH_EMPTY, and if it is
+ * NULL then it will have type == DPKG_ARCH_NONE.
  *
  * @param name The architecture name.
  */
diff --git a/lib/dpkg/atomic-file.c b/lib/dpkg/atomic-file.c
index b49a47b9b..20b1fb37e 100644
--- a/lib/dpkg/atomic-file.c
+++ b/lib/dpkg/atomic-file.c
@@ -58,7 +58,7 @@ atomic_file_open(struct atomic_file *file)
 		        file->name_new);
 	fchmod(fileno(file->fp), 0644);
 
-	push_cleanup(cu_closestream, ~ehflag_normaltidy, NULL, 0, 1, file->fp);
+	push_cleanup(cu_closestream, ~ehflag_normaltidy, 1, file->fp);
 }
 
 void
diff --git a/lib/dpkg/buffer.c b/lib/dpkg/buffer.c
index c6c53eb7b..9faa12d93 100644
--- a/lib/dpkg/buffer.c
+++ b/lib/dpkg/buffer.c
@@ -38,7 +38,7 @@
 #include <dpkg/buffer.h>
 
 struct buffer_md5_ctx {
-	struct MD5Context ctx;
+	MD5_CTX ctx;
 	char *hash;
 };
 
@@ -225,6 +225,8 @@ buffer_copy(struct buffer_data *read_data,
 
 	if (bytesread < 0 || byteswritten < 0)
 		return -1;
+	if (totalread != totalwritten)
+		return -1;
 	if (limit > 0)
 		return dpkg_put_error(err, _("unexpected end of file or stream"));
 
diff --git a/lib/dpkg/command.c b/lib/dpkg/command.c
index b6a79d7c8..ab89d4b9b 100644
--- a/lib/dpkg/command.c
+++ b/lib/dpkg/command.c
@@ -51,7 +51,7 @@ command_init(struct command *cmd, const char *filename, const char *name)
 		cmd->name = name;
 	cmd->argc = 0;
 	cmd->argv_size = 10;
-	cmd->argv = m_malloc(cmd->argv_size * sizeof(const char *));
+	cmd->argv = m_malloc(cmd->argv_size * sizeof(cmd->argv[0]));
 	cmd->argv[0] = NULL;
 }
 
@@ -85,7 +85,7 @@ command_grow_argv(struct command *cmd, int need)
 		return;
 
 	cmd->argv_size = (cmd->argv_size + need) * 2;
-	cmd->argv = m_realloc(cmd->argv, cmd->argv_size * sizeof(const char *));
+	cmd->argv = m_realloc(cmd->argv, cmd->argv_size * sizeof(cmd->argv[0]));
 }
 
 /**
@@ -182,27 +182,6 @@ command_exec(struct command *cmd)
 	ohshite(_("unable to execute %s (%s)"), cmd->name, cmd->filename);
 }
 
-
-/**
- * Get a suitable pager.
- *
- * @return A string representing a pager.
- */
-const char *
-command_get_pager(void)
-{
-	const char *pager;
-
-	if (!isatty(1))
-		return CAT;
-
-	pager = getenv("PAGER");
-	if (str_is_unset(pager))
-		pager = DEFAULTPAGER;
-
-	return pager;
-}
-
 /**
  * Execute a shell with a possible command.
  *
diff --git a/lib/dpkg/command.h b/lib/dpkg/command.h
index 8cd2af9f1..7d2098a29 100644
--- a/lib/dpkg/command.h
+++ b/lib/dpkg/command.h
@@ -54,7 +54,6 @@ void command_add_args(struct command *cmd, ...) DPKG_ATTR_SENTINEL;
 
 void command_exec(struct command *cmd) DPKG_ATTR_NORET;
 
-const char *command_get_pager(void);
 void command_shell(const char *cmd, const char *name) DPKG_ATTR_NORET;
 
 /** @} */
diff --git a/src/infodb-access.c b/lib/dpkg/db-ctrl-access.c
index c28f46da2..d31f5466f 100644
--- a/src/infodb-access.c
+++ b/lib/dpkg/db-ctrl-access.c
@@ -1,6 +1,6 @@
 /*
  * dpkg - main program for package management
- * infodb.c - package control information database
+ * db-ctrl-access.c - package control information database
  *
  * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2011-2014 Guillem Jover <guillem@debian.org>
@@ -32,11 +32,10 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
+#include <dpkg/fsys.h>
+#include <dpkg/db-ctrl.h>
 #include <dpkg/debug.h>
 
-#include "filesdb.h"
-#include "infodb.h"
-
 bool
 pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin,
                     const char *name)
@@ -82,7 +81,7 @@ pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin,
 	if (!db_dir)
 		ohshite(_("cannot read info directory"));
 
-	push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)db_dir);
+	push_cleanup(cu_closedir, ~0, 1, (void *)db_dir);
 	while ((db_de = readdir(db_dir)) != NULL) {
 		const char *filename, *filetype, *dot;
 
diff --git a/src/infodb-format.c b/lib/dpkg/db-ctrl-format.c
index 432930890..a545ec5e7 100644
--- a/src/infodb-format.c
+++ b/lib/dpkg/db-ctrl-format.c
@@ -1,6 +1,6 @@
 /*
  * dpkg - main program for package management
- * infodb-format.c - package control information database format
+ * db-ctrl-format.c - package control information database format
  *
  * Copyright © 2011-2014 Guillem Jover <guillem@debian.org>
  *
@@ -32,17 +32,17 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/varbuf.h>
-
-#include "infodb.h"
+#include <dpkg/db-ctrl.h>
 
 static enum pkg_infodb_format db_format = PKG_INFODB_FORMAT_UNKNOWN;
 static bool db_upgrading;
+static char *db_infodir;
 
 static enum pkg_infodb_format
 pkg_infodb_parse_format(const char *file)
 {
 	FILE *fp;
-	int format;
+	unsigned int format;
 
 	fp = fopen(file, "r");
 	if (fp == NULL) {
@@ -118,16 +118,14 @@ pkg_infodb_is_upgrading(void)
 const char *
 pkg_infodb_get_dir(void)
 {
-	static char *infodir;
-
-	if (infodir == NULL)
-		infodir = dpkg_db_get_path(INFODIR);
+	if (db_infodir == NULL)
+		db_infodir = dpkg_db_get_path(INFODIR);
 
-	return infodir;
+	return db_infodir;
 }
 
 const char *
-pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin,
+pkg_infodb_get_file(const struct pkginfo *pkg, const struct pkgbin *pkgbin,
                     const char *filetype)
 {
 	static struct varbuf vb;
@@ -149,3 +147,12 @@ pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin,
 
 	return vb.buf;
 }
+
+const char *
+pkg_infodb_reset_dir(void)
+{
+	free(db_infodir);
+	db_infodir = NULL;
+
+	return pkg_infodb_get_dir();
+}
diff --git a/src/infodb-upgrade.c b/lib/dpkg/db-ctrl-upgrade.c
index 1a8e144e8..9b6d735cc 100644
--- a/src/infodb-upgrade.c
+++ b/lib/dpkg/db-ctrl-upgrade.c
@@ -1,6 +1,6 @@
 /*
  * dpkg - main program for package management
- * infodb-upgrade.c - package control information database format upgrade
+ * db-ctrl-upgrade.c - package control information database format upgrade
  *
  * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2011-2014 Guillem Jover <guillem@debian.org>
@@ -34,12 +34,11 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
+#include <dpkg/fsys.h>
+#include <dpkg/db-ctrl.h>
 #include <dpkg/path.h>
 #include <dpkg/dir.h>
 
-#include "filesdb.h"
-#include "infodb.h"
-
 struct rename_node {
 	struct rename_node *next;
 	char *old;
@@ -92,7 +91,7 @@ pkg_infodb_link_multiarch_files(void)
 	if (!db_dir)
 		ohshite(_("cannot read info directory"));
 
-	push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)db_dir);
+	push_cleanup(cu_closedir, ~0, 1, (void *)db_dir);
 	while ((db_de = readdir(db_dir)) != NULL) {
 		const char *filetype, *dot;
 		struct pkginfo *pkg;
@@ -115,7 +114,7 @@ pkg_infodb_link_multiarch_files(void)
 		if (strchr(pkgname.buf, ':'))
 			continue;
 
-		set = pkg_db_find_set(pkgname.buf);
+		set = pkg_hash_find_set(pkgname.buf);
 		for (pkg = &set->pkg; pkg; pkg = pkg->arch_next)
 			if (pkg->status != PKG_STAT_NOTINSTALLED)
 				break;
@@ -214,7 +213,7 @@ pkg_infodb_upgrade_to_multiarch(void)
 	db_file = atomic_file_new(db_format_file, 0);
 	atomic_file_open(db_file);
 
-	push_cleanup(cu_abort_db_upgrade, ehflag_bombout, NULL, 0, 1, db_file);
+	push_cleanup(cu_abort_db_upgrade, ehflag_bombout, 1, db_file);
 
 	pkg_infodb_link_multiarch_files();
 	pkg_infodb_write_format(db_file, 1);
diff --git a/src/infodb.h b/lib/dpkg/db-ctrl.h
index 472011cc3..e4dccd285 100644
--- a/src/infodb.h
+++ b/lib/dpkg/db-ctrl.h
@@ -1,6 +1,6 @@
 /*
- * dpkg - main program for package management
- * infodb.h - package control information database
+ * libdpkg - Debian packaging suite library routines
+ * db-ctrl.h - package control information database
  *
  * Copyright © 2011-2014 Guillem Jover <guillem@debian.org>
  *
@@ -18,8 +18,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#ifndef DPKG_INFODB_H
-#define DPKG_INFODB_H
+#ifndef LIBDPKG_DB_CTRL_H
+#define LIBDPKG_DB_CTRL_H
 
 #include <stdbool.h>
 
@@ -38,8 +38,9 @@ bool pkg_infodb_is_upgrading(void);
 void pkg_infodb_upgrade(void);
 
 const char *pkg_infodb_get_dir(void);
-const char *pkg_infodb_get_file(struct pkginfo *pkg, struct pkgbin *pkgbin,
+const char *pkg_infodb_get_file(const struct pkginfo *pkg, const struct pkgbin *pkgbin,
                                 const char *filetype);
+const char *pkg_infodb_reset_dir(void);
 bool pkg_infodb_has_file(struct pkginfo *pkg, struct pkgbin *pkgbin,
                          const char *name);
 
@@ -48,4 +49,4 @@ typedef void pkg_infodb_file_func(const char *filename, const char *filetype);
 void pkg_infodb_foreach(struct pkginfo *pkg, struct pkgbin *pkgbin,
                         pkg_infodb_file_func *func);
 
-#endif /* DPKG_INFODB_H */
+#endif /* LIBDPKG_DB_CTRL_H */
diff --git a/src/filesdb-hash.c b/lib/dpkg/db-fsys-digest.c
index 275716009..5b32d9179 100644
--- a/src/filesdb-hash.c
+++ b/lib/dpkg/db-fsys-digest.c
@@ -1,6 +1,6 @@
 /*
- * dpkg - main program for package management
- * filesdb-hash.c - management of database of files installed on system
+ * libdpkg - Debian packaging suite library routines
+ * db-fsys-digest.c - management of filesystem digests database
  *
  * Copyright © 2012-2014 Guillem Jover <guillem@debian.org>
  *
@@ -35,17 +35,16 @@
 #include <dpkg/debug.h>
 #include <dpkg/fdio.h>
 #include <dpkg/dir.h>
-
-#include "filesdb.h"
-#include "infodb.h"
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 
 /*
- * If mask is nonzero, will not write any file whose filenamenode
+ * If mask is nonzero, will not write any file whose fsys_namenode
  * has any flag bits set in mask.
  */
 void
 write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                      struct fileinlist *list, enum filenamenode_flags mask)
+                      struct fsys_namenode_list *list, enum fsys_namenode_flags mask)
 {
 	struct atomic_file *file;
 	const char *hashfile;
@@ -61,7 +60,7 @@ write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
 	atomic_file_open(file);
 
 	for (; list; list = list->next) {
-		 struct filenamenode *namenode = list->namenode;
+		 struct fsys_namenode *namenode = list->namenode;
 
 		if (mask && (namenode->flags & mask))
 			continue;
@@ -81,14 +80,15 @@ write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
 }
 
 static void
-parse_filehash_buffer(char *buf, char *buf_end,
+parse_filehash_buffer(struct varbuf *buf,
                       struct pkginfo *pkg, struct pkgbin *pkgbin)
 {
 	char *thisline, *nextline;
 	const char *pkgname = pkg_name(pkg, pnaw_nonambig);
+	const char *buf_end = buf->buf + buf->used;
 
-	for (thisline = buf; thisline < buf_end; thisline = nextline) {
-		struct filenamenode *namenode;
+	for (thisline = buf->buf; thisline < buf_end; thisline = nextline) {
+		struct fsys_namenode *namenode;
 		char *endline, *hash_end, *filename;
 
 		endline = memchr(thisline, '\n', buf_end - thisline);
@@ -125,51 +125,27 @@ parse_filehash_buffer(char *buf, char *buf_end,
 		      thisline, filename);
 
 		/* Add the file to the list. */
-		namenode = findnamenode(filename, fnn_nocopy);
-		namenode->newhash = thisline;
+		namenode = fsys_hash_find_node(filename, 0);
+		namenode->newhash = nfstrsave(thisline);
 	}
 }
 
 void
 parse_filehash(struct pkginfo *pkg, struct pkgbin *pkgbin)
 {
-	static int fd;
 	const char *hashfile;
-	struct stat st;
+	struct varbuf buf = VARBUF_INIT;
+	struct dpkg_error err = DPKG_ERROR_INIT;
 
 	hashfile = pkg_infodb_get_file(pkg, pkgbin, HASHFILE);
 
-	fd = open(hashfile, O_RDONLY);
-	if (fd < 0) {
-		if (errno == ENOENT)
-			return;
-
-		ohshite(_("cannot open control file '%s' for package '%s'"),
-		        HASHFILE, pkg_name(pkg, pnaw_nonambig));
-	}
-
-	if (fstat(fd, &st) < 0)
-		ohshite(_("cannot stat control file '%s' for package '%s'"),
-		        HASHFILE, pkg_name(pkg, pnaw_nonambig));
-
-	if (!S_ISREG(st.st_mode))
-		ohshit(_("control file '%s' for package '%s' is not a regular file"),
-		       HASHFILE, pkg_name(pkg, pnaw_nonambig));
+	if (file_slurp(hashfile, &buf, &err) < 0 && err.syserrno != ENOENT)
+		dpkg_error_print(&err,
+		                 _("loading control file '%s' for package '%s'"),
+		                 HASHFILE, pkg_name(pkg, pnaw_nonambig));
 
-	if (st.st_size > 0) {
-		char *buf, *buf_end;
-
-		buf = nfmalloc(st.st_size);
-		buf_end = buf + st.st_size;
-
-		if (fd_read(fd, buf, st.st_size) < 0)
-			ohshite(_("cannot read control file '%s' for package '%s'"),
-			        HASHFILE, pkg_name(pkg, pnaw_nonambig));
-
-		parse_filehash_buffer(buf, buf_end, pkg, pkgbin);
-	}
+	if (buf.used > 0)
+		parse_filehash_buffer(&buf, pkg, pkgbin);
 
-	if (close(fd))
-		ohshite(_("cannot close control file '%s' for package '%s'"),
-		        HASHFILE, pkg_name(pkg, pnaw_nonambig));
+	varbuf_destroy(&buf);
 }
diff --git a/src/divertdb.c b/lib/dpkg/db-fsys-divert.c
index a2e94f6bd..bf0b7ff5a 100644
--- a/src/divertdb.c
+++ b/lib/dpkg/db-fsys-divert.c
@@ -1,6 +1,6 @@
 /*
- * dpkg - main program for package management
- * divertdb.c - management of database of diverted files
+ * libdpkg - Debian packaging suite library routines
+ * db-fsys-divert.c - management of filesystem diverted files database
  *
  * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2000, 2001 Wichert Akkerman <wakkerma@debian.org>
@@ -36,11 +36,10 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
+#include <dpkg/debug.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
-#include "main.h"
-
-static struct diversion *diversions = NULL;
+static struct fsys_diversion *diversions = NULL;
 static char *diversionsname;
 
 void
@@ -51,7 +50,7 @@ ensure_diversions(void)
 	char linebuf[MAXDIVERTFILENAME];
 	static FILE *file_prev;
 	FILE *file;
-	struct diversion *ov, *oicontest, *oialtname;
+	struct fsys_diversion *ov, *oicontest, *oialtname;
 
 	if (diversionsname == NULL)
 		diversionsname = dpkg_db_get_path(DIVERSIONSFILE);
@@ -102,19 +101,19 @@ ensure_diversions(void)
 	debug(dbg_general, "%s: new, (re)loading", __func__);
 
 	while (fgets_checked(linebuf, sizeof(linebuf), file, diversionsname) >= 0) {
-		oicontest = nfmalloc(sizeof(struct diversion));
-		oialtname = nfmalloc(sizeof(struct diversion));
+		oicontest = nfmalloc(sizeof(*oicontest));
+		oialtname = nfmalloc(sizeof(*oialtname));
 
-		oialtname->camefrom = findnamenode(linebuf, 0);
+		oialtname->camefrom = fsys_hash_find_node(linebuf, 0);
 		oialtname->useinstead = NULL;
 
 		fgets_must(linebuf, sizeof(linebuf), file, diversionsname);
-		oicontest->useinstead = findnamenode(linebuf, 0);
+		oicontest->useinstead = fsys_hash_find_node(linebuf, 0);
 		oicontest->camefrom = NULL;
 
 		fgets_must(linebuf, sizeof(linebuf), file, diversionsname);
 		oicontest->pkgset = strcmp(linebuf, ":") ?
-		                    pkg_db_find_set(linebuf) : NULL;
+		                    pkg_hash_find_set(linebuf) : NULL;
 		oialtname->pkgset = oicontest->pkgset;
 
 		if (oialtname->camefrom->divert ||
diff --git a/lib/dpkg/db-fsys-files.c b/lib/dpkg/db-fsys-files.c
new file mode 100644
index 000000000..ffd26cee2
--- /dev/null
+++ b/lib/dpkg/db-fsys-files.c
@@ -0,0 +1,324 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * db-fsys-files.c - management of filesystem files database
+ *
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright © 2000,2001 Wichert Akkerman <wakkerma@debian.org>
+ * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#ifdef HAVE_LINUX_FIEMAP_H
+#include <linux/fiemap.h>
+#include <linux/fs.h>
+#include <sys/ioctl.h>
+#include <sys/vfs.h>
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <errno.h>
+#include <string.h>
+#include <pwd.h>
+#include <grp.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <stdlib.h>
+
+#include <dpkg/i18n.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/string.h>
+#include <dpkg/path.h>
+#include <dpkg/dir.h>
+#include <dpkg/fdio.h>
+#include <dpkg/pkg-array.h>
+#include <dpkg/pkg-files.h>
+#include <dpkg/progress.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
+
+/*** Generic data structures and routines. ***/
+
+static bool allpackagesdone = false;
+
+void note_must_reread_files_inpackage(struct pkginfo *pkg) {
+  allpackagesdone = false;
+  pkg->files_list_valid = false;
+}
+
+enum pkg_filesdb_load_status {
+  PKG_FILESDB_LOAD_NONE = 0,
+  PKG_FILESDB_LOAD_INPROGRESS = 1,
+  PKG_FILESDB_LOAD_DONE = 2,
+};
+
+static enum pkg_filesdb_load_status saidread = PKG_FILESDB_LOAD_NONE;
+
+/**
+ * Load the list of files in this package into memory, or update the
+ * list if it is there but stale.
+ */
+void
+ensure_packagefiles_available(struct pkginfo *pkg)
+{
+  const char *filelistfile;
+  struct fsys_namenode_list **lendp;
+  char *loaded_list_end, *thisline, *nextline, *ptr;
+  struct varbuf buf = VARBUF_INIT;
+  struct dpkg_error err = DPKG_ERROR_INIT;
+
+  if (pkg->files_list_valid)
+    return;
+
+  /* Throw away any stale data, if there was any. */
+  pkg_files_blank(pkg);
+
+  /* Packages which aren't installed don't have a files list. */
+  if (pkg->status == PKG_STAT_NOTINSTALLED) {
+    pkg->files_list_valid = true;
+    return;
+  }
+
+  filelistfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE);
+
+  onerr_abort++;
+
+  if (file_slurp(filelistfile, &buf, &err) < 0) {
+    if (err.syserrno != ENOENT)
+      dpkg_error_print(&err, _("loading files list file for package '%s'"),
+                       pkg_name(pkg, pnaw_nonambig));
+
+    onerr_abort--;
+    if (pkg->status != PKG_STAT_CONFIGFILES &&
+        dpkg_version_is_informative(&pkg->configversion)) {
+      warning(_("files list file for package '%.250s' missing; assuming "
+                "package has no files currently installed"),
+              pkg_name(pkg, pnaw_nonambig));
+    }
+    pkg->files = NULL;
+    pkg->files_list_valid = true;
+    return;
+  }
+
+  if (buf.used) {
+    loaded_list_end = buf.buf + buf.used;
+
+    lendp = &pkg->files;
+    thisline = buf.buf;
+    while (thisline < loaded_list_end) {
+      struct fsys_namenode *namenode;
+
+      ptr = memchr(thisline, '\n', loaded_list_end - thisline);
+      if (ptr == NULL)
+        ohshit(_("files list file for package '%.250s' is missing final newline"),
+               pkg_name(pkg, pnaw_nonambig));
+      /* Where to start next time around. */
+      nextline = ptr + 1;
+      /* Strip trailing ‘/’. */
+      if (ptr > thisline && ptr[-1] == '/') ptr--;
+      /* Add the file to the list. */
+      if (ptr == thisline)
+        ohshit(_("files list file for package '%.250s' contains empty filename"),
+               pkg_name(pkg, pnaw_nonambig));
+      *ptr = '\0';
+
+      namenode = fsys_hash_find_node(thisline, 0);
+      lendp = pkg_files_add_file(pkg, namenode, lendp);
+      thisline = nextline;
+    }
+  }
+
+  varbuf_destroy(&buf);
+
+  onerr_abort--;
+
+  pkg->files_list_valid = true;
+}
+
+#if defined(HAVE_LINUX_FIEMAP_H)
+static int
+pkg_sorter_by_files_list_phys_offs(const void *a, const void *b)
+{
+  const struct pkginfo *pa = *(const struct pkginfo **)a;
+  const struct pkginfo *pb = *(const struct pkginfo **)b;
+
+  /* We can't simply subtract, because the difference may be greater than
+   * INT_MAX. */
+  if (pa->files_list_phys_offs < pb->files_list_phys_offs)
+    return -1;
+  else if (pa->files_list_phys_offs > pb->files_list_phys_offs)
+    return 1;
+  else
+    return 0;
+}
+
+static void
+pkg_files_optimize_load(struct pkg_array *array)
+{
+  struct statfs fs;
+  int i;
+
+  /* Get the filesystem block size. */
+  if (statfs(pkg_infodb_get_dir(), &fs) < 0)
+    return;
+
+  /* Sort packages by the physical location of their list files, so that
+   * scanning them later will minimize disk drive head movements. */
+  for (i = 0; i < array->n_pkgs; i++) {
+    struct pkginfo *pkg = array->pkgs[i];
+    struct {
+      struct fiemap fiemap;
+      struct fiemap_extent extent;
+    } fm;
+    const char *listfile;
+    int fd;
+
+    if (pkg->status == PKG_STAT_NOTINSTALLED ||
+        pkg->files_list_phys_offs != 0)
+      continue;
+
+    pkg->files_list_phys_offs = -1;
+
+    listfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE);
+
+    fd = open(listfile, O_RDONLY);
+    if (fd < 0)
+      continue;
+
+    memset(&fm, 0, sizeof(fm));
+    fm.fiemap.fm_start = 0;
+    fm.fiemap.fm_length = fs.f_bsize;
+    fm.fiemap.fm_flags = 0;
+    fm.fiemap.fm_extent_count = 1;
+
+    if (ioctl(fd, FS_IOC_FIEMAP, (unsigned long)&fm) == 0)
+      pkg->files_list_phys_offs = fm.fiemap.fm_extents[0].fe_physical;
+
+    close(fd);
+  }
+
+  pkg_array_sort(array, pkg_sorter_by_files_list_phys_offs);
+}
+#elif defined(HAVE_POSIX_FADVISE)
+static void
+pkg_files_optimize_load(struct pkg_array *array)
+{
+  int i;
+
+  /* Ask the kernel to start preloading the list files, so as to get a
+   * boost when later we actually load them. */
+  for (i = 0; i < array->n_pkgs; i++) {
+    struct pkginfo *pkg = array->pkgs[i];
+    const char *listfile;
+    int fd;
+
+    listfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE);
+
+    fd = open(listfile, O_RDONLY | O_NONBLOCK);
+    if (fd != -1) {
+      posix_fadvise(fd, 0, 0, POSIX_FADV_WILLNEED);
+      close(fd);
+    }
+  }
+}
+#else
+static void
+pkg_files_optimize_load(struct pkg_array *array)
+{
+}
+#endif
+
+void ensure_allinstfiles_available(void) {
+  struct pkg_array array;
+  struct pkginfo *pkg;
+  struct progress progress;
+  int i;
+
+  if (allpackagesdone) return;
+  if (saidread < PKG_FILESDB_LOAD_DONE) {
+    int max = pkg_hash_count_pkg();
+
+    saidread = PKG_FILESDB_LOAD_INPROGRESS;
+    progress_init(&progress, _("(Reading database ... "), max);
+  }
+
+  pkg_array_init_from_hash(&array);
+
+  pkg_files_optimize_load(&array);
+
+  for (i = 0; i < array.n_pkgs; i++) {
+    pkg = array.pkgs[i];
+    ensure_packagefiles_available(pkg);
+
+    if (saidread == PKG_FILESDB_LOAD_INPROGRESS)
+      progress_step(&progress);
+  }
+
+  pkg_array_destroy(&array);
+
+  allpackagesdone = true;
+
+  if (saidread == PKG_FILESDB_LOAD_INPROGRESS) {
+    progress_done(&progress);
+    printf(P_("%d file or directory currently installed.)\n",
+              "%d files and directories currently installed.)\n",
+              fsys_hash_entries()),
+           fsys_hash_entries());
+    saidread = PKG_FILESDB_LOAD_DONE;
+  }
+}
+
+void ensure_allinstfiles_available_quiet(void) {
+  saidread = PKG_FILESDB_LOAD_DONE;
+  ensure_allinstfiles_available();
+}
+
+/*
+ * If mask is nonzero, will not write any file whose fsys_namenode
+ * has any flag bits set in mask.
+ */
+void
+write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
+                      struct fsys_namenode_list *list, enum fsys_namenode_flags mask)
+{
+  struct atomic_file *file;
+  struct fsys_namenode_list *node;
+  const char *listfile;
+
+  listfile = pkg_infodb_get_file(pkg, pkgbin, LISTFILE);
+
+  file = atomic_file_new(listfile, 0);
+  atomic_file_open(file);
+
+  for (node = list; node; node = node->next) {
+    if (!(mask && (node->namenode->flags & mask))) {
+      fputs(node->namenode->name, file->fp);
+      putc('\n', file->fp);
+    }
+  }
+
+  atomic_file_sync(file);
+  atomic_file_close(file);
+  atomic_file_commit(file);
+  atomic_file_free(file);
+
+  dir_sync_path(pkg_infodb_get_dir());
+
+  note_must_reread_files_inpackage(pkg);
+}
diff --git a/src/statdb.c b/lib/dpkg/db-fsys-override.c
index 39d67e411..e079c5ffb 100644
--- a/src/statdb.c
+++ b/lib/dpkg/db-fsys-override.c
@@ -1,6 +1,6 @@
 /*
- * dpkg - main program for package management
- * statdb.c - management of database of ownership and mode of files
+ * libdpkg - Debian packaging suite library routines
+ * db-fsys-override.c - management of filesystem stat overrides database
  *
  * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2000, 2001 Wichert Akkerman <wakkerma@debian.org>
@@ -38,9 +38,8 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/fdio.h>
-
-#include "filesdb.h"
-#include "main.h"
+#include <dpkg/debug.h>
+#include <dpkg/db-fsys.h>
 
 static char *statoverridename;
 
@@ -118,8 +117,8 @@ ensure_statoverrides(enum statdb_parse_flags flags)
 	FILE *file;
 	char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr;
 	struct file_stat *fso;
-	struct filenamenode *fnn;
-	struct fileiterator *iter;
+	struct fsys_namenode *fnn;
+	struct fsys_hash_iter *iter;
 
 	if (statoverridename == NULL)
 		statoverridename = dpkg_db_get_path(STATOVERRIDEFILE);
@@ -158,10 +157,10 @@ ensure_statoverrides(enum statdb_parse_flags flags)
 	file_prev = file;
 
 	/* Reset statoverride information. */
-	iter = files_db_iter_new();
-	while ((fnn = files_db_iter_next(iter)))
+	iter = fsys_hash_iter_new();
+	while ((fnn = fsys_hash_iter_next(iter)))
 		fnn->statoverride = NULL;
-	files_db_iter_free(iter);
+	fsys_hash_iter_free(iter);
 
 	if (!file) {
 		onerr_abort--;
@@ -185,7 +184,7 @@ ensure_statoverrides(enum statdb_parse_flags flags)
 
 	thisline = loaded_list;
 	while (thisline < loaded_list_end) {
-		fso = nfmalloc(sizeof(struct file_stat));
+		fso = nfmalloc(sizeof(*fso));
 
 		ptr = memchr(thisline, '\n', loaded_list_end - thisline);
 		if (ptr == NULL)
@@ -209,8 +208,9 @@ ensure_statoverrides(enum statdb_parse_flags flags)
 			fso->uname = NULL;
 
 		if (fso->uid == (uid_t)-1 && !(flags & STATDB_PARSE_LAX))
-			ohshit(_("unknown user '%s' in statoverride file"),
-			       thisline);
+			ohshit(_("unknown system user '%s' in statoverride file; the system user got removed\n"
+			         "before the override, which is most probably a packaging bug, to recover you\n"
+			         "can remove the override manually with %s"), thisline, DPKGSTAT);
 
 		/* Move to the next bit */
 		thisline = ptr + 1;
@@ -230,8 +230,9 @@ ensure_statoverrides(enum statdb_parse_flags flags)
 			fso->gname = NULL;
 
 		if (fso->gid == (gid_t)-1 && !(flags & STATDB_PARSE_LAX))
-			ohshit(_("unknown group '%s' in statoverride file"),
-			       thisline);
+			ohshit(_("unknown system group '%s' in statoverride file; the system group got removed\n"
+			         "before the override, which is most probably a packaging bug, to recover you\n"
+			         "can remove the override manually with %s"), thisline, DPKGSTAT);
 
 		/* Move to the next bit */
 		thisline = ptr + 1;
@@ -251,7 +252,7 @@ ensure_statoverrides(enum statdb_parse_flags flags)
 		if (thisline >= loaded_list_end)
 			ohshit(_("unexpected end of line in statoverride file"));
 
-		fnn = findnamenode(thisline, 0);
+		fnn = fsys_hash_find_node(thisline, 0);
 		if (fnn->statoverride)
 			ohshit(_("multiple statoverrides present for file '%.250s'"),
 			       thisline);
diff --git a/lib/dpkg/db-fsys.h b/lib/dpkg/db-fsys.h
new file mode 100644
index 000000000..339a0fb45
--- /dev/null
+++ b/lib/dpkg/db-fsys.h
@@ -0,0 +1,75 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * db-fsys.h - management of database of files installed on system
+ *
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBDPKG_DB_FSYS_H
+#define LIBDPKG_DB_FSYS_H
+
+#include <dpkg/file.h>
+#include <dpkg/fsys.h>
+
+/*
+ * Data structure here is as follows:
+ *
+ * For each package we have a ‘struct fsys_namenode_list *’, the head of a list of
+ * files in that package. They are in ‘forwards’ order. Each entry has a
+ * pointer to the ‘struct fsys_namenode’.
+ *
+ * The struct fsys_namenodes are in a hash table, indexed by name.
+ * (This hash table is not visible to callers.)
+ *
+ * Each fsys_namenode has a (possibly empty) list of ‘struct filepackage’,
+ * giving a list of the packages listing that filename.
+ *
+ * When we read files contained info about a particular package we set the
+ * ‘files’ member of the clientdata struct to the appropriate thing. When
+ * not yet set the files pointer is made to point to ‘fileslist_uninited’
+ * (this is available only internally, within filesdb.c - the published
+ * interface is ensure_*_available).
+ */
+
+struct pkginfo;
+
+void ensure_diversions(void);
+
+enum statdb_parse_flags {
+	STATDB_PARSE_NORMAL = 0,
+	STATDB_PARSE_LAX = 1,
+};
+
+uid_t statdb_parse_uid(const char *str);
+gid_t statdb_parse_gid(const char *str);
+mode_t statdb_parse_mode(const char *str);
+void ensure_statoverrides(enum statdb_parse_flags flags);
+
+#define LISTFILE           "list"
+#define HASHFILE           "md5sums"
+
+void ensure_packagefiles_available(struct pkginfo *pkg);
+void ensure_allinstfiles_available(void);
+void ensure_allinstfiles_available_quiet(void);
+void note_must_reread_files_inpackage(struct pkginfo *pkg);
+void parse_filehash(struct pkginfo *pkg, struct pkgbin *pkgbin);
+void write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
+                           struct fsys_namenode_list *list, enum fsys_namenode_flags mask);
+void write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
+                           struct fsys_namenode_list *list, enum fsys_namenode_flags mask);
+
+#endif /* LIBDPKG_DB_FSYS_H */
diff --git a/lib/dpkg/dbmodify.c b/lib/dpkg/dbmodify.c
index ec1102107..763293170 100644
--- a/lib/dpkg/dbmodify.c
+++ b/lib/dpkg/dbmodify.c
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <string.h>
@@ -51,6 +50,7 @@ static bool db_initialized;
 
 static enum modstatdb_rw cstatus=-1, cflags=0;
 static char *lockfile;
+static char *frontendlockfile;
 static char *statusfile, *availablefile;
 static char *importanttmpfile=NULL;
 static FILE *importanttmp;
@@ -140,6 +140,7 @@ static const struct fni {
   char **store;
 } fnis[] = {
   {   LOCKFILE,                   &lockfile           },
+  {   FRONTENDLOCKFILE,           &frontendlockfile   },
   {   STATUSFILE,                 &statusfile         },
   {   AVAILFILE,                  &availablefile      },
   {   UPDATESDIR,                 &updatesdir         },
@@ -185,6 +186,7 @@ modstatdb_done(void)
 }
 
 static int dblockfd = -1;
+static int frontendlockfd = -1;
 
 bool
 modstatdb_is_locked(void)
@@ -195,7 +197,8 @@ modstatdb_is_locked(void)
   if (dblockfd == -1) {
     lockfd = open(lockfile, O_RDONLY);
     if (lockfd == -1)
-      ohshite(_("unable to open lock file %s for testing"), lockfile);
+      ohshite(_("unable to check lock file for dpkg database directory %s"),
+              dpkg_db_get_dir());
   } else {
     lockfd = dblockfd;
   }
@@ -216,12 +219,26 @@ modstatdb_can_lock(void)
   if (dblockfd >= 0)
     return true;
 
+  if (getenv("DPKG_FRONTEND_LOCKED") == NULL) {
+    frontendlockfd = open(frontendlockfile, O_RDWR | O_CREAT | O_TRUNC, 0660);
+    if (frontendlockfd == -1) {
+      if (errno == EACCES || errno == EPERM)
+        return false;
+      else
+        ohshite(_("unable to open/create dpkg frontend lock for directory %s"),
+                dpkg_db_get_dir());
+    }
+  } else {
+    frontendlockfd = -1;
+  }
+
   dblockfd = open(lockfile, O_RDWR | O_CREAT | O_TRUNC, 0660);
   if (dblockfd == -1) {
     if (errno == EACCES || errno == EPERM)
       return false;
     else
-      ohshite(_("unable to open/create status database lockfile"));
+      ohshite(_("unable to open/create dpkg database lock file for directory %s"),
+              dpkg_db_get_dir());
   }
 
   return true;
@@ -231,9 +248,14 @@ void
 modstatdb_lock(void)
 {
   if (!modstatdb_can_lock())
-    ohshit(_("you do not have permission to lock the dpkg status database"));
-
-  file_lock(&dblockfd, FILE_LOCK_NOWAIT, lockfile, _("dpkg status database"));
+    ohshit(_("you do not have permission to lock the dpkg database directory %s"),
+           dpkg_db_get_dir());
+
+  if (frontendlockfd != -1)
+    file_lock(&frontendlockfd, FILE_LOCK_NOWAIT, frontendlockfile,
+              _("dpkg frontend lock"));
+  file_lock(&dblockfd, FILE_LOCK_NOWAIT, lockfile,
+            _("dpkg database lock"));
 }
 
 void
@@ -241,8 +263,11 @@ modstatdb_unlock(void)
 {
   /* Unlock. */
   pop_cleanup(ehflag_normaltidy);
+  if (frontendlockfd != -1)
+    pop_cleanup(ehflag_normaltidy);
 
   dblockfd = -1;
+  frontendlockfd = -1;
 }
 
 enum modstatdb_rw
@@ -262,9 +287,11 @@ modstatdb_open(enum modstatdb_rw readwritereq)
   case msdbrw_write: case msdbrw_writeifposs:
     if (access(dpkg_db_get_dir(), W_OK)) {
       if (errno != EACCES)
-        ohshite(_("unable to access dpkg status area"));
+        ohshite(_("unable to access the dpkg database directory %s"),
+                dpkg_db_get_dir());
       else if (readwritereq == msdbrw_write)
-        ohshit(_("operation requires read/write access to dpkg status area"));
+        ohshit(_("required read/write access to the dpkg database directory %s"),
+               dpkg_db_get_dir());
       cstatus= msdbrw_readonly;
     } else {
       modstatdb_lock();
@@ -307,13 +334,19 @@ modstatdb_get_status(void)
 void modstatdb_checkpoint(void) {
   int i;
 
-  assert(cstatus >= msdbrw_write);
+  if (cstatus < msdbrw_write)
+    internerr("modstatdb status '%d' is not writable", cstatus);
+
   writedb(statusfile, wdb_must_sync);
 
   for (i=0; i<nextupdate; i++) {
     sprintf(updatefnrest, IMPORTANTFMT, i);
+
     /* Have we made a real mess? */
-    assert(strlen(updatefnrest) <= IMPORTANTMAXLEN);
+    if (strlen(updatefnrest) > IMPORTANTMAXLEN)
+      internerr("modstatdb update entry name '%s' longer than %d",
+                updatefnrest, IMPORTANTMAXLEN);
+
     if (unlink(updatefnbuf))
       ohshite(_("failed to remove my own update file %.255s"),updatefnbuf);
   }
@@ -341,7 +374,7 @@ void modstatdb_shutdown(void) {
     break;
   }
 
-  pkg_db_reset();
+  pkg_hash_reset();
 
   modstatdb_done();
 }
@@ -349,7 +382,8 @@ void modstatdb_shutdown(void) {
 static void
 modstatdb_note_core(struct pkginfo *pkg)
 {
-  assert(cstatus >= msdbrw_write);
+  if (cstatus < msdbrw_write)
+    internerr("modstatdb status '%d' is not writable", cstatus);
 
   varbuf_reset(&uvb);
   varbufrecord(&uvb, pkg, &pkg->installed);
@@ -377,7 +411,9 @@ modstatdb_note_core(struct pkginfo *pkg)
   dir_sync_path(updatesdir);
 
   /* Have we made a real mess? */
-  assert(strlen(updatefnrest) <= IMPORTANTMAXLEN);
+  if (strlen(updatefnrest) > IMPORTANTMAXLEN)
+    internerr("modstatdb update entry name '%s' longer than %d",
+              updatefnrest, IMPORTANTMAXLEN);
 
   nextupdate++;
 
@@ -413,11 +449,15 @@ void modstatdb_note(struct pkginfo *pkg) {
     pkg->trigaw.head = pkg->trigaw.tail = NULL;
   }
 
-  log_message("status %s %s %s", pkg_status_name(pkg),
-              pkg_name(pkg, pnaw_always),
-	      versiondescribe(&pkg->installed.version, vdew_nonambig));
-  statusfd_send("status: %s: %s", pkg_name(pkg, pnaw_nonambig),
-                pkg_status_name(pkg));
+  if (pkg->status_dirty) {
+    log_message("status %s %s %s", pkg_status_name(pkg),
+                pkg_name(pkg, pnaw_always),
+                versiondescribe_c(&pkg->installed.version, vdew_nonambig));
+    statusfd_send("status: %s: %s", pkg_name(pkg, pnaw_nonambig),
+                  pkg_status_name(pkg));
+
+    pkg->status_dirty = false;
+  }
 
   if (cstatus >= msdbrw_write)
     modstatdb_note_core(pkg);
diff --git a/lib/dpkg/dpkg-db.h b/lib/dpkg/dpkg-db.h
index bffd317ab..10de6d3e2 100644
--- a/lib/dpkg/dpkg-db.h
+++ b/lib/dpkg/dpkg-db.h
@@ -84,8 +84,8 @@ struct conffile {
   bool obsolete;
 };
 
-struct filedetails {
-  struct filedetails *next;
+struct archivedetails {
+  struct archivedetails *next;
   const char *name;
   const char *msdosname;
   const char *size;
@@ -204,11 +204,12 @@ struct pkginfo {
   const char *otherpriority;
   const char *section;
   struct dpkg_version configversion;
-  struct filedetails *files;
   struct pkgbin installed;
   struct pkgbin available;
   struct perpackagestate *clientdata;
 
+  struct archivedetails *archives;
+
   struct {
     /* ->aw == this */
     struct trigaw *head, *tail;
@@ -217,6 +218,22 @@ struct pkginfo {
   /* ->pend == this, non-NULL for us when Triggers-Pending. */
   struct trigaw *othertrigaw_head;
   struct trigpend *trigpend_head;
+
+  /**
+   * files_list_valid  files  Meaning
+   * ----------------  -----  -------
+   * false             NULL   Not read yet, must do so if want them.
+   * false             !NULL  Read, but rewritten and now out of date. If want
+   *                          info must throw away old and reread file.
+   * true              !NULL  Read, all is OK.
+   * true              NULL   Read OK, but, there were no files.
+   */
+  struct fsys_namenode_list *files;
+  off_t files_list_phys_offs;
+  bool files_list_valid;
+
+  /* The status has changed, it needs to be logged. */
+  bool status_dirty;
 };
 
 /**
@@ -277,21 +294,34 @@ void pkg_blank(struct pkginfo *pp);
 void pkgbin_blank(struct pkgbin *pkgbin);
 bool pkg_is_informative(struct pkginfo *pkg, struct pkgbin *info);
 
-struct pkgset *pkg_db_find_set(const char *name);
-struct pkginfo *pkg_db_get_singleton(struct pkgset *set);
-struct pkginfo *pkg_db_find_singleton(const char *name);
-struct pkginfo *pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch);
-struct pkginfo *pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch);
-int pkg_db_count_set(void);
-int pkg_db_count_pkg(void);
-void pkg_db_reset(void);
-
-struct pkgiterator *pkg_db_iter_new(void);
-struct pkgset *pkg_db_iter_next_set(struct pkgiterator *iter);
-struct pkginfo *pkg_db_iter_next_pkg(struct pkgiterator *iter);
-void pkg_db_iter_free(struct pkgiterator *iter);
+struct pkgset *
+pkg_hash_find_set(const char *name);
+struct pkginfo *
+pkg_hash_get_singleton(struct pkgset *set);
+struct pkginfo *
+pkg_hash_find_singleton(const char *name);
+struct pkginfo *
+pkg_hash_get_pkg(struct pkgset *set, const struct dpkg_arch *arch);
+struct pkginfo *
+pkg_hash_find_pkg(const char *name, const struct dpkg_arch *arch);
+int
+pkg_hash_count_set(void);
+int
+pkg_hash_count_pkg(void);
+void
+pkg_hash_reset(void);
+
+struct pkg_hash_iter *
+pkg_hash_iter_new(void);
+struct pkgset *
+pkg_hash_iter_next_set(struct pkg_hash_iter *iter);
+struct pkginfo *
+pkg_hash_iter_next_pkg(struct pkg_hash_iter *iter);
+void
+pkg_hash_iter_free(struct pkg_hash_iter *iter);
 
-void pkg_db_report(FILE *);
+void
+pkg_hash_report(FILE *);
 
 /*** from parse.c ***/
 
@@ -304,8 +334,8 @@ enum parsedbflags {
   pdb_rejectstatus		= DPKG_BIT(2),
   /** Ignore priority/section info if we already have any. */
   pdb_weakclassification	= DPKG_BIT(3),
-  /** Ignore files info if we already have them. */
-  pdb_ignorefiles		= DPKG_BIT(4),
+  /** Ignore archives info if we already have them. */
+  pdb_ignore_archives		= DPKG_BIT(4),
   /** Ignore packages with older versions already read. */
   pdb_ignoreolder		= DPKG_BIT(5),
   /** Perform laxer version parsing. */
@@ -362,6 +392,8 @@ int parseversion(struct dpkg_version *version, const char *,
                  struct dpkg_error *err);
 const char *versiondescribe(const struct dpkg_version *,
                             enum versiondisplayepochwhen);
+const char *versiondescribe_c(const struct dpkg_version *version,
+                              enum versiondisplayepochwhen vdew);
 
 enum pkg_name_arch_when {
   /** Never display arch. */
@@ -377,9 +409,21 @@ enum pkg_name_arch_when {
 void varbuf_add_pkgbin_name(struct varbuf *vb, const struct pkginfo *pkg,
                             const struct pkgbin *pkgbin,
                             enum pkg_name_arch_when pnaw);
-const char *pkgbin_name(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                        enum pkg_name_arch_when pnaw);
-const char *pkg_name(struct pkginfo *pkg, enum pkg_name_arch_when pnaw);
+
+const char *
+pkgbin_name_archqual(const struct pkginfo *pkg, const struct pkgbin *pkgbin);
+
+const char *
+pkgbin_name(struct pkginfo *pkg, struct pkgbin *pkgbin,
+            enum pkg_name_arch_when pnaw);
+const char *
+pkg_name(struct pkginfo *pkg, enum pkg_name_arch_when pnaw);
+
+const char *
+pkgbin_name_const(const struct pkginfo *pkg, const struct pkgbin *pkgbin,
+                  enum pkg_name_arch_when pnaw);
+const char *
+pkg_name_const(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw);
 
 void
 pkg_source_version(struct dpkg_version *version,
@@ -407,6 +451,7 @@ enum writedb_flags {
   wdb_must_sync			= DPKG_BIT(1),
 };
 
+void writedb_records(FILE *fp, const char *filename, enum writedb_flags flags);
 void writedb(const char *filename, enum writedb_flags flags);
 
 /* Note: The varbufs must have been initialized and will not be
diff --git a/lib/dpkg/dpkg.h b/lib/dpkg/dpkg.h
index 19b7914f4..2bb067af3 100644
--- a/lib/dpkg/dpkg.h
+++ b/lib/dpkg/dpkg.h
@@ -78,6 +78,7 @@ DPKG_BEGIN_DECLS
 #define STATUSFILE        "status"
 #define AVAILFILE         "available"
 #define LOCKFILE          "lock"
+#define FRONTENDLOCKFILE  "lock-frontend"
 #define DIVERSIONSFILE    "diversions"
 #define STATOVERRIDEFILE  "statoverride"
 #define UPDATESDIR        "updates/"
@@ -145,6 +146,7 @@ char *m_strndup(const char *str, size_t n);
 int m_asprintf(char **strp, const char *fmt, ...) DPKG_ATTR_PRINTF(2);
 int m_vasprintf(char **strp, const char *fmt, va_list args)
 	DPKG_ATTR_VPRINTF(2);
+int m_dup(int oldfd);
 void m_dup2(int oldfd, int newfd);
 void m_pipe(int fds[2]);
 void m_output(FILE *f, const char *name);
diff --git a/lib/dpkg/dump.c b/lib/dpkg/dump.c
index b13eb6e79..48f0beb03 100644
--- a/lib/dpkg/dump.c
+++ b/lib/dpkg/dump.c
@@ -30,7 +30,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
@@ -41,6 +40,8 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
+#include <dpkg/pkg-array.h>
+#include <dpkg/pkg-show.h>
 #include <dpkg/string.h>
 #include <dpkg/dir.h>
 #include <dpkg/parsedump.h>
@@ -57,7 +58,9 @@ w_name(struct varbuf *vb,
        const struct pkginfo *pkg, const struct pkgbin *pkgbin,
        enum fwriteflags flags, const struct fieldinfo *fip)
 {
-  assert(pkg->set->name);
+  if (pkg->set->name == NULL)
+    internerr("pkgset has no name");
+
   if (flags&fw_printheader)
     varbuf_add_str(vb, "Package: ");
   varbuf_add_str(vb, pkg->set->name);
@@ -139,16 +142,16 @@ w_charfield(struct varbuf *vb,
 }
 
 void
-w_filecharf(struct varbuf *vb,
-            const struct pkginfo *pkg, const struct pkgbin *pkgbin,
-            enum fwriteflags flags, const struct fieldinfo *fip)
+w_archives(struct varbuf *vb,
+           const struct pkginfo *pkg, const struct pkgbin *pkgbin,
+           enum fwriteflags flags, const struct fieldinfo *fip)
 {
-  struct filedetails *fdp;
+  struct archivedetails *archive;
 
   if (pkgbin != &pkg->available)
     return;
-  fdp = pkg->files;
-  if (!fdp || !STRUCTFIELD(fdp, fip->integer, const char *))
+  archive = pkg->archives;
+  if (!archive || !STRUCTFIELD(archive, fip->integer, const char *))
     return;
 
   if (flags&fw_printheader) {
@@ -156,10 +159,10 @@ w_filecharf(struct varbuf *vb,
     varbuf_add_char(vb, ':');
   }
 
-  while (fdp) {
+  while (archive) {
     varbuf_add_char(vb, ' ');
-    varbuf_add_str(vb, STRUCTFIELD(fdp, fip->integer, const char *));
-    fdp= fdp->next;
+    varbuf_add_str(vb, STRUCTFIELD(archive, fip->integer, const char *));
+    archive = archive->next;
   }
 
   if (flags&fw_printheader)
@@ -230,7 +233,11 @@ w_priority(struct varbuf *vb,
 {
   if (pkg->priority == PKG_PRIO_UNKNOWN)
     return;
-  assert(pkg->priority <= PKG_PRIO_UNKNOWN);
+
+  if (pkg->priority > PKG_PRIO_UNKNOWN)
+    internerr("package %s has out-of-range priority %d",
+              pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg->priority);
+
   if (flags&fw_printheader)
     varbuf_add_str(vb, "Priority: ");
   varbuf_add_str(vb, pkg_priority_name(pkg));
@@ -245,38 +252,46 @@ w_status(struct varbuf *vb,
 {
   if (pkgbin != &pkg->installed)
     return;
-  assert(pkg->want <= PKG_WANT_PURGE);
-  assert(pkg->eflag <= PKG_EFLAG_REINSTREQ);
 
-#define PEND pkg->trigpend_head
-#define AW pkg->trigaw.head
+  if (pkg->want > PKG_WANT_PURGE)
+    internerr("package %s has unknown want state %d",
+              pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg->want);
+  if (pkg->eflag > PKG_EFLAG_REINSTREQ)
+    internerr("package %s has unknown error state %d",
+              pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg->eflag);
+
   switch (pkg->status) {
   case PKG_STAT_NOTINSTALLED:
   case PKG_STAT_CONFIGFILES:
-    assert(!PEND);
-    assert(!AW);
+    if (pkg->trigpend_head || pkg->trigaw.head)
+      internerr("package %s in state %s, has awaited or pending triggers",
+              pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg));
     break;
   case PKG_STAT_HALFINSTALLED:
   case PKG_STAT_UNPACKED:
   case PKG_STAT_HALFCONFIGURED:
-    assert(!PEND);
+    if (pkg->trigpend_head)
+      internerr("package %s in state %s, has pending triggers",
+              pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg));
     break;
   case PKG_STAT_TRIGGERSAWAITED:
-    assert(AW);
+    if (pkg->trigaw.head == NULL)
+      internerr("package %s in state %s, has no awaited triggers",
+                pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg));
     break;
   case PKG_STAT_TRIGGERSPENDING:
-    assert(PEND);
-    assert(!AW);
+    if (pkg->trigpend_head == NULL || pkg->trigaw.head)
+      internerr("package %s in stata %s, has awaited or no pending triggers",
+              pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg));
     break;
   case PKG_STAT_INSTALLED:
-    assert(!PEND);
-    assert(!AW);
+    if (pkg->trigpend_head || pkg->trigaw.head)
+      internerr("package %s in state %s, has awaited or pending triggers",
+              pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg));
     break;
   default:
     internerr("unknown package status '%d'", pkg->status);
   }
-#undef PEND
-#undef AW
 
   if (flags&fw_printheader)
     varbuf_add_str(vb, "Status: ");
@@ -295,7 +310,9 @@ void varbufdependency(struct varbuf *vb, struct dependency *dep) {
 
   possdel= "";
   for (dop= dep->list; dop; dop= dop->next) {
-    assert(dop->up == dep);
+    if (dop->up != dep)
+      internerr("dependency and deppossi not linked properly");
+
     varbuf_add_str(vb, possdel);
     possdel = " | ";
     varbuf_add_str(vb, dop->ed->name);
@@ -339,7 +356,10 @@ w_dependency(struct varbuf *vb,
 
   for (dyp = pkgbin->depends; dyp; dyp = dyp->next) {
     if (dyp->type != fip->integer) continue;
-    assert(dyp->up == pkg);
+
+    if (dyp->up != pkg)
+      internerr("dependency and package %s not linked properly",
+                pkgbin_name_const(pkg, pkgbin, pnaw_always));
 
     if (dep_found) {
       varbuf_add_str(vb, ", ");
@@ -389,8 +409,10 @@ w_trigpend(struct varbuf *vb,
   if (pkgbin == &pkg->available || !pkg->trigpend_head)
     return;
 
-  assert(pkg->status >= PKG_STAT_TRIGGERSAWAITED &&
-         pkg->status <= PKG_STAT_TRIGGERSPENDING);
+  if (pkg->status < PKG_STAT_TRIGGERSAWAITED ||
+      pkg->status > PKG_STAT_TRIGGERSPENDING)
+    internerr("package %s in non-trigger state %s, has pending triggers",
+              pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg));
 
   if (flags & fw_printheader)
     varbuf_add_str(vb, "Triggers-Pending:");
@@ -412,8 +434,10 @@ w_trigaw(struct varbuf *vb,
   if (pkgbin == &pkg->available || !pkg->trigaw.head)
     return;
 
-  assert(pkg->status > PKG_STAT_CONFIGFILES &&
-         pkg->status <= PKG_STAT_TRIGGERSAWAITED);
+  if (pkg->status <= PKG_STAT_CONFIGFILES ||
+      pkg->status > PKG_STAT_TRIGGERSAWAITED)
+    internerr("package %s in state %s, has awaited triggers",
+              pkgbin_name_const(pkg, pkgbin, pnaw_always), pkg_status_name(pkg));
 
   if (flags & fw_printheader)
     varbuf_add_str(vb, "Triggers-Awaited:");
@@ -461,55 +485,69 @@ writerecord(FILE *file, const char *filename,
 
   varbufrecord(&vb, pkg, pkgbin);
   varbuf_end_str(&vb);
-  if (fputs(vb.buf,file) < 0) {
-    struct varbuf pkgname = VARBUF_INIT;
-    int errno_saved = errno;
 
-    varbuf_add_pkgbin_name(&pkgname, pkg, pkgbin, pnaw_nonambig);
-
-    errno = errno_saved;
+  if (fputs(vb.buf, file) < 0)
     ohshite(_("failed to write details of '%.50s' to '%.250s'"),
-            pkgname.buf, filename);
-  }
+            pkgbin_name_const(pkg, pkgbin, pnaw_nonambig), filename);
 
   varbuf_destroy(&vb);
 }
 
 void
-writedb(const char *filename, enum writedb_flags flags)
+writedb_records(FILE *fp, const char *filename, enum writedb_flags flags)
 {
   static char writebuf[8192];
 
-  struct pkgiterator *iter;
+  struct pkg_array array;
   struct pkginfo *pkg;
   struct pkgbin *pkgbin;
   const char *which;
-  struct atomic_file *file;
   struct varbuf vb = VARBUF_INIT;
+  int i;
 
   which = (flags & wdb_dump_available) ? "available" : "status";
 
-  file = atomic_file_new(filename, ATOMIC_FILE_BACKUP);
-  atomic_file_open(file);
-  if (setvbuf(file->fp, writebuf, _IOFBF, sizeof(writebuf)))
+  if (setvbuf(fp, writebuf, _IOFBF, sizeof(writebuf)))
     ohshite(_("unable to set buffering on %s database file"), which);
 
-  iter = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(iter)) != NULL) {
+  pkg_array_init_from_hash(&array);
+  pkg_array_sort(&array, pkg_sorter_by_nonambig_name_arch);
+
+  for (i = 0; i < array.n_pkgs; i++) {
+    pkg = array.pkgs[i];
     pkgbin = (flags & wdb_dump_available) ? &pkg->available : &pkg->installed;
+
     /* Don't dump records which have no useful content. */
     if (!pkg_is_informative(pkg, pkgbin))
       continue;
+
     varbufrecord(&vb, pkg, pkgbin);
     varbuf_add_char(&vb, '\n');
     varbuf_end_str(&vb);
-    if (fputs(vb.buf, file->fp) < 0)
+    if (fputs(vb.buf, fp) < 0)
       ohshite(_("failed to write %s database record about '%.50s' to '%.250s'"),
               which, pkgbin_name(pkg, pkgbin, pnaw_nonambig), filename);
     varbuf_reset(&vb);
   }
-  pkg_db_iter_free(iter);
+
+  pkg_array_destroy(&array);
   varbuf_destroy(&vb);
+}
+
+void
+writedb(const char *filename, enum writedb_flags flags)
+{
+  struct atomic_file *file;
+  enum atomic_file_flags atomic_flags = ATOMIC_FILE_BACKUP;
+
+  if (flags & wdb_dump_available)
+    atomic_flags = 0;
+
+  file = atomic_file_new(filename, atomic_flags);
+  atomic_file_open(file);
+
+  writedb_records(file->fp, filename, flags);
+
   if (flags & wdb_must_sync)
     atomic_file_sync(file);
 
diff --git a/lib/dpkg/ehandle.c b/lib/dpkg/ehandle.c
index f21fb07e9..e525db003 100644
--- a/lib/dpkg/ehandle.c
+++ b/lib/dpkg/ehandle.c
@@ -135,7 +135,7 @@ error_context_new(void)
 {
   struct error_context *necp;
 
-  necp = malloc(sizeof(struct error_context));
+  necp = malloc(sizeof(*necp));
   if (!necp)
     ohshite(_("out of memory for new error context"));
   necp->next= econtext;
@@ -190,7 +190,7 @@ error_context_errmsg_format(const char *fmt, va_list args)
   int rc;
 
   va_copy(args_copy, args);
-  rc = vasprintf(&errmsg, fmt, args);
+  rc = vasprintf(&errmsg, fmt, args_copy);
   va_end(args_copy);
 
   /* If the message was constructed successfully, at least we have some
@@ -311,7 +311,7 @@ void push_checkpoint(int mask, int value) {
   struct cleanup_entry *cep;
   int i;
 
-  cep = malloc(sizeof(struct cleanup_entry) + sizeof(char *));
+  cep = malloc(sizeof(*cep) + sizeof(void *));
   if (cep == NULL) {
     onerr_abort++;
     ohshite(_("out of memory for new cleanup entry"));
@@ -324,9 +324,11 @@ void push_checkpoint(int mask, int value) {
   econtext->cleanups= cep;
 }
 
-void push_cleanup(void (*call1)(int argc, void **argv), int mask1,
+static void
+cleanup_entry_new(void (*call1)(int argc, void **argv), int mask1,
                   void (*call2)(int argc, void **argv), int mask2,
-                  unsigned int nargs, ...) {
+                  unsigned int nargs, va_list vargs)
+{
   struct cleanup_entry *cep;
   void **argv;
   int e = 0;
@@ -334,7 +336,7 @@ void push_cleanup(void (*call1)(int argc, void **argv), int mask1,
 
   onerr_abort++;
 
-  cep = malloc(sizeof(struct cleanup_entry) + sizeof(char *) * (nargs + 1));
+  cep = malloc(sizeof(*cep) + sizeof(void *) * (nargs + 1));
   if (!cep) {
     if (nargs > array_count(emergency.args))
       ohshite(_("out of memory for new cleanup entry with many arguments"));
@@ -343,7 +345,8 @@ void push_cleanup(void (*call1)(int argc, void **argv), int mask1,
   cep->calls[0].call= call1; cep->calls[0].mask= mask1;
   cep->calls[1].call= call2; cep->calls[1].mask= mask2;
   cep->cpmask=~0; cep->cpvalue=0; cep->argc= nargs;
-  va_start(args, nargs);
+
+  va_copy(args, vargs);
   argv = cep->argv;
   while (nargs-- > 0)
     *argv++ = va_arg(args, void *);
@@ -359,6 +362,29 @@ void push_cleanup(void (*call1)(int argc, void **argv), int mask1,
   onerr_abort--;
 }
 
+void
+push_cleanup(void (*call)(int argc, void **argv), int mask,
+             unsigned int nargs, ...)
+{
+  va_list args;
+
+  va_start(args, nargs);
+  cleanup_entry_new(call, mask, NULL, 0, nargs, args);
+  va_end(args);
+}
+
+void
+push_cleanup_fallback(void (*call1)(int argc, void **argv), int mask1,
+                      void (*call2)(int argc, void **argv), int mask2,
+                      unsigned int nargs, ...)
+{
+  va_list args;
+
+  va_start(args, nargs);
+  cleanup_entry_new(call1, mask1, call2, mask2, nargs, args);
+  va_end(args);
+}
+
 void pop_cleanup(int flagset) {
   struct cleanup_entry *cep;
   int i;
diff --git a/lib/dpkg/ehandle.h b/lib/dpkg/ehandle.h
index 370614812..36059048a 100644
--- a/lib/dpkg/ehandle.h
+++ b/lib/dpkg/ehandle.h
@@ -59,8 +59,10 @@ void push_error_context_func(error_handler_func *handler,
 void push_error_context(void);
 void pop_error_context(int flagset);
 
-void push_cleanup(void (*f1)(int argc, void **argv), int flagmask1,
-                  void (*f2)(int argc, void **argv), int flagmask2,
+void push_cleanup_fallback(void (*f1)(int argc, void **argv), int flagmask1,
+                           void (*f2)(int argc, void **argv), int flagmask2,
+                           unsigned int nargs, ...);
+void push_cleanup(void (*call)(int argc, void **argv), int flagmask,
                   unsigned int nargs, ...);
 void push_checkpoint(int mask, int value);
 void pop_cleanup(int flagset);
diff --git a/lib/dpkg/error.c b/lib/dpkg/error.c
index b2b0e3f9c..025c558ac 100644
--- a/lib/dpkg/error.c
+++ b/lib/dpkg/error.c
@@ -29,8 +29,9 @@
 #include <dpkg/varbuf.h>
 #include <dpkg/error.h>
 
-static void DPKG_ATTR_VPRINTF(3)
-dpkg_error_set(struct dpkg_error *err, int type, const char *fmt, va_list args)
+static void DPKG_ATTR_VPRINTF(4)
+dpkg_error_set(struct dpkg_error *err, enum dpkg_msg_type type, int syserrno,
+               const char *fmt, va_list args)
 {
 	struct varbuf str = VARBUF_INIT;
 
@@ -38,18 +39,25 @@ dpkg_error_set(struct dpkg_error *err, int type, const char *fmt, va_list args)
 		return;
 
 	err->type = type;
+	err->syserrno = syserrno;
 
 	varbuf_vprintf(&str, fmt, args);
 	err->str = str.buf;
 }
 
+bool
+dpkg_has_error(struct dpkg_error *err)
+{
+	return err != NULL && err->type != DPKG_MSG_NONE;
+}
+
 int
 dpkg_put_warn(struct dpkg_error *err, const char *fmt, ...)
 {
 	va_list args;
 
 	va_start(args, fmt);
-	dpkg_error_set(err, DPKG_MSG_WARN, fmt, args);
+	dpkg_error_set(err, DPKG_MSG_WARN, 0, fmt, args);
 	va_end(args);
 
 	return -1;
@@ -61,7 +69,7 @@ dpkg_put_error(struct dpkg_error *err, const char *fmt, ...)
 	va_list args;
 
 	va_start(args, fmt);
-	dpkg_error_set(err, DPKG_MSG_ERROR, fmt, args);
+	dpkg_error_set(err, DPKG_MSG_ERROR, 0, fmt, args);
 	va_end(args);
 
 	return -1;
@@ -72,11 +80,12 @@ dpkg_put_errno(struct dpkg_error *err, const char *fmt, ...)
 {
 	va_list args;
 	char *new_fmt;
+	int syserrno = errno;
 
 	new_fmt = str_fmt("%s (%s)", fmt, strerror(errno));
 
 	va_start(args, fmt);
-	dpkg_error_set(err, DPKG_MSG_ERROR, new_fmt, args);
+	dpkg_error_set(err, DPKG_MSG_ERROR, syserrno, new_fmt, args);
 	va_end(args);
 
 	free(new_fmt);
@@ -103,9 +112,19 @@ dpkg_error_print(struct dpkg_error *err, const char *fmt, ...)
 }
 
 void
+dpkg_error_move(struct dpkg_error *dst, struct dpkg_error *src)
+{
+	dst->type = src->type;
+	src->type = DPKG_MSG_NONE;
+	dst->str = src->str;
+	src->str = NULL;
+}
+
+void
 dpkg_error_destroy(struct dpkg_error *err)
 {
 	err->type = DPKG_MSG_NONE;
+	err->syserrno = 0;
 	free(err->str);
 	err->str = NULL;
 }
diff --git a/lib/dpkg/error.h b/lib/dpkg/error.h
index 4d8b048df..9fd7ead21 100644
--- a/lib/dpkg/error.h
+++ b/lib/dpkg/error.h
@@ -21,6 +21,8 @@
 #ifndef LIBDPKG_ERROR_H
 #define LIBDPKG_ERROR_H
 
+#include <stdbool.h>
+
 #include <dpkg/macros.h>
 
 DPKG_BEGIN_DECLS
@@ -40,10 +42,15 @@ enum dpkg_msg_type {
 struct dpkg_error {
 	enum dpkg_msg_type type;
 
+	int syserrno;
 	char *str;
 };
 
-#define DPKG_ERROR_INIT { DPKG_MSG_NONE, NULL }
+#define DPKG_ERROR_INIT { DPKG_MSG_NONE, 0, NULL }
+
+#define DPKG_ERROR_OBJECT (struct dpkg_error)DPKG_ERROR_INIT
+
+bool dpkg_has_error(struct dpkg_error *err);
 
 int dpkg_put_warn(struct dpkg_error *err, const char *fmt, ...)
 	DPKG_ATTR_PRINTF(2);
@@ -55,6 +62,7 @@ int dpkg_put_errno(struct dpkg_error *err, const char *fmt, ...)
 void dpkg_error_print(struct dpkg_error *err, const char *fmt, ...)
 	DPKG_ATTR_PRINTF(2);
 
+void dpkg_error_move(struct dpkg_error *dst, struct dpkg_error *src);
 void dpkg_error_destroy(struct dpkg_error *err);
 
 /** @} */
diff --git a/lib/dpkg/fields.c b/lib/dpkg/fields.c
index aeb22b46c..8294149b9 100644
--- a/lib/dpkg/fields.c
+++ b/lib/dpkg/fields.c
@@ -62,20 +62,22 @@ enum parse_nv_flags {
  */
 static int
 parse_nv(struct parsedb_state *ps, enum parse_nv_flags flags,
-         const char **strp, const struct namevalue *nv_head, const char *what)
+         const char **strp, const struct namevalue *nv_head)
 {
   const char *str_start = *strp, *str_end;
   const struct namevalue *nv;
   int value;
 
+  dpkg_error_destroy(&ps->err);
+
   if (str_start[0] == '\0')
-    parse_error(ps, _("%s is missing"), what);
+    return dpkg_put_error(&ps->err, _("is missing a value"));
 
   nv = namevalue_find_by_name(nv_head, str_start);
   if (nv == NULL) {
     /* We got no match, skip further string validation. */
     if (!(flags & PARSE_NV_FALLBACK))
-      parse_error(ps, _("'%.50s' is not allowed for %s"), str_start, what);
+      return dpkg_put_error(&ps->err, _("has invalid value '%.50s'"), str_start);
 
     str_end = NULL;
     value = -1;
@@ -87,7 +89,7 @@ parse_nv(struct parsedb_state *ps, enum parse_nv_flags flags,
   }
 
   if (!(flags & PARSE_NV_NEXT) && str_is_set(str_end))
-    parse_error(ps, _("junk after %s"), what);
+    return dpkg_put_error(&ps->err, _("has trailing junk"));
 
   *strp = str_end;
 
@@ -103,28 +105,28 @@ f_name(struct pkginfo *pkg, struct pkgbin *pkgbin,
 
   e = pkg_name_is_illegal(value);
   if (e != NULL)
-    parse_error(ps, _("invalid package name (%.250s)"), e);
-  /* We use the new name, as pkg_db_find_set() may have done a tolower for us. */
-  pkg->set->name = pkg_db_find_set(value)->name;
+    parse_error(ps, _("invalid package name in '%s' field: %s"), fip->name, e);
+  /* We use the new name, as pkg_hash_find_set() may have done a tolower for us. */
+  pkg->set->name = pkg_hash_find_set(value)->name;
 }
 
 void
-f_filecharf(struct pkginfo *pkg, struct pkgbin *pkgbin,
-            struct parsedb_state *ps,
-            const char *value, const struct fieldinfo *fip)
+f_archives(struct pkginfo *pkg, struct pkgbin *pkgbin,
+           struct parsedb_state *ps,
+           const char *value, const struct fieldinfo *fip)
 {
-  struct filedetails *fdp, **fdpp;
+  struct archivedetails *fdp, **fdpp;
   char *cpos, *space;
   int allowextend;
 
   if (!*value)
-    parse_error(ps, _("empty file details field '%s'"), fip->name);
+    parse_error(ps, _("empty archive details '%s' field"), fip->name);
   if (!(ps->flags & pdb_recordavailable))
     parse_error(ps,
-                _("file details field '%s' not allowed in status file"),
+                _("archive details '%s' field not allowed in status file"),
                fip->name);
-  allowextend = !pkg->files;
-  fdpp = &pkg->files;
+  allowextend = !pkg->archives;
+  fdpp = &pkg->archives;
   cpos= nfstrsave(value);
   while (*cpos) {
     space = cpos;
@@ -136,9 +138,9 @@ f_filecharf(struct pkginfo *pkg, struct pkgbin *pkgbin,
     if (!fdp) {
       if (!allowextend)
         parse_error(ps,
-                    _("too many values in file details field '%s' "
+                    _("too many values in archive details '%s' field "
                       "(compared to others)"), fip->name);
-      fdp= nfmalloc(sizeof(struct filedetails));
+      fdp = nfmalloc(sizeof(*fdp));
       fdp->next= NULL;
       fdp->name= fdp->msdosname= fdp->size= fdp->md5sum= NULL;
       *fdpp= fdp;
@@ -151,7 +153,7 @@ f_filecharf(struct pkginfo *pkg, struct pkgbin *pkgbin,
   }
   if (*fdpp)
     parse_error(ps,
-                _("too few values in file details field '%s' "
+                _("too few values in archive details '%s' field "
                   "(compared to others)"), fip->name);
 }
 
@@ -174,8 +176,11 @@ f_boolean(struct pkginfo *pkg, struct pkgbin *pkgbin,
   if (!*value)
     return;
 
-  boolean = parse_nv(ps, PARSE_NV_LAST, &value, booleaninfos,
-                     _("yes/no in boolean field"));
+  boolean = parse_nv(ps, PARSE_NV_LAST, &value, booleaninfos);
+  if (dpkg_has_error(&ps->err))
+    parse_error(ps, _("boolean (yes/no) '%s' field: %s"),
+                fip->name, ps->err.str);
+
   STRUCTFIELD(pkgbin, fip->integer, bool) = boolean;
 }
 
@@ -189,8 +194,10 @@ f_multiarch(struct pkginfo *pkg, struct pkgbin *pkgbin,
   if (!*value)
     return;
 
-  multiarch = parse_nv(ps, PARSE_NV_LAST, &value, multiarchinfos,
-                       _("foreign/allowed/same/no in quadstate field"));
+  multiarch = parse_nv(ps, PARSE_NV_LAST, &value, multiarchinfos);
+  if (dpkg_has_error(&ps->err))
+    parse_error(ps, _("quadstate (foreign/allowed/same/no) '%s' field: %s"),
+                fip->name, ps->err.str);
   STRUCTFIELD(pkgbin, fip->integer, int) = multiarch;
 }
 
@@ -201,8 +208,8 @@ f_architecture(struct pkginfo *pkg, struct pkgbin *pkgbin,
 {
   pkgbin->arch = dpkg_arch_find(value);
   if (pkgbin->arch->type == DPKG_ARCH_ILLEGAL)
-    parse_warn(ps, _("'%s' is not a valid architecture name: %s"),
-               value, dpkg_arch_name_is_illegal(value));
+    parse_warn(ps, _("'%s' is not a valid architecture name in '%s' field: %s"),
+               value, fip->name, dpkg_arch_name_is_illegal(value));
 }
 
 void
@@ -225,7 +232,9 @@ f_priority(struct pkginfo *pkg, struct pkgbin *pkgbin,
   if (!*value) return;
 
   priority = parse_nv(ps, PARSE_NV_LAST | PARSE_NV_FALLBACK, &str,
-                      priorityinfos, _("word in 'Priority' field"));
+                      priorityinfos);
+  if (dpkg_has_error(&ps->err))
+    parse_error(ps, _("word in '%s' field: %s"), fip->name, ps->err.str);
 
   if (str == NULL) {
     pkg->priority = PKG_PRIO_OTHER;
@@ -243,16 +252,22 @@ f_status(struct pkginfo *pkg, struct pkgbin *pkgbin,
   if (ps->flags & pdb_rejectstatus)
     parse_error(ps,
                 _("value for '%s' field not allowed in this context"),
-                "Status");
+                fip->name);
   if (ps->flags & pdb_recordavailable)
     return;
 
-  pkg->want = parse_nv(ps, PARSE_NV_NEXT, &value, wantinfos,
-                       _("first (want) word in 'Status' field"));
-  pkg->eflag = parse_nv(ps, PARSE_NV_NEXT, &value, eflaginfos,
-                        _("second (error) word in 'Status' field"));
-  pkg->status = parse_nv(ps, PARSE_NV_LAST, &value, statusinfos,
-                         _("third (status) word in 'Status' field"));
+  pkg->want = parse_nv(ps, PARSE_NV_NEXT, &value, wantinfos);
+  if (dpkg_has_error(&ps->err))
+    parse_error(ps, _("first (want) word in '%s' field: %s"),
+                fip->name, ps->err.str);
+  pkg->eflag = parse_nv(ps, PARSE_NV_NEXT, &value, eflaginfos);
+  if (dpkg_has_error(&ps->err))
+    parse_error(ps, _("second (error) word in '%s' field: %s"),
+                fip->name, ps->err.str);
+  pkg->status = parse_nv(ps, PARSE_NV_LAST, &value, statusinfos);
+  if (dpkg_has_error(&ps->err))
+    parse_error(ps, _("third (status) word in '%s' field: %s"),
+                fip->name, ps->err.str);
 }
 
 void
@@ -260,9 +275,8 @@ f_version(struct pkginfo *pkg, struct pkgbin *pkgbin,
           struct parsedb_state *ps,
           const char *value, const struct fieldinfo *fip)
 {
-  parse_db_version(ps, &pkgbin->version, value,
-                   _("error in '%s' field string '%.250s'"),
-                   "Version", value);
+  if (parse_db_version(ps, &pkgbin->version, value) < 0)
+    parse_problem(ps, _("'%s' field value '%.250s'"), fip->name, value);
 }
 
 void
@@ -272,9 +286,7 @@ f_revision(struct pkginfo *pkg, struct pkgbin *pkgbin,
 {
   char *newversion;
 
-  parse_warn(ps,
-             _("obsolete '%s' or '%s' field used"),
-             "Revision", "Package-Revision");
+  parse_warn(ps, _("obsolete '%s' field used"), fip->name);
   if (!*value) return;
   if (str_is_set(pkgbin->version.revision)) {
     newversion = nfmalloc(strlen(pkgbin->version.version) +
@@ -294,14 +306,12 @@ f_configversion(struct pkginfo *pkg, struct pkgbin *pkgbin,
   if (ps->flags & pdb_rejectstatus)
     parse_error(ps,
                 _("value for '%s' field not allowed in this context"),
-                "Config-Version");
+                fip->name);
   if (ps->flags & pdb_recordavailable)
     return;
 
-  parse_db_version(ps, &pkg->configversion, value,
-                   _("error in '%s' field string '%.250s'"),
-                   "Config-Version", value);
-
+  if (parse_db_version(ps, &pkg->configversion, value) < 0)
+    parse_problem(ps, _("'%s' field value '%.250s'"), fip->name, value);
 }
 
 /*
@@ -348,8 +358,8 @@ f_conffiles(struct pkginfo *pkg, struct pkgbin *pkgbin,
     if (c == '\n') continue;
     if (c != ' ')
       parse_error(ps,
-                  _("value for '%s' has line starting with non-space '%c'"),
-                  "Conffiles", c);
+                  _("value for '%s' field has line starting with non-space '%c'"),
+                  fip->name, c);
     for (endent = value; (c = *endent) != '\0' && c != '\n'; endent++) ;
     conffvalue_lastword(value, endent, endent,
 			&hashstart, &hashlen, &endfn,
@@ -360,12 +370,13 @@ f_conffiles(struct pkginfo *pkg, struct pkgbin *pkgbin,
       conffvalue_lastword(value, endfn, endent,
 			  &hashstart, &hashlen, &endfn,
 			  ps);
-    newlink= nfmalloc(sizeof(struct conffile));
+    newlink = nfmalloc(sizeof(*newlink));
     value = path_skip_slash_dotslash(value);
     namelen= (int)(endfn-value);
     if (namelen <= 0)
       parse_error(ps,
-                  _("root or null directory is listed as a conffile"));
+                  _("root or empty directory listed as a conffile in '%s' field"),
+                  fip->name);
     newptr = nfmalloc(namelen+2);
     newptr[0]= '/';
     memcpy(newptr+1,value,namelen);
@@ -408,7 +419,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
 
    /* Loop creating new struct dependency's. */
   for (;;) {
-    dyp= nfmalloc(sizeof(struct dependency));
+    dyp = nfmalloc(sizeof(*dyp));
     /* Set this to NULL for now, as we don't know what our real
      * struct pkginfo address (in the database) is going to be yet. */
     dyp->up = NULL;
@@ -438,9 +449,9 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
         parse_error(ps,
                     _("'%s' field, invalid package name '%.255s': %s"),
                     fip->name, depname.buf, emsg);
-      dop= nfmalloc(sizeof(struct deppossi));
+      dop = nfmalloc(sizeof(*dop));
       dop->up= dyp;
-      dop->ed = pkg_db_find_set(depname.buf);
+      dop->ed = pkg_hash_find_set(depname.buf);
       dop->next= NULL; *ldopp= dop; ldopp= &dop->next;
 
       /* Don't link this (which is after all only ‘new_pkg’ from
@@ -540,7 +551,7 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
         if ((dop->verrel != DPKG_RELATION_EQ) && (fip->integer == dep_provides))
           parse_warn(ps,
                      _("only exact versions may be used for '%s' field"),
-                     "Provides");
+                     fip->name);
 
         if (!c_isspace(*p) && !c_isalnum(*p)) {
           parse_warn(ps,
@@ -577,9 +588,10 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
         varbuf_reset(&version);
         varbuf_add_buf(&version, versionstart, versionlength);
         varbuf_end_str(&version);
-        parse_db_version(ps, &dop->version, version.buf,
-                         _("'%s' field, reference to '%.255s': "
-                           "error in version"), fip->name, depname.buf);
+        if (parse_db_version(ps, &dop->version, version.buf) < 0)
+          parse_problem(ps,
+                        _("'%s' field, reference to '%.255s': version '%s'"),
+                        fip->name, depname.buf, version.buf);
         p++;
         while (c_isspace(*p))
           p++;
@@ -596,8 +608,8 @@ f_dependency(struct pkginfo *pkg, struct pkgbin *pkgbin,
           fip->integer == dep_breaks ||
           fip->integer == dep_provides ||
           fip->integer == dep_replaces)
-        parse_error(ps,
-                    _("alternatives ('|') not allowed in %s field"), fip->name);
+        parse_error(ps, _("alternatives ('|') not allowed in '%s' field"),
+                    fip->name);
       p++;
       while (c_isspace(*p))
         p++;
@@ -656,7 +668,7 @@ f_trigpend(struct pkginfo *pend, struct pkgbin *pkgbin,
   if (ps->flags & pdb_rejectstatus)
     parse_error(ps,
                 _("value for '%s' field not allowed in this context"),
-                "Triggers-Pending");
+                fip->name);
 
   while ((word = scan_word(&value))) {
     emsg = trig_name_is_illegal(word);
@@ -681,7 +693,7 @@ f_trigaw(struct pkginfo *aw, struct pkgbin *pkgbin,
   if (ps->flags & pdb_rejectstatus)
     parse_error(ps,
                 _("value for '%s' field not allowed in this context"),
-                "Triggers-Awaited");
+                fip->name);
 
   while ((word = scan_word(&value))) {
     struct dpkg_error err;
diff --git a/lib/dpkg/file.c b/lib/dpkg/file.c
index f8afdeb8a..ceda51047 100644
--- a/lib/dpkg/file.c
+++ b/lib/dpkg/file.c
@@ -25,15 +25,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
 
 #include <dpkg/dpkg.h>
 #include <dpkg/i18n.h>
-#include <dpkg/subproc.h>
-#include <dpkg/command.h>
+#include <dpkg/pager.h>
+#include <dpkg/fdio.h>
+#include <dpkg/buffer.h>
 #include <dpkg/file.h>
 
 /**
@@ -61,6 +61,49 @@ file_copy_perms(const char *src, const char *dst)
 		ohshite(_("unable to set mode of target file '%.250s'"), dst);
 }
 
+static int
+file_slurp_fd(int fd, const char *filename, struct varbuf *vb,
+              struct dpkg_error *err)
+{
+	struct stat st;
+
+	if (fstat(fd, &st) < 0)
+		return dpkg_put_errno(err, _("cannot stat %s"), filename);
+
+	if (!S_ISREG(st.st_mode))
+		return dpkg_put_error(err, _("%s is not a regular file"),
+		                      filename);
+
+	if (st.st_size == 0)
+		return 0;
+
+	varbuf_init(vb, st.st_size);
+	if (fd_read(fd, vb->buf, st.st_size) < 0)
+		return dpkg_put_errno(err, _("cannot read %s"), filename);
+	vb->used = st.st_size;
+
+	return 0;
+}
+
+int
+file_slurp(const char *filename, struct varbuf *vb, struct dpkg_error *err)
+{
+	int fd;
+	int rc;
+
+	varbuf_init(vb, 0);
+
+	fd = open(filename, O_RDONLY);
+	if (fd < 0)
+		return dpkg_put_errno(err, _("cannot open %s"), filename);
+
+	rc = file_slurp_fd(fd, filename, vb, err);
+
+	(void)close(fd);
+
+	return rc;
+}
+
 static void
 file_lock_setup(struct flock *fl, short type)
 {
@@ -75,25 +118,27 @@ file_lock_setup(struct flock *fl, short type)
  * Unlock a previously locked file.
  */
 void
-file_unlock(int lockfd, const char *lock_desc)
+file_unlock(int lockfd, const char *lockfile, const char *lockdesc)
 {
 	struct flock fl;
 
-	assert(lockfd >= 0);
+	if (lockfd < 0)
+		internerr("%s (%s) fd is %d < 0", lockdesc, lockfile, lockfd);
 
 	file_lock_setup(&fl, F_UNLCK);
 
 	if (fcntl(lockfd, F_SETLK, &fl) == -1)
-		ohshite(_("unable to unlock %s"), lock_desc);
+		ohshite(_("unable to unlock %s"), lockdesc);
 }
 
 static void
 file_unlock_cleanup(int argc, void **argv)
 {
 	int lockfd = *(int *)argv[0];
-	const char *lock_desc = argv[1];
+	const char *lockfile = argv[1];
+	const char *lockdesc = argv[2];
 
-	file_unlock(lockfd, lock_desc);
+	file_unlock(lockfd, lockfile, lockdesc);
 }
 
 /**
@@ -144,34 +189,50 @@ file_lock(int *lockfd, enum file_lock_flags flags, const char *filename,
 		lock_cmd = F_SETLK;
 
 	if (fcntl(*lockfd, lock_cmd, &fl) == -1) {
-		if (errno == EACCES || errno == EAGAIN)
-			ohshit(_("%s is locked by another process"), desc);
-		else
+		const char *warnmsg;
+
+		if (errno != EACCES && errno != EAGAIN)
 			ohshite(_("unable to lock %s"), desc);
+
+		warnmsg = _("Note: removing the lock file is always wrong, "
+		            "and can end up damaging the\n"
+		            "locked area and the entire system. "
+		            "See <https://wiki.debian.org/Teams/Dpkg/FAQ>.");
+
+		file_lock_setup(&fl, F_WRLCK);
+		if (fcntl(*lockfd, F_GETLK, &fl) == -1)
+			ohshit(_("%s was locked by another process\n%s"),
+			       desc, warnmsg);
+
+		ohshit(_("%s was locked by another process with pid %d\n%s"),
+		       desc, fl.l_pid, warnmsg);
 	}
 
-	push_cleanup(file_unlock_cleanup, ~0, NULL, 0, 2, lockfd, desc);
+	push_cleanup(file_unlock_cleanup, ~0, 3, lockfd, filename, desc);
 }
 
 void
 file_show(const char *filename)
 {
-	pid_t pid;
+	struct pager *pager;
+	struct dpkg_error err;
+	int fd, rc;
 
 	if (filename == NULL)
-		internerr("file '%s' does not exist", filename);
+		internerr("filename is NULL");
+
+	fd = open(filename, O_RDONLY);
+	if (fd < 0)
+		ohshite(_("cannot open file %s"), filename);
 
-	pid = subproc_fork();
-	if (pid == 0) {
-		struct command cmd;
-		const char *pager;
+	pager = pager_spawn(_("pager to show file"));
+	rc = fd_fd_copy(fd, STDOUT_FILENO, -1, &err);
+	pager_reap(pager);
 
-		pager = command_get_pager();
+	close(fd);
 
-		command_init(&cmd, pager, _("showing file on pager"));
-		command_add_arg(&cmd, pager);
-		command_add_arg(&cmd, filename);
-		command_exec(&cmd);
+	if (rc < 0 && err.syserrno != EPIPE) {
+		errno = err.syserrno;
+		ohshite(_("cannot write file %s into the pager"), filename);
 	}
-	subproc_reap(pid, _("showing file on pager"), SUBPROC_NOCHECK);
 }
diff --git a/lib/dpkg/file.h b/lib/dpkg/file.h
index a1dd270ec..ead11c73a 100644
--- a/lib/dpkg/file.h
+++ b/lib/dpkg/file.h
@@ -26,6 +26,8 @@
 #include <stdbool.h>
 
 #include <dpkg/macros.h>
+#include <dpkg/error.h>
+#include <dpkg/varbuf.h>
 
 DPKG_BEGIN_DECLS
 
@@ -48,6 +50,9 @@ struct file_stat {
 
 void file_copy_perms(const char *src, const char *dst);
 
+int
+file_slurp(const char *filename, struct varbuf *vb, struct dpkg_error *err);
+
 enum file_lock_flags {
 	FILE_LOCK_NOWAIT,
 	FILE_LOCK_WAIT,
@@ -55,8 +60,8 @@ enum file_lock_flags {
 
 bool file_is_locked(int lockfd, const char *filename);
 void file_lock(int *lockfd, enum file_lock_flags flags, const char *filename,
-               const char *desc);
-void file_unlock(int fd, const char *desc);
+               const char *filedesc);
+void file_unlock(int fd, const char *filename, const char *filedesc);
 void file_show(const char *filename);
 
 /** @} */
diff --git a/lib/dpkg/fsys-dir.c b/lib/dpkg/fsys-dir.c
new file mode 100644
index 000000000..15335b23e
--- /dev/null
+++ b/lib/dpkg/fsys-dir.c
@@ -0,0 +1,93 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * fsys-dir.c - filesystem root directory functions
+ *
+ * Copyright © 2011, 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <stdlib.h>
+
+#include <dpkg/dpkg.h>
+#include <dpkg/string.h>
+#include <dpkg/path.h>
+#include <dpkg/fsys.h>
+
+static const char *fsys_dir = "";
+
+/**
+ * Set current on-disk filesystem root directory.
+ *
+ * The directory is initially set to "", this function can be used to
+ * set the directory to a new value, or to set it to a default value if dir
+ * is NULL. For the latter the order is, value from environment variable
+ * DPKG_ROOT, and then the built-in default "",
+ *
+ * @param dir The new filesystem root directory, or NULL to set to default.
+ *
+ * @return The new filesystem root directory.
+ */
+const char *
+dpkg_fsys_set_dir(const char *dir)
+{
+	char *new_dir;
+
+	if (dir == NULL) {
+		const char *env;
+
+		env = getenv("DPKG_ROOT");
+		if (env)
+			dir = env;
+		else
+			dir = "";
+	}
+
+	new_dir = m_strdup(dir);
+	path_trim_slash_slashdot(new_dir);
+
+	fsys_dir = new_dir;
+
+	return fsys_dir;
+}
+
+/**
+ * Get current on-disk filesystem root directory.
+ *
+ * @return The current filesystem root directory.
+ */
+const char *
+dpkg_fsys_get_dir(void)
+{
+	return fsys_dir;
+}
+
+/**
+ * Get a pathname to the current on-disk filesystem root directory.
+ *
+ * This function returns an allocated string, which should be freed with
+ * free(2).
+ *
+ * @param pathpart The pathpart to append to the new pathname.
+ *
+ * @return The newly allocated pathname.
+ */
+char *
+dpkg_fsys_get_path(const char *pathpart)
+{
+	return str_fmt("%s/%s", fsys_dir, pathpart);
+}
diff --git a/lib/dpkg/fsys-hash.c b/lib/dpkg/fsys-hash.c
new file mode 100644
index 000000000..88ec47e4a
--- /dev/null
+++ b/lib/dpkg/fsys-hash.c
@@ -0,0 +1,210 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * fsys-hash.c - filesystem nodes hash table
+ *
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright © 2000, 2001 Wichert Akkerman <wakkerma@debian.org>
+ * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/string.h>
+#include <dpkg/path.h>
+
+#include "fsys.h"
+
+/* This must always be a prime for optimal performance.
+ * This is the closest one to 2^18 (262144). */
+#define BINS 262139
+
+static struct fsys_namenode *bins[BINS];
+static int nfiles = 0;
+
+void
+fsys_hash_init(void)
+{
+	struct fsys_namenode *fnn;
+	int i;
+
+	for (i = 0; i < BINS; i++) {
+		for (fnn = bins[i]; fnn; fnn = fnn->next) {
+			fnn->flags = 0;
+			fnn->oldhash = NULL;
+			fnn->newhash = EMPTYHASHFLAG;
+			fnn->file_ondisk_id = NULL;
+		}
+	}
+}
+
+void
+fsys_hash_reset(void)
+{
+	int i;
+
+	for (i = 0; i < BINS; i++)
+		bins[i] = NULL;
+
+	nfiles = 0;
+}
+
+int
+fsys_hash_entries(void)
+{
+	return nfiles;
+}
+
+struct fsys_namenode *
+fsys_hash_find_node(const char *name, enum fsys_hash_find_flags flags)
+{
+	struct fsys_namenode **pointerp, *newnode;
+	const char *orig_name = name;
+
+	/* We skip initial slashes and ‘./’ pairs, and add our own single
+	 * leading slash. */
+	name = path_skip_slash_dotslash(name);
+
+	pointerp = bins + (str_fnv_hash(name) % (BINS));
+	while (*pointerp) {
+		/* XXX: This should not be needed, but it has been a constant
+		 * source of assertions over the years. Hopefully with the
+		 * internerr() we will get better diagnostics. */
+		if ((*pointerp)->name[0] != '/')
+			internerr("filename node '%s' does not start with '/'",
+			          (*pointerp)->name);
+
+		if (strcmp((*pointerp)->name + 1, name) == 0)
+			break;
+		pointerp = &(*pointerp)->next;
+	}
+	if (*pointerp)
+		return *pointerp;
+
+	if (flags & FHFF_NONE)
+		return NULL;
+
+	newnode = nfmalloc(sizeof(*newnode));
+	newnode->packages = NULL;
+	if ((flags & FHFF_NOCOPY) && name > orig_name && name[-1] == '/') {
+		newnode->name = name - 1;
+	} else {
+		char *newname = nfmalloc(strlen(name) + 2);
+
+		newname[0] = '/';
+		strcpy(newname + 1, name);
+		newnode->name = newname;
+	}
+	newnode->flags = 0;
+	newnode->next = NULL;
+	newnode->divert = NULL;
+	newnode->statoverride = NULL;
+	newnode->oldhash = NULL;
+	newnode->newhash = EMPTYHASHFLAG;
+	newnode->file_ondisk_id = NULL;
+	newnode->trig_interested = NULL;
+	*pointerp = newnode;
+	nfiles++;
+
+	return newnode;
+}
+
+void
+fsys_hash_report(FILE *file)
+{
+	struct fsys_namenode *node;
+	int i, c;
+	int *freq;
+	int empty = 0, used = 0, collided = 0;
+
+	freq = m_malloc(sizeof(freq[0]) * nfiles + 1);
+	for (i = 0; i <= nfiles; i++)
+		freq[i] = 0;
+	for (i = 0; i < BINS; i++) {
+		for (c = 0, node = bins[i]; node; c++, node = node->next);
+		fprintf(file, "fsys-hash: bin %5d has %7d\n", i, c);
+		if (c == 0)
+			empty++;
+		else if (c == 1)
+			used++;
+		else {
+			used++;
+			collided++;
+		}
+		freq[c]++;
+	}
+	for (i = nfiles; i > 0 && freq[i] == 0; i--);
+	while (i >= 0) {
+		fprintf(file, "fsys-hash: size %7d occurs %5d times\n",
+		        i, freq[i]);
+		i--;
+	}
+	fprintf(file, "fsys-hash: bins empty %d\n", empty);
+	fprintf(file, "fsys-hash: bins used %d (collided %d)\n", used,
+	        collided);
+
+	m_output(file, "<hash report>");
+
+	free(freq);
+}
+
+/*
+ * Forward iterator.
+ */
+
+struct fsys_hash_iter {
+	struct fsys_namenode *namenode;
+	int nbinn;
+};
+
+struct fsys_hash_iter *
+fsys_hash_iter_new(void)
+{
+	struct fsys_hash_iter *iter;
+
+	iter = m_malloc(sizeof(*iter));
+	iter->namenode = NULL;
+	iter->nbinn = 0;
+
+	return iter;
+}
+
+struct fsys_namenode *
+fsys_hash_iter_next(struct fsys_hash_iter *iter)
+{
+	struct fsys_namenode *fnn = NULL;
+
+	while (!iter->namenode) {
+		if (iter->nbinn >= BINS)
+			return NULL;
+		iter->namenode = bins[iter->nbinn++];
+	}
+	fnn = iter->namenode;
+	iter->namenode = fnn->next;
+
+	return fnn;
+}
+
+void
+fsys_hash_iter_free(struct fsys_hash_iter *iter)
+{
+	free(iter);
+}
diff --git a/lib/dpkg/fsys-iter.c b/lib/dpkg/fsys-iter.c
new file mode 100644
index 000000000..807aabbb0
--- /dev/null
+++ b/lib/dpkg/fsys-iter.c
@@ -0,0 +1,126 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * fsys-iter.c - filesystem nodes iterators
+ *
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright © 2000, 2001 Wichert Akkerman <wakkerma@debian.org>
+ * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <stdlib.h>
+
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/pkg-list.h>
+
+#include "fsys.h"
+
+/*
+ * Reverse iterator.
+ */
+
+/*
+ * Initializes an iterator that appears to go through the file list ‘files’
+ * in reverse order, returning the namenode from each. What actually happens
+ * is that we walk the list here, building up a reverse list, and then peel
+ * it apart one entry at a time.
+ */
+void
+fsys_hash_rev_iter_init(struct fsys_hash_rev_iter *iter,
+                        struct fsys_namenode_list *files)
+{
+	struct fsys_namenode_list *newent;
+
+	iter->todo = NULL;
+	while (files) {
+		newent = m_malloc(sizeof(*newent));
+		newent->namenode = files->namenode;
+		newent->next = iter->todo;
+		iter->todo = newent;
+		files = files->next;
+	}
+}
+
+struct fsys_namenode *
+fsys_hash_rev_iter_next(struct fsys_hash_rev_iter *iter)
+{
+	struct fsys_namenode *next;
+	struct fsys_namenode_list *todo;
+
+	todo = iter->todo;
+	if (!todo)
+		return NULL;
+	next = todo->namenode;
+	iter->todo = todo->next;
+	free(todo);
+
+	return next;
+}
+
+/*
+ * Clients must call this function to clean up the fsys_hash_rev_iter
+ * if they wish to break out of the iteration before it is all done.
+ * Calling this function is not necessary if fsys_hash_rev_iter_next() has
+ * been called until it returned 0.
+ */
+void
+fsys_hash_rev_iter_abort(struct fsys_hash_rev_iter *iter)
+{
+	while (fsys_hash_rev_iter_next(iter))
+		;
+}
+
+/*
+ * Iterator for packages owning a file.
+ */
+
+struct fsys_node_pkgs_iter {
+	struct pkg_list *pkg_node;
+};
+
+struct fsys_node_pkgs_iter *
+fsys_node_pkgs_iter_new(struct fsys_namenode *fnn)
+{
+	struct fsys_node_pkgs_iter *iter;
+
+	iter = m_malloc(sizeof(*iter));
+	iter->pkg_node = fnn->packages;
+
+	return iter;
+}
+
+struct pkginfo *
+fsys_node_pkgs_iter_next(struct fsys_node_pkgs_iter *iter)
+{
+	struct pkg_list *pkg_node;
+
+	if (iter->pkg_node == NULL)
+		return NULL;
+
+	pkg_node = iter->pkg_node;
+	iter->pkg_node = pkg_node->next;
+
+	return pkg_node->pkg;
+}
+
+void
+fsys_node_pkgs_iter_free(struct fsys_node_pkgs_iter *iter)
+{
+	free(iter);
+}
diff --git a/lib/dpkg/fsys.h b/lib/dpkg/fsys.h
new file mode 100644
index 000000000..8b9107472
--- /dev/null
+++ b/lib/dpkg/fsys.h
@@ -0,0 +1,204 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * fsys.h - filesystem nodes hash table
+ *
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBDPKG_FSYS_H
+#define LIBDPKG_FSYS_H
+
+#include <stdio.h>
+
+#include <dpkg/file.h>
+
+/*
+ * Data structure here is as follows:
+ *
+ * For each package we have a ‘struct fsys_namenode_list *’, the head of a list of
+ * files in that package. They are in ‘forwards’ order. Each entry has a
+ * pointer to the ‘struct fsys_namenode’.
+ *
+ * The struct fsys_namenodes are in a hash table, indexed by name.
+ * (This hash table is not visible to callers.)
+ *
+ * Each fsys_namenode has a (possibly empty) list of ‘struct filepackage’,
+ * giving a list of the packages listing that filename.
+ *
+ * When we read files contained info about a particular package we set the
+ * ‘files’ member of the clientdata struct to the appropriate thing. When
+ * not yet set the files pointer is made to point to ‘fileslist_uninited’
+ * (this is available only internally, within filesdb.c - the published
+ * interface is ensure_*_available).
+ */
+
+struct pkginfo;
+
+/**
+ * Flags to fsys_hash_find_node().
+ */
+enum fsys_hash_find_flags {
+	/** Do not need to copy filename. */
+	FHFF_NOCOPY			= DPKG_BIT(0),
+	/** The find function might return NULL. */
+	FHFF_NONE			= DPKG_BIT(1),
+};
+
+enum fsys_namenode_flags {
+	/** In the newconffiles list. */
+	FNNF_NEW_CONFF			= DPKG_BIT(0),
+	/** In the new filesystem archive. */
+	FNNF_NEW_INARCHIVE		= DPKG_BIT(1),
+	/** In the old package's conffiles list. */
+	FNNF_OLD_CONFF			= DPKG_BIT(2),
+	/** Obsolete conffile. */
+	FNNF_OBS_CONFF			= DPKG_BIT(3),
+	/** Must remove from other packages' lists. */
+	FNNF_ELIDE_OTHER_LISTS		= DPKG_BIT(4),
+	/** >= 1 instance is a dir, cannot rename over. */
+	FNNF_NO_ATOMIC_OVERWRITE	= DPKG_BIT(5),
+	/** New file has been placed on the disk. */
+	FNNF_PLACED_ON_DISK		= DPKG_BIT(6),
+	FNNF_DEFERRED_FSYNC		= DPKG_BIT(7),
+	FNNF_DEFERRED_RENAME		= DPKG_BIT(8),
+	/** Path being filtered. */
+	FNNF_FILTERED			= DPKG_BIT(9),
+};
+
+/**
+ * Stores information to uniquely identify an on-disk file.
+ */
+struct file_ondisk_id {
+	dev_t id_dev;
+	ino_t id_ino;
+};
+
+struct fsys_namenode {
+	struct fsys_namenode *next;
+	const char *name;
+	struct pkg_list *packages;
+	struct fsys_diversion *divert;
+
+	/** We allow the administrator to override the owner, group and mode
+	 * of a file. If such an override is present we use that instead of
+	 * the stat information stored in the archive.
+	 *
+	 * This functionality used to be in the suidmanager package. */
+	struct file_stat *statoverride;
+
+	struct trigfileint *trig_interested;
+
+	/*
+	 * Fields from here on are used by archives.c &c, and cleared by
+	 * fsys_hash_init().
+	 */
+
+	/** Set to zero when a new node is created. */
+	enum fsys_namenode_flags flags;
+
+	/** Valid iff this namenode is in the newconffiles list. */
+	const char *oldhash;
+
+	/** Valid iff the file was unpacked and hashed on this run. */
+	const char *newhash;
+
+	struct file_ondisk_id *file_ondisk_id;
+};
+
+struct fsys_namenode_list {
+	struct fsys_namenode_list *next;
+	struct fsys_namenode *namenode;
+};
+
+/**
+ * Queue of fsys_namenode entries.
+ */
+struct fsys_namenode_queue {
+	struct fsys_namenode_list *head, **tail;
+};
+
+/**
+ * When we deal with an ‘overridden’ file, every package except the
+ * overriding one is considered to contain the other file instead. Both
+ * files have entries in the filesdb database, and they refer to each other
+ * via these diversion structures.
+ *
+ * The contested filename's fsys_namenode has an diversion entry with
+ * useinstead set to point to the redirected filename's fsys_namenode; the
+ * redirected fsys_namenode has camefrom set to the contested fsys_namenode.
+ * Both sides' diversion entries will have pkg set to the package (if any)
+ * which is allowed to use the contended filename.
+ *
+ * Packages that contain either version of the file will all refer to the
+ * contested fsys_namenode in their per-file package lists (both in core and
+ * on disk). References are redirected to the other fsys_namenode's filename
+ * where appropriate.
+ */
+struct fsys_diversion {
+	struct fsys_namenode *useinstead;
+	struct fsys_namenode *camefrom;
+	struct pkgset *pkgset;
+
+	/** The ‘contested’ halves are in this list for easy cleanup. */
+	struct fsys_diversion *next;
+};
+
+struct fsys_node_pkgs_iter;
+struct fsys_node_pkgs_iter *
+fsys_node_pkgs_iter_new(struct fsys_namenode *fnn);
+struct pkginfo *
+fsys_node_pkgs_iter_next(struct fsys_node_pkgs_iter *iter);
+void
+fsys_node_pkgs_iter_free(struct fsys_node_pkgs_iter *iter);
+
+void
+fsys_hash_init(void);
+void
+fsys_hash_reset(void);
+void
+fsys_hash_report(FILE *file);
+int
+fsys_hash_entries(void);
+
+struct fsys_hash_iter;
+struct fsys_hash_iter *
+fsys_hash_iter_new(void);
+struct fsys_namenode *
+fsys_hash_iter_next(struct fsys_hash_iter *iter);
+void
+fsys_hash_iter_free(struct fsys_hash_iter *iter);
+
+struct fsys_namenode *
+fsys_hash_find_node(const char *filename, enum fsys_hash_find_flags flags);
+
+struct fsys_hash_rev_iter {
+	struct fsys_namenode_list *todo;
+};
+
+void
+fsys_hash_rev_iter_init(struct fsys_hash_rev_iter *iter,
+                        struct fsys_namenode_list *files);
+struct fsys_namenode *
+fsys_hash_rev_iter_next(struct fsys_hash_rev_iter *iter);
+void
+fsys_hash_rev_iter_abort(struct fsys_hash_rev_iter *iter);
+
+const char *dpkg_fsys_set_dir(const char *dir);
+const char *dpkg_fsys_get_dir(void);
+char *dpkg_fsys_get_path(const char *pathpart);
+
+#endif /* LIBDPKG_FSYS_H */
diff --git a/lib/dpkg/i18n.c b/lib/dpkg/i18n.c
index 147c5756e..495270003 100644
--- a/lib/dpkg/i18n.c
+++ b/lib/dpkg/i18n.c
@@ -23,6 +23,10 @@
 
 #include <dpkg/i18n.h>
 
+#ifdef HAVE_USELOCALE
+static locale_t dpkg_C_locale;
+#endif
+
 void
 dpkg_locales_init(const char *package)
 {
@@ -30,6 +34,10 @@ dpkg_locales_init(const char *package)
 	bindtextdomain(package, LOCALEDIR);
 	textdomain(package);
 
+#ifdef HAVE_USELOCALE
+	dpkg_C_locale = newlocale(LC_ALL_MASK, "C", (locale_t)0);
+#endif
+
 #if defined(__APPLE__) && defined(__MACH__)
 	/*
 	 * On Mac OS X, the libintl code needs to call into the CoreFoundation
@@ -44,3 +52,37 @@ dpkg_locales_init(const char *package)
 	gettext("");
 #endif
 }
+
+void
+dpkg_locales_done(void)
+{
+#ifdef HAVE_USELOCALE
+	freelocale(dpkg_C_locale);
+	dpkg_C_locale = (locale_t)0;
+#endif
+}
+
+struct dpkg_locale
+dpkg_locale_switch_C(void)
+{
+	struct dpkg_locale loc;
+
+#ifdef HAVE_USELOCALE
+	loc.oldloc = uselocale(dpkg_C_locale);
+#else
+	loc.oldloc = setlocale(LC_ALL, NULL);
+	setlocale(LC_ALL, "C");
+#endif
+
+	return loc;
+}
+
+void
+dpkg_locale_switch_back(struct dpkg_locale loc)
+{
+#ifdef HAVE_USELOCALE
+	uselocale(loc.oldloc);
+#else
+	setlocale(LC_ALL, loc.oldloc);
+#endif
+}
diff --git a/lib/dpkg/i18n.h b/lib/dpkg/i18n.h
index e92158f15..f574433a2 100644
--- a/lib/dpkg/i18n.h
+++ b/lib/dpkg/i18n.h
@@ -43,6 +43,14 @@ DPKG_BEGIN_DECLS
 #define C_(ctxt, str) pgettext(ctxt, str)
 
 void dpkg_locales_init(const char *package);
+void dpkg_locales_done(void);
+
+struct dpkg_locale {
+	void *oldloc;
+};
+
+struct dpkg_locale dpkg_locale_switch_C(void);
+void dpkg_locale_switch_back(struct dpkg_locale loc);
 
 /** @} */
 
diff --git a/lib/dpkg/libdpkg.map b/lib/dpkg/libdpkg.map
index 5e685c948..33297a8bf 100644
--- a/lib/dpkg/libdpkg.map
+++ b/lib/dpkg/libdpkg.map
@@ -1,14 +1,17 @@
 LIBDPKG_0 {
 global:
 	# Error reporting
+	dpkg_has_error;
 	dpkg_put_warn;
 	dpkg_put_error;
 	dpkg_put_errno;
 	dpkg_error_print;
+	dpkg_error_move;
 	dpkg_error_destroy;
 
 	# Charset and string functions
 	dpkg_locales_init;
+	dpkg_locales_done;
 
 	# Program name
 	dpkg_set_progname;
@@ -46,6 +49,7 @@ LIBDPKG_PRIVATE {
 	catch_fatal_error;
 	push_checkpoint;
 	push_cleanup;
+	push_cleanup_fallback;
 	pop_cleanup;
 	onerr_abort;		# XXX variable, do not export
 	ohshitv;
@@ -54,6 +58,8 @@ LIBDPKG_PRIVATE {
 	do_internerr;
 	dpkg_set_report_piped_mode;
 	dpkg_set_report_buffer;
+	dpkg_warning_printer;
+	dpkg_set_warning_printer;
 	warning_get_count;
 	warningv;
 	warning;
@@ -79,6 +85,7 @@ LIBDPKG_PRIVATE {
 	m_strdup;
 	m_vasprintf;
 	m_asprintf;
+	m_dup;
 	m_dup2;
 	m_pipe;
 	m_output;
@@ -90,6 +97,7 @@ LIBDPKG_PRIVATE {
 
 	str_match_end;
 	str_fnv_hash;
+	str_concat;
 	str_fmt;
 	str_escape_fmt;
 	str_strip_quotes;
@@ -98,6 +106,7 @@ LIBDPKG_PRIVATE {
 	str_gen_crop;
 
 	# Variable buffer support
+	varbuf_new;
 	varbuf_init;
 	varbuf_reset;
 	varbuf_grow;
@@ -114,6 +123,7 @@ LIBDPKG_PRIVATE {
 	varbuf_snapshot;
 	varbuf_rollback;
 	varbuf_destroy;
+	varbuf_free;
 
 	# Path, directory and file functions
 	secure_unlink_statted;
@@ -130,6 +140,7 @@ LIBDPKG_PRIVATE {
 	dir_sync_path_parent;
 	dir_sync_contents;
 
+	treenode_get_name;
 	treenode_get_mode;
 	treenode_get_virtname;
 	treenode_get_pathname;
@@ -137,9 +148,11 @@ LIBDPKG_PRIVATE {
 	treewalk_node;
 	treewalk_next;
 	treewalk_close;
+	treewalk;
 
 	file_copy_perms;
 	file_show;
+	file_slurp;
 
 	atomic_file_new;
 	atomic_file_open;
@@ -176,10 +189,14 @@ LIBDPKG_PRIVATE {
 	command_add_argv;
 	command_add_args;
 	command_exec;
-	command_get_pager;
 	command_shell;
 	command_destroy;
 
+	pager_get_exec;
+	pager_spawn;
+	pager_reap;
+	pager_enable;
+
 	setcloexec;
 
 	# Compression support
@@ -243,6 +260,7 @@ LIBDPKG_PRIVATE {
 	dpkg_version_compare;
 	dpkg_version_relate;
 	versiondescribe;
+	versiondescribe_c;
 	parseversion;
 
 	# Architecture database
@@ -278,8 +296,11 @@ LIBDPKG_PRIVATE {
 	varbuf_add_source_version;
 	pkgbin_name;
 	pkg_name;
+	pkgbin_name_const;
+	pkg_name_const;
 	pkg_source_version;
-	pkgbin_summary;
+	pkgbin_synopsis;
+	pkg_synopsis;
 	pkg_abbrev_want;
 	pkg_abbrev_status;
 	pkg_abbrev_eflag;
@@ -294,7 +315,7 @@ LIBDPKG_PRIVATE {
 	pkg_list_prepend;
 
 	# Package array handling
-	pkg_array_init_from_db;
+	pkg_array_init_from_hash;
 	pkg_array_init_from_names;
 	pkg_array_foreach;
 	pkg_array_sort;
@@ -307,7 +328,21 @@ LIBDPKG_PRIVATE {
 	pkg_queue_push;
 	pkg_queue_pop;
 
+	# Package in-core database functions
+	pkg_hash_find_set;
+	pkg_hash_find_singleton;
+	pkg_hash_find_pkg;
+	pkg_hash_get_singleton;
+	pkg_hash_count_set;
+	pkg_hash_count_pkg;
+	pkg_hash_reset;
+	pkg_hash_iter_new;
+	pkg_hash_iter_next_set;
+	pkg_hash_iter_next_pkg;
+	pkg_hash_iter_free;
+
 	# Package field handling
+	booleaninfos;		# XXX variable, do not export
 	fieldinfos;		# XXX variable, do not export
 	find_field_info;
 	find_arbfield_info;
@@ -330,18 +365,6 @@ LIBDPKG_PRIVATE {
 	pkg_spec_iter_next_pkg;
 	pkg_spec_iter_destroy;
 
-	# Package in-core database functions
-	pkg_db_find_set;
-	pkg_db_find_singleton;
-	pkg_db_find_pkg;
-	pkg_db_count_set;
-	pkg_db_count_pkg;
-	pkg_db_reset;
-	pkg_db_iter_new;
-	pkg_db_iter_next_set;
-	pkg_db_iter_next_pkg;
-	pkg_db_iter_free;
-
 	# Dependency and Conflict functions
 	pkg_virtual_deppossi_satisfied;
 	deparchsatisfied;
@@ -360,6 +383,7 @@ LIBDPKG_PRIVATE {
 	parsedb_parse;
 	parsedb_close;
 	parsedb;
+	writedb_records;
 	writedb;
 
 	dpkg_db_set_dir;
@@ -380,6 +404,53 @@ LIBDPKG_PRIVATE {
 	modstatdb_shutdown;
 	modstatdb_done;
 
+	# Package on-disk control database support
+	pkg_infodb_foreach;
+	pkg_infodb_get_dir;
+	pkg_infodb_get_file;
+	pkg_infodb_has_file;
+	pkg_infodb_upgrade;
+
+	# Package on-disk diversion database support
+	ensure_diversions;
+
+	# Filesystem node hash support
+	fsys_hash_init;
+	fsys_hash_reset;
+	fsys_hash_entries;
+	fsys_hash_find_node;
+	fsys_hash_report;
+
+	fsys_hash_iter_new;
+	fsys_hash_iter_next;
+	fsys_hash_iter_free;
+
+	fsys_hash_rev_iter_init;
+	fsys_hash_rev_iter_next;
+	fsys_hash_rev_iter_abort;
+
+	fsys_node_pkgs_iter_new;
+	fsys_node_pkgs_iter_next;
+	fsys_node_pkgs_iter_free;
+
+	dpkg_fsys_set_dir;
+	dpkg_fsys_get_dir;
+	dpkg_fsys_get_path;
+
+	# Package on-disk filesystem database support
+	parse_filehash;
+	write_filelist_except;
+	write_filehash_except;
+	ensure_packagefiles_available;
+	ensure_allinstfiles_available;
+	ensure_allinstfiles_available_quiet;
+
+	# Package on-disk stat override database support
+	statdb_parse_uid;
+	statdb_parse_gid;
+	statdb_parse_mode;
+	ensure_statoverrides;
+
 	# Triggers support
 	trig_name_is_illegal;
 	trigdef_set_methods;
diff --git a/lib/dpkg/log.c b/lib/dpkg/log.c
index 3079f3ca6..c2221c819 100644
--- a/lib/dpkg/log.c
+++ b/lib/dpkg/log.c
@@ -83,7 +83,7 @@ statusfd_add(int fd)
 
 	setcloexec(fd, _("<package status and progress file descriptor>"));
 
-	pipe_new = nfmalloc(sizeof(struct pipef));
+	pipe_new = nfmalloc(sizeof(*pipe_new));
 	pipe_new->fd = fd;
 	pipe_new->next = status_pipes;
 	status_pipes = pipe_new;
diff --git a/lib/dpkg/mlib.c b/lib/dpkg/mlib.c
index 1470a7f61..4e5e5b1a8 100644
--- a/lib/dpkg/mlib.c
+++ b/lib/dpkg/mlib.c
@@ -24,6 +24,7 @@
 
 #include <sys/types.h>
 
+#include <errno.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -110,6 +111,19 @@ m_asprintf(char **strp, const char *fmt, ...)
   return n;
 }
 
+int
+m_dup(int oldfd)
+{
+  int newfd;
+
+  newfd = dup(oldfd);
+  if (newfd >= 0)
+    return newfd;
+
+  onerr_abort++;
+  ohshite(_("failed to dup for fd %d"), oldfd);
+}
+
 void m_dup2(int oldfd, int newfd) {
   const char *const stdstrings[]= { "in", "out", "err" };
 
@@ -130,7 +144,7 @@ void
 m_output(FILE *f, const char *name)
 {
   fflush(f);
-  if (ferror(f))
+  if (ferror(f) && errno != EPIPE)
     ohshite(_("error writing to '%s'"), name);
 }
 
diff --git a/lib/dpkg/options-parsers.c b/lib/dpkg/options-parsers.c
index b65215027..c26864278 100644
--- a/lib/dpkg/options-parsers.c
+++ b/lib/dpkg/options-parsers.c
@@ -1,6 +1,6 @@
 /*
  * dpkg - main program for package management
- * options-helper.c - command-line options parser helpers
+ * options-parsers.c - command-line options parser helpers
  *
  * Copyright © 2014 Guillem Jover <guillem@debian.org>
  *
diff --git a/lib/dpkg/pager.c b/lib/dpkg/pager.c
new file mode 100644
index 000000000..4eab2f09e
--- /dev/null
+++ b/lib/dpkg/pager.c
@@ -0,0 +1,145 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * pager.c - pager execution support
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <sys/types.h>
+
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <unistd.h>
+
+#include <dpkg/dpkg.h>
+#include <dpkg/i18n.h>
+#include <dpkg/string.h>
+#include <dpkg/subproc.h>
+#include <dpkg/command.h>
+#include <dpkg/pager.h>
+
+static bool pager_enabled = true;
+
+void
+pager_enable(bool enable)
+{
+	pager_enabled = enable;
+}
+
+/**
+ * Get a suitable pager.
+ *
+ * @return A string representing a pager.
+ */
+const char *
+pager_get_exec(void)
+{
+	const char *pager;
+
+	if (!isatty(0) || !isatty(1))
+		return CAT;
+
+	pager = getenv("DPKG_PAGER");
+	if (str_is_unset(pager))
+		pager = getenv("PAGER");
+	if (str_is_unset(pager))
+		pager = DEFAULTPAGER;
+
+	return pager;
+}
+
+struct pager {
+	bool used;
+	const char *desc;
+	pid_t pid;
+	struct sigaction sigpipe;
+	int stdout_old;
+	int pipe[2];
+};
+
+struct pager *
+pager_spawn(const char *desc)
+{
+	struct sigaction sa;
+	struct pager *pager;
+	const char *exec;
+
+	pager = m_calloc(1, sizeof(*pager));
+	pager->used = isatty(0) && isatty(1);
+	pager->desc = desc;
+
+	exec = pager_get_exec();
+	if (strcmp(exec, CAT) == 0)
+		pager->used = false;
+
+	if (!pager_enabled)
+		pager->used = false;
+
+	if (!pager->used)
+		return pager;
+
+	m_pipe(pager->pipe);
+
+	memset(&sa, 0, sizeof(sa));
+	sigemptyset(&sa.sa_mask);
+	sa.sa_handler = SIG_IGN;
+	sa.sa_flags = 0;
+
+	sigaction(SIGPIPE, &sa, &pager->sigpipe);
+
+	pager->pid = subproc_fork();
+	if (pager->pid == 0) {
+		/* Set better defaults for less if not already set. */
+		setenv("LESS", "-FRSXMQ", 0);
+
+		m_dup2(pager->pipe[0], 0);
+		close(pager->pipe[0]);
+		close(pager->pipe[1]);
+
+		command_shell(exec, desc);
+	}
+
+	pager->stdout_old = m_dup(1);
+	m_dup2(pager->pipe[1], 1);
+	close(pager->pipe[0]);
+	close(pager->pipe[1]);
+
+	/* Force the output to fully buffered, because originally stdout was
+	 * a tty, so it was set as line buffered. This way we send as much as
+	 * possible to the pager, which will handle the output by itself. */
+	setvbuf(stdout, NULL, _IOFBF, 0);
+
+	return pager;
+}
+
+void
+pager_reap(struct pager *pager)
+{
+	if (!pager->used)
+		return;
+
+	m_dup2(pager->stdout_old, 1);
+	subproc_reap(pager->pid, pager->desc, SUBPROC_NOPIPE);
+
+	sigaction(SIGPIPE, &pager->sigpipe, NULL);
+
+	free(pager);
+}
diff --git a/lib/dpkg/pager.h b/lib/dpkg/pager.h
new file mode 100644
index 000000000..f9029d0a5
--- /dev/null
+++ b/lib/dpkg/pager.h
@@ -0,0 +1,54 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * pager.h - pager execution support
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBDPKG_PAGER_H
+#define LIBDPKG_PAGER_H
+
+#include <stdbool.h>
+
+#include <dpkg/macros.h>
+
+DPKG_BEGIN_DECLS
+
+/**
+ * @defgroup pager Pager execution
+ * @ingroup dpkg-internal
+ * @{
+ */
+
+struct pager;
+
+void
+pager_enable(bool enable);
+
+const char *
+pager_get_exec(void);
+
+struct pager *
+pager_spawn(const char *desc);
+
+void
+pager_reap(struct pager *pager);
+
+/** @} */
+
+DPKG_END_DECLS
+
+#endif /* LIBDPKG_PAGER_H */
diff --git a/lib/dpkg/parse.c b/lib/dpkg/parse.c
index 1b3bf13d8..f7979b8e5 100644
--- a/lib/dpkg/parse.c
+++ b/lib/dpkg/parse.c
@@ -28,7 +28,6 @@
 #include <sys/mman.h>
 #endif
 
-#include <assert.h>
 #include <fcntl.h>
 #include <string.h>
 #include <unistd.h>
@@ -65,7 +64,6 @@ const struct fieldinfo fieldinfos[]= {
   { FIELD("Multi-Arch"),       f_multiarch,       w_multiarch,      PKGIFPOFF(multiarch)     },
   { FIELD("Source"),           f_charfield,       w_charfield,      PKGIFPOFF(source)        },
   { FIELD("Version"),          f_version,         w_version,        PKGIFPOFF(version)       },
-  { FIELD("Revision"),         f_revision,        w_null                                     },
   { FIELD("Config-Version"),   f_configversion,   w_configversion                            },
   { FIELD("Replaces"),         f_dependency,      w_dependency,     dep_replaces             },
   { FIELD("Provides"),         f_dependency,      w_dependency,     dep_provides             },
@@ -77,25 +75,21 @@ const struct fieldinfo fieldinfos[]= {
   { FIELD("Conflicts"),        f_dependency,      w_dependency,     dep_conflicts            },
   { FIELD("Enhances"),         f_dependency,      w_dependency,     dep_enhances             },
   { FIELD("Conffiles"),        f_conffiles,       w_conffiles                                },
-  { FIELD("Filename"),         f_filecharf,       w_filecharf,      FILEFOFF(name)           },
-  { FIELD("Size"),             f_filecharf,       w_filecharf,      FILEFOFF(size)           },
-  { FIELD("MD5sum"),           f_filecharf,       w_filecharf,      FILEFOFF(md5sum)         },
-  { FIELD("MSDOS-Filename"),   f_filecharf,       w_filecharf,      FILEFOFF(msdosname)      },
+  { FIELD("Filename"),         f_archives,        w_archives,       ARCHIVEFOFF(name)        },
+  { FIELD("Size"),             f_archives,        w_archives,       ARCHIVEFOFF(size)        },
+  { FIELD("MD5sum"),           f_archives,        w_archives,       ARCHIVEFOFF(md5sum)      },
+  { FIELD("MSDOS-Filename"),   f_archives,        w_archives,       ARCHIVEFOFF(msdosname)   },
   { FIELD("Description"),      f_charfield,       w_charfield,      PKGIFPOFF(description)   },
   { FIELD("Triggers-Pending"), f_trigpend,        w_trigpend                                 },
   { FIELD("Triggers-Awaited"), f_trigaw,          w_trigaw                                   },
   /* Note that aliases are added to the nicknames table. */
-  {  NULL                                                                             }
-};
-
-static const struct nickname nicknames[] = {
-  /* Note: Capitalization of these strings is important. */
-  { NICK("Recommended"),      .canon = "Recommends" },
-  { NICK("Optional"),         .canon = "Suggests" },
-  { NICK("Class"),            .canon = "Priority" },
-  { NICK("Package-Revision"), .canon = "Revision" },
-  { NICK("Package_Revision"), .canon = "Revision" },
-  { .nick = NULL }
+  { FIELD("Revision"),         f_revision,        w_null                                     },
+  { FIELD("Recommended"),      f_dependency,      w_null                                     },
+  { FIELD("Optional"),         f_dependency,      w_null                                     },
+  { FIELD("Class"),            f_priority,        w_null                                     },
+  { FIELD("Package-Revision"), f_revision,        w_null                                     },
+  { FIELD("Package_Revision"), f_revision,        w_null                                     },
+  { NULL                                                                                     }
 };
 
 /**
@@ -117,19 +111,9 @@ pkg_parse_field(struct parsedb_state *ps, struct field_state *fs,
                 void *parse_obj)
 {
   struct pkg_parse_object *pkg_obj = parse_obj;
-  const struct nickname *nick;
   const struct fieldinfo *fip;
   int *ip;
 
-  for (nick = nicknames; nick->nick; nick++)
-    if (nick->nicklen == (size_t)fs->fieldlen &&
-        strncasecmp(nick->nick, fs->fieldstart, fs->fieldlen) == 0)
-      break;
-  if (nick->nick) {
-    fs->fieldstart = nick->canon;
-    fs->fieldlen = strlen(fs->fieldstart);
-  }
-
   for (fip = fieldinfos, ip = fs->fieldencountered; fip->name; fip++, ip++)
     if (fip->namelen == (size_t)fs->fieldlen &&
         strncasecmp(fip->name, fs->fieldstart, fs->fieldlen) == 0)
@@ -160,7 +144,7 @@ pkg_parse_field(struct parsedb_state *ps, struct field_state *fs,
                    fs->fieldlen, fs->fieldstart);
       larpp = &arp->next;
     }
-    arp = nfmalloc(sizeof(struct arbitraryfield));
+    arp = nfmalloc(sizeof(*arp));
     arp->name = nfstrnsave(fs->fieldstart, fs->fieldlen);
     arp->value = nfstrnsave(fs->valuestart, fs->valuelen);
     arp->next = NULL;
@@ -178,7 +162,7 @@ pkg_parse_verify(struct parsedb_state *ps,
   struct dependency *dep;
   struct deppossi *dop;
 
-  parse_must_have_field(ps, pkg->set->name, "package name");
+  parse_must_have_field(ps, pkg->set->name, "Package");
 
   /* XXX: We need to check for status != PKG_STAT_HALFINSTALLED as while
    * unpacking an unselected package, it will not have yet all data in
@@ -187,9 +171,9 @@ pkg_parse_verify(struct parsedb_state *ps,
   if ((ps->flags & pdb_recordavailable) ||
       (pkg->status != PKG_STAT_NOTINSTALLED &&
        pkg->status != PKG_STAT_HALFINSTALLED)) {
-    parse_ensure_have_field(ps, &pkgbin->description, "description");
-    parse_ensure_have_field(ps, &pkgbin->maintainer, "maintainer");
-    parse_must_have_field(ps, pkgbin->version.version, "version");
+    parse_ensure_have_field(ps, &pkgbin->description, "Description");
+    parse_ensure_have_field(ps, &pkgbin->maintainer, "Maintainer");
+    parse_must_have_field(ps, pkgbin->version.version, "Version");
   }
 
   /* XXX: Versions before dpkg 1.10.19 did not preserve the Architecture
@@ -201,9 +185,9 @@ pkg_parse_verify(struct parsedb_state *ps,
      * is in such a state that it make sense), so that it can be used safely
      * on string comparisons and the like. */
     if (pkgbin->arch->type == DPKG_ARCH_NONE)
-      parse_warn(ps, _("missing %s"), "architecture");
+      parse_warn(ps, _("missing '%s' field"), "Architecture");
     else if (pkgbin->arch->type == DPKG_ARCH_EMPTY)
-      parse_warn(ps, _("empty value for %s"), "architecture");
+      parse_warn(ps, _("empty value for '%s' field"), "Architecture");
   }
   /* Mark missing architectures as empty, to distinguish these from
    * unused slots in the db. */
@@ -212,12 +196,15 @@ pkg_parse_verify(struct parsedb_state *ps,
 
   if (pkgbin->arch->type == DPKG_ARCH_EMPTY &&
       pkgbin->multiarch == PKG_MULTIARCH_SAME)
-    parse_error(ps, _("package has field '%s' but is missing architecture"),
+    parse_error(ps, _("package has '%s' field but is missing architecture"),
                 "Multi-Arch: same");
   if (pkgbin->arch->type == DPKG_ARCH_ALL &&
       pkgbin->multiarch == PKG_MULTIARCH_SAME)
-    parse_error(ps, _("package has field '%s' but is architecture all"),
-                "Multi-Arch: same");
+    parse_error(ps, _("package has '%s' field but is architecture '%s'"),
+                "Multi-Arch: same", "all");
+
+  /* Generate the cached fully qualified package name representation. */
+  pkgbin->pkgname_archqual = pkgbin_name_archqual(pkg, pkgbin);
 
   /* Initialize deps to be arch-specific unless stated otherwise. */
   for (dep = pkgbin->depends; dep; dep = dep->next)
@@ -239,7 +226,8 @@ pkg_parse_verify(struct parsedb_state *ps,
           pkg->status == PKG_STAT_NOTINSTALLED ||
           pkg->status == PKG_STAT_TRIGGERSPENDING)
         parse_error(ps,
-                    _("Config-Version for package with inappropriate Status"));
+                    _("'%s' field present for package with inappropriate '%s' field"),
+                    "Config-Version", "Status");
     } else {
       if (pkg->status == PKG_STAT_INSTALLED ||
           pkg->status == PKG_STAT_TRIGGERSPENDING)
@@ -255,7 +243,8 @@ pkg_parse_verify(struct parsedb_state *ps,
                 pkg_status_name(pkg));
   else if (pkg->status == PKG_STAT_TRIGGERSAWAITED && !pkg->trigaw.head)
     parse_error(ps,
-                _("package has status triggers-awaited but no triggers awaited"));
+                _("package has status %s but no triggers awaited"),
+                pkg_status_name(pkg));
 
   if (pkg->trigpend_head &&
       !(pkg->status == PKG_STAT_TRIGGERSPENDING ||
@@ -265,8 +254,8 @@ pkg_parse_verify(struct parsedb_state *ps,
                 pkg_status_name(pkg));
   else if (pkg->status == PKG_STAT_TRIGGERSPENDING && !pkg->trigpend_head)
     parse_error(ps,
-                _("package has status triggers-pending but no triggers "
-                  "pending"));
+                _("package has status %s but no triggers pending"),
+                pkg_status_name(pkg));
 
   /* FIXME: There was a bug that could make a not-installed package have
    * conffiles, so we check for them here and remove them (rather than
@@ -275,8 +264,8 @@ pkg_parse_verify(struct parsedb_state *ps,
       pkg->status == PKG_STAT_NOTINSTALLED &&
       pkgbin->conffiles) {
     parse_warn(ps,
-               _("Package which in state not-installed has conffiles, "
-                 "forgetting them"));
+               _("package has status %s and has conffiles, forgetting them"),
+               pkg_status_name(pkg));
     pkgbin->conffiles = NULL;
   }
 
@@ -302,7 +291,18 @@ pkg_parse_verify(struct parsedb_state *ps,
       pkg->eflag == PKG_EFLAG_OK &&
       pkg->want == PKG_WANT_INSTALL &&
       pkgbin->arch->type == DPKG_ARCH_EMPTY)
-    pkg->want = PKG_WANT_UNKNOWN;
+    pkg_set_want(pkg, PKG_WANT_UNKNOWN);
+
+  /* XXX: Versions before dpkg 1.13.10 did not blank the Origin and Bugs
+   * fields, so there can be packages that should be garbage collected but
+   * are lingering around. Blank them to make sure we will forget all about
+   * them on the next database dump. */
+  if (!(ps->flags & pdb_recordavailable) &&
+      pkg->status == PKG_STAT_NOTINSTALLED &&
+      pkg->eflag == PKG_EFLAG_OK &&
+      pkg->want == PKG_WANT_UNKNOWN) {
+    pkgbin_blank(pkgbin);
+  }
 }
 
 struct pkgcount {
@@ -340,7 +340,7 @@ parse_find_set_slot(struct parsedb_state *ps,
   struct pkgset *set;
   struct pkginfo *pkg;
 
-  set = pkg_db_find_set(new_pkg->set->name);
+  set = pkg_hash_find_set(new_pkg->set->name);
 
   /* Sanity checks: verify that the db is in a consistent state. */
 
@@ -403,9 +403,9 @@ parse_find_pkg_slot(struct parsedb_state *ps,
      * possible architecture switch, for example from native to all. */
     if (pkgset_installed_instances(db_set) == 1 &&
         new_pkgbin->multiarch != PKG_MULTIARCH_SAME)
-      return pkg_db_get_singleton(db_set);
+      return pkg_hash_get_singleton(db_set);
     else
-      return pkg_db_get_pkg(db_set, new_pkgbin->arch);
+      return pkg_hash_get_pkg(db_set, new_pkgbin->arch);
   } else {
     bool selection = false;
 
@@ -417,28 +417,29 @@ parse_find_pkg_slot(struct parsedb_state *ps,
     /* Verify we don't allow something that will mess up the db. */
     if (pkgset_installed_instances(db_set) > 1 &&
         !selection && new_pkgbin->multiarch != PKG_MULTIARCH_SAME)
-      ohshit(_("%s %s (Multi-Arch: %s) is not co-installable with "
-               "%s which has multiple installed instances"),
+      ohshit(_("package %s (%s) with field '%s: %s' is not co-installable "
+               "with %s which has multiple installed instances"),
              pkgbin_name(new_pkg, new_pkgbin, pnaw_always),
              versiondescribe(&new_pkgbin->version, vdew_nonambig),
-             multiarchinfos[new_pkgbin->multiarch].name, db_set->name);
+             "Multi-Arch", multiarchinfos[new_pkgbin->multiarch].name,
+             db_set->name);
 
     /* If we are parsing the status file, use a slot per arch. */
     if (ps->type == pdb_file_status)
-      return pkg_db_get_pkg(db_set, new_pkgbin->arch);
+      return pkg_hash_get_pkg(db_set, new_pkgbin->arch);
 
     /* If we are doing an update, from the log or a new package, then
      * handle cross-grades. */
     if (pkgset_installed_instances(db_set) == 1) {
-      db_pkg = pkg_db_get_singleton(db_set);
+      db_pkg = pkg_hash_get_singleton(db_set);
 
       if (db_pkg->installed.multiarch == PKG_MULTIARCH_SAME &&
           new_pkgbin->multiarch == PKG_MULTIARCH_SAME)
-        return pkg_db_get_pkg(db_set, new_pkgbin->arch);
+        return pkg_hash_get_pkg(db_set, new_pkgbin->arch);
       else
         return db_pkg;
     } else {
-      return pkg_db_get_pkg(db_set, new_pkgbin->arch);
+      return pkg_hash_get_pkg(db_set, new_pkgbin->arch);
     }
   }
 }
@@ -478,18 +479,21 @@ pkg_parse_copy(struct parsedb_state *ps,
     pkg_copy_eflags(dst_pkg, src_pkg);
     pkg_set_status(dst_pkg, src_pkg->status);
     dst_pkg->configversion = src_pkg->configversion;
-    dst_pkg->files = NULL;
+    dst_pkg->archives = NULL;
 
     dst_pkg->trigpend_head = src_pkg->trigpend_head;
     dst_pkg->trigaw = src_pkg->trigaw;
     for (ta = dst_pkg->trigaw.head; ta; ta = ta->sameaw.next) {
-      assert(ta->aw == src_pkg);
+      if (ta->aw != src_pkg)
+        internerr("trigger awaited package %s and origin package %s not linked properly",
+                  pkg_name(ta->aw, pnaw_always),
+                  pkgbin_name(src_pkg, src_pkgbin, pnaw_always));
       ta->aw = dst_pkg;
-      /* ->othertrigaw_head is updated by trig_note_aw in *(pkg_db_find())
+      /* ->othertrigaw_head is updated by trig_note_aw in *(pkg_hash_find())
        * rather than in dst_pkg. */
     }
-  } else if (!(ps->flags & pdb_ignorefiles)) {
-    dst_pkg->files = src_pkg->files;
+  } else if (!(ps->flags & pdb_ignore_archives)) {
+    dst_pkg->archives = src_pkg->archives;
   }
 }
 
@@ -521,6 +525,7 @@ parsedb_new(const char *filename, int fd, enum parsedbflags flags)
   struct parsedb_state *ps;
 
   ps = m_malloc(sizeof(*ps));
+  ps->err = DPKG_ERROR_OBJECT;
   ps->filename = filename;
   ps->type = parse_get_type(ps, flags);
   ps->flags = flags;
@@ -552,7 +557,7 @@ parsedb_open(const char *filename, enum parsedbflags flags)
 
   ps = parsedb_new(filename, fd, flags | pdb_close_fd);
 
-  push_cleanup(cu_closefd, ~ehflag_normaltidy, NULL, 0, 1, &ps->fd);
+  push_cleanup(cu_closefd, ~ehflag_normaltidy, 1, &ps->fd);
 
   return ps;
 }
diff --git a/lib/dpkg/parsedump.h b/lib/dpkg/parsedump.h
index 336f35f7f..ea29ff317 100644
--- a/lib/dpkg/parsedump.h
+++ b/lib/dpkg/parsedump.h
@@ -25,6 +25,8 @@
 
 #include <stdint.h>
 
+#include <dpkg/error.h>
+
 /**
  * @defgroup parsedump In-core package database parsing and reading
  * @ingroup dpkg-public
@@ -46,6 +48,7 @@ enum parsedbtype {
 struct parsedb_state {
 	enum parsedbtype type;
 	enum parsedbflags flags;
+	struct dpkg_error err;
 	struct pkginfo *pkg;
 	struct pkgbin *pkgbin;
 	char *data;
@@ -89,17 +92,22 @@ bool parse_stanza(struct parsedb_state *ps, struct field_state *fs,
 #define STRUCTFIELD(klass, off, type) (*(type *)((uintptr_t)(klass) + (off)))
 
 #define PKGIFPOFF(f) (offsetof(struct pkgbin, f))
-#define FILEFOFF(f) (offsetof(struct filedetails, f))
+#define ARCHIVEFOFF(f) (offsetof(struct archivedetails, f))
 
 typedef void freadfunction(struct pkginfo *pkg, struct pkgbin *pkgbin,
                            struct parsedb_state *ps,
                            const char *value, const struct fieldinfo *fip);
-freadfunction f_name, f_charfield, f_priority, f_section, f_status, f_filecharf;
+freadfunction f_name;
+freadfunction f_charfield;
+freadfunction f_priority;
+freadfunction f_section;
+freadfunction f_status;
 freadfunction f_boolean, f_dependency, f_conffiles, f_version, f_revision;
 freadfunction f_configversion;
 freadfunction f_multiarch;
 freadfunction f_architecture;
 freadfunction f_trigpend, f_trigaw;
+freadfunction f_archives;
 
 enum fwriteflags {
 	/** Print field header and trailing newline. */
@@ -113,8 +121,8 @@ fwritefunction w_name, w_charfield, w_priority, w_section, w_status, w_configver
 fwritefunction w_version, w_null, w_booleandefno, w_dependency, w_conffiles;
 fwritefunction w_multiarch;
 fwritefunction w_architecture;
-fwritefunction w_filecharf;
 fwritefunction w_trigpend, w_trigaw;
+fwritefunction w_archives;
 
 void
 varbuf_add_arbfield(struct varbuf *vb, const struct arbitraryfield *arbfield,
@@ -130,14 +138,19 @@ struct fieldinfo {
   size_t integer;
 };
 
-void parse_db_version(struct parsedb_state *ps,
-                      struct dpkg_version *version, const char *value,
-                      const char *fmt, ...) DPKG_ATTR_PRINTF(4);
+int
+parse_db_version(struct parsedb_state *ps,
+                 struct dpkg_version *version, const char *value)
+	DPKG_ATTR_REQRET;
 
 void parse_error(struct parsedb_state *ps, const char *fmt, ...)
 	DPKG_ATTR_NORET DPKG_ATTR_PRINTF(2);
 void parse_warn(struct parsedb_state *ps, const char *fmt, ...)
 	DPKG_ATTR_PRINTF(2);
+void
+parse_problem(struct parsedb_state *ps, const char *fmt, ...)
+	DPKG_ATTR_PRINTF(2);
+
 void parse_must_have_field(struct parsedb_state *ps,
                            const char *value, const char *what);
 void parse_ensure_have_field(struct parsedb_state *ps,
@@ -145,14 +158,6 @@ void parse_ensure_have_field(struct parsedb_state *ps,
 
 #define MSDOS_EOF_CHAR '\032' /* ^Z */
 
-#define NICK(name) .nick = name, .nicklen = sizeof(name) - 1
-
-struct nickname {
-  const char *nick;
-  const char *canon;
-  size_t nicklen;
-};
-
 extern const struct fieldinfo fieldinfos[];
 
 /** @} */
diff --git a/lib/dpkg/parsehelp.c b/lib/dpkg/parsehelp.c
index 453077fd9..34247269e 100644
--- a/lib/dpkg/parsehelp.c
+++ b/lib/dpkg/parsehelp.c
@@ -77,6 +77,24 @@ parse_warn(struct parsedb_state *ps, const char *fmt, ...)
   va_end(args);
 }
 
+void
+parse_problem(struct parsedb_state *ps, const char *fmt, ...)
+{
+  va_list args;
+  char *str;
+
+  va_start(args, fmt);
+  m_vasprintf(&str, parse_error_msg(ps, fmt), args);
+  va_end(args);
+
+  if (ps->err.type == DPKG_MSG_WARN)
+    warning("%s: %s", str, ps->err.str);
+  else
+    ohshit("%s: %s", str, ps->err.str);
+
+  free(str);
+}
+
 const struct fieldinfo *
 find_field_info(const struct fieldinfo *fields, const char *fieldname)
 {
@@ -170,6 +188,20 @@ const char *versiondescribe
   return vb->buf;
 }
 
+const char *
+versiondescribe_c(const struct dpkg_version *version,
+                  enum versiondisplayepochwhen vdew)
+{
+  struct dpkg_locale oldloc;
+  const char *str;
+
+  oldloc = dpkg_locale_switch_C();
+  str = versiondescribe(version, vdew);
+  dpkg_locale_switch_back(oldloc);
+
+  return str;
+}
+
 /**
  * Parse a version string and check for invalid syntax.
  *
@@ -266,29 +298,24 @@ parseversion(struct dpkg_version *rversion, const char *string,
  * @param ps The parsedb state.
  * @param version The version to parse into.
  * @param value The version string to parse from.
- * @param fmt The error format string.
+ *
+ * @retval  0 On success, and err is reset.
+ * @retval -1 On failure, and err is set accordingly.
  */
-void
+int
 parse_db_version(struct parsedb_state *ps, struct dpkg_version *version,
-                 const char *value, const char *fmt, ...)
+                 const char *value)
 {
-  struct dpkg_error err;
-  va_list args;
-  char buf[1000];
-
-  if (parseversion(version, value, &err) == 0)
-    return;
+  dpkg_error_destroy(&ps->err);
 
-  va_start(args, fmt);
-  vsnprintf(buf, sizeof(buf), fmt, args);
-  va_end(args);
+  if (parseversion(version, value, &ps->err) == 0)
+    return 0;
 
-  if (err.type == DPKG_MSG_WARN && (ps->flags & pdb_lax_version_parser))
-    parse_warn(ps, "%s: %.250s", buf, err.str);
-  else
-    parse_error(ps, "%s: %.250s", buf, err.str);
+  /* If not in lax mode, turn everything into an error. */
+  if (!(ps->flags & pdb_lax_version_parser))
+    ps->err.type = DPKG_MSG_ERROR;
 
-  dpkg_error_destroy(&err);
+  return -1;
 }
 
 void
@@ -296,9 +323,9 @@ parse_must_have_field(struct parsedb_state *ps,
                       const char *value, const char *what)
 {
   if (!value)
-    parse_error(ps, _("missing %s"), what);
+    parse_error(ps, _("missing '%s' field"), what);
   else if (!*value)
-    parse_error(ps, _("empty value for %s"), what);
+    parse_error(ps, _("empty value for '%s' field"), what);
 }
 
 void
@@ -308,9 +335,9 @@ parse_ensure_have_field(struct parsedb_state *ps,
   static const char empty[] = "";
 
   if (!*value) {
-    parse_warn(ps, _("missing %s"), what);
+    parse_warn(ps, _("missing '%s' field"), what);
     *value = empty;
   } else if (!**value) {
-    parse_warn(ps, _("empty value for %s"), what);
+    parse_warn(ps, _("empty value for '%s' field"), what);
   }
 }
diff --git a/lib/dpkg/path-remove.c b/lib/dpkg/path-remove.c
index ab26b4a8d..6afb37607 100644
--- a/lib/dpkg/path-remove.c
+++ b/lib/dpkg/path-remove.c
@@ -1,6 +1,6 @@
 /*
  * libdpkg - Debian packaging suite library routines
- * path-remove.c - path removal functionss
+ * path-remove.c - path removal functions
  *
  * Copyright © 1994-1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2007-2015 Guillem Jover <guillem@debian.org>
@@ -24,7 +24,6 @@
 
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
@@ -122,7 +121,8 @@ path_remove_tree(const char *pathname)
 	const char *u;
 
 	u = path_skip_slash_dotslash(pathname);
-	assert(*u);
+	if (u[0] == '\0')
+		internerr("pathname '%s' reduces to nothing", pathname);
 
 	debug(dbg_eachfile, "%s '%s'", __func__, pathname);
 	if (!rmdir(pathname))
diff --git a/lib/dpkg/perf.h b/lib/dpkg/perf.h
new file mode 100644
index 000000000..c7d9301a8
--- /dev/null
+++ b/lib/dpkg/perf.h
@@ -0,0 +1,71 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * perf.h - performance testing support
+ *
+ * Copyright © 2009-2019 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef LIBDPKG_PERF_H
+#define LIBDPKG_PERF_H
+
+#include <config.h>
+#include <compat.h>
+
+#include <time.h>
+#include <stdio.h>
+
+struct perf_slot {
+	struct timespec t_ini, t_end;
+};
+
+static inline void
+perf_ts_sub(struct timespec *a, struct timespec *b, struct timespec *res)
+{
+	res->tv_sec = a->tv_sec - b->tv_sec;
+	res->tv_nsec = a->tv_nsec - b->tv_nsec;
+	if (res->tv_nsec < 0) {
+		res->tv_sec--;
+		res->tv_nsec += 1000000000;
+	}
+}
+
+static void
+perf_ts_mark_print(const char *str)
+{
+	struct timespec ts;
+
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+
+	printf("%lu.%.9lu: %s\n", ts.tv_sec, ts.tv_nsec, str);
+}
+
+static void
+perf_ts_slot_print(struct perf_slot *ps, const char *str)
+{
+	struct timespec t_res;
+
+	perf_ts_sub(&ps->t_end, &ps->t_ini, &t_res);
+
+	printf("%lu.%.9lu: %s (%lu.%.9lu sec)\n",
+	       ps->t_end.tv_sec, ps->t_end.tv_nsec,
+	       str, t_res.tv_sec, t_res.tv_nsec);
+}
+
+#define perf_ts_slot_start(ps) clock_gettime(CLOCK_MONOTONIC, &((ps)->t_ini))
+#define perf_ts_slot_stop(ps) clock_gettime(CLOCK_MONOTONIC, &((ps)->t_end))
+
+#endif
diff --git a/lib/dpkg/pkg-array.c b/lib/dpkg/pkg-array.c
index 24c6dc0e2..0ce285e92 100644
--- a/lib/dpkg/pkg-array.c
+++ b/lib/dpkg/pkg-array.c
@@ -22,7 +22,6 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 
@@ -60,21 +59,23 @@ pkg_array_init_from_names(struct pkg_array *a, pkg_mapper_func pkg_mapper,
  * @param a The array to initialize.
  */
 void
-pkg_array_init_from_db(struct pkg_array *a)
+pkg_array_init_from_hash(struct pkg_array *a)
 {
-	struct pkgiterator *iter;
+	struct pkg_hash_iter *iter;
 	struct pkginfo *pkg;
 	int i;
 
-	a->n_pkgs = pkg_db_count_pkg();
+	a->n_pkgs = pkg_hash_count_pkg();
 	a->pkgs = m_malloc(sizeof(a->pkgs[0]) * a->n_pkgs);
 
-	iter = pkg_db_iter_new();
-	for (i = 0; (pkg = pkg_db_iter_next_pkg(iter)); i++)
+	iter = pkg_hash_iter_new();
+	for (i = 0; (pkg = pkg_hash_iter_next_pkg(iter)); i++)
 		a->pkgs[i] = pkg;
-	pkg_db_iter_free(iter);
+	pkg_hash_iter_free(iter);
 
-	assert(i == a->n_pkgs);
+	if (i != a->n_pkgs)
+		internerr("inconsistent state in pkg array: i=%d != npkgs=%d",
+		          i, a->n_pkgs);
 }
 
 /**
diff --git a/lib/dpkg/pkg-array.h b/lib/dpkg/pkg-array.h
index 858b4fe46..f9ea385b6 100644
--- a/lib/dpkg/pkg-array.h
+++ b/lib/dpkg/pkg-array.h
@@ -44,7 +44,7 @@ typedef struct pkginfo *pkg_mapper_func(const char *name);
 typedef void pkg_array_visitor_func(struct pkg_array *a, struct pkginfo *pkg,
                                     void *pkg_data);
 
-void pkg_array_init_from_db(struct pkg_array *a);
+void pkg_array_init_from_hash(struct pkg_array *a);
 void pkg_array_init_from_names(struct pkg_array *a, pkg_mapper_func *pkg_mapper,
                                const char **pkg_names);
 void pkg_array_foreach(struct pkg_array *a, pkg_array_visitor_func *pkg_visitor,
diff --git a/lib/dpkg/pkg-files.c b/lib/dpkg/pkg-files.c
new file mode 100644
index 000000000..f02213270
--- /dev/null
+++ b/lib/dpkg/pkg-files.c
@@ -0,0 +1,95 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * pkg-files.c - handle list of filesystem files per package
+ *
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright © 2000,2001 Wichert Akkerman <wakkerma@debian.org>
+ * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/i18n.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/pkg-list.h>
+#include <dpkg/pkg-files.h>
+
+/**
+ * Erase the files saved in pkg.
+ */
+void
+pkg_files_blank(struct pkginfo *pkg)
+{
+	struct fsys_namenode_list *current;
+
+	for (current = pkg->files;
+	     current;
+	     current = current->next) {
+		struct pkg_list **pkg_prev = &current->namenode->packages;
+		struct pkg_list *pkg_node;
+
+		/* For each file that used to be in the package, go through
+		 * looking for this package's entry in the list of packages
+		 * containing this file, and blank it out. */
+		for (pkg_node = current->namenode->packages;
+		     pkg_node;
+		     pkg_node = pkg_node->next) {
+			if (pkg_node->pkg == pkg) {
+				*pkg_prev = pkg_node->next;
+
+				/* The actual filelist links were allocated
+				 * w/ nfmalloc, so we should not free them. */
+				break;
+			}
+
+			pkg_prev = &pkg_node->next;
+		}
+	}
+	pkg->files = NULL;
+}
+
+struct fsys_namenode_list **
+pkg_files_add_file(struct pkginfo *pkg, struct fsys_namenode *namenode,
+                   struct fsys_namenode_list **file_tail)
+{
+	struct fsys_namenode_list *newent;
+	struct pkg_list *pkg_node;
+
+	if (file_tail == NULL)
+		file_tail = &pkg->files;
+
+	/* Make sure we're at the end. */
+	while ((*file_tail) != NULL)
+		file_tail = &((*file_tail)->next);
+
+	/* Create a new node. */
+	newent = nfmalloc(sizeof(*newent));
+	newent->namenode = namenode;
+	newent->next = NULL;
+	*file_tail = newent;
+	file_tail = &newent->next;
+
+	/* Add pkg to newent's package list. */
+	pkg_node = nfmalloc(sizeof(*pkg_node));
+	pkg_node->pkg = pkg;
+	pkg_node->next = newent->namenode->packages;
+	newent->namenode->packages = pkg_node;
+
+	/* Return the position for the next guy. */
+	return file_tail;
+}
diff --git a/lib/dpkg/pkg-files.h b/lib/dpkg/pkg-files.h
new file mode 100644
index 000000000..bee137a16
--- /dev/null
+++ b/lib/dpkg/pkg-files.h
@@ -0,0 +1,46 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * pkg-files.h - primitives for pkg files handling
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBDPKG_PKG_FILES_H
+#define LIBDPKG_PKG_FILES_H
+
+#include <dpkg/dpkg-db.h>
+#include <dpkg/fsys.h>
+
+DPKG_BEGIN_DECLS
+
+/**
+ * @defgroup pkg-files Package files handling
+ * @ingroup dpkg-public
+ * @{
+ */
+
+void
+pkg_files_blank(struct pkginfo *pkg);
+
+struct fsys_namenode_list **
+pkg_files_add_file(struct pkginfo *pkg, struct fsys_namenode *namenode,
+                   struct fsys_namenode_list **file_tail);
+
+/** @} */
+
+DPKG_END_DECLS
+
+#endif /* LIBDPKG_PKG_FILES_H */
diff --git a/lib/dpkg/pkg-format.c b/lib/dpkg/pkg-format.c
index 40344a829..1985df068 100644
--- a/lib/dpkg/pkg-format.c
+++ b/lib/dpkg/pkg-format.c
@@ -22,16 +22,22 @@
 #include <config.h>
 #include <compat.h>
 
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #include <errno.h>
 #include <limits.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <unistd.h>
 
 #include <dpkg/i18n.h>
 #include <dpkg/error.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 #include <dpkg/parsedump.h>
 #include <dpkg/pkg-show.h>
 #include <dpkg/pkg-format.h>
@@ -194,11 +200,8 @@ pkg_format_parse(const char *fmt, struct dpkg_error *err)
 			fmtend = fmt;
 			do {
 				fmtend += 1;
-				fmtend = strchr(fmtend, '$');
-			} while (fmtend && fmtend[1] != '{');
-
-			if (!fmtend)
-				fmtend = fmt + strlen(fmt);
+				fmtend = strchrnul(fmtend, '$');
+			} while (fmtend[0] && fmtend[1] != '{');
 
 			if (!parsestring(node, fmt, fmtend - 1, err)) {
 				pkg_format_free(head);
@@ -269,19 +272,69 @@ virt_status_eflag(struct varbuf *vb,
 }
 
 static void
-virt_summary(struct varbuf *vb,
-             const struct pkginfo *pkg, const struct pkgbin *pkgbin,
-             enum fwriteflags flags, const struct fieldinfo *fip)
+virt_synopsis(struct varbuf *vb,
+              const struct pkginfo *pkg, const struct pkgbin *pkgbin,
+              enum fwriteflags flags, const struct fieldinfo *fip)
 {
 	const char *desc;
 	int len;
 
-	desc = pkgbin_summary(pkg, pkgbin, &len);
+	desc = pkgbin_synopsis(pkg, pkgbin, &len);
 
 	varbuf_add_buf(vb, desc, len);
 }
 
 static void
+virt_fsys_last_modified(struct varbuf *vb,
+                        const struct pkginfo *pkg, const struct pkgbin *pkgbin,
+                        enum fwriteflags flags, const struct fieldinfo *fip)
+{
+	const char *listfile;
+	struct stat st;
+
+	if (pkg->status == PKG_STAT_NOTINSTALLED)
+		return;
+
+	listfile = pkg_infodb_get_file(pkg, pkgbin, LISTFILE);
+
+	if (stat(listfile, &st) < 0) {
+		if (errno == ENOENT)
+			return;
+
+		ohshite(_("cannot get package %s filesystem last modification time"),
+		        pkgbin_name_const(pkg, pkgbin, pnaw_nonambig));
+	}
+
+	varbuf_printf(vb, "%ld", st.st_mtime);
+}
+
+static void
+virt_fsys_files(struct varbuf *vb,
+                const struct pkginfo *pkg, const struct pkgbin *pkgbin,
+                enum fwriteflags flags, const struct fieldinfo *fip)
+{
+	struct fsys_namenode_list *node;
+
+	/* XXX: This cast is so wrong on so many levels, but the alternatives
+	 * are apparently worse. We might need to end up removing the const
+	 * from the arguments.
+	 *
+	 * Ideally loading the entire fsys db would be cheaper, and stored
+	 * in a single file, so we could do it unconditionally, before any
+	 * formatting. */
+	ensure_packagefiles_available((struct pkginfo *)pkg);
+
+	if (!pkg->files_list_valid)
+		return;
+
+	for (node = pkg->files; node; node = node->next) {
+		varbuf_add_char(vb, ' ');
+		varbuf_add_str(vb, node->namenode->name);
+		varbuf_add_char(vb, '\n');
+	}
+}
+
+static void
 virt_source_package(struct varbuf *vb,
                     const struct pkginfo *pkg, const struct pkgbin *pkgbin,
                     enum fwriteflags flags, const struct fieldinfo *fip)
@@ -321,11 +374,14 @@ virt_source_upstream_version(struct varbuf *vb,
 
 static const struct fieldinfo virtinfos[] = {
 	{ FIELD("binary:Package"), NULL, virt_package },
-	{ FIELD("binary:Summary"), NULL, virt_summary },
+	{ FIELD("binary:Synopsis"), NULL, virt_synopsis },
+	{ FIELD("binary:Summary"), NULL, virt_synopsis },
 	{ FIELD("db:Status-Abbrev"), NULL, virt_status_abbrev },
 	{ FIELD("db:Status-Want"), NULL, virt_status_want },
 	{ FIELD("db:Status-Status"), NULL, virt_status_status },
 	{ FIELD("db:Status-Eflag"), NULL, virt_status_eflag },
+	{ FIELD("db-fsys:Files"), NULL, virt_fsys_files },
+	{ FIELD("db-fsys:Last-Modified"), NULL, virt_fsys_last_modified },
 	{ FIELD("source:Package"), NULL, virt_source_package },
 	{ FIELD("source:Version"), NULL, virt_source_version },
 	{ FIELD("source:Upstream-Version"), NULL, virt_source_upstream_version },
diff --git a/lib/dpkg/pkg-format.h b/lib/dpkg/pkg-format.h
index cba39a147..3e013003d 100644
--- a/lib/dpkg/pkg-format.h
+++ b/lib/dpkg/pkg-format.h
@@ -1,6 +1,6 @@
 /*
  * libdpkg - Debian packaging suite library routines
- * pkg-format.c - customizable package formatting
+ * pkg-format.g - customizable package formatting
  *
  * Copyright © 2001 Wichert Akkerman <wakkerma@debian.org>
  *
diff --git a/lib/dpkg/pkg-db.c b/lib/dpkg/pkg-hash.c
index 300c1cad8..18d642eef 100644
--- a/lib/dpkg/pkg-db.c
+++ b/lib/dpkg/pkg-hash.c
@@ -1,6 +1,6 @@
 /*
  * libdpkg - Debian packaging suite library routines
- * pkg-db.c - low level package database routines (hash tables, etc.)
+ * pkg-hash.c - low level package database routines (hash tables, etc.)
  *
  * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
@@ -24,7 +24,6 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <string.h>
 #include <stdlib.h>
 
@@ -35,11 +34,16 @@
 #include <dpkg/string.h>
 #include <dpkg/arch.h>
 
-/* This must always be a prime for optimal performance.
- * With 4093 buckets, we glean a 20% speedup, for 8191 buckets
- * we get 23%. The nominal increase in memory usage is a mere
- * sizeof(void *) * 8191 (i.e. less than 32 KiB on 32bit systems). */
-#define BINS 8191
+/*
+ * This must always be a prime for optimal performance.
+ *
+ * We use a number that is close to the amount of packages currently present
+ * in a Debian suite, so that installed and available packages do not add
+ * tons of collisions.
+ *
+ * The memory usage is «BINS * sizeof(void *)».
+ */
+#define BINS 65521
 
 static struct pkgset *bins[BINS];
 static int npkg, nset;
@@ -61,7 +65,7 @@ static int npkg, nset;
  * @return The package set.
  */
 struct pkgset *
-pkg_db_find_set(const char *inname)
+pkg_hash_find_set(const char *inname)
 {
   struct pkgset **setp, *new_set;
   char *name = m_strdup(inname), *p;
@@ -80,7 +84,7 @@ pkg_db_find_set(const char *inname)
     return *setp;
   }
 
-  new_set = nfmalloc(sizeof(struct pkgset));
+  new_set = nfmalloc(sizeof(*new_set));
   pkgset_blank(new_set);
   new_set->name = nfstrsave(name);
   new_set->next = NULL;
@@ -105,7 +109,7 @@ pkg_db_find_set(const char *inname)
  * @return The singleton package instance.
  */
 struct pkginfo *
-pkg_db_get_singleton(struct pkgset *set)
+pkg_hash_get_singleton(struct pkgset *set)
 {
   struct pkginfo *pkg;
 
@@ -139,13 +143,13 @@ pkg_db_get_singleton(struct pkgset *set)
  * @return The package instance.
  */
 struct pkginfo *
-pkg_db_find_singleton(const char *name)
+pkg_hash_find_singleton(const char *name)
 {
   struct pkgset *set;
   struct pkginfo *pkg;
 
-  set = pkg_db_find_set(name);
-  pkg = pkg_db_get_singleton(set);
+  set = pkg_hash_find_set(name);
+  pkg = pkg_hash_get_singleton(set);
   if (pkg == NULL)
     ohshit(_("ambiguous package name '%s' with more "
              "than one installed instance"), set->name);
@@ -167,17 +171,21 @@ pkg_db_find_singleton(const char *name)
  * @return The package instance.
  */
 struct pkginfo *
-pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch)
+pkg_hash_get_pkg(struct pkgset *set, const struct dpkg_arch *arch)
 {
   struct pkginfo *pkg, **pkgp;
 
-  assert(arch);
-  assert(arch->type != DPKG_ARCH_NONE);
+  if (arch == NULL)
+    internerr("arch argument is NULL");
+  if (arch->type == DPKG_ARCH_NONE)
+    internerr("arch argument is none");
 
   pkg = &set->pkg;
 
   /* If there's a single unused slot, let's use that. */
   if (pkg->installed.arch->type == DPKG_ARCH_NONE && pkg->arch_next == NULL) {
+    /* We can only initialize the arch pkgbin members, because those are used
+     * to find instances, anything else will be overwritten at parse time. */
     pkg->installed.arch = arch;
     pkg->available.arch = arch;
     return pkg;
@@ -192,10 +200,12 @@ pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch)
   }
 
   /* Need to create a new instance for the wanted architecture. */
-  pkg = nfmalloc(sizeof(struct pkginfo));
+  pkg = nfmalloc(sizeof(*pkg));
   pkg_blank(pkg);
   pkg->set = set;
   pkg->arch_next = NULL;
+  /* We can only initialize the arch pkgbin members, because those are used
+   * to find instances, anything else will be overwritten at parse time. */
   pkg->installed.arch = arch;
   pkg->available.arch = arch;
   *pkgp = pkg;
@@ -213,13 +223,13 @@ pkg_db_get_pkg(struct pkgset *set, const struct dpkg_arch *arch)
  * @return The package instance.
  */
 struct pkginfo *
-pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch)
+pkg_hash_find_pkg(const char *name, const struct dpkg_arch *arch)
 {
   struct pkgset *set;
   struct pkginfo *pkg;
 
-  set = pkg_db_find_set(name);
-  pkg = pkg_db_get_pkg(set, arch);
+  set = pkg_hash_find_set(name);
+  pkg = pkg_hash_get_pkg(set, arch);
 
   return pkg;
 }
@@ -230,7 +240,7 @@ pkg_db_find_pkg(const char *name, const struct dpkg_arch *arch)
  * @return The number of package sets.
  */
 int
-pkg_db_count_set(void)
+pkg_hash_count_set(void)
 {
   return nset;
 }
@@ -241,12 +251,12 @@ pkg_db_count_set(void)
  * @return The number of package instances.
  */
 int
-pkg_db_count_pkg(void)
+pkg_hash_count_pkg(void)
 {
   return npkg;
 }
 
-struct pkgiterator {
+struct pkg_hash_iter {
   struct pkginfo *pkg;
   int nbinn;
 };
@@ -258,12 +268,12 @@ struct pkgiterator {
  *
  * @return The iterator.
  */
-struct pkgiterator *
-pkg_db_iter_new(void)
+struct pkg_hash_iter *
+pkg_hash_iter_new(void)
 {
-  struct pkgiterator *iter;
+  struct pkg_hash_iter *iter;
 
-  iter = m_malloc(sizeof(struct pkgiterator));
+  iter = m_malloc(sizeof(*iter));
   iter->pkg = NULL;
   iter->nbinn = 0;
 
@@ -280,7 +290,7 @@ pkg_db_iter_new(void)
  * @return A package set.
  */
 struct pkgset *
-pkg_db_iter_next_set(struct pkgiterator *iter)
+pkg_hash_iter_next_set(struct pkg_hash_iter *iter)
 {
   struct pkgset *set;
 
@@ -315,7 +325,7 @@ pkg_db_iter_next_set(struct pkgiterator *iter)
  * @return A package instance.
  */
 struct pkginfo *
-pkg_db_iter_next_pkg(struct pkgiterator *iter)
+pkg_hash_iter_next_pkg(struct pkg_hash_iter *iter)
 {
   struct pkginfo *pkg;
 
@@ -344,13 +354,13 @@ pkg_db_iter_next_pkg(struct pkgiterator *iter)
  * @name iter The iterator.
  */
 void
-pkg_db_iter_free(struct pkgiterator *iter)
+pkg_hash_iter_free(struct pkg_hash_iter *iter)
 {
   free(iter);
 }
 
 void
-pkg_db_reset(void)
+pkg_hash_reset(void)
 {
   int i;
 
@@ -362,25 +372,36 @@ pkg_db_reset(void)
 }
 
 void
-pkg_db_report(FILE *file)
+pkg_hash_report(FILE *file)
 {
   int i, c;
   struct pkgset *pkg;
   int *freq;
+  int empty = 0, used = 0, collided = 0;
 
   freq = m_malloc(sizeof(int) * nset + 1);
   for (i = 0; i <= nset; i++)
     freq[i] = 0;
   for (i=0; i<BINS; i++) {
     for (c=0, pkg= bins[i]; pkg; c++, pkg= pkg->next);
-    fprintf(file,"bin %5d has %7d\n",i,c);
+    fprintf(file, "pkg-hash: bin %5d has %7d\n", i, c);
+    if (c == 0)
+      empty++;
+    else if (c == 1)
+      used++;
+    else {
+      used++;
+      collided++;
+    }
     freq[c]++;
   }
   for (i = nset; i > 0 && freq[i] == 0; i--);
   while (i >= 0) {
-    fprintf(file, "size %7d occurs %5d times\n", i, freq[i]);
+    fprintf(file, "pkg-hash: size %7d occurs %5d times\n", i, freq[i]);
     i--;
   }
+  fprintf(file, "pkg-hash: bins empty %d\n", empty);
+  fprintf(file, "pkg-hash: bins used %d (collided %d)\n", used, collided);
 
   m_output(file, "<hash report>");
 
diff --git a/lib/dpkg/pkg-show.c b/lib/dpkg/pkg-show.c
index 6af658c42..67e5af404 100644
--- a/lib/dpkg/pkg-show.c
+++ b/lib/dpkg/pkg-show.c
@@ -34,6 +34,10 @@ static bool
 pkgbin_name_needs_arch(const struct pkgbin *pkgbin,
                        enum pkg_name_arch_when pnaw)
 {
+	if (pkgbin->arch->type == DPKG_ARCH_NONE ||
+	    pkgbin->arch->type == DPKG_ARCH_EMPTY)
+		return false;
+
 	switch (pnaw) {
 	case pnaw_never:
 		break;
@@ -43,8 +47,7 @@ pkgbin_name_needs_arch(const struct pkgbin *pkgbin,
 	/* Fall through. */
 	case pnaw_foreign:
 		if (pkgbin->arch->type == DPKG_ARCH_NATIVE ||
-		    pkgbin->arch->type == DPKG_ARCH_ALL ||
-		    pkgbin->arch->type == DPKG_ARCH_NONE)
+		    pkgbin->arch->type == DPKG_ARCH_ALL)
 			break;
 	/* Fall through. */
 	case pnaw_always:
@@ -76,12 +79,33 @@ varbuf_add_pkgbin_name(struct varbuf *vb,
 	varbuf_end_str(vb);
 }
 
+const char *
+pkgbin_name_archqual(const struct pkginfo *pkg, const struct pkgbin *pkgbin)
+{
+	char *pkgname;
+
+	if (pkgbin->arch->type == DPKG_ARCH_NONE ||
+	    pkgbin->arch->type == DPKG_ARCH_EMPTY)
+		return pkg->set->name;
+
+	pkgname = nfmalloc(strlen(pkg->set->name) + 1 +
+	                   strlen(pkgbin->arch->name) + 1);
+	str_concat(pkgname, pkg->set->name, ":",
+	                    pkgbin->arch->name, NULL);
+
+	return pkgname;
+}
+
 /**
  * Return a string representation of the package name.
  *
  * The returned string must not be freed, and it's permanently allocated so
  * can be used as long as the non-freeing memory pool has not been freed.
  *
+ * Note, that this const variant will "leak" a new non-freeing string on
+ * each call if the internal cache has not been previously initialized,
+ * so it is advised to use it only in error reporting code paths.
+ *
  * The pnaw parameter should be one of pnaw_never (never print arch),
  * pnaw_foreign (print arch for foreign packages only), pnaw_nonambig (print
  * arch for non ambiguous cases) or pnaw_always (always print arch),
@@ -93,24 +117,63 @@ varbuf_add_pkgbin_name(struct varbuf *vb,
  * @return The string representation.
  */
 const char *
-pkgbin_name(struct pkginfo *pkg, struct pkgbin *pkgbin,
+pkgbin_name_const(const struct pkginfo *pkg, const struct pkgbin *pkgbin,
             enum pkg_name_arch_when pnaw)
 {
 	if (!pkgbin_name_needs_arch(pkgbin, pnaw))
 		return pkg->set->name;
 
-	/* Cache the package name representation, for later reuse. */
-	if (pkgbin->pkgname_archqual == NULL) {
-		struct varbuf vb = VARBUF_INIT;
+	/* Return a non-freeing package name representation, which
+	 * is intended to be used in error-handling code, as we will keep
+	 * "leaking" them until the next memory pool flush. */
+	if (pkgbin->pkgname_archqual == NULL)
+		return pkgbin_name_archqual(pkg, pkgbin);
 
-		varbuf_add_str(&vb, pkg->set->name);
-		varbuf_add_archqual(&vb, pkgbin->arch);
-		varbuf_end_str(&vb);
+	return pkgbin->pkgname_archqual;
+}
 
-		pkgbin->pkgname_archqual = nfstrsave(vb.buf);
+/**
+ * Return a string representation of the installed package name.
+ *
+ * This is equivalent to pkgbin_name_const() but just for its installed pkgbin.
+ *
+ * @param pkg   The package to consider.
+ * @param pnaw  When to display the architecture qualifier.
+ *
+ * @return The string representation.
+ */
+const char *
+pkg_name_const(const struct pkginfo *pkg, enum pkg_name_arch_when pnaw)
+{
+	return pkgbin_name_const(pkg, &pkg->installed, pnaw);
+}
 
-		varbuf_destroy(&vb);
-	}
+/**
+ * Return a string representation of the package name.
+ *
+ * The returned string must not be freed, and it's permanently allocated so
+ * can be used as long as the non-freeing memory pool has not been freed.
+ *
+ * The pnaw parameter should be one of pnaw_never (never print arch),
+ * pnaw_foreign (print arch for foreign packages only), pnaw_nonambig (print
+ * arch for non ambiguous cases) or pnaw_always (always print arch),
+ *
+ * @param pkg     The package to consider.
+ * @param pkgbin  The binary package instance to consider.
+ * @param pnaw    When to display the architecture qualifier.
+ *
+ * @return The string representation.
+ */
+const char *
+pkgbin_name(struct pkginfo *pkg, struct pkgbin *pkgbin,
+            enum pkg_name_arch_when pnaw)
+{
+	if (!pkgbin_name_needs_arch(pkgbin, pnaw))
+		return pkg->set->name;
+
+	/* Cache the package name representation, for later reuse. */
+	if (pkgbin->pkgname_archqual == NULL)
+		pkgbin->pkgname_archqual = pkgbin_name_archqual(pkg, pkgbin);
 
 	return pkgbin->pkgname_archqual;
 }
@@ -132,22 +195,22 @@ pkg_name(struct pkginfo *pkg, enum pkg_name_arch_when pnaw)
 }
 
 /**
- * Return a string representation of the package summary.
+ * Return a string representation of the package synopsis.
  *
  * The returned string must not be freed, and it's permanently allocated so
  * can be used as long as the non-freeing memory pool has not been freed.
  *
- * The package summary is the short description, but it is not NUL terminated,
+ * The package synopsis is the short description, but it is not NUL terminated,
  * so the output len argument should be used to limit the string length.
  *
  * @param pkg      The package to consider.
  * @param pkgbin   The binary package instance to consider.
- * @param[out] len The length of the summary string within the description.
+ * @param[out] len The length of the synopsis string within the description.
  *
  * @return The string representation.
  */
 const char *
-pkgbin_summary(const struct pkginfo *pkg, const struct pkgbin *pkgbin, int *len)
+pkgbin_synopsis(const struct pkginfo *pkg, const struct pkgbin *pkgbin, int *len)
 {
 	const char *pdesc;
 
@@ -161,6 +224,39 @@ pkgbin_summary(const struct pkginfo *pkg, const struct pkgbin *pkgbin, int *len)
 }
 
 /**
+ * Return a string representation of the package synopsis.
+ *
+ * The returned string must not be freed, and it's permanently allocated so
+ * can be used as long as the non-freeing memory pool has not been freed.
+ *
+ * It will try to use the installed version, otherwise it will fallback to
+ * use the available version.
+ *
+ * The package synopsis is the short description, but it is not NUL terminated,
+ * so the output len argument should be used to limit the string length.
+ *
+ * @param pkg      The package to consider.
+ * @param[out] len The length of the synopsis string within the description.
+ *
+ * @return The string representation.
+ */
+const char *
+pkg_synopsis(const struct pkginfo *pkg, int *len)
+{
+	const char *pdesc;
+
+	pdesc = pkg->installed.description;
+	if (!pdesc)
+		pdesc = pkg->available.description;
+	if (!pdesc)
+		pdesc = _("(no description available)");
+
+	*len = strcspn(pdesc, "\n");
+
+	return pdesc;
+}
+
+/**
  * Return a character abbreviated representation of the package want status.
  *
  * @param pkg The package to consider.
diff --git a/lib/dpkg/pkg-show.h b/lib/dpkg/pkg-show.h
index dd8f666e6..4ac3f5d65 100644
--- a/lib/dpkg/pkg-show.h
+++ b/lib/dpkg/pkg-show.h
@@ -34,8 +34,10 @@ DPKG_BEGIN_DECLS
 
 int pkg_sorter_by_nonambig_name_arch(const void *a, const void *b);
 
-const char *pkgbin_summary(const struct pkginfo *pkg,
-                           const struct pkgbin *pkgbin, int *len_ret);
+const char *pkgbin_synopsis(const struct pkginfo *pkg,
+                            const struct pkgbin *pkgbin, int *len_ret);
+const char *
+pkg_synopsis(const struct pkginfo *pkg, int *len_ret);
 int pkg_abbrev_want(const struct pkginfo *pkg);
 int pkg_abbrev_status(const struct pkginfo *pkg);
 int pkg_abbrev_eflag(const struct pkginfo *pkg);
diff --git a/lib/dpkg/pkg-spec.c b/lib/dpkg/pkg-spec.c
index 9b4d0da31..3e3f59fa0 100644
--- a/lib/dpkg/pkg-spec.c
+++ b/lib/dpkg/pkg-spec.c
@@ -97,7 +97,7 @@ pkg_spec_is_illegal(struct pkg_spec *ps)
 	if (!ps->arch_is_pattern && ps->flags & PKG_SPEC_ARCH_SINGLE) {
 		struct pkgset *set;
 
-		set = pkg_db_find_set(ps->name);
+		set = pkg_hash_find_set(ps->name);
 
 		/* Single instancing only applies with no architecture. */
 		if (ps->arch->type == DPKG_ARCH_NONE &&
@@ -195,9 +195,9 @@ static struct pkginfo *
 pkg_spec_get_pkg(struct pkg_spec *ps)
 {
 	if (ps->arch->type == DPKG_ARCH_NONE)
-		return pkg_db_find_singleton(ps->name);
+		return pkg_hash_find_singleton(ps->name);
 	else
-		return pkg_db_find_pkg(ps->name, ps->arch);
+		return pkg_hash_find_pkg(ps->name, ps->arch);
 }
 
 struct pkginfo *
@@ -245,9 +245,9 @@ void
 pkg_spec_iter_init(struct pkg_spec *ps)
 {
 	if (ps->name_is_pattern)
-		ps->pkg_iter = pkg_db_iter_new();
+		ps->pkg_iter = pkg_hash_iter_new();
 	else
-		ps->pkg_next = &pkg_db_find_set(ps->name)->pkg;
+		ps->pkg_next = &pkg_hash_find_set(ps->name)->pkg;
 }
 
 static struct pkginfo *
@@ -255,7 +255,7 @@ pkg_spec_iter_next_pkgname(struct pkg_spec *ps)
 {
 	struct pkginfo *pkg;
 
-	while ((pkg = pkg_db_iter_next_pkg(ps->pkg_iter))) {
+	while ((pkg = pkg_hash_iter_next_pkg(ps->pkg_iter))) {
 		if (pkg_spec_match_pkg(ps, pkg, &pkg->installed))
 			return pkg;
 	}
@@ -290,7 +290,7 @@ pkg_spec_iter_next_pkg(struct pkg_spec *ps)
 void
 pkg_spec_iter_destroy(struct pkg_spec *ps)
 {
-	pkg_db_iter_free(ps->pkg_iter);
+	pkg_hash_iter_free(ps->pkg_iter);
 	pkg_spec_iter_blank(ps);
 }
 
diff --git a/lib/dpkg/pkg-spec.h b/lib/dpkg/pkg-spec.h
index 956b7fe3c..964f0d982 100644
--- a/lib/dpkg/pkg-spec.h
+++ b/lib/dpkg/pkg-spec.h
@@ -60,7 +60,7 @@ struct pkg_spec {
 	bool arch_is_pattern;
 
 	/** Used for the pkg_db iterator. */
-	struct pkgiterator *pkg_iter;
+	struct pkg_hash_iter *pkg_iter;
 	/** Used for the pkgset iterator. */
 	struct pkginfo *pkg_next;
 };
diff --git a/lib/dpkg/pkg.c b/lib/dpkg/pkg.c
index 1fc3d0c21..893d14e18 100644
--- a/lib/dpkg/pkg.c
+++ b/lib/dpkg/pkg.c
@@ -22,9 +22,9 @@
 #include <config.h>
 #include <compat.h>
 
-#include <assert.h>
 #include <string.h>
 
+#include <dpkg/ehandle.h>
 #include <dpkg/string.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg.h>
@@ -42,9 +42,12 @@ pkg_set_status(struct pkginfo *pkg, enum pkgstatus status)
 	else if (status == PKG_STAT_NOTINSTALLED)
 		pkg->set->installed_instances--;
 
-	assert(pkg->set->installed_instances >= 0);
+	if (pkg->set->installed_instances < 0)
+		internerr("pkgset %s went into negative installed instances %d",
+		          pkg->set->name, pkg->set->installed_instances);
 
 	pkg->status = status;
+	pkg->status_dirty = true;
 }
 
 /**
@@ -113,13 +116,17 @@ void
 pkg_blank(struct pkginfo *pkg)
 {
 	pkg->status = PKG_STAT_NOTINSTALLED;
+	pkg->status_dirty = false;
 	pkg->eflag = PKG_EFLAG_OK;
 	pkg->want = PKG_WANT_UNKNOWN;
 	pkg->priority = PKG_PRIO_UNKNOWN;
 	pkg->otherpriority = NULL;
 	pkg->section = NULL;
 	dpkg_version_blank(&pkg->configversion);
+	pkg->files_list_valid = false;
+	pkg->files_list_phys_offs = 0;
 	pkg->files = NULL;
+	pkg->archives = NULL;
 	pkg->clientdata = NULL;
 	pkg->trigaw.head = NULL;
 	pkg->trigaw.tail = NULL;
diff --git a/lib/dpkg/report.c b/lib/dpkg/report.c
index 58df60006..f7763b362 100644
--- a/lib/dpkg/report.c
+++ b/lib/dpkg/report.c
@@ -51,6 +51,24 @@ dpkg_set_report_buffer(FILE *fp)
 		setvbuf(fp, NULL, piped_mode, 0);
 }
 
+void
+dpkg_warning_printer(const char *msg, void *data)
+{
+	fprintf(stderr, "%s%s:%s %s%s:%s %s\n",
+	        color_get(COLOR_PROG), dpkg_get_progname(), color_reset(),
+	        color_get(COLOR_WARN), _("warning"), color_reset(), msg);
+}
+
+static dpkg_warning_printer_func *warning_printer_func = dpkg_warning_printer;
+static void *warning_printer_data;
+
+void
+dpkg_set_warning_printer(dpkg_warning_printer_func *printer, void *data)
+{
+	warning_printer_func = printer;
+	warning_printer_data = data;
+}
+
 static int warn_count = 0;
 
 int
@@ -67,9 +85,7 @@ warningv(const char *fmt, va_list args)
 	warn_count++;
 
 	m_vasprintf(&buf, fmt, args);
-	fprintf(stderr, "%s%s:%s %s%s:%s %s\n",
-	        color_get(COLOR_PROG), dpkg_get_progname(), color_reset(),
-	        color_get(COLOR_WARN), _("warning"), color_reset(), buf);
+	warning_printer_func(buf, warning_printer_data);
 	free(buf);
 }
 
diff --git a/lib/dpkg/report.h b/lib/dpkg/report.h
index 4cadc7fe3..862a8429a 100644
--- a/lib/dpkg/report.h
+++ b/lib/dpkg/report.h
@@ -38,6 +38,11 @@ DPKG_BEGIN_DECLS
 void dpkg_set_report_piped_mode(int mode);
 void dpkg_set_report_buffer(FILE *fp);
 
+typedef void dpkg_warning_printer_func(const char *msg, void *data);
+
+void dpkg_warning_printer(const char *msg, void *data);
+void dpkg_set_warning_printer(dpkg_warning_printer_func *printer, void *data);
+
 int warning_get_count(void);
 void warningv(const char *fmt, va_list args) DPKG_ATTR_VPRINTF(1);
 void warning(const char *fmt, ...) DPKG_ATTR_PRINTF(1);
diff --git a/lib/dpkg/string.c b/lib/dpkg/string.c
index 220e2789f..ff97159f9 100644
--- a/lib/dpkg/string.c
+++ b/lib/dpkg/string.c
@@ -28,6 +28,25 @@
 #include <dpkg/string.h>
 #include <dpkg/dpkg.h>
 
+char *
+str_concat(char *dst, ...)
+{
+	va_list args;
+	const char *src;
+	size_t len;
+
+	va_start(args, dst);
+	while ((src = va_arg(args, const char *))) {
+		len = strlen(src);
+		memcpy(dst, src, len);
+		dst += len;
+	}
+	va_end(args);
+	*dst = '\0';
+
+	return dst;
+}
+
 /**
  * Match the end of a string.
  *
diff --git a/lib/dpkg/string.h b/lib/dpkg/string.h
index 927aeaee4..d0f6bd7ad 100644
--- a/lib/dpkg/string.h
+++ b/lib/dpkg/string.h
@@ -56,6 +56,7 @@ bool str_match_end(const char *str, const char *end);
 
 unsigned int str_fnv_hash(const char *str);
 
+char *str_concat(char *dst, ...) DPKG_ATTR_SENTINEL;
 char *str_fmt(const char *fmt, ...) DPKG_ATTR_PRINTF(1);
 char *str_escape_fmt(char *dest, const char *src, size_t n);
 char *str_quote_meta(const char *src);
diff --git a/lib/dpkg/subproc.c b/lib/dpkg/subproc.c
index b2f36ec2e..7b3fb9906 100644
--- a/lib/dpkg/subproc.c
+++ b/lib/dpkg/subproc.c
@@ -73,7 +73,7 @@ subproc_signals_ignore(const char *name)
 	for (i = 0; i < array_count(signo_ignores); i++)
 		subproc_set_signal(signo_ignores[i], &sa, &sa_save[i], name);
 
-	push_cleanup(subproc_signals_cleanup, ~0, NULL, 0, 0);
+	push_cleanup(subproc_signals_cleanup, ~0, 0);
 	onerr_abort--;
 }
 
diff --git a/lib/dpkg/t/.gitignore b/lib/dpkg/t/.gitignore
index e22bcc9e4..b711dbee7 100644
--- a/lib/dpkg/t/.gitignore
+++ b/lib/dpkg/t/.gitignore
@@ -1,6 +1,11 @@
+# Benchmarks
+b-fsys-hash
+b-pkg-hash
+# Compiled helpers
 c-tarextract
 c-treewalk
 c-trigdeferred
+# Testsuite
 t-ar
 t-arch
 t-buffer
@@ -9,12 +14,20 @@ t-command
 t-deb-version
 t-ehandle
 t-error
+t-file
+t-fsys-dir
+t-fsys-hash
+t-headers-cpp
 t-macros
 t-mod-db
+t-namevalue
+t-pager
 t-path
 t-pkginfo
+t-pkg-hash
 t-pkg-list
 t-pkg-queue
+t-pkg-show
 t-progname
 t-string
 t-subproc
diff --git a/lib/dpkg/t/Makefile.am b/lib/dpkg/t/Makefile.am
index 12dc4d86a..ab9ce3b4b 100644
--- a/lib/dpkg/t/Makefile.am
+++ b/lib/dpkg/t/Makefile.am
@@ -17,20 +17,26 @@ TEST_ENV_VARS = \
 	DPKG_PROGTAR=$(TAR) \
 	$(nil)
 
+t_headers_cpp_SOURCES = t-headers-cpp.cc
+
 # The tests are sorted in order of increasing complexity.
 test_programs = \
 	t-test \
 	t-test-skip \
 	t-macros \
+	t-headers-cpp \
 	t-c-ctype \
+	t-namevalue \
 	t-ehandle \
 	t-error \
 	t-string \
+	t-file \
 	t-buffer \
 	t-path \
 	t-progname \
 	t-subproc \
 	t-command \
+	t-pager \
 	t-varbuf \
 	t-ar \
 	t-tar \
@@ -40,6 +46,10 @@ test_programs = \
 	t-pkginfo \
 	t-pkg-list \
 	t-pkg-queue \
+	t-pkg-hash \
+	t-pkg-show \
+	t-fsys-dir \
+	t-fsys-hash \
 	t-trigger \
 	t-mod-db \
 	$(nil)
@@ -50,8 +60,15 @@ test_scripts = \
 	t-trigdeferred.t \
 	$(nil)
 
+BENCHMARK_LDADD_FLAGS = -lrt $(LDADD)
+
+b_fsys_hash_LDADD = $(BENCHMARK_LDADD_FLAGS)
+b_pkg_hash_LDADD = $(BENCHMARK_LDADD_FLAGS)
+
 check_PROGRAMS = \
 	$(test_programs) \
+	b-fsys-hash \
+	b-pkg-hash \
 	c-tarextract \
 	c-treewalk \
 	c-trigdeferred \
diff --git a/lib/dpkg/t/b-fsys-hash.c b/lib/dpkg/t/b-fsys-hash.c
new file mode 100644
index 000000000..373cfc7c6
--- /dev/null
+++ b/lib/dpkg/t/b-fsys-hash.c
@@ -0,0 +1,80 @@
+/*
+ * dpkg - main program for package management
+ * b-fsys-hash.c - test fsys database load and hash performance
+ *
+ * Copyright © 2009-2019 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <dpkg/i18n.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+
+#include <dpkg/perf.h>
+
+#include <dpkg/db-fsys.h>
+
+static const char *admindir;
+
+int
+main(int argc, const char *const *argv)
+{
+	struct perf_slot ps;
+
+	push_error_context();
+	setvbuf(stdout, NULL, _IONBF, 0);
+
+	admindir = dpkg_db_set_dir(admindir);
+
+	perf_ts_mark_print("init");
+
+	perf_ts_slot_start(&ps);
+	fsys_hash_init();
+	perf_ts_slot_stop(&ps);
+
+	perf_ts_slot_print(&ps, "fsys_hash_init");
+
+	perf_ts_slot_start(&ps);
+	modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
+	perf_ts_slot_stop(&ps);
+
+	perf_ts_slot_print(&ps, "modstatdb_init");
+
+	perf_ts_slot_start(&ps);
+	ensure_allinstfiles_available_quiet();
+	perf_ts_slot_stop(&ps);
+
+	perf_ts_slot_print(&ps, "load .list");
+
+	pkg_hash_report(stdout);
+	fsys_hash_report(stdout);
+
+	modstatdb_shutdown();
+	pop_error_context(ehflag_normaltidy);
+
+	perf_ts_mark_print("shutdown");
+
+	return 0;
+}
diff --git a/lib/dpkg/t/b-pkg-hash.c b/lib/dpkg/t/b-pkg-hash.c
new file mode 100644
index 000000000..74e26af7b
--- /dev/null
+++ b/lib/dpkg/t/b-pkg-hash.c
@@ -0,0 +1,65 @@
+/*
+ * dpkg - main program for package management
+ * b-pkg-hash.c - test pkg database load and hash performance
+ *
+ * Copyright © 2009-2019 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2,
+ * or (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with dpkg; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <time.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <dpkg/i18n.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+
+#include <dpkg/perf.h>
+
+static const char *admindir;
+
+int
+main(int argc, const char *const *argv)
+{
+	struct perf_slot ps;
+
+	push_error_context();
+	setvbuf(stdout, NULL, _IONBF, 0);
+
+	admindir = dpkg_db_set_dir(admindir);
+
+	perf_ts_mark_print("init");
+
+	perf_ts_slot_start(&ps);
+	modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
+	perf_ts_slot_stop(&ps);
+
+	perf_ts_slot_print(&ps, "modstatdb_init");
+
+	pkg_hash_report(stdout);
+
+	modstatdb_shutdown();
+	pop_error_context(ehflag_normaltidy);
+
+	perf_ts_mark_print("shutdown");
+
+	return 0;
+}
diff --git a/lib/dpkg/t/c-tarextract.c b/lib/dpkg/t/c-tarextract.c
index 4781c0237..34f3d08fa 100644
--- a/lib/dpkg/t/c-tarextract.c
+++ b/lib/dpkg/t/c-tarextract.c
@@ -42,16 +42,17 @@ struct tar_context {
 };
 
 static int
-tar_read(void *ctx, char *buffer, int size)
+tar_read(struct tar_archive *tar, char *buffer, int size)
 {
-	struct tar_context *tc = ctx;
+	struct tar_context *tc = tar->ctx;
 
 	return fd_read(tc->tar_fd, buffer, size);
 }
 
 static int
-tar_object_skip(struct tar_context *tc, struct tar_entry *te)
+tar_object_skip(struct tar_archive *tar, struct tar_entry *te)
 {
+	struct tar_context *tc = tar->ctx;
 	off_t size;
 
 	size = (te->size + TARBLKSZ - 1) / TARBLKSZ * TARBLKSZ;
@@ -62,7 +63,7 @@ tar_object_skip(struct tar_context *tc, struct tar_entry *te)
 }
 
 static int
-tar_object(void *ctx, struct tar_entry *te)
+tar_object(struct tar_archive *tar, struct tar_entry *te)
 {
 	printf("%s mode=%o time=%ld.%.9d uid=%d gid=%d", te->name,
 	       te->stat.mode, te->mtime, 0, te->stat.uid, te->stat.gid);
@@ -74,7 +75,7 @@ tar_object(void *ctx, struct tar_entry *te)
 	switch (te->type) {
 	case TAR_FILETYPE_FILE0:
 	case TAR_FILETYPE_FILE:
-		tar_object_skip(ctx, te);
+		tar_object_skip(tar, te);
 		printf(" type=file size=%jd", (intmax_t)te->size);
 		break;
 	case TAR_FILETYPE_HARDLINK:
@@ -116,7 +117,8 @@ struct tar_operations tar_ops = {
 int
 main(int argc, char **argv)
 {
-	struct tar_context ctx;
+	struct tar_archive tar;
+	struct tar_context tar_ctx;
 	const char *tar_name = argv[1];
 
 	setvbuf(stdout, NULL, _IOLBF, 0);
@@ -124,18 +126,22 @@ main(int argc, char **argv)
 	push_error_context();
 
 	if (tar_name) {
-		ctx.tar_fd = open(tar_name, O_RDONLY);
-		if (ctx.tar_fd < 0)
+		tar_ctx.tar_fd = open(tar_name, O_RDONLY);
+		if (tar_ctx.tar_fd < 0)
 			ohshite("cannot open file '%s'", tar_name);
 	} else {
-		ctx.tar_fd = STDIN_FILENO;
+		tar_ctx.tar_fd = STDIN_FILENO;
 	}
 
-	if (tar_extractor(&ctx, &tar_ops))
+	tar.err = DPKG_ERROR_OBJECT;
+	tar.ctx = &tar_ctx;
+	tar.ops = &tar_ops;
+
+	if (tar_extractor(&tar))
 		ohshite("extracting tar");
 
 	if (tar_name)
-		close(ctx.tar_fd);
+		close(tar_ctx.tar_fd);
 
 	pop_error_context(ehflag_normaltidy);
 
diff --git a/lib/dpkg/t/t-ar.c b/lib/dpkg/t/t-ar.c
index 28b5e38f3..88e93872a 100644
--- a/lib/dpkg/t/t-ar.c
+++ b/lib/dpkg/t/t-ar.c
@@ -21,6 +21,8 @@
 #include <config.h>
 #include <compat.h>
 
+#include <string.h>
+
 #include <dpkg/test.h>
 #include <dpkg/ar.h>
 
@@ -29,11 +31,11 @@ test_ar_normalize_name(void)
 {
 	struct dpkg_ar_hdr arh;
 
-	strncpy(arh.ar_name, "member-name/    ", sizeof(arh.ar_name));
+	memccpy(arh.ar_name, "member-name/    ", '\0', sizeof(arh.ar_name));
 	dpkg_ar_normalize_name(&arh);
 	test_str(arh.ar_name, ==, "member-name");
 
-	strncpy(arh.ar_name, "member-name     ", sizeof(arh.ar_name));
+	memccpy(arh.ar_name, "member-name     ", '\0', sizeof(arh.ar_name));
 	dpkg_ar_normalize_name(&arh);
 	test_str(arh.ar_name, ==, "member-name");
 }
diff --git a/lib/dpkg/t/t-command.c b/lib/dpkg/t/t-command.c
index b59abd4e4..099884560 100644
--- a/lib/dpkg/t/t-command.c
+++ b/lib/dpkg/t/t-command.c
@@ -208,44 +208,9 @@ test_command_shell(void)
 	test_pass(ret == 0);
 }
 
-static void
-test_dup_file(int fd, const char *filename, int flags)
-{
-	int newfd;
-
-	newfd = open(filename, flags);
-	dup2(newfd, fd);
-	close(newfd);
-}
-
-static void
-test_command_pager(void)
-{
-	const char *pager, *default_pager;
-	int origfd = dup(STDOUT_FILENO);
-
-	/* Test stdout being a tty. */
-	test_todo_block("environment might not expose controlling terminal") {
-		test_dup_file(STDOUT_FILENO, "/dev/tty", O_WRONLY);
-		setenv("PAGER", "test-pager", 1);
-		pager = command_get_pager();
-		unsetenv("PAGER");
-		default_pager = command_get_pager();
-		dup2(origfd, STDOUT_FILENO);
-		test_str(pager, ==, "test-pager");
-		test_str(default_pager, ==, DEFAULTPAGER);
-	}
-
-	/* Test stdout not being a tty. */
-	test_dup_file(STDOUT_FILENO, "/dev/null", O_WRONLY);
-	pager = command_get_pager();
-	dup2(origfd, STDOUT_FILENO);
-	test_str(pager, ==, CAT);
-}
-
 TEST_ENTRY(test)
 {
-	test_plan(52);
+	test_plan(49);
 
 	test_command_init();
 	test_command_grow_argv();
@@ -254,5 +219,4 @@ TEST_ENTRY(test)
 	test_command_add_args();
 	test_command_exec();
 	test_command_shell();
-	test_command_pager();
 }
diff --git a/lib/dpkg/t/t-ehandle.c b/lib/dpkg/t/t-ehandle.c
index 5904bfae1..7a20887af 100644
--- a/lib/dpkg/t/t-ehandle.c
+++ b/lib/dpkg/t/t-ehandle.c
@@ -100,7 +100,7 @@ test_cleanup_error(void)
 		pass = false;
 
 		push_error_context_jump(&handler_jump, printer_empty, "test cleanup");
-		push_cleanup(cleanup_error, ~ehflag_normaltidy, NULL, 0, 0);
+		push_cleanup(cleanup_error, ~ehflag_normaltidy, 0);
 		pop_error_context(ehflag_bombout);
 
 		/* We should have recovered from the cleanup handler failing,
diff --git a/lib/dpkg/t/t-error.c b/lib/dpkg/t/t-error.c
index 5e2f55fcd..e93459e7e 100644
--- a/lib/dpkg/t/t-error.c
+++ b/lib/dpkg/t/t-error.c
@@ -42,10 +42,12 @@ test_dpkg_error_put(void)
 	test_pass(dpkg_put_errno(NULL, "void error") < 0);
 
 	test_pass(dpkg_put_warn(&err, "test warning %d", 10) < 0);
+	test_pass(err.syserrno == 0);
 	test_str(err.str, ==, "test warning 10");
 	test_warn(err);
 
 	test_pass(dpkg_put_error(&err, "test error %d", 20) < 0);
+	test_pass(err.syserrno == 0);
 	test_str(err.str, ==, "test error 20");
 	test_error(err);
 
@@ -54,6 +56,7 @@ test_dpkg_error_put(void)
 		test_bail("cannot allocate string");
 	test_pass(dpkg_put_errno(&err, "test errno %d", 30) < 0);
 	test_str(err.str, ==, errstr_ref);
+	test_pass(err.syserrno == ENOENT);
 	test_error(err);
 	free(errstr_ref);
 	errno = 0;
@@ -64,17 +67,20 @@ test_dpkg_error_destroy(void)
 {
 	struct dpkg_error err = DPKG_ERROR_INIT;
 
-	test_pass(dpkg_put_error(&err, "test destroy") < 0);
+	errno = ENOENT;
+	test_pass(dpkg_put_errno(&err, "test destroy") < 0);
+	test_pass(err.syserrno == ENOENT);
 	test_pass(err.type == DPKG_MSG_ERROR);
 	test_pass(err.str != NULL);
 	dpkg_error_destroy(&err);
 	test_pass(err.type == DPKG_MSG_NONE);
+	test_pass(err.syserrno == 0);
 	test_pass(err.str == NULL);
 }
 
 TEST_ENTRY(test)
 {
-	test_plan(19);
+	test_plan(24);
 
 	test_dpkg_error_put();
 	test_dpkg_error_destroy();
diff --git a/lib/dpkg/t/t-file.c b/lib/dpkg/t/t-file.c
new file mode 100644
index 000000000..ca68eaefe
--- /dev/null
+++ b/lib/dpkg/t/t-file.c
@@ -0,0 +1,96 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-file.c - test file functions
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/test.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/file.h>
+
+#include <sys/types.h>
+
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+static const char ref_data[] =
+	"this is a test string\n"
+	"within a test file\n"
+	"containing multiple lines\n"
+;
+
+static void
+test_file_slurp(void)
+{
+	struct varbuf vb = VARBUF_INIT;
+	struct dpkg_error err = DPKG_ERROR_INIT;
+	char *test_file;
+	char *test_dir;
+	int fd;
+
+	test_pass(file_slurp("/nonexistent", &vb, &err) < 0);
+	test_pass(vb.used == 0);
+	test_pass(vb.buf == NULL);
+	test_pass(err.syserrno == ENOENT);
+	test_error(err);
+	varbuf_destroy(&vb);
+
+	test_dir = test_alloc(strdup("test.XXXXXX"));
+	test_pass(mkdtemp(test_dir) != NULL);
+	test_pass(file_slurp(test_dir, &vb, &err) < 0);
+	test_pass(vb.used == 0);
+	test_pass(vb.buf == NULL);
+	test_pass(err.syserrno == 0);
+	test_error(err);
+	varbuf_destroy(&vb);
+	test_pass(rmdir(test_dir) == 0);
+
+	test_file = test_alloc(strdup("test.XXXXXX"));
+	fd = mkstemp(test_file);
+	test_pass(fd >= 0);
+
+	test_pass(file_slurp(test_file, &vb, &err) == 0);
+	test_pass(vb.used == 0);
+	test_pass(vb.buf == NULL);
+	test_pass(err.syserrno == 0);
+	test_pass(err.type == DPKG_MSG_NONE);
+	varbuf_destroy(&vb);
+
+	test_pass(write(fd, ref_data, strlen(ref_data)) == (ssize_t)strlen(ref_data));
+	test_pass(lseek(fd, 0, SEEK_SET) == 0);
+
+	test_pass(file_slurp(test_file, &vb, &err) == 0);
+	test_pass(vb.used == strlen(ref_data));
+	test_mem(vb.buf, ==, ref_data, min(vb.used, strlen(ref_data)));
+	test_pass(err.syserrno == 0);
+	test_pass(err.type == DPKG_MSG_NONE);
+	varbuf_destroy(&vb);
+
+	test_pass(unlink(test_file) == 0);
+}
+
+TEST_ENTRY(test)
+{
+	test_plan(26);
+
+	test_file_slurp();
+}
diff --git a/lib/dpkg/t/t-fsys-dir.c b/lib/dpkg/t/t-fsys-dir.c
new file mode 100644
index 000000000..7dbe753d1
--- /dev/null
+++ b/lib/dpkg/t/t-fsys-dir.c
@@ -0,0 +1,65 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-fsys.c - test filesystem handling
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <stdlib.h>
+
+#include <dpkg/test.h>
+#include <dpkg/fsys.h>
+
+static void
+test_fsys_dir(void)
+{
+	char *dir;
+
+	test_str(dpkg_fsys_get_dir(), ==, "");
+
+	dpkg_fsys_set_dir("/testdir");
+	test_str(dpkg_fsys_get_dir(), ==, "/testdir");
+
+	dir = dpkg_fsys_get_path("testfile");
+	test_str(dir, ==, "/testdir/testfile");
+	free(dir);
+
+	setenv("DPKG_ROOT", "/testenvdir", 1);
+	dpkg_fsys_set_dir(NULL);
+	test_str(dpkg_fsys_get_dir(), ==, "/testenvdir");
+
+	dir = dpkg_fsys_get_path("testfile");
+	test_str(dir, ==, "/testenvdir/testfile");
+	free(dir);
+
+	unsetenv("DPKG_ROOT");
+	dpkg_fsys_set_dir(NULL);
+	test_str(dpkg_fsys_get_dir(), ==, "");
+
+	dir = dpkg_fsys_get_path("testfile");
+	test_str(dir, ==, "/testfile");
+	free(dir);
+}
+
+TEST_ENTRY(test)
+{
+	test_plan(7);
+
+	test_fsys_dir();
+}
diff --git a/lib/dpkg/t/t-fsys-hash.c b/lib/dpkg/t/t-fsys-hash.c
new file mode 100644
index 000000000..d80dbe899
--- /dev/null
+++ b/lib/dpkg/t/t-fsys-hash.c
@@ -0,0 +1,108 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-fsys-hash.c - test fsys-hash implementation
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/test.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/fsys.h>
+
+static void
+test_fsys_nodes(void)
+{
+	struct fsys_namenode *fnn;
+	struct fsys_hash_iter *iter;
+	const char *name;
+
+	test_pass(fsys_hash_entries() == 0);
+
+	fsys_hash_init();
+
+	fnn = fsys_hash_find_node("/nonexistent", FHFF_NONE);
+	test_pass(fnn == NULL);
+	test_pass(fsys_hash_entries() == 0);
+
+	name = "/test/path/aa";
+	fnn = fsys_hash_find_node(name, FHFF_NOCOPY);
+	test_pass(fnn != NULL);
+	test_pass(fsys_hash_entries() == 1);
+	test_pass(fnn->name == name);
+	test_str(fnn->name, ==, "/test/path/aa");
+	test_pass(fnn->flags == 0);
+	test_pass(fnn->oldhash == NULL);
+	test_str(fnn->newhash, ==, EMPTYHASHFLAG);
+
+	fnn = fsys_hash_find_node("//./test/path/bb", 0);
+	test_pass(fnn != NULL);
+	test_pass(fsys_hash_entries() == 2);
+	test_str(fnn->name, ==, "/test/path/bb");
+	test_pass(fnn->flags == 0);
+	test_pass(fnn->oldhash == NULL);
+	test_str(fnn->newhash, ==, EMPTYHASHFLAG);
+
+	fnn = fsys_hash_find_node("/test/path/cc", 0);
+	test_pass(fnn != NULL);
+	test_pass(fsys_hash_entries() == 3);
+	test_str(fnn->name, ==, "/test/path/cc");
+	test_pass(fnn->flags == 0);
+	test_pass(fnn->oldhash == NULL);
+	test_str(fnn->newhash, ==, EMPTYHASHFLAG);
+
+	iter = fsys_hash_iter_new();
+	while ((fnn = fsys_hash_iter_next(iter))) {
+		if (strcmp(fnn->name, "/test/path/aa") == 0)
+			test_str(fnn->name, ==, "/test/path/aa");
+		else if (strcmp(fnn->name, "/test/path/bb") == 0)
+			test_str(fnn->name, ==, "/test/path/bb");
+		else if (strcmp(fnn->name, "/test/path/cc") == 0)
+			test_str(fnn->name, ==, "/test/path/cc");
+		else
+			test_fail("unknown fsys_namenode");
+	}
+	fsys_hash_iter_free(iter);
+
+	fsys_hash_init();
+	test_pass(fsys_hash_entries() == 3);
+	fnn = fsys_hash_find_node("/test/path/aa", FHFF_NONE);
+	test_pass(fnn != NULL);
+	fnn = fsys_hash_find_node("/test/path/bb", FHFF_NONE);
+	test_pass(fnn != NULL);
+	fnn = fsys_hash_find_node("/test/path/cc", FHFF_NONE);
+	test_pass(fnn != NULL);
+	test_pass(fsys_hash_entries() == 3);
+
+	fsys_hash_reset();
+	test_pass(fsys_hash_entries() == 0);
+	fnn = fsys_hash_find_node("/test/path/aa", FHFF_NONE);
+	test_pass(fnn == NULL);
+	fnn = fsys_hash_find_node("/test/path/bb", FHFF_NONE);
+	test_pass(fnn == NULL);
+	fnn = fsys_hash_find_node("/test/path/cc", FHFF_NONE);
+	test_pass(fnn == NULL);
+	test_pass(fsys_hash_entries() == 0);
+}
+
+TEST_ENTRY(test)
+{
+	test_plan(35);
+
+	test_fsys_nodes();
+}
diff --git a/lib/dpkg/t/t-headers-cpp.cc b/lib/dpkg/t/t-headers-cpp.cc
new file mode 100644
index 000000000..b5becf9ae
--- /dev/null
+++ b/lib/dpkg/t/t-headers-cpp.cc
@@ -0,0 +1,82 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-headers-cpp.cc - test C++ inclusion of headers
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <cstdbool>
+
+#include <dpkg/ar.h>
+#include <dpkg/arch.h>
+#include <dpkg/atomic-file.h>
+#include <dpkg/buffer.h>
+#include <dpkg/c-ctype.h>
+#include <dpkg/color.h>
+#include <dpkg/command.h>
+#include <dpkg/compress.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
+#include <dpkg/deb-version.h>
+#include <dpkg/debug.h>
+#include <dpkg/dir.h>
+#include <dpkg/dlist.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/ehandle.h>
+#include <dpkg/error.h>
+#include <dpkg/fdio.h>
+#include <dpkg/file.h>
+#include <dpkg/fsys.h>
+#include <dpkg/glob.h>
+#include <dpkg/i18n.h>
+#include <dpkg/macros.h>
+#include <dpkg/namevalue.h>
+#include <dpkg/options.h>
+#include <dpkg/pager.h>
+#include <dpkg/parsedump.h>
+#include <dpkg/path.h>
+#include <dpkg/pkg-array.h>
+#include <dpkg/pkg-files.h>
+#include <dpkg/pkg-format.h>
+#include <dpkg/pkg-list.h>
+#include <dpkg/pkg-queue.h>
+#include <dpkg/pkg-show.h>
+#include <dpkg/pkg-spec.h>
+#include <dpkg/pkg.h>
+#include <dpkg/progname.h>
+#include <dpkg/program.h>
+#include <dpkg/progress.h>
+#include <dpkg/report.h>
+#include <dpkg/string.h>
+#include <dpkg/subproc.h>
+#include <dpkg/tarfn.h>
+#include <dpkg/test.h>
+#include <dpkg/treewalk.h>
+#include <dpkg/trigdeferred.h>
+#include <dpkg/triglib.h>
+#include <dpkg/varbuf.h>
+#include <dpkg/version.h>
+
+TEST_ENTRY(test)
+{
+	test_plan(1);
+
+	test_pass(true);
+}
diff --git a/lib/dpkg/t/t-mod-db.c b/lib/dpkg/t/t-mod-db.c
index 680dab5e5..c40d8e8ae 100644
--- a/lib/dpkg/t/t-mod-db.c
+++ b/lib/dpkg/t/t-mod-db.c
@@ -1,6 +1,6 @@
 /*
  * libdpkg - Debian packaging suite library routines
- * t-db.c - test database implementation
+ * t-mod-db.c - test database implementation
  *
  * Copyright © 2011 Guillem Jover <guillem@debian.org>
  *
diff --git a/lib/dpkg/t/t-namevalue.c b/lib/dpkg/t/t-namevalue.c
new file mode 100644
index 000000000..c8647662e
--- /dev/null
+++ b/lib/dpkg/t/t-namevalue.c
@@ -0,0 +1,48 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-namevalue.c - test name/value implementation
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/test.h>
+#include <dpkg/namevalue.h>
+#include <dpkg/dpkg-db.h>
+
+static void
+test_namevalue(void)
+{
+	const struct namevalue *nv;
+
+	nv = namevalue_find_by_name(booleaninfos, "");
+	test_pass(nv == NULL);
+
+	nv = namevalue_find_by_name(booleaninfos, "no");
+	test_pass(nv != NULL);
+	test_pass(nv->value == false);
+	test_pass(nv->length == strlen("no"));
+	test_str(nv->name, ==, "no");
+}
+
+TEST_ENTRY(test)
+{
+	test_plan(5);
+
+	test_namevalue();
+}
diff --git a/lib/dpkg/t/t-pager.c b/lib/dpkg/t/t-pager.c
new file mode 100644
index 000000000..2481e8065
--- /dev/null
+++ b/lib/dpkg/t/t-pager.c
@@ -0,0 +1,75 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-pager.c - test pager implementation
+ *
+ * Copyright © 2010-2012 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include <dpkg/test.h>
+#include <dpkg/pager.h>
+#include <dpkg/dpkg.h>
+
+static void
+test_dup_file(int fd, const char *filename, int flags)
+{
+	int newfd;
+
+	newfd = open(filename, flags);
+	dup2(newfd, fd);
+	close(newfd);
+}
+
+static void
+test_pager_get_exec(void)
+{
+	const char *pager, *default_pager;
+	int origfd = dup(STDOUT_FILENO);
+
+	/* Test stdout being a tty. */
+	test_todo_block("environment might not expose controlling terminal") {
+		test_dup_file(STDOUT_FILENO, "/dev/tty", O_WRONLY);
+		setenv("PAGER", "test-pager", 1);
+		pager = pager_get_exec();
+		unsetenv("PAGER");
+		default_pager = pager_get_exec();
+		dup2(origfd, STDOUT_FILENO);
+		test_str(pager, ==, "test-pager");
+		test_str(default_pager, ==, DEFAULTPAGER);
+	}
+
+	/* Test stdout not being a tty. */
+	test_dup_file(STDOUT_FILENO, "/dev/null", O_WRONLY);
+	pager = pager_get_exec();
+	dup2(origfd, STDOUT_FILENO);
+	test_str(pager, ==, CAT);
+}
+
+TEST_ENTRY(test)
+{
+	test_plan(3);
+
+	test_pager_get_exec();
+}
diff --git a/lib/dpkg/t/t-pkg-hash.c b/lib/dpkg/t/t-pkg-hash.c
new file mode 100644
index 000000000..72185a2f1
--- /dev/null
+++ b/lib/dpkg/t/t-pkg-hash.c
@@ -0,0 +1,178 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-pkg-hash.c - test pkg-hash implementation
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/test.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/pkg.h>
+
+static void
+test_pkg_hash(void)
+{
+	struct dpkg_arch *arch;
+	struct pkgset *set;
+	struct pkginfo *pkg;
+	struct pkg_hash_iter *iter;
+	int pkginstance;
+
+	test_pass(pkg_hash_count_set() == 0);
+	test_pass(pkg_hash_count_pkg() == 0);
+
+	set = pkg_hash_find_set("pkg-aa");
+	test_pass(set != NULL);
+	test_str(set->name, ==, "pkg-aa");
+	test_pass(pkg_hash_count_set() == 1);
+	test_pass(pkg_hash_count_pkg() == 1);
+
+	set = pkg_hash_find_set("pkg-aa");
+	test_pass(set != NULL);
+	test_str(set->name, ==, "pkg-aa");
+	test_pass(pkg_hash_count_set() == 1);
+	test_pass(pkg_hash_count_pkg() == 1);
+
+	set = pkg_hash_find_set("Pkg-AA");
+	test_pass(set != NULL);
+	test_str(set->name, ==, "pkg-aa");
+	test_pass(pkg_hash_count_set() == 1);
+	test_pass(pkg_hash_count_pkg() == 1);
+
+	set = pkg_hash_find_set("pkg-bb");
+	pkg_set_status(&set->pkg, PKG_STAT_INSTALLED);
+	test_pass(set != NULL);
+	test_str(set->name, ==, "pkg-bb");
+	test_pass(pkg_hash_count_set() == 2);
+	test_pass(pkg_hash_count_pkg() == 2);
+
+	set = pkg_hash_find_set("pkg-cc");
+	test_pass(set != NULL);
+	test_str(set->name, ==, "pkg-cc");
+	test_pass(pkg_hash_count_set() == 3);
+	test_pass(pkg_hash_count_pkg() == 3);
+
+	arch = dpkg_arch_find("arch-xx");
+	pkg = pkg_hash_find_pkg("pkg-aa", arch);
+	pkg_set_status(pkg, PKG_STAT_INSTALLED);
+	test_pass(pkg != NULL);
+	test_str(pkg->set->name, ==, "pkg-aa");
+	test_str(pkg->installed.arch->name, ==, "arch-xx");
+	test_str(pkg->available.arch->name, ==, "arch-xx");
+	test_pass(pkg_hash_count_set() == 3);
+	test_pass(pkg_hash_count_pkg() == 3);
+
+	arch = dpkg_arch_find("arch-yy");
+	pkg = pkg_hash_find_pkg("pkg-aa", arch);
+	test_pass(pkg != NULL);
+	test_str(pkg->set->name, ==, "pkg-aa");
+	test_str(pkg->installed.arch->name, ==, "arch-yy");
+	test_str(pkg->available.arch->name, ==, "arch-yy");
+	test_pass(pkg_hash_count_set() == 3);
+	test_pass(pkg_hash_count_pkg() == 4);
+
+	arch = dpkg_arch_find("arch-zz");
+	pkg = pkg_hash_find_pkg("pkg-aa", arch);
+	pkg_set_status(pkg, PKG_STAT_UNPACKED);
+	test_pass(pkg != NULL);
+	test_str(pkg->set->name, ==, "pkg-aa");
+	test_str(pkg->installed.arch->name, ==, "arch-zz");
+	test_str(pkg->available.arch->name, ==, "arch-zz");
+	test_pass(pkg_hash_count_set() == 3);
+	test_pass(pkg_hash_count_pkg() == 5);
+
+	arch = dpkg_arch_find("arch-xx");
+	pkg = pkg_hash_find_pkg("pkg-aa", arch);
+	test_pass(pkg != NULL);
+	test_str(pkg->set->name, ==, "pkg-aa");
+	test_str(pkg->installed.arch->name, ==, "arch-xx");
+	test_str(pkg->available.arch->name, ==, "arch-xx");
+	test_pass(pkg_hash_count_set() == 3);
+	test_pass(pkg_hash_count_pkg() == 5);
+
+	set = pkg_hash_find_set("pkg-aa");
+	test_str(set->name, ==, "pkg-aa");
+	pkg = pkg_hash_get_singleton(set);
+	test_pass(pkg == NULL);
+	test_pass(pkg_hash_count_set() == 3);
+	test_pass(pkg_hash_count_pkg() == 5);
+
+	pkg = pkg_hash_find_singleton("pkg-bb");
+	test_pass(pkg != NULL);
+	test_str(pkg->set->name, ==, "pkg-bb");
+	test_pass(pkg_hash_count_set() == 3);
+	test_pass(pkg_hash_count_pkg() == 5);
+
+	pkg = pkg_hash_find_singleton("pkg-cc");
+	test_pass(pkg != NULL);
+	test_str(pkg->set->name, ==, "pkg-cc");
+	test_pass(pkg_hash_count_set() == 3);
+	test_pass(pkg_hash_count_pkg() == 5);
+
+	iter = pkg_hash_iter_new();
+	while ((set = pkg_hash_iter_next_set(iter))) {
+		if (strcmp(set->name, "pkg-aa") == 0)
+			test_str(set->name, ==, "pkg-aa");
+		else if (strcmp(set->name, "pkg-bb") == 0)
+			test_str(set->name, ==, "pkg-bb");
+		else if (strcmp(set->name, "pkg-cc") == 0)
+			test_str(set->name, ==, "pkg-cc");
+		else
+			test_fail("unknown fsys_namenode");
+	}
+	pkg_hash_iter_free(iter);
+
+	pkginstance = 0;
+	iter = pkg_hash_iter_new();
+	while ((pkg = pkg_hash_iter_next_pkg(iter))) {
+		pkginstance++;
+		if (strcmp(pkg->set->name, "pkg-aa") == 0) {
+			struct pkgbin *pkgbin = &pkg->installed;
+
+			test_str(pkg->set->name, ==, "pkg-aa");
+			if (strcmp(pkgbin->arch->name, "arch-xx") == 0)
+				test_str(pkgbin->arch->name, ==, "arch-xx");
+			else if (strcmp(pkgbin->arch->name, "arch-yy") == 0)
+				test_str(pkgbin->arch->name, ==, "arch-yy");
+			else if (strcmp(pkgbin->arch->name, "arch-zz") == 0)
+				test_str(pkgbin->arch->name, ==, "arch-zz");
+			else
+				test_fail("unknown pkginfo instance");
+		} else if (strcmp(pkg->set->name, "pkg-bb") == 0) {
+			test_str(pkg->set->name, ==, "pkg-bb");
+		} else if (strcmp(pkg->set->name, "pkg-cc") == 0) {
+			test_str(pkg->set->name, ==, "pkg-cc");
+		} else {
+			test_fail("unknown fsys_namenode");
+		}
+	}
+	pkg_hash_iter_free(iter);
+
+	pkg_hash_reset();
+	test_pass(pkg_hash_count_set() == 0);
+	test_pass(pkg_hash_count_pkg() == 0);
+}
+
+TEST_ENTRY(test)
+{
+	test_plan(71);
+
+	test_pkg_hash();
+}
diff --git a/lib/dpkg/t/t-pkg-show.c b/lib/dpkg/t/t-pkg-show.c
new file mode 100644
index 000000000..0f6ece061
--- /dev/null
+++ b/lib/dpkg/t/t-pkg-show.c
@@ -0,0 +1,61 @@
+/*
+ * libdpkg - Debian packaging suite library routines
+ * t-pkg-show.c - test pkg-show implementation
+ *
+ * Copyright © 2018 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/test.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/arch.h>
+
+static void
+test_pkg_show_name(void)
+{
+	struct dpkg_arch *arch;
+	struct pkginfo *pkg;
+	const char *pkgname;
+
+	arch = dpkg_arch_find("arch");
+	test_pass(arch);
+
+	pkg = pkg_hash_find_pkg("test", arch);
+	test_pass(pkg);
+	test_str(pkg->set->name, ==, "test");
+	test_pass(pkg->installed.arch->type == DPKG_ARCH_UNKNOWN);
+
+	pkgname = pkg_name(pkg, pnaw_never);
+	test_pass(pkgname);
+	test_str(pkgname, ==, "test");
+
+	pkgname = pkg_name(pkg, pnaw_nonambig);
+	test_pass(pkgname);
+	test_str(pkgname, ==, "test:arch");
+
+	pkgname = pkg_name(pkg, pnaw_always);
+	test_pass(pkgname);
+	test_str(pkgname, ==, "test:arch");
+}
+
+TEST_ENTRY(test)
+{
+	test_plan(10);
+
+	test_pkg_show_name();
+}
diff --git a/lib/dpkg/t/t-string.c b/lib/dpkg/t/t-string.c
index 038de84b0..fc2819b55 100644
--- a/lib/dpkg/t/t-string.c
+++ b/lib/dpkg/t/t-string.c
@@ -77,6 +77,37 @@ test_str_fnv_hash(void)
 }
 
 static void
+test_str_concat(void)
+{
+	char buf[1024], *str;
+
+	memset(buf, 0, sizeof(buf));
+	str = str_concat(buf, NULL);
+	test_pass(str == buf);
+	test_str(buf, ==, "");
+
+	memset(buf, 0, sizeof(buf));
+	str = str_concat(buf, "aaa", NULL);
+	test_str(buf, ==, "aaa");
+	test_pass(str == buf + 3);
+
+	memset(buf, 0, sizeof(buf));
+	str = str_concat(buf, "zzzz", "yy", "xxxx", NULL);
+	test_str(buf, ==, "zzzzyyxxxx");
+	test_pass(str == buf + 10);
+
+	memset(buf, 0, sizeof(buf));
+	str = str_concat(buf, "1234", "", "5678", NULL);
+	test_str(buf, ==, "12345678");
+	test_pass(str == buf + 8);
+
+	memset(buf, ' ', sizeof(buf));
+	str = str_concat(buf, "eol", NULL, "bom", NULL);
+	test_str(buf, ==, "eol");
+	test_pass(str == buf + 3);
+}
+
+static void
 test_str_fmt(void)
 {
 	char *str;
@@ -119,6 +150,8 @@ test_str_escape_fmt(void)
 	memset(buf, 'a', sizeof(buf));
 	q = str_escape_fmt(buf, NULL, 0);
 	test_mem(buf, ==, "aaaa", 4);
+	test_pass(buf == q);
+	test_pass(strnlen(buf, sizeof(buf)) == sizeof(buf));
 
 	memset(buf, 'a', sizeof(buf));
 	q = str_escape_fmt(buf, "b", 1);
@@ -197,11 +230,12 @@ test_str_strip_quotes(void)
 
 TEST_ENTRY(test)
 {
-	test_plan(50);
+	test_plan(62);
 
 	test_str_is_set();
 	test_str_match_end();
 	test_str_fnv_hash();
+	test_str_concat();
 	test_str_fmt();
 	test_str_escape_fmt();
 	test_str_quote_meta();
diff --git a/lib/dpkg/t/t-tar.c b/lib/dpkg/t/t-tar.c
index 8417ed306..6fa217de5 100644
--- a/lib/dpkg/t/t-tar.c
+++ b/lib/dpkg/t/t-tar.c
@@ -72,22 +72,22 @@ test_tar_atol8(void)
 	errno = 0;
 	u = tar_atoul("   11111aaa ", 12, UINTMAX_MAX);
 	test_pass(u == 0);
-	test_pass(errno == EINVAL);
+	test_pass(errno == ERANGE);
 
 	errno = 0;
 	u = tar_atoul("          8 ", 12, UINTMAX_MAX);
 	test_pass(u == 0);
-	test_pass(errno == EINVAL);
+	test_pass(errno == ERANGE);
 
 	errno = 0;
 	u = tar_atoul("         18 ", 12, UINTMAX_MAX);
 	test_pass(u == 0);
-	test_pass(errno == EINVAL);
+	test_pass(errno == ERANGE);
 
 	errno = 0;
 	u = tar_atoul("    aa      ", 12, UINTMAX_MAX);
 	test_pass(u == 0);
-	test_pass(errno == EINVAL);
+	test_pass(errno == ERANGE);
 }
 
 static void
diff --git a/lib/dpkg/t/t-tarextract.t b/lib/dpkg/t/t-tarextract.t
index 25916bb8d..5fb9afa09 100755
--- a/lib/dpkg/t/t-tarextract.t
+++ b/lib/dpkg/t/t-tarextract.t
@@ -119,7 +119,7 @@ TAR
 
     make_path($tmpdir);
 
-    my $cwd = cwd();
+    my $cwd = getcwd();
 
     # Check generated tarballs.
     foreach my $type (qw(v7 ustar oldgnu gnu)) {
diff --git a/lib/dpkg/t/t-test.c b/lib/dpkg/t/t-test.c
index 62b35ce2f..48ce8726b 100644
--- a/lib/dpkg/t/t-test.c
+++ b/lib/dpkg/t/t-test.c
@@ -25,7 +25,7 @@
 
 TEST_ENTRY(test)
 {
-	test_plan(20);
+	test_plan(22);
 
 	test_pass(1);
 	test_fail(0);
@@ -58,4 +58,9 @@ TEST_ENTRY(test)
 	test_mem("abcd", ==, "abcd", 5);
 	test_mem("ababcd", ==, "ababff", 4);
 	test_mem("ababcd", !=, "ababff", 6);
+
+	setenv("srcdir", "aaa", 1);
+	setenv("builddir", "bbb", 1);
+	test_str(test_get_srcdir(), ==, "aaa");
+	test_str(test_get_builddir(), ==, "bbb");
 }
diff --git a/lib/dpkg/t/t-treewalk.t b/lib/dpkg/t/t-treewalk.t
index dcde7901e..6f379c81b 100755
--- a/lib/dpkg/t/t-treewalk.t
+++ b/lib/dpkg/t/t-treewalk.t
@@ -45,7 +45,7 @@ sub make_file {
 # Populate the tree hierarchy.
 sub make_tree {
     my ($dirtree) = @_;
-    my $cwd = cwd();
+    my $cwd = getcwd();
 
     make_path($dirtree);
     chdir $dirtree;
diff --git a/lib/dpkg/t/t-varbuf.c b/lib/dpkg/t/t-varbuf.c
index 3fb4444b2..8df733b9b 100644
--- a/lib/dpkg/t/t-varbuf.c
+++ b/lib/dpkg/t/t-varbuf.c
@@ -1,6 +1,6 @@
 /*
  * libdpkg - Debian packaging suite library routines
- * t-verbuf.c - test varbuf implementation
+ * t-varbuf.c - test varbuf implementation
  *
  * Copyright © 2009-2011, 2013-2015 Guillem Jover <guillem@debian.org>
  *
@@ -60,6 +60,26 @@ test_varbuf_prealloc(void)
 }
 
 static void
+test_varbuf_new(void)
+{
+	struct varbuf *vb;
+
+	vb = varbuf_new(0);
+	test_pass(vb != NULL);
+	test_pass(vb->used == 0);
+	test_pass(vb->size == 0);
+	test_pass(vb->buf == NULL);
+	varbuf_free(vb);
+
+	vb = varbuf_new(10);
+	test_pass(vb != NULL);
+	test_pass(vb->used == 0);
+	test_pass(vb->size >= 10);
+	test_pass(vb->buf != NULL);
+	varbuf_free(vb);
+}
+
+static void
 test_varbuf_grow(void)
 {
 	struct varbuf vb;
@@ -350,10 +370,11 @@ test_varbuf_detach(void)
 
 TEST_ENTRY(test)
 {
-	test_plan(120);
+	test_plan(128);
 
 	test_varbuf_init();
 	test_varbuf_prealloc();
+	test_varbuf_new();
 	test_varbuf_grow();
 	test_varbuf_trunc();
 	test_varbuf_add_buf();
diff --git a/lib/dpkg/tarfn.c b/lib/dpkg/tarfn.c
index 27952f926..a0821f217 100644
--- a/lib/dpkg/tarfn.c
+++ b/lib/dpkg/tarfn.c
@@ -22,6 +22,9 @@
 #include <config.h>
 #include <compat.h>
 
+#if HAVE_SYS_SYSMACROS_H
+#include <sys/sysmacros.h>
+#endif
 #include <sys/stat.h>
 
 #include <errno.h>
@@ -35,6 +38,8 @@
 
 #include <dpkg/macros.h>
 #include <dpkg/dpkg.h>
+#include <dpkg/i18n.h>
+#include <dpkg/error.h>
 #include <dpkg/tarfn.h>
 
 #define TAR_MAGIC_USTAR "ustar\0" "00"
@@ -105,7 +110,7 @@ tar_atol8(const char *s, size_t size)
 		if (*s == '\0' || *s == ' ')
 			break;
 		if (*s < '0' || *s > '7')
-			return tar_ret_errno(EINVAL, 0);
+			return tar_ret_errno(ERANGE, 0);
 		n = (n * 010) + (*s++ - '0');
 	}
 
@@ -118,7 +123,7 @@ tar_atol8(const char *s, size_t size)
 	if (s < end)
 		return tar_ret_errno(EINVAL, 0);
 
-	return n;
+	return tar_ret_errno(0, n);
 }
 
 /**
@@ -154,12 +159,12 @@ tar_atol256(const char *s, size_t size, intmax_t min, uintmax_t max)
 
 	for (;;) {
 		n = (n << 8) | c;
-		if (--size <= 0)
+		if (--size == 0)
 			break;
 		c = *s++;
 	}
 
-	return n;
+	return tar_ret_errno(0, n);
 }
 
 static uintmax_t
@@ -269,7 +274,7 @@ tar_header_checksum(struct tar_header *h)
 }
 
 static int
-tar_header_decode(struct tar_header *h, struct tar_entry *d)
+tar_header_decode(struct tar_header *h, struct tar_entry *d, struct dpkg_error *err)
 {
 	long checksum;
 
@@ -296,7 +301,11 @@ tar_header_decode(struct tar_header *h, struct tar_entry *d)
 	/* Even though off_t is signed, we use an unsigned parser here because
 	 * negative offsets are not allowed. */
 	d->size = TAR_ATOUL(h->size, off_t);
+	if (errno)
+		return dpkg_put_errno(err, _("invalid tar header size field"));
 	d->mtime = TAR_ATOSL(h->mtime, time_t);
+	if (errno)
+		return dpkg_put_errno(err, _("invalid tar header mtime field"));
 
 	if (d->type == TAR_FILETYPE_CHARDEV || d->type == TAR_FILETYPE_BLOCKDEV)
 		d->dev = makedev(TAR_ATOUL(h->devmajor, dev_t),
@@ -309,19 +318,25 @@ tar_header_decode(struct tar_header *h, struct tar_entry *d)
 	else
 		d->stat.uname = NULL;
 	d->stat.uid = TAR_ATOUL(h->uid, uid_t);
+	if (errno)
+		return dpkg_put_errno(err, _("invalid tar header uid field"));
 
 	if (*h->group)
 		d->stat.gname = m_strndup(h->group, sizeof(h->group));
 	else
 		d->stat.gname = NULL;
 	d->stat.gid = TAR_ATOUL(h->gid, gid_t);
+	if (errno)
+		return dpkg_put_errno(err, _("invalid tar header gid field"));
 
 	checksum = tar_atol8(h->checksum, sizeof(h->checksum));
-
-	/* Check for parse errors. */
 	if (errno)
-		return 0;
-	return tar_header_checksum(h) == checksum;
+		return dpkg_put_errno(err, _("invalid tar header checksum field"));
+
+	if (tar_header_checksum(h) != checksum)
+		return dpkg_put_error(err, _("invalid tar header checksum"));
+
+	return 0;
 }
 
 /**
@@ -336,8 +351,7 @@ tar_header_decode(struct tar_header *h, struct tar_entry *d)
  *   bogus name or link.
  */
 static int
-tar_gnu_long(void *ctx, const struct tar_operations *ops, struct tar_entry *te,
-             char **longp)
+tar_gnu_long(struct tar_archive *tar, struct tar_entry *te, char **longp)
 {
 	char buf[TARBLKSZ];
 	char *bp;
@@ -350,14 +364,15 @@ tar_gnu_long(void *ctx, const struct tar_operations *ops, struct tar_entry *te,
 	for (long_read = te->size; long_read > 0; long_read -= TARBLKSZ) {
 		int copysize;
 
-		status = ops->read(ctx, buf, TARBLKSZ);
+		status = tar->ops->read(tar, buf, TARBLKSZ);
 		if (status == TARBLKSZ)
 			status = 0;
 		else {
 			/* Read partial header record? */
 			if (status > 0) {
 				errno = 0;
-				status = -1;
+				status = dpkg_put_error(&tar->err,
+				                        _("partially read tar header"));
 			}
 
 			/* If we didn't get TARBLKSZ bytes read, punt. */
@@ -393,6 +408,8 @@ tar_entry_destroy(struct tar_entry *te)
 	free(te->linkname);
 	free(te->stat.uname);
 	free(te->stat.gname);
+
+	memset(te, 0, sizeof(*te));
 }
 
 struct tar_symlink_entry {
@@ -424,7 +441,7 @@ tar_entry_update_from_system(struct tar_entry *te)
 }
 
 int
-tar_extractor(void *ctx, const struct tar_operations *ops)
+tar_extractor(struct tar_archive *tar)
 {
 	int status;
 	char buffer[TARBLKSZ];
@@ -442,17 +459,14 @@ tar_extractor(void *ctx, const struct tar_operations *ops)
 	h.stat.uname = NULL;
 	h.stat.gname = NULL;
 
-	while ((status = ops->read(ctx, buffer, TARBLKSZ)) == TARBLKSZ) {
+	while ((status = tar->ops->read(tar, buffer, TARBLKSZ)) == TARBLKSZ) {
 		int name_len;
 
-		if (!tar_header_decode((struct tar_header *)buffer, &h)) {
+		if (tar_header_decode((struct tar_header *)buffer, &h, &tar->err) < 0) {
 			if (h.name[0] == '\0') {
-				/* End of tape. */
+				/* End Of Tape. */
 				status = 0;
 			} else {
-				/* Indicates broken tarfile:
-				 * “Header checksum error”. */
-				errno = 0;
 				status = -1;
 			}
 			tar_entry_destroy(&h);
@@ -471,9 +485,9 @@ tar_extractor(void *ctx, const struct tar_operations *ops)
 		}
 
 		if (h.name[0] == '\0') {
-			/* Indicates broken tarfile: “Bad header data”. */
+			status = dpkg_put_error(&tar->err,
+			                        _("invalid tar header with empty name field"));
 			errno = 0;
-			status = -1;
 			tar_entry_destroy(&h);
 			break;
 		}
@@ -484,7 +498,7 @@ tar_extractor(void *ctx, const struct tar_operations *ops)
 		case TAR_FILETYPE_FILE:
 			/* Compatibility with pre-ANSI ustar. */
 			if (h.name[name_len - 1] != '/') {
-				status = ops->extract_file(ctx, &h);
+				status = tar->ops->extract_file(tar, &h);
 				break;
 			}
 			/* Else, fall through. */
@@ -492,10 +506,10 @@ tar_extractor(void *ctx, const struct tar_operations *ops)
 			if (h.name[name_len - 1] == '/') {
 				h.name[name_len - 1] = '\0';
 			}
-			status = ops->mkdir(ctx, &h);
+			status = tar->ops->mkdir(tar, &h);
 			break;
 		case TAR_FILETYPE_HARDLINK:
-			status = ops->link(ctx, &h);
+			status = tar->ops->link(tar, &h);
 			break;
 		case TAR_FILETYPE_SYMLINK:
 			symlink_node = m_malloc(sizeof(*symlink_node));
@@ -512,18 +526,42 @@ tar_extractor(void *ctx, const struct tar_operations *ops)
 		case TAR_FILETYPE_CHARDEV:
 		case TAR_FILETYPE_BLOCKDEV:
 		case TAR_FILETYPE_FIFO:
-			status = ops->mknod(ctx, &h);
+			status = tar->ops->mknod(tar, &h);
 			break;
 		case TAR_FILETYPE_GNU_LONGLINK:
-			status = tar_gnu_long(ctx, ops, &h, &next_long_link);
+			status = tar_gnu_long(tar, &h, &next_long_link);
 			break;
 		case TAR_FILETYPE_GNU_LONGNAME:
-			status = tar_gnu_long(ctx, ops, &h, &next_long_name);
+			status = tar_gnu_long(tar, &h, &next_long_name);
+			break;
+		case TAR_FILETYPE_GNU_VOLUME:
+		case TAR_FILETYPE_GNU_MULTIVOL:
+		case TAR_FILETYPE_GNU_SPARSE:
+		case TAR_FILETYPE_GNU_DUMPDIR:
+			status = dpkg_put_error(&tar->err,
+			                        _("unsupported GNU tar header type '%c'"),
+			                        h.type);
+			errno = 0;
+			break;
+		case TAR_FILETYPE_SOLARIS_EXTENDED:
+		case TAR_FILETYPE_SOLARIS_ACL:
+			status = dpkg_put_error(&tar->err,
+			                        _("unsupported Solaris tar header type '%c'"),
+			                        h.type);
+			errno = 0;
+			break;
+		case TAR_FILETYPE_PAX_GLOBAL:
+		case TAR_FILETYPE_PAX_EXTENDED:
+			status = dpkg_put_error(&tar->err,
+			                        _("unsupported PAX tar header type '%c'"),
+			                        h.type);
+			errno = 0;
 			break;
 		default:
-			/* Indicates broken tarfile: “Bad header field”. */
+			status = dpkg_put_error(&tar->err,
+			                        _("unknown tar header type '%c'"),
+			                        h.type);
 			errno = 0;
-			status = -1;
 		}
 		tar_entry_destroy(&h);
 		if (status != 0)
@@ -534,7 +572,7 @@ tar_extractor(void *ctx, const struct tar_operations *ops)
 	while (symlink_head) {
 		symlink_node = symlink_head->next;
 		if (status == 0)
-			status = ops->symlink(ctx, &symlink_head->h);
+			status = tar->ops->symlink(tar, &symlink_head->h);
 		tar_entry_destroy(&symlink_head->h);
 		free(symlink_head);
 		symlink_head = symlink_node;
@@ -545,11 +583,11 @@ tar_extractor(void *ctx, const struct tar_operations *ops)
 	free(next_long_link);
 
 	if (status > 0) {
-		/* Indicates broken tarfile: “Read partial header record”. */
+		status = dpkg_put_error(&tar->err,
+		                        _("partially read tar header"));
 		errno = 0;
-		return -1;
-	} else {
-		/* Return whatever I/O function returned. */
-		return status;
 	}
+
+	/* Return whatever I/O function returned. */
+	return status;
 }
diff --git a/lib/dpkg/tarfn.h b/lib/dpkg/tarfn.h
index 37269de02..38ab9a9fe 100644
--- a/lib/dpkg/tarfn.h
+++ b/lib/dpkg/tarfn.h
@@ -26,6 +26,7 @@
 
 #include <stdint.h>
 
+#include <dpkg/error.h>
 #include <dpkg/file.h>
 
 /**
@@ -37,6 +38,7 @@
 #define TARBLKSZ	512
 
 enum tar_format {
+	TAR_FORMAT_UNKNOWN,
 	TAR_FORMAT_OLD,
 	TAR_FORMAT_GNU,
 	TAR_FORMAT_USTAR,
@@ -53,12 +55,21 @@ enum tar_filetype {
 	TAR_FILETYPE_BLOCKDEV = '4',
 	TAR_FILETYPE_DIR = '5',
 	TAR_FILETYPE_FIFO = '6',
+	TAR_FILETYPE_CONTIG = '7',
 	TAR_FILETYPE_GNU_LONGLINK = 'K',
 	TAR_FILETYPE_GNU_LONGNAME = 'L',
+	TAR_FILETYPE_GNU_VOLUME = 'V',
+	TAR_FILETYPE_GNU_MULTIVOL = 'M',
+	TAR_FILETYPE_GNU_DUMPDIR = 'D',
+	TAR_FILETYPE_GNU_SPARSE = 'S',
+	TAR_FILETYPE_PAX_GLOBAL = 'g',
+	TAR_FILETYPE_PAX_EXTENDED = 'x',
+	TAR_FILETYPE_SOLARIS_EXTENDED = 'X',
+	TAR_FILETYPE_SOLARIS_ACL = 'A',
 };
 
 struct tar_entry {
-	/** Tar archive format. */
+	/** Tar entry format. */
 	enum tar_format format;
 	/** File type. */
 	enum tar_filetype type;
@@ -76,8 +87,10 @@ struct tar_entry {
 	struct file_stat stat;
 };
 
-typedef int tar_read_func(void *ctx, char *buffer, int length);
-typedef int tar_make_func(void *ctx, struct tar_entry *h);
+struct tar_archive;
+
+typedef int tar_read_func(struct tar_archive *tar, char *buffer, int length);
+typedef int tar_make_func(struct tar_archive *tar, struct tar_entry *h);
 
 struct tar_operations {
 	tar_read_func *read;
@@ -89,6 +102,18 @@ struct tar_operations {
 	tar_make_func *mknod;
 };
 
+struct tar_archive {
+	/* Global tar archive error. */
+	struct dpkg_error err;
+
+	/** Tar archive format. */
+	enum tar_format format;
+
+	/* Operation functions and context. */
+	const struct tar_operations *ops;
+	void *ctx;
+};
+
 uintmax_t
 tar_atoul(const char *s, size_t size, uintmax_t max);
 intmax_t
@@ -97,7 +122,8 @@ tar_atosl(const char *s, size_t size, intmax_t min, intmax_t max);
 void
 tar_entry_update_from_system(struct tar_entry *te);
 
-int tar_extractor(void *ctx, const struct tar_operations *ops);
+int
+tar_extractor(struct tar_archive *tar);
 
 /** @} */
 
diff --git a/lib/dpkg/test.h b/lib/dpkg/test.h
index 39ecb967b..a0e5ffdae 100644
--- a/lib/dpkg/test.h
+++ b/lib/dpkg/test.h
@@ -59,6 +59,18 @@ test_alloc(void *ptr, const char *reason)
 #define test_alloc(ptr) \
 	test_alloc((ptr), "cannot allocate memory for " #ptr " in " __FILE__ ":" test_stringify(__LINE__))
 
+static inline const char *
+test_get_envdir(const char *envvar)
+{
+	const char *envdir = getenv(envvar);
+	return envdir ? envdir : ".";
+}
+
+#define test_get_srcdir() \
+	test_get_envdir("srcdir")
+#define test_get_builddir() \
+	test_get_envdir("builddir")
+
 static int test_id = 1;
 static int test_skip_code;
 static const char *test_skip_prefix;
diff --git a/lib/dpkg/treewalk.c b/lib/dpkg/treewalk.c
index 3a669e6b0..dee072f2d 100644
--- a/lib/dpkg/treewalk.c
+++ b/lib/dpkg/treewalk.c
@@ -206,7 +206,7 @@ treenode_resize_down(struct treenode *node)
 	else
 		node->down_size = 8;
 
-	new_size = node->down_size * sizeof(struct treenode *);
+	new_size = node->down_size * sizeof(*node);
 	node->down = m_realloc(node->down, new_size);
 }
 
@@ -367,7 +367,7 @@ treewalk_open(const char *rootdir, enum treewalk_options options,
 	struct treeroot *tree;
 	struct treenode *root;
 
-	tree = m_malloc(sizeof(struct treeroot));
+	tree = m_malloc(sizeof(*tree));
 
 	tree->options = options;
 	if (func)
diff --git a/lib/dpkg/trigdeferred.c b/lib/dpkg/trigdeferred.c
index e5bb2c347..b9b028f73 100644
--- a/lib/dpkg/trigdeferred.c
+++ b/lib/dpkg/trigdeferred.c
@@ -1,6 +1,6 @@
 /*
  * libdpkg - Debian packaging suite library routines
- * trigdeferred.c - parsing of triggers/Deferred
+ * trigdeferred.c - parsing of triggers/Unincorp (was …/Deferred)
  *
  * Copyright © 2007 Canonical Ltd
  * written by Ian Jackson <ijackson@chiark.greenend.org.uk>
@@ -83,13 +83,14 @@ trigdef_update_start(enum trigdef_update_flags uf)
 			if (lock_fd == -1) {
 				if (!(errno == ENOENT && (uf & TDUF_NO_LOCK_OK)))
 					ohshite(_("unable to open/create "
-					          "triggers lockfile '%.250s'"),
+					          "triggers lock file '%.250s'"),
 					        fn.buf);
 				return TDUS_ERROR_NO_DIR;
 			}
 		}
 
-		file_lock(&lock_fd, FILE_LOCK_WAIT, fn.buf, _("triggers area"));
+		file_lock(&lock_fd, FILE_LOCK_WAIT, fn.buf,
+		          _("triggers database lock"));
 	}
 
 	constructfn(&fn, triggersdir, TRIGGERSDEFERREDFILE);
diff --git a/lib/dpkg/trigdeferred.h b/lib/dpkg/trigdeferred.h
index 5b7b87cd3..c353ca150 100644
--- a/lib/dpkg/trigdeferred.h
+++ b/lib/dpkg/trigdeferred.h
@@ -1,6 +1,6 @@
 /*
  * libdpkg - Debian packaging suite library routines
- * trigdeferred.h - parsing of triggers/Deferred
+ * trigdeferred.h - parsing of triggers/Unincorp (was …/Deferred)
  *
  * Copyright © 2007 Canonical, Ltd.
  *   written by Ian Jackson <ijackson@chiark.greenend.org.uk>
diff --git a/lib/dpkg/triglib.c b/lib/dpkg/triglib.c
index 57bd2a66b..ab9060f66 100644
--- a/lib/dpkg/triglib.c
+++ b/lib/dpkg/triglib.c
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -104,7 +103,9 @@ trig_clear_awaiters(struct pkginfo *notpend)
 	struct trigaw *ta;
 	struct pkginfo *aw;
 
-	assert(!notpend->trigpend_head);
+	if (notpend->trigpend_head)
+		internerr("package %s has pending triggers",
+		          pkg_name(notpend, pnaw_always));
 
 	ta = notpend->othertrigaw_head;
 	notpend->othertrigaw_head = NULL;
@@ -395,12 +396,15 @@ trk_file_interest_change(const char *trig, struct pkginfo *pkg,
                          struct pkgbin *pkgbin, int signum,
                          enum trig_options opts)
 {
-	struct filenamenode *fnn;
+	struct fsys_namenode *fnn;
 	struct trigfileint **search, *tfi;
 
 	fnn = trigh.namenode_find(trig, signum <= 0);
 	if (!fnn) {
-		assert(signum < 0);
+		if (signum >= 0)
+			internerr("lost filename node '%s' for package %s "
+			          "triggered to add", trig,
+			          pkgbin_name(pkg, pkgbin, pnaw_always));
 		return;
 	}
 
@@ -503,7 +507,7 @@ trig_file_interests_ensure(void)
 		        triggersfilefile);
 	}
 
-	push_cleanup(cu_closestream, ~0, NULL, 0, 1, f);
+	push_cleanup(cu_closestream, ~0, 1, f);
 	while (fgets_checked(linebuf, sizeof(linebuf), f, triggersfilefile) >= 0) {
 		struct dpkg_error err;
 		char *slash;
@@ -541,14 +545,14 @@ ok:
 void
 trig_file_activate_byname(const char *trig, struct pkginfo *aw)
 {
-	struct filenamenode *fnn = trigh.namenode_find(trig, 1);
+	struct fsys_namenode *fnn = trigh.namenode_find(trig, 1);
 
 	if (fnn)
 		trig_file_activate(fnn, aw);
 }
 
 void
-trig_file_activate(struct filenamenode *trig, struct pkginfo *aw)
+trig_file_activate(struct fsys_namenode *trig, struct pkginfo *aw)
 {
 	struct trigfileint *tfi;
 
@@ -575,7 +579,7 @@ trig_file_activate_parents(const char *trig, struct pkginfo *aw)
 }
 
 void
-trig_path_activate(struct filenamenode *trig, struct pkginfo *aw)
+trig_path_activate(struct fsys_namenode *trig, struct pkginfo *aw)
 {
 	trig_file_activate(trig, aw);
 	trig_file_activate_parents(trigh.namenode_name(trig), aw);
@@ -584,7 +588,7 @@ trig_path_activate(struct filenamenode *trig, struct pkginfo *aw)
 static void
 trig_path_activate_byname(const char *trig, struct pkginfo *aw)
 {
-	struct filenamenode *fnn = trigh.namenode_find(trig, 1);
+	struct fsys_namenode *fnn = trigh.namenode_find(trig, 1);
 
 	if (fnn)
 		trig_file_activate(fnn, aw);
@@ -627,7 +631,10 @@ trig_cicb_interest_change(const char *trig, struct pkginfo *pkg,
 {
 	const struct trigkindinfo *tki = trig_classify_byname(trig);
 
-	assert(filetriggers_edited >= 0);
+	if (filetriggers_edited < 0)
+		internerr("trigger control file for package %s not read",
+		          pkgbin_name(pkg, pkgbin, pnaw_always));
+
 	tki->interest_change(trig, pkg, pkgbin, signum, opts);
 }
 
@@ -687,7 +694,7 @@ trig_parse_ci(const char *file, trig_parse_cicb *interest,
 			return; /* No file is just like an empty one. */
 		ohshite(_("unable to open triggers ci file '%.250s'"), file);
 	}
-	push_cleanup(cu_closestream, ~0, NULL, 0, 1, f);
+	push_cleanup(cu_closestream, ~0, 1, f);
 
 	while ((l = fgets_checked(linebuf, sizeof(linebuf), f, file)) >= 0) {
 		for (cmd = linebuf; c_iswhite(*cmd); cmd++) ;
@@ -814,42 +821,12 @@ trig_incorporate(enum modstatdb_rw cstatus)
 
 /*---------- Default hooks. ----------*/
 
-struct filenamenode {
-	struct filenamenode *next;
-	const char *name;
-	struct trigfileint *trig_interested;
-};
-
-static struct filenamenode *trigger_files;
-
-static struct filenamenode *
-th_simple_nn_find(const char *name, bool nonew)
-{
-	struct filenamenode *search;
-
-	for (search = trigger_files; search; search = search->next)
-		if (strcmp(search->name, name) == 0)
-			return search;
-
-	/* Not found. */
-	if (nonew)
-		return NULL;
-
-	search = nfmalloc(sizeof(*search));
-	search->name = nfstrsave(name);
-	search->trig_interested = NULL;
-	search->next = trigger_files;
-	trigger_files = search;
-
-	return search;
-}
-
 TRIGHOOKS_DEFINE_NAMENODE_ACCESSORS
 
 static struct trig_hooks trigh = {
 	.enqueue_deferred = NULL,
 	.transitional_activate = NULL,
-	.namenode_find = th_simple_nn_find,
+	.namenode_find = th_nn_find,
 	.namenode_interested = th_nn_interested,
 	.namenode_name = th_nn_name,
 };
diff --git a/lib/dpkg/triglib.h b/lib/dpkg/triglib.h
index 3e63f5cbc..b4c772516 100644
--- a/lib/dpkg/triglib.h
+++ b/lib/dpkg/triglib.h
@@ -25,6 +25,7 @@
 
 #include <dpkg/macros.h>
 #include <dpkg/dpkg-db.h>
+#include <dpkg/fsys.h>
 
 DPKG_BEGIN_DECLS
 
@@ -53,7 +54,7 @@ enum trig_options {
 struct trigfileint {
 	struct pkginfo *pkg;
 	struct pkgbin *pkgbin;
-	struct filenamenode *fnn;
+	struct fsys_namenode *fnn;
 	enum trig_options options;
 	struct trigfileint *samefile_next;
 	struct {
@@ -70,24 +71,26 @@ struct trig_hooks {
 	void (*enqueue_deferred)(struct pkginfo *pend);
 	void (*transitional_activate)(enum modstatdb_rw cstatus);
 
-	struct filenamenode *(*namenode_find)(const char *filename, bool nonew);
-	struct trigfileint **(*namenode_interested)(struct filenamenode *fnn);
+	struct fsys_namenode *(*namenode_find)(const char *filename, bool nonew);
+	struct trigfileint **(*namenode_interested)(struct fsys_namenode *fnn);
 
 	/** Returns a pointer from nfmalloc. */
-	const char *(*namenode_name)(struct filenamenode *fnn);
+	const char *(*namenode_name)(struct fsys_namenode *fnn);
 };
 
 #define TRIGHOOKS_DEFINE_NAMENODE_ACCESSORS				 \
-  static struct trigfileint **th_nn_interested(struct filenamenode *fnn) \
+  static struct fsys_namenode *th_nn_find(const char *name, bool nonew)	 \
+    { return fsys_hash_find_node(name, nonew ? FHFF_NONE : 0); }		 \
+  static struct trigfileint **th_nn_interested(struct fsys_namenode *fnn) \
     { return &fnn->trig_interested; }					 \
-  static const char *th_nn_name(struct filenamenode *fnn)		 \
+  static const char *th_nn_name(struct fsys_namenode *fnn)		 \
     { return fnn->name; }
 
 void trig_override_hooks(const struct trig_hooks *hooks);
 
 void trig_file_activate_byname(const char *trig, struct pkginfo *aw);
-void trig_file_activate(struct filenamenode *trig, struct pkginfo *aw);
-void trig_path_activate(struct filenamenode *trig, struct pkginfo *aw);
+void trig_file_activate(struct fsys_namenode *trig, struct pkginfo *aw);
+void trig_path_activate(struct fsys_namenode *trig, struct pkginfo *aw);
 
 bool trig_note_pend_core(struct pkginfo *pend, const char *trig /*not copied!*/);
 bool trig_note_pend(struct pkginfo *pend, const char *trig /*not copied!*/);
diff --git a/lib/dpkg/trignote.c b/lib/dpkg/trignote.c
index 1029a030e..957e80859 100644
--- a/lib/dpkg/trignote.c
+++ b/lib/dpkg/trignote.c
@@ -76,7 +76,7 @@ trig_note_pend(struct pkginfo *pend, const char *trig)
 
 /*
  * Note: This is called also from fields.c where *aw is a temporary
- * but pend is from pkg_db_find()!
+ * but pend is from pkg_hash_find()!
  *
  * @retval true  For done.
  * @retval false For already noted.
diff --git a/lib/dpkg/varbuf.c b/lib/dpkg/varbuf.c
index 9a62f92e9..ee757bcc7 100644
--- a/lib/dpkg/varbuf.c
+++ b/lib/dpkg/varbuf.c
@@ -115,6 +115,17 @@ varbuf_get_str(struct varbuf *v)
   return v->buf;
 }
 
+struct varbuf *
+varbuf_new(size_t size)
+{
+  struct varbuf *v;
+
+  v = m_malloc(sizeof(*v));
+  varbuf_init(v, size);
+
+  return v;
+}
+
 void
 varbuf_init(struct varbuf *v, size_t size)
 {
@@ -186,3 +197,10 @@ varbuf_destroy(struct varbuf *v)
 {
   free(v->buf); v->buf=NULL; v->size=0; v->used=0;
 }
+
+void
+varbuf_free(struct varbuf *v)
+{
+  free(v->buf);
+  free(v);
+}
diff --git a/lib/dpkg/varbuf.h b/lib/dpkg/varbuf.h
index 9b9a30f95..06f09f5e8 100644
--- a/lib/dpkg/varbuf.h
+++ b/lib/dpkg/varbuf.h
@@ -72,12 +72,14 @@ struct varbuf {
 
 #define VARBUF_INIT { 0, 0, NULL }
 
+struct varbuf *varbuf_new(size_t size);
 void varbuf_init(struct varbuf *v, size_t size);
 void varbuf_grow(struct varbuf *v, size_t need_size);
 void varbuf_trunc(struct varbuf *v, size_t used_size);
 char *varbuf_detach(struct varbuf *v);
 void varbuf_reset(struct varbuf *v);
 void varbuf_destroy(struct varbuf *v);
+void varbuf_free(struct varbuf *v);
 
 void varbuf_add_char(struct varbuf *v, int c);
 void varbuf_dup_char(struct varbuf *v, int c, size_t n);
diff --git a/m4/dpkg-arch.m4 b/m4/dpkg-arch.m4
index ec25d95e5..71044c90f 100644
--- a/m4/dpkg-arch.m4
+++ b/m4/dpkg-arch.m4
@@ -1,3 +1,4 @@
+# serial 1
 # Copyright © 2005 Scott James Remnant <scott@netsplit.com>
 # Copyright © 2006-2009 Guillem Jover <guillem@debian.org>
 
diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4
index 1ea3e4b22..1cc149a8e 100644
--- a/m4/dpkg-build.m4
+++ b/m4/dpkg-build.m4
@@ -1,3 +1,4 @@
+# serial 1
 # Copyright © 2010-2014 Guillem Jover <guillem@debian.org>
 
 # DPKG_BUILD_SHARED_LIBS()
@@ -84,6 +85,21 @@ AC_DEFUN([DPKG_DEB_COMPRESSOR], [
     [default dpkg-deb build compressor])
 ]) # DPKG_DEB_COMPRESSOR
 
+# DPKG_DIST_IS_RELEASE()
+# --------------------
+# Check whether we are preparing a distribution tarball for a release, and
+# set PACKAGE_DIST_IS_RELEASE accordingly.
+AC_DEFUN([DPKG_DIST_IS_RELEASE], [
+  AS_IF([echo $PACKAGE_VERSION | grep -q -v '[-]'], [
+    dpkg_dist_is_release=1
+  ], [
+    dpkg_dist_is_release=0
+  ])
+  AM_CONDITIONAL([PACKAGE_DIST_IS_RELEASE],
+    [test "$dpkg_dist_is_release" -eq 1])
+  AC_SUBST([PACKAGE_DIST_IS_RELEASE], [$dpkg_dist_is_release])
+])# DPKG_DIST_IS_RELEASE
+
 # DPKG_DIST_CHECK(COND, ERROR)
 # ---------------
 # Check if the condition is fulfilled when preparing a distribution tarball.
diff --git a/m4/dpkg-compiler.m4 b/m4/dpkg-compiler.m4
index 8acd3998c..9799f6fea 100644
--- a/m4/dpkg-compiler.m4
+++ b/m4/dpkg-compiler.m4
@@ -1,10 +1,11 @@
+# serial 1
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>
 # Copyright © 2006, 2009-2011, 2013-2016 Guillem Jover <guillem@debian.org>
 
 # DPKG_CHECK_COMPILER_FLAG
 # ------------------------
 AC_DEFUN([DPKG_CHECK_COMPILER_FLAG], [
-  m4_define([dpkg_check_flag], [m4_default([$2], [$1])])
+  m4_define([dpkg_check_flag], m4_bpatsubst([$1], [^-Wno-], [-W]))
 
   AC_LANG_CASE(
   [C], [
@@ -45,38 +46,40 @@ AC_DEFUN([DPKG_CHECK_COMPILER_FLAG], [
 AC_DEFUN([DPKG_CHECK_COMPILER_WARNINGS], [
   DPKG_CHECK_COMPILER_FLAG([-Wall])
   DPKG_CHECK_COMPILER_FLAG([-Wextra])
-  DPKG_CHECK_COMPILER_FLAG([-Wno-unused-parameter], [-Wunused-parameter])
-  DPKG_CHECK_COMPILER_FLAG([-Wno-missing-field-initializers],
-                           [-Wmissing-field-initializers])
-  DPKG_CHECK_COMPILER_FLAG([-Wno-tautological-constant-out-of-range-compare],
-                           [-Wtautological-constant-out-of-range-compare])
+
+  DPKG_CHECK_COMPILER_FLAG([-Wcast-align])
+  DPKG_CHECK_COMPILER_FLAG([-Wdocumentation])
+  DPKG_CHECK_COMPILER_FLAG([-Wduplicated-cond])
+  DPKG_CHECK_COMPILER_FLAG([-Wformat -Wformat-security])
+  DPKG_CHECK_COMPILER_FLAG([-Winit-self])
+  DPKG_CHECK_COMPILER_FLAG([-Wlogical-not-parentheses])
+  DPKG_CHECK_COMPILER_FLAG([-Wlogical-op])
   DPKG_CHECK_COMPILER_FLAG([-Wmissing-declarations])
   DPKG_CHECK_COMPILER_FLAG([-Wmissing-format-attribute])
-  DPKG_CHECK_COMPILER_FLAG([-Wformat -Wformat-security])
-  DPKG_CHECK_COMPILER_FLAG([-Wsizeof-array-argument])
+  DPKG_CHECK_COMPILER_FLAG([-Wno-missing-field-initializers])
+  DPKG_CHECK_COMPILER_FLAG([-Wno-nonnull-compare])
+  DPKG_CHECK_COMPILER_FLAG([-Wno-tautological-constant-out-of-range-compare])
+  DPKG_CHECK_COMPILER_FLAG([-Wno-unused-parameter])
+  DPKG_CHECK_COMPILER_FLAG([-Wnull-dereference])
   DPKG_CHECK_COMPILER_FLAG([-Wpointer-arith])
-  DPKG_CHECK_COMPILER_FLAG([-Wlogical-op])
-  DPKG_CHECK_COMPILER_FLAG([-Wlogical-not-parentheses])
-  DPKG_CHECK_COMPILER_FLAG([-Wswitch-bool])
-  DPKG_CHECK_COMPILER_FLAG([-Wvla])
-  DPKG_CHECK_COMPILER_FLAG([-Winit-self])
-  DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings])
-  DPKG_CHECK_COMPILER_FLAG([-Wcast-align])
   DPKG_CHECK_COMPILER_FLAG([-Wrestrict])
+  DPKG_CHECK_COMPILER_FLAG([-Wregister])
   DPKG_CHECK_COMPILER_FLAG([-Wshadow])
   DPKG_CHECK_COMPILER_FLAG([-Wshift-negative-value])
-  DPKG_CHECK_COMPILER_FLAG([-Wduplicated-cond])
-  DPKG_CHECK_COMPILER_FLAG([-Wnull-dereference])
+  DPKG_CHECK_COMPILER_FLAG([-Wsizeof-array-argument])
+  DPKG_CHECK_COMPILER_FLAG([-Wswitch-bool])
+  DPKG_CHECK_COMPILER_FLAG([-Wvla])
+  DPKG_CHECK_COMPILER_FLAG([-Wwrite-strings])
 
   AC_LANG_CASE(
   [C], [
-    DPKG_CHECK_COMPILER_FLAG([-Wdeclaration-after-statement])
-    DPKG_CHECK_COMPILER_FLAG([-Wnested-externs])
     DPKG_CHECK_COMPILER_FLAG([-Wbad-function-cast])
-    DPKG_CHECK_COMPILER_FLAG([-Wstrict-prototypes])
+    DPKG_CHECK_COMPILER_FLAG([-Wc99-c11-compat])
+    DPKG_CHECK_COMPILER_FLAG([-Wdeclaration-after-statement])
     DPKG_CHECK_COMPILER_FLAG([-Wmissing-prototypes])
+    DPKG_CHECK_COMPILER_FLAG([-Wnested-externs])
     DPKG_CHECK_COMPILER_FLAG([-Wold-style-definition])
-    DPKG_CHECK_COMPILER_FLAG([-Wc99-c11-compat])
+    DPKG_CHECK_COMPILER_FLAG([-Wstrict-prototypes])
   ],
   [C++], [
     DPKG_CHECK_COMPILER_FLAG([-Wc++11-compat])
diff --git a/m4/dpkg-coverage.m4 b/m4/dpkg-coverage.m4
index 4e14b736a..70b67d152 100644
--- a/m4/dpkg-coverage.m4
+++ b/m4/dpkg-coverage.m4
@@ -1,3 +1,4 @@
+# serial 1
 # Copyright © 2010 Guillem Jover <guillem@debian.org>
 
 # DPKG_CODE_COVERAGE
@@ -29,8 +30,8 @@ AC_DEFUN([DPKG_CODE_COVERAGE], [
        AC_MSG_ERROR([missing genhtml, which is required for C coverage support])
      ])
 
-     CFLAGS="$CFLAGS --coverage"
-     LDFLAGS="$LDFLAGS --coverage"
+     CFLAGS="$CFLAGS --coverage -O0"
+     LDFLAGS="$LDFLAGS --coverage -O0"
 
      AC_MSG_CHECKING([for Devel::Cover perl module])
      AS_IF([$($PERL -e "require Devel::Cover;" 2>/dev/null)], [
diff --git a/m4/dpkg-funcs.m4 b/m4/dpkg-funcs.m4
index 80e76d6f1..74acf220d 100644
--- a/m4/dpkg-funcs.m4
+++ b/m4/dpkg-funcs.m4
@@ -1,3 +1,4 @@
+# serial 1
 # Copyright © 2005 Scott James Remnant <scott@netsplit.com>
 # Copyright © 2008-2009,2015 Guillem Jover <guillem@debian.org>
 
diff --git a/m4/dpkg-libs.m4 b/m4/dpkg-libs.m4
index 577264706..ffe373b7d 100644
--- a/m4/dpkg-libs.m4
+++ b/m4/dpkg-libs.m4
@@ -1,3 +1,4 @@
+# serial 1
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>
 # Copyright © 2007 Nicolas François <nicolas.francois@centraliens.net>
 # Copyright © 2006, 2009-2012, 2014-2015 Guillem Jover <guillem@debian.org>
diff --git a/m4/dpkg-linker.m4 b/m4/dpkg-linker.m4
index 1bb64350d..4451199ea 100644
--- a/m4/dpkg-linker.m4
+++ b/m4/dpkg-linker.m4
@@ -1,3 +1,4 @@
+# serial 1
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 # Copyright © 2010, 2014, 2016 Guillem Jover <guillem@debian.org>
 
diff --git a/m4/dpkg-progs.m4 b/m4/dpkg-progs.m4
index 80673f438..f952bd170 100644
--- a/m4/dpkg-progs.m4
+++ b/m4/dpkg-progs.m4
@@ -1,3 +1,4 @@
+# serial 1
 # Copyright © 2005 Scott James Remnant <scott@netsplit.com>
 # Copyright © 2007 Frank Lichtenheld <djpig@debian.org>
 # Copyright © 2007, 2009, 2011 Guillem Jover <guillem@debian.org>
@@ -7,18 +8,19 @@
 # Locate perl interpreter in the path
 AC_DEFUN([DPKG_PROG_PERL], [
   AC_ARG_VAR([PERL], [Perl interpreter])dnl
-  m4_define([PERL_MIN_VERSION], [5.20.2])
-  AC_CACHE_CHECK([for perl >= PERL_MIN_VERSION], [ac_cv_path_PERL], [
+  m4_define([_PERL_MIN_VERSION], [5.24.1])
+  AC_SUBST([PERL_MIN_VERSION], [_PERL_MIN_VERSION])
+  AC_CACHE_CHECK([for perl >= _PERL_MIN_VERSION], [ac_cv_path_PERL], [
     AC_PATH_PROGS_FEATURE_CHECK([PERL], [perl], [
       perlcheck=$(test -x $ac_path_PERL && \
                   $ac_path_PERL -MConfig -Mversion -e \
-                  'my $r = qv("v$Config{version}") >= qv("PERL_MIN_VERSION");
+                  'my $r = qv("v$Config{version}") >= qv("_PERL_MIN_VERSION");
                    print "yes" if $r')
       AS_IF([test "x$perlcheck" = "xyes"], [
         ac_cv_path_PERL=$ac_path_PERL ac_path_PERL_found=:
       ])
     ], [
-      AC_MSG_ERROR([cannot find perl >= PERL_MIN_VERSION])
+      AC_MSG_ERROR([cannot find perl >= _PERL_MIN_VERSION])
     ])
   ])
   AC_SUBST([PERL], [$ac_cv_path_PERL])
@@ -36,6 +38,7 @@ AC_DEFUN([DPKG_PROG_PERL], [
 # --------------
 AC_DEFUN([DPKG_PROG_PO4A], [
   AC_REQUIRE([AM_NLS])
+  AC_ARG_VAR([PO4A], [po4a program])
   AC_CHECK_PROGS([PO4A], [po4a])
   AS_IF([test "$USE_NLS" = "yes" && test -n "$PO4A"], [
     USE_PO4A=yes
@@ -48,6 +51,7 @@ AC_DEFUN([DPKG_PROG_PO4A], [
 # DPKG_PROG_POD2MAN
 # --------------
 AC_DEFUN([DPKG_PROG_POD2MAN], [
+  AC_ARG_VAR([POD2MAN], [pod2man program])
   AC_CHECK_PROGS([POD2MAN], [pod2man])
   AM_CONDITIONAL([BUILD_POD_DOC], [test "x$POD2MAN" != "x"])
 ])# DPKG_PROG_POD2MAN
diff --git a/m4/dpkg-types.m4 b/m4/dpkg-types.m4
index 7fbbd2a0a..f6553112f 100644
--- a/m4/dpkg-types.m4
+++ b/m4/dpkg-types.m4
@@ -1,3 +1,4 @@
+# serial 1
 # Copyright © 2005 Scott James Remnant <scott@netsplit.com>
 # Copyright © 2009-2011 Guillem Jover <guillem@debian.org>
 
@@ -11,26 +12,6 @@ AC_DEFUN([DPKG_TYPE_PTRDIFF_T], [
   ])
 ])# DPKG_TYPE_PTRDIFF_T
 
-# DPKG_TYPE_U_INT_T(N)
-# --------------------
-# Check for u_intN_t BSD type, defining to C99 type if not.
-AC_DEFUN([DPKG_TYPE_U_INT_T], [
-  AC_CHECK_TYPE([u_int$1_t], [], [
-    AC_DEFINE_UNQUOTED([u_int$1_t], [uint$1_t],
-      [Define to 'uint$1_t' if not defined.])
-  ])
-])
-
-# DPKG_TYPES_U_INT_T
-# ------------------
-# Check for u_int(8|16|32|64)_t BSD types, defining to C99 types if not.
-AC_DEFUN([DPKG_TYPES_U_INT_T], [
-  DPKG_TYPE_U_INT_T([8])
-  DPKG_TYPE_U_INT_T([16])
-  DPKG_TYPE_U_INT_T([32])
-  DPKG_TYPE_U_INT_T([64])
-])
-
 # DPKG_DECL_SYS_SIGLIST
 # ---------------------
 # Check for the sys_siglist variable in either signal.h or unistd.h
diff --git a/m4/dpkg-unicode.m4 b/m4/dpkg-unicode.m4
index 2cef2c7f1..dbe199498 100644
--- a/m4/dpkg-unicode.m4
+++ b/m4/dpkg-unicode.m4
@@ -1,3 +1,4 @@
+# serial 1
 # Copyright © 1995-2003, 2005-2006 Free Software Foundation, Inc.
 # Copyright © 2009 Yuri Vasilevski <yvasilev@gentoo.org>
 # Copyright © 2010 Guillem Jover <guillem@debian.org>
diff --git a/man/Makefile.am b/man/Makefile.am
index a88d92ced..dbd6f61b2 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -9,6 +9,7 @@ man_MANS = \
 	deb-src-control.5 \
 	deb-src-files.5 \
 	deb-src-rules.5 \
+	deb-src-symbols.5 \
 	deb-version.7 \
 	deb-shlibs.5 \
 	deb-split.5 \
@@ -91,6 +92,7 @@ EXTRA_DIST = \
 	deb-src-control.man \
 	deb-src-files.man \
 	deb-src-rules.man \
+	deb-src-symbols.man \
 	deb-substvars.man \
 	deb-symbols.man \
 	deb-triggers.man \
@@ -255,10 +257,10 @@ uninstall-local-yes:
 	done
 
 dist-hook: man.stamp
-	cp $(srcdir)/man.stamp $(distdir)/
+	cp -p $< $(distdir)/
 	for lang in $(LINGUAS_DIST); do \
-	  cp $(srcdir)/po/$$lang.po $(distdir)/po; \
-	  cp $(srcdir)/po/$$lang.add $(distdir)/po; \
+	  cp -p $(srcdir)/po/$$lang.po $(distdir)/po; \
+	  cp -p $(srcdir)/po/$$lang.add $(distdir)/po; \
 	  $(MKDIR_P) $(distdir)/$$lang; \
-	  cp -R $(srcdir)/$$lang $(distdir)/; \
+	  cp -pR $(srcdir)/$$lang $(distdir)/; \
 	done
diff --git a/man/deb-buildinfo.man b/man/deb-buildinfo.man
index 5013aa047..0a77c1bf6 100644
--- a/man/deb-buildinfo.man
+++ b/man/deb-buildinfo.man
@@ -18,6 +18,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-buildinfo 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-buildinfo \- Debian build information file format
@@ -72,8 +73,9 @@ If the source version differs from the binary version, then the
 \fIsource-name\fP will be followed by a \fIsource-version\fP in parenthesis.
 This can happen when the build is for a binary-only non-maintainer upload.
 .TP
-.BR Binary: " \fIbinary-package-list\fP (required)"
+.BR Binary: " \fIbinary-package-list\fP (required in context)"
 This folded field is a space-separated list of binary packages built.
+If the build is source-only, then the field is omitted (since dpkg 1.20.0).
 .TP
 .BR Architecture: " \fIarch-list\fP (required)"
 This space-separated field lists the architectures of the files currently
@@ -149,6 +151,40 @@ via some pattern match to avoid leaking possibly sensitive information.
 On Debian and derivatives only build paths starting with \fI/build/\fP
 will emit this field.
 .TP
+.B Build\-Tainted\-By:
+.TQ
+.I " taint-reason-list"
+This folded field contains a space-separated list of non-exhaustive reason
+tags (formed by alphanumeric and dash characters) which identify why the
+current build has been tainted (since dpkg 1.19.5).
+.IP
+On Debian and derivatives the following reason tags can be emitted:
+.RS
+.TP
+.B merged\-usr\-via\-symlinks
+The system has a merged \fI/usr\fP via symlinks.
+This will confuse \fBdpkg\-query\fP, \fBdpkg\-statoverride\fP,
+\fBdpkg\-trigger\fP, \fBupdate\-alternatives\fP and any other tool using
+pathnames as keys into their databases, as it creates filesystem aliasing
+problems, and messes with the understanding of the filesystem that
+\fBdpkg\fP has recorded in its database.
+For build systems that hardcode pathnames to specific binaries or libraries
+on the resulting artifacts, it can also produce packages that will be
+incompatible with non-/usr-merged filesystems.
+.TP
+.B usr\-local\-has\-configs
+The system has configuration files under \fI/usr/local/etc\fP.
+.TP
+.B usr\-local\-has\-includes
+The system has header files under \fI/usr/local/include\fP.
+.TP
+.B usr\-local\-has\-programs
+The system has programs under \fI/usr/local/bin\fP or \fI/usr/local/sbin\fP.
+.TP
+.B usr\-local\-has\-libraries
+The system has libraries, either static or shared under \fI/usr/local/lib\fP.
+.RE
+.TP
 .BR Installed\-Build\-Depends: " (required)"
 .TQ
 .I " package-list"
diff --git a/man/deb-changelog.man b/man/deb-changelog.man
index 6aaa5d2cf..6d57a8a9d 100644
--- a/man/deb-changelog.man
+++ b/man/deb-changelog.man
@@ -23,6 +23,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb-changelog 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-changelog \- dpkg source packages' changelog file format
@@ -142,12 +143,12 @@ The maintainer details and the date must be separated by exactly two
 spaces.
 .PP
 Any line that consists entirely (i.e., no leading whitespace) of \fB#\fP
-or \fB/* */\fP style comments, RCS keywords, Vim modelines or Emacs local
-variables should be ignored.
+or \fB/* */\fP style comments or RCS keywords.
 .PP
-Ancient changelog entries with other formats at the end of the file should
-be accepted and preserved on output, but their contents might be otherwise
-ignored and parsing stopped at that point.
+Vim modelines or Emacs local variables, and ancient changelog entries with
+other formats at the end of the file should be accepted and preserved on
+output, but their contents might be otherwise ignored and parsing stopped
+at that point.
 .PP
 The entire changelog must be encoded in UTF-8.
 .SH FILES
diff --git a/man/deb-changes.man b/man/deb-changes.man
index 431f4c429..9e1c55f66 100644
--- a/man/deb-changes.man
+++ b/man/deb-changes.man
@@ -18,6 +18,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-changes 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-changes \- Debian changes file format
@@ -70,8 +71,9 @@ If the source version differs from the binary version, then the
 \fIsource-name\fP will be followed by a \fIsource-version\fP in parenthesis.
 This can happen when the upload is a binary-only non-maintainer upload.
 .TP
-.BR Binary: " \fIbinary-package-list\fP (required)"
+.BR Binary: " \fIbinary-package-list\fP (required in context)"
 This folded field is a space-separated list of binary packages to upload.
+If the upload is source-only, then the field is omitted (since dpkg 1.19.3).
 .TP
 .BR Architecture: " \fIarch-list\fP"
 Lists the architectures of the files currently being uploaded.
@@ -113,6 +115,7 @@ typically the person who prepared the package changes for this release.
 This multiline field contains a list of binary package names followed by
 a space, a dash (‘\fB\-\fP’) and their possibly truncated short
 descriptions.
+If the upload is source-only, then the field is omitted (since dpkg 1.19.3).
 .TP
 .BI Closes: " bug-number-list"
 A space-separated list of bug report numbers that have been resolved with
@@ -123,7 +126,7 @@ close the referred bug numbers in the distribution bug tracking system.
 .B Binary\-Only: yes
 This field denotes that the upload is a binary-only non-maintainer build.
 It originates from the \fBbinary\-only=yes\fP key/value from the changelog
-matadata entry.
+metadata entry.
 .TP
 .BI Built\-For\-Profiles: " profile-list"
 This field specifies a whitespace separated list of build profiles that
@@ -185,7 +188,7 @@ The list of files in these fields must match the list of files in the
 .
 .SH BUGS
 The \fBFiles\fP field is inconsistent with the other \fBChecksums\fP fields.
-The \fBChange\-By\fP and \fBMaintainer\fP fields have confusing names.
+The \fBChanged\-By\fP and \fBMaintainer\fP fields have confusing names.
 The \fBDistribution\fP field contains information about what is commonly
 referred to as a suite.
 .SH SEE ALSO
diff --git a/man/deb-conffiles.man b/man/deb-conffiles.man
index 5150ddca2..47d9c9194 100644
--- a/man/deb-conffiles.man
+++ b/man/deb-conffiles.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-conffiles 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-conffiles \- package conffiles
diff --git a/man/deb-control.man b/man/deb-control.man
index 865b4941a..5ad1f493d 100644
--- a/man/deb-control.man
+++ b/man/deb-control.man
@@ -20,6 +20,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-control 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-control \- Debian binary packages' master control file format
@@ -341,10 +342,17 @@ Binary packages marked with this field will not appear in the
 \fIdebian/control\fP master source control file.
 The only currently used reason is \fBdebug\-symbols\fP.
 .
+.TP
+.BI Build\-Ids: " elf-build-id-list"
+This field specifies a whitespace separated list of ELF build-ids. These
+are unique identifiers for semantically identical ELF objects, for each
+of these within the package.
+.
+The format or the way to compute each build-id is not defined by design.
+.
 .SH EXAMPLE
 .\" .RS
 .nf
-# Comment
 Package: grep
 Essential: yes
 Priority: required
@@ -367,7 +375,13 @@ Description: GNU grep, egrep and fgrep.
 .fi
 .\" .RE
 .
+.SH BUGS
+The \fBBuild\-Ids\fP field uses a rather generic name out of its original
+context within an ELF object, which serves a very specific purpose and
+executable format.
+.
 .SH SEE ALSO
+.BR deb\-src\-control (5),
 .BR deb (5),
 .BR deb\-version (7),
 .BR debtags (1),
diff --git a/man/deb-extra-override.man b/man/deb-extra-override.man
index 294c7a97b..81eea0358 100644
--- a/man/deb-extra-override.man
+++ b/man/deb-extra-override.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-extra\-override 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-extra\-override \- Debian archive extra override file
diff --git a/man/deb-old.man b/man/deb-old.man
index 16a4633b1..8fa217d0a 100644
--- a/man/deb-old.man
+++ b/man/deb-old.man
@@ -18,6 +18,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-old 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-old \- old style Debian binary package format
diff --git a/man/deb-origin.man b/man/deb-origin.man
index 81d499ca2..5f63b224d 100644
--- a/man/deb-origin.man
+++ b/man/deb-origin.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-origin 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-origin \- Vendor-specific information files
diff --git a/man/deb-override.man b/man/deb-override.man
index bb1140282..6954aa4dc 100644
--- a/man/deb-override.man
+++ b/man/deb-override.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-override 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-override \- Debian archive override file
@@ -65,7 +66,6 @@ in the
 directory on any Debian mirror.
 .
 .SH SEE ALSO
-.ad l
 .BR dpkg\-scanpackages (1),
 .BR dpkg\-scansources (1),
 .BR apt\-ftparchive (1).
diff --git a/man/deb-postinst.man b/man/deb-postinst.man
index c792a7568..acd4994d0 100644
--- a/man/deb-postinst.man
+++ b/man/deb-postinst.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-postinst 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-postinst \- package post-installation maintainer script
diff --git a/man/deb-postrm.man b/man/deb-postrm.man
index 30553cad9..9903289b8 100644
--- a/man/deb-postrm.man
+++ b/man/deb-postrm.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-postrm 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-postrm \- package post-removal maintainer script
diff --git a/man/deb-preinst.man b/man/deb-preinst.man
index 3004ca5b1..1c7596c78 100644
--- a/man/deb-preinst.man
+++ b/man/deb-preinst.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-preinst 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-preinst \- package pre-installation maintainer script
diff --git a/man/deb-prerm.man b/man/deb-prerm.man
index a75df19dc..a1402d3ea 100644
--- a/man/deb-prerm.man
+++ b/man/deb-prerm.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-prerm 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-prerm \- package pre-removal maintainer script
diff --git a/man/deb-shlibs.man b/man/deb-shlibs.man
index 223cd441f..7c023e015 100644
--- a/man/deb-shlibs.man
+++ b/man/deb-shlibs.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-shlibs 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-shlibs \- Debian shared library information file
@@ -25,7 +26,7 @@ deb\-shlibs \- Debian shared library information file
 .PP
 .B shlibs
 files map shared library names and versions
-.RI ( sonames )
+.RI ( SONAMEs )
 to dependencies suitable for a package control file.  There is one
 entry per line. Blank lines are \fBnot\fP allowed.  Lines beginning
 with an \fB#\fP character are considered commentary, and are ignored.
@@ -43,13 +44,23 @@ but the \fIdependencies\fP field extends to the end of the line.  The
 The \fIdependencies\fP field has the same syntax as the \fBDepends\fP
 field in a binary control file, see \fBdeb\-control\fP(5).
 .
+.SH SONAME FORMATS
+The SONAME formats supported are:
+
+  \fIname\fP.so.\fIversion\fP
+
+and
+
+  \fIname\fP-\fIversion\fP.so
+
+where \fIname\fP is usually prefixed by \fBlib\fP.
 .SH EXAMPLES
 .PP
 The
 .B shlibs
 file for a typical library package, named
 .IR libcrunch1 ,
-that provides one library whose soname is
+that provides one library whose SONAME is
 .IR libcrunch.so.1 ,
 might read
 .IP
diff --git a/man/deb-split.man b/man/deb-split.man
index 09372ca38..e0d7e8f91 100644
--- a/man/deb-split.man
+++ b/man/deb-split.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-split 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-split \- Debian multi-part binary package format
diff --git a/man/deb-src-control.man b/man/deb-src-control.man
index 259475c2e..c5fff3ca7 100644
--- a/man/deb-src-control.man
+++ b/man/deb-src-control.man
@@ -18,6 +18,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-src\-control 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-src\-control \- Debian source packages' master control file format
@@ -50,9 +51,9 @@ Lines starting with a ‘\fB#\fP’ are treated as comments.
 .BR Source: " \fIsource-package-name\fP (required)"
 The value of this field is the name of the source package, and should
 match the name of the source package in the debian/changelog file. A package
-name must consist only of lower case letters (a-z), digits (0-9), plus (+) and
+name must consist only of lowercase letters (a-z), digits (0-9), plus (+) and
 minus (-) signs, and periods (.). Package names must be at least two characters
-long and must start with an alphanumeric character.
+long and must start with a lowercase alphanumeric character (a-z0-9).
 
 .TP
 .BR Maintainer: " \fIfullname-email\fP (recommended)"
@@ -126,6 +127,15 @@ expose an interface that is used to run a command under (fake)root.
 .RE
 
 .TP
+.BI Testsuite: " name-list"
+.TQ
+.BI Testsuite\-Triggers: " package-list"
+These fields are described in the
+.BR dsc (5)
+manual page, as they are generated from information inferred from
+\fBdebian/tests/control\fP or copied literally to the source control file.
+
+.TP
 .BI Vcs\-Arch: " url"
 .TQ
 .BI Vcs\-Bzr: " url"
@@ -444,8 +454,8 @@ Maintainer: Dpkg Developers <debian\-dpkg@lists.debian.org>
 # this field is copied to the binary and source packages
 XBS\-Upstream\-Release\-Status: stable
 Homepage: https://wiki.debian.org/Teams/Dpkg
-Vcs\-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git
-Vcs\-Git: https://anonscm.debian.org/git/dpkg/dpkg.git
+Vcs\-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git
+Vcs\-Git: https://git.dpkg.org/git/dpkg/dpkg.git
 Standards\-Version: 3.7.3
 Build\-Depends: pkg\-config, debhelper (>= 4.1.81),
  libselinux1\-dev (>= 1.28\-4) [!linux\-any]
diff --git a/man/deb-src-files.man b/man/deb-src-files.man
index 39269aacd..181adca49 100644
--- a/man/deb-src-files.man
+++ b/man/deb-src-files.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-src\-files 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-src\-files \- Debian distribute files format
@@ -33,6 +34,9 @@ The \fIdebian/files\fP file has a simple whitespace-delimited format.
 .I filename
 .I section
 .I priority
+[
+.I keyword=value\&...\&
+]
 .in -5
 .PP
 .I filename
@@ -43,12 +47,17 @@ and
 .I priority
 correspond to the respective control fields available in the .deb.
 The allowed values are specific to each distribution archive.
+.PP
+.I keyword=value\&...\&
+corresponds to an optional whitespace-delimited list of attributes for this
+entry.
+The only currently supported keyword is \fBautomatic\fP with value
+\fByes\fP, to mark automatically generated files.
 .
 .SH NOTES
 This file is not intended to be modified directly, please use one of
 \fBdpkg\-gencontrol\fP or \fBdpkg\-distaddfile\fP to add entries to it.
 .
 .SH SEE ALSO
-.ad l
 .BR dpkg\-genchanges (1),
 .BR dpkg\-distaddfile (1).
diff --git a/man/deb-src-rules.man b/man/deb-src-rules.man
index 19a8f7207..5b5f372a2 100644
--- a/man/deb-src-rules.man
+++ b/man/deb-src-rules.man
@@ -16,6 +16,8 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-src\-rules 5 "2017-09-05" "Debian Project" "dpkg utilities"
+.ad l
+.nh
 .SH NAME
 deb\-src\-rules \- Debian source package rules file
 .
@@ -40,7 +42,7 @@ This target will be called with root privileges.
 .B build\-indep
 Build architecture independent files required to build any architecture
 independent binary package.
-If there are no architecture indepdenent binary packages to generate,
+If there are no architecture independent binary packages to generate,
 the target must still exist but do nothing.
 This target must not require root privileges.
 .TP
@@ -76,8 +78,6 @@ depending (at least transitively) on \fBbinary\-indep\fP and/or
 This target will be called with root privileges.
 .
 .SH SEE ALSO
-.ad l
-.nh
 .BR dpkg\-architecture (1),
 .BR dpkg\-vendor (1),
 .BR dpkg\-buildflags (1),
diff --git a/man/deb-src-symbols.man b/man/deb-src-symbols.man
new file mode 100644
index 000000000..e1fc836fb
--- /dev/null
+++ b/man/deb-src-symbols.man
@@ -0,0 +1,348 @@
+.\" dpkg manual page - deb-src-symbols(5)
+.\"
+.\" Copyright © 2007-2011 Raphaël Hertzog <hertzog@debian.org>
+.\" Copyright © 2009-2010 Modestas Vainius <modestas@vainius.eu>
+.\" Copyright © 2012-2015 Guillem Jover <guillem@debian.org>
+.\"
+.\" This is free software; you can redistribute it and/or modify
+.\" it under the terms of the GNU General Public License as published by
+.\" the Free Software Foundation; either version 2 of the License, or
+.\" (at your option) any later version.
+.\"
+.\" This is distributed in the hope that it will be useful,
+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+.\" GNU General Public License for more details.
+.\"
+.\" You should have received a copy of the GNU General Public License
+.\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
+.
+.TH deb\-src\-symbols 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.nh
+.SH NAME
+deb\-src\-symbols \- Debian's extended shared library template file
+.
+.SH SYNOPSIS
+debian/\fIpackage\fR.symbols.\fIarch\fR
+.br
+debian/symbols.\fIarch\fR
+.br
+debian/\fIpackage\fR.symbols
+.br
+debian/symbols
+.
+.SH DESCRIPTION
+The symbol file templates are shipped in Debian source packages, and its
+format is a superset of the symbols files shippsed in binary packages.
+.P
+.SS Comments
+Comments are supported in template symbol files. Any line with ‘#’ as
+the first character is a comment except if it starts with ‘#include’
+(see section \fBUsing includes\fP).
+Lines starting with ‘#MISSING:’ are special comments documenting
+symbols that have disappeared.
+.SS Using #PACKAGE# substitution
+.P
+In some rare cases, the name of the library varies between architectures.
+To avoid hardcoding the name of the package in the symbols file, you can
+use the marker \fI#PACKAGE#\fR. It will be replaced by the real package
+name during installation of the symbols files. Contrary to the
+\fI#MINVER#\fR marker, \fI#PACKAGE#\fR will never appear in a symbols file
+inside a binary package.
+.SS Using symbol tags
+.P
+Symbol tagging is useful for marking symbols that are special in some way.  Any
+symbol can have an arbitrary number of tags associated with it. While all tags are
+parsed and stored, only some of them are understood by
+\fBdpkg\-gensymbols\fR and trigger special handling of the symbols. See
+subsection \fBStandard symbol tags\fR for reference of these tags.
+.P
+Tag specification comes right before the symbol name (no whitespace is allowed
+in between). It always starts with an opening bracket \fB(\fR, ends with a
+closing bracket \fB)\fR and must contain at least one tag. Multiple tags are
+separated by the \fB|\fR character. Each tag can optionally have a value which
+is separated form the tag name by the \fB=\fR character. Tag names and values
+can be arbitrary strings except they cannot contain any of the special \fB)\fR
+\fB|\fR \fB=\fR characters. Symbol names following a tag specification can
+optionally be quoted with either \fB'\fR or \fB"\fR characters to allow
+whitespaces in them. However, if there are no tags specified for the symbol,
+quotes are treated as part of the symbol name which continues up until the
+first space.
+.P
+ (tag1=i am marked|tag name with space)"tagged quoted symbol"@Base 1.0
+ (optional)tagged_unquoted_symbol@Base 1.0 1
+ untagged_symbol@Base 1.0
+.P
+The first symbol in the example is named \fItagged quoted symbol\fR and has two
+tags: \fItag1\fR with value \fIi am marked\fR and \fItag name with space\fR
+that has no value. The second symbol named \fItagged_unquoted_symbol\fR is
+only tagged with the tag named \fIoptional\fR. The last symbol is an
+example of the normal untagged symbol.
+.P
+Since symbol tags are an extension of the \fBdeb\-symbols\fP(5) format, they
+can only be part of the symbols files used in source packages (those files
+should then be seen as templates used to build the symbols files that are
+embedded in binary packages). When
+\fBdpkg\-gensymbols\fR is called without the \fB\-t\fP option, it will
+output symbols files compatible to the \fBdeb\-symbols\fP(5) format:
+it fully processes symbols according to the requirements of their standard tags
+and strips all tags from the output. On the contrary, in template mode
+(\fB\-t\fP) all symbols and their tags (both standard and unknown ones)
+are kept in the output and are written in their original form as they were
+loaded.
+.SS Standard symbol tags
+.TP
+.B optional
+A symbol marked as optional can disappear from the library at any time and that
+will never cause \fBdpkg\-gensymbols\fR to fail. However, disappeared optional
+symbols will continuously appear as MISSING in the diff in each new package
+revision.  This behaviour serves as a reminder for the maintainer that such a
+symbol needs to be removed from the symbol file or readded to the library. When
+the optional symbol, which was previously declared as MISSING, suddenly
+reappears in the next revision, it will be upgraded back to the “existing”
+status with its minimum version unchanged.
+
+This tag is useful for symbols which are private where their disappearance do
+not cause ABI breakage. For example, most of C++ template instantiations fall
+into this category. Like any other tag, this one may also have an arbitrary
+value: it could be used to indicate why the symbol is considered optional.
+.TP
+.B arch=\fIarchitecture-list\fR
+.TQ
+.B arch\-bits=\fIarchitecture-bits\fR
+.TQ
+.B arch\-endian=\fIarchitecture-endianness\fR
+These tags allow one to restrict the set of architectures where the symbol
+is supposed to exist. The \fBarch\-bits\fP and \fBarch\-endian\fP tags
+are supported since dpkg 1.18.0. When the symbols list is updated with
+the symbols
+discovered in the library, all arch-specific symbols which do not concern
+the current host architecture are treated as if they did not exist. If an
+arch-specific symbol matching the current host architecture does not exist
+in the library, normal procedures for missing symbols apply and it may
+cause \fBdpkg\-gensymbols\fR to fail. On the other hand, if the
+arch-specific symbol is found when it was not supposed to exist (because
+the current host architecture is not listed in the tag or does not match
+the endianness and bits), it is made arch neutral (i.e. the arch, arch-bits
+and arch-endian tags are dropped and the symbol will appear in the diff due
+to this change), but it is not considered as new.
+
+When operating in the default non-template mode, among arch-specific symbols
+only those that match the current host architecture are written to the
+symbols file. On the contrary, all arch-specific symbols (including those
+from foreign arches) are always written to the symbol file when operating
+in template mode.
+
+The format of \fIarchitecture-list\fR is the same as the one used in the
+\fBBuild\-Depends\fP field of \fIdebian/control\fR (except the enclosing
+square brackets []). For example, the first symbol from the list below
+will be considered only on alpha, any\-amd64 and ia64 architectures,
+the second only on linux architectures, while the third one anywhere
+except on armel.
+
+ (arch=alpha any\-amd64 ia64)64bit_specific_symbol@Base 1.0
+ (arch=linux\-any)linux_specific_symbol@Base 1.0
+ (arch=!armel)symbol_armel_does_not_have@Base 1.0
+
+The \fIarchitecture-bits\fP is either \fB32\fP or \fB64\fP.
+
+ (arch-bits=32)32bit_specific_symbol@Base 1.0
+ (arch-bits=64)64bit_specific_symbol@Base 1.0
+
+The \fIarchitecture-endianness\fP is either \fBlittle\fP or \fBbig\fP.
+
+ (arch-endian=little)little_endian_specific_symbol@Base 1.0
+ (arch-endian=big)big_endian_specific_symbol@Base 1.0
+
+Multiple restrictions can be chained.
+
+ (arch-bits=32|arch-endian=little)32bit_le_symbol@Base 1.0
+.TP
+.B ignore\-blacklist
+dpkg\-gensymbols has an internal blacklist of symbols that should not
+appear in symbols files as they are usually only side-effects of
+implementation details of the toolchain. If for some reason, you really
+want one of those symbols to be included in the symbols file, you should
+tag the symbol with \fBignore\-blacklist\fP. It can be necessary for
+some low level toolchain libraries like libgcc.
+.TP
+.B c++
+Denotes \fIc++\fR symbol pattern. See \fBUsing symbol patterns\fR subsection
+below.
+.TP
+.B symver
+Denotes \fIsymver\fR (symbol version) symbol pattern. See \fBUsing symbol
+patterns\fR subsection below.
+.TP
+.B regex
+Denotes \fIregex\fR symbol pattern. See \fBUsing symbol patterns\fR subsection
+below.
+.SS Using symbol patterns
+.P
+Unlike a standard symbol specification, a pattern may cover multiple real
+symbols from the library. \fBdpkg\-gensymbols\fR will attempt to match each
+pattern against each real symbol that does \fInot\fR have a specific symbol
+counterpart defined in the symbol file. Whenever the first matching pattern is
+found, all its tags and properties will be used as a basis specification of the
+symbol. If none of the patterns matches, the symbol will be considered as new.
+
+A pattern is considered lost if it does not match any symbol in the library. By
+default this will trigger a \fBdpkg\-gensymbols\fP failure under \fB\-c1\fP or
+higher level. However, if the failure is undesired, the pattern may be marked
+with the \fIoptional\fR tag. Then if the pattern does not match anything, it
+will only appear in the diff as MISSING. Moreover, like any symbol, the pattern
+may be limited to the specific architectures with the \fIarch\fR tag. Please
+refer to \fBStandard symbol tags\fR subsection above for more information.
+
+Patterns are an extension of the \fBdeb\-symbols\fP(5) format hence they are
+only valid in symbol file templates. Pattern specification syntax is not any
+different from the one of a specific symbol. However, symbol name part of the
+specification serves as an expression to be matched against \fIname@version\fR
+of the real symbol. In order to distinguish among different pattern types, a
+pattern will typically be tagged with a special tag.
+
+At the moment, \fBdpkg\-gensymbols\fR supports three basic pattern types:
+.TP 3
+.B c++
+This pattern is denoted by the \fIc++\fR tag. It matches only C++ symbols by
+their demangled symbol name (as emitted by \fBc++filt\fR(1) utility). This
+pattern is very handy for matching symbols which mangled names might vary
+across different architectures while their demangled names remain the same. One
+group of such symbols is \fInon\-virtual thunks\fR which have architecture
+specific offsets embedded in their mangled names. A common instance of this
+case is a virtual destructor which under diamond inheritance needs a
+non-virtual thunk symbol. For example, even if _ZThn8_N3NSB6ClassDD1Ev@Base on
+32bit architectures will probably be _ZThn16_N3NSB6ClassDD1Ev@Base on 64bit
+ones, it can be matched with a single \fIc++\fR pattern:
+
+libdummy.so.1 libdummy1 #MINVER#
+ [...]
+ (c++)"non\-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0
+ [...]
+
+The demangled name above can be obtained by executing the following command:
+
+ $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt
+
+Please note that while mangled name is unique in the library by definition,
+this is not necessarily true for demangled names. A couple of distinct real
+symbols may have the same demangled name. For example, that's the case with
+non-virtual thunk symbols in complex inheritance configurations or with most
+constructors and destructors (since g++ typically generates two real symbols
+for them). However, as these collisions happen on the ABI level, they should
+not degrade quality of the symbol file.
+.TP
+.B symver
+This pattern is denoted by the \fIsymver\fR tag. Well maintained libraries have
+versioned symbols where each version corresponds to the upstream version where
+the symbol got added. If that's the case, you can use a \fIsymver\fR pattern to
+match any symbol associated to the specific version. For example:
+
+libc.so.6 libc6 #MINVER#
+ (symver)GLIBC_2.0 2.0
+ [...]
+ (symver)GLIBC_2.7 2.7
+ access@GLIBC_2.0 2.2
+
+All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to
+minimal version of 2.0 and 2.7 respectively with the exception of the symbol
+access@GLIBC_2.0. The latter will lead to a minimal dependency on libc6 version
+2.2 despite being in the scope of the "(symver)GLIBC_2.0" pattern because
+specific symbols take precedence over patterns.
+
+Please note that while old style wildcard patterns (denoted by "*@version" in
+the symbol name field) are still supported, they have been deprecated by new
+style syntax "(symver|optional)version". For example, "*@GLIBC_2.0 2.0" should
+be written as "(symver|optional)GLIBC_2.0 2.0" if the same behaviour is needed.
+.TP
+.B regex
+Regular expression patterns are denoted by the \fIregex\fR tag. They match by
+the perl regular expression specified in the symbol name field. A regular
+expression is matched as it is, therefore do not forget to start it with the
+\fI^\fR character or it may match any part of the real symbol
+\fIname@version\fR string. For example:
+
+libdummy.so.1 libdummy1 #MINVER#
+ (regex)"^mystack_.*@Base$" 1.0
+ (regex|optional)"private" 1.0
+
+Symbols like "mystack_new@Base", "mystack_push@Base", "mystack_pop@Base" etc.
+will be matched by the first pattern while e.g. "ng_mystack_new@Base" won't.
+The second pattern will match all symbols having the string "private" in their
+names and matches will inherit \fIoptional\fR tag from the pattern.
+.P
+Basic patterns listed above can be combined where it makes sense. In that case,
+they are processed in the order in which the tags are specified. For example,
+both
+
+ (c++|regex)"^NSA::ClassA::Private::privmethod\\d\\(int\\)@Base" 1.0
+ (regex|c++)N3NSA6ClassA7Private11privmethod\\dEi@Base 1.0
+
+will match symbols "_ZN3NSA6ClassA7Private11privmethod1Ei@Base" and
+"_ZN3NSA6ClassA7Private11privmethod2Ei@Base". When matching the first pattern,
+the raw symbol is first demangled as C++ symbol, then the demangled name is
+matched against the regular expression. On the other hand, when matching the
+second pattern, regular expression is matched against the raw symbol name, then
+the symbol is tested if it is C++ one by attempting to demangle it. A failure
+of any basic pattern will result in the failure of the whole pattern.
+Therefore, for example, "__N3NSA6ClassA7Private11privmethod\\dEi@Base" will not
+match either of the patterns because it is not a valid C++ symbol.
+
+In general, all patterns are divided into two groups: aliases (basic \fIc++\fR
+and \fIsymver\fR) and generic patterns (\fIregex\fR, all combinations of
+multiple basic patterns). Matching of basic alias-based patterns is fast (O(1))
+while generic patterns are O(N) (N - generic pattern count) for each symbol.
+Therefore, it is recommended not to overuse generic patterns.
+
+When multiple patterns match the same real symbol, aliases (first \fIc++\fR,
+then \fIsymver\fR) are preferred over generic patterns. Generic patterns are
+matched in the order they are found in the symbol file template until the first
+success.  Please note, however, that manual reordering of template file entries
+is not recommended because \fBdpkg\-gensymbols\fR generates diffs based on the
+alphanumerical order of their names.
+.SS Using includes
+.P
+When the set of exported symbols differ between architectures, it may become
+inefficient to use a single symbol file. In those cases, an include directive
+may prove to be useful in a couple of ways:
+.IP • 4
+You can factorize the common part in some external file
+and include that file in your \fIpackage\fR.symbols.\fIarch\fR file by
+using an include directive like this:
+
+#include "\fIpackages\fR.symbols.common"
+.IP •
+The include directive may also be tagged like any symbol:
+
+(tag|...|tagN)#include "file-to-include"
+
+As a result, all symbols included from \fIfile-to-include\fR will be considered
+to be tagged with \fItag\fR ... \fItagN\fR by default. You can use this feature
+to create a common \fIpackage\fR.symbols file which includes architecture
+specific symbol files:
+
+  common_symbol1@Base 1.0
+ (arch=amd64 ia64 alpha)#include "package.symbols.64bit"
+ (arch=!amd64 !ia64 !alpha)#include "package.symbols.32bit"
+  common_symbol2@Base 1.0
+.P
+The symbols files are read line by line, and include directives are processed
+as soon as they are encountered. This means that the content of the included
+file can override any content that appeared before the include directive and
+that any content after the directive can override anything contained in the
+included file. Any symbol (or even another #include directive) in the included
+file can specify additional tags or override values of the inherited tags in
+its tag specification. However, there is no way for the symbol to remove
+any of the inherited tags.
+.P
+An included file can repeat the header line containing the SONAME of the
+library. In that case, it overrides any header line previously read.
+However, in general it's best to avoid duplicating header lines. One way
+to do it is the following:
+.PP
+#include "libsomething1.symbols.common"
+ arch_specific_symbol@Base 1.0
+.SH SEE ALSO
+.BR deb\-symbols (5),
+.BR dpkg\-shlibdeps (1),
+.BR dpkg\-gensymbols (1).
diff --git a/man/deb-substvars.man b/man/deb-substvars.man
index 76110faff..bfaa6ff4f 100644
--- a/man/deb-substvars.man
+++ b/man/deb-substvars.man
@@ -19,6 +19,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-substvars 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-substvars \- Debian source substitution variables
@@ -39,8 +40,10 @@ they perform some variable substitutions on the output file.
 
 A variable substitution has the form
 .BI ${ variable-name }\fR.
-Variable names consist of alphanumerics, hyphens and colons and start
-with an alphanumeric. Variable substitutions are performed repeatedly
+Variable names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and
+colons (:) and start with an alphanumeric, and are case-sensitive, even
+though they might refer to other entities which are case-preserving.
+Variable substitutions are performed repeatedly
 until none are left; the full text of the field after the substitution
 is rescanned to look for more substitutions.
 
@@ -128,6 +131,7 @@ the value of that field. If this variable is not set
 will compute the default value by accumulating the size of each regular
 file and symlink rounded to 1 KiB used units, and a baseline of 1 KiB for
 any other filesystem object type.
+With hardlinks only being counted once as a regular file.
 
 \fBNote:\fP Take into account that this can only ever be an approximation,
 as the actual size used on the installed system will depend greatly on the
@@ -190,7 +194,6 @@ and an empty value is assumed.
 List of substitution variables and values.
 .
 .SH SEE ALSO
-.ad l
 .BR dpkg (1),
 .BR dpkg\-genchanges (1),
 .BR dpkg\-gencontrol (1),
diff --git a/man/deb-symbols.man b/man/deb-symbols.man
index ca52b1733..5f1e39e1f 100644
--- a/man/deb-symbols.man
+++ b/man/deb-symbols.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-symbols 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-symbols \- Debian's extended shared library information file
@@ -67,6 +68,13 @@ and is used by \fBdpkg\-shlibdeps\fP to make sure that the dependency
 generated is at least as strict as the corresponding build dependency
 (since dpkg 1.14.13).
 .TP
+.B Build\-Depends\-Packages
+The same as \fBBuild\-Depends\-Package\fP but accepts a comma-separated
+list of package names (since dpkg 1.20.0).
+This field will override any \fBBuild\-Depends\-Package\fP field present,
+and is mostly useful with “\-dev” packages and metapackages depending
+on these, say for a transition period.
+.TP
 .B Ignore\-Blacklist\-Groups
 It indicates what blacklist groups should be ignored, as a whitespace
 separated list, so that the symbols contained in those groups get
diff --git a/man/deb-triggers.man b/man/deb-triggers.man
index dba9fca4d..7c82fea8e 100644
--- a/man/deb-triggers.man
+++ b/man/deb-triggers.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-triggers 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-triggers \- package triggers
@@ -43,9 +44,17 @@ The trigger control directives currently supported are:
 .IP
 Specifies that the package is interested in the named trigger. All
 triggers in which a package is interested must be listed using this
-directive in the triggers control file. The “noawait” variant does
-not put the triggering packages in triggers\-awaited state. This should
-be used when the functionality provided by the trigger is not crucial.
+directive in the triggers control file.
+.IP
+The “await” variants put the triggering package in triggers\-awaited
+state depending on how the trigger was activated.
+The “noawait” variant does not put the triggering packages in
+triggers\-awaited state, even if the triggering package declared an
+“await” activation (either with an \fBactivate\-await\fP or \fBactivate\fP
+directive, or by using the \fBdpkg\-trigger\fP \fB\-\-no\-await\fP
+command-line option).
+The “noawait” variant should be used when the functionality provided
+by the trigger is not crucial.
 .TP
 \fBactivate\fP \fItrigger-name\fP
 .TQ
@@ -57,9 +66,13 @@ Arranges that changes to this package's state will activate the
 specified trigger. The trigger will be activated at the start of
 the following operations: unpack, configure, remove (including for
 the benefit of a conflicting package), purge and deconfigure.
-The “noawait” variant does not put the triggering packages in
-triggers\-awaited state. This should be used when the functionality
-provided by the trigger is not crucial.
+.IP
+The “await” variants only put the triggering package in triggers\-awaited
+state if the interest directive is also “await”.
+The “noawait” variant never puts the triggering packages in
+triggers\-awaited state.
+The “noawait” variant should be used when the functionality provided
+by the trigger is not crucial.
 .IP
 If this package disappears during the unpacking of another package
 the trigger will be activated when the disappearance is noted
@@ -83,6 +96,13 @@ will lead to errors if used with an older dpkg.
 .PP
 The “\-await” alias variants are supported since dpkg 1.17.21, and
 will lead to errors if used with an older dpkg.
+.PP
+When a package provides an \fBinterest\-noawait\fP directive, any activation
+will set the triggering package into “noawait” mode, regardless of the
+awaiting mode requested by the activation (either “await” or “noawait”).
+When a package provides an \fBinterest\fP or \fBinterest\-await\fP directive,
+any activation will set the triggering package into “await” or “noawait“
+depending on how it was activated.
 .
 .SH SEE ALSO
 .BR dpkg\-trigger (1),
diff --git a/man/deb-version.man b/man/deb-version.man
index 8bb76354c..f96d801fc 100644
--- a/man/deb-version.man
+++ b/man/deb-version.man
@@ -19,6 +19,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb\-version 7 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb\-version \- Debian package version number format
diff --git a/man/deb.man b/man/deb.man
index 2b8da5ff0..5ae3a5fde 100644
--- a/man/deb.man
+++ b/man/deb.man
@@ -19,6 +19,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb \- Debian binary package format
diff --git a/man/deb822.man b/man/deb822.man
index d51d9b85f..dbd5bcf70 100644
--- a/man/deb822.man
+++ b/man/deb822.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH deb822 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 deb822 \- Debian RFC822 control data format
diff --git a/man/dpkg-architecture.man b/man/dpkg-architecture.man
index 3edc97526..7c5214898 100644
--- a/man/dpkg-architecture.man
+++ b/man/dpkg-architecture.man
@@ -19,6 +19,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-architecture 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-architecture \- set and determine the architecture for package building
@@ -175,7 +176,8 @@ Examples: i386\-linux\-gnu, x86_64\-linux\-gnu.
 Example paths: /lib/powerpc64le-linux-gnu/, /usr/lib/i386-kfreebsd-gnu/.
 .
 .SH VARIABLES
-The following variables are set by \fBdpkg\-architecture\fP:
+The following variables are set by \fBdpkg\-architecture\fP (see the
+\fBTERMS\fP section for a description of the naming scheme):
 .IP "\fBDEB_BUILD_ARCH\fP" 4
 The Debian architecture of the build machine.
 .IP "\fBDEB_BUILD_ARCH_ABI\fP" 4
diff --git a/man/dpkg-buildflags.man b/man/dpkg-buildflags.man
index a0a76ed53..f8b3da8c3 100644
--- a/man/dpkg-buildflags.man
+++ b/man/dpkg-buildflags.man
@@ -18,6 +18,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-buildflags 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-buildflags \- returns build flags to use during package build
@@ -107,7 +108,7 @@ This is a legacy alias for \fBcmdline\fP.
 .TP
 .B make
 Make directives to set and export all the compilation flags in the
-environment. Output can be written to a makefile fragment and
+environment. Output can be written to a Makefile fragment and
 evaluated using an \fBinclude\fP directive.
 .RE
 .TP
@@ -276,7 +277,7 @@ propagate and to allow finding any omission of normal build flag settings.
 The only currently supported flags are \fBCPPFLAGS\fP, \fBCFLAGS\fP,
 \fBOBJCFLAGS\fP, \fBCXXFLAGS\fP and \fBOBJCXXFLAGS\fP with flags set
 to \fB\-D__DEB_CANARY_\fP\fIflag\fP_\fIrandom-id\fP\fB__\fP, and
-\fBLDFLAGS\fP set to \fB\-Wl,\-z,deb-canary\-\fP\fIrandom-id\fP.
+\fBLDFLAGS\fP set to \fB\-Wl,\-z,deb\-canary\-\fP\fIrandom-id\fP.
 .
 .SS sanitize
 Several compile-time options (detailed below) can be used to help sanitize
@@ -390,18 +391,25 @@ above). The option cannot become enabled if \fBrelro\fP is not enabled.
 .
 .TP
 .B pie
-This setting (with no default since dpkg 1.18.23, and injected by default
-by gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386,
-mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian architectures)
-adds the required options via gcc specs files if
-needed to enable or disable PIE. When enabled and injected by gcc,
-adds nothing. When enabled and not injected by gcc, adds \fB\-fPIE\fP
-to \fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBOBJCFLAGS\fP, \fBOBJCXXFLAGS\fP,
-\fBGCJFLAGS\fP, \fBFFLAGS\fP and \fBFCFLAGS\fP, and \fB\-fPIE \-pie\fP
-to \fBLDFLAGS\fP. When disabled and injected by gcc, adds \fB\-fno\-PIE\fP
-to \fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBOBJCFLAGS\fP, \fBOBJCXXFLAGS\fP,
-\fBGCJFLAGS\fP, \fBFFLAGS\fP and \fBFCFLAGS\fP, and
-\fB\-fno\-PIE \-no\-pie\fP to \fBLDFLAGS\fP.
+This setting (with no global default since dpkg 1.18.23, as it is enabled
+by default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386,
+kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64,
+ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds
+the required options to enable or disable PIE via gcc specs files, if
+needed, depending on whether gcc injects on that architecture the flags
+by itself or not.
+When the setting is enabled and gcc injects the flags, it adds nothing.
+When the setting is enabled and gcc does not inject the flags, it adds
+\fB\-fPIE\fP (via \fI%PKGDATADIR%/pie-compiler.specs\fP) to \fBCFLAGS\fP,
+\fBCXXFLAGS\fP, \fBOBJCFLAGS\fP, \fBOBJCXXFLAGS\fP, \fBGCJFLAGS\fP,
+\fBFFLAGS\fP and \fBFCFLAGS\fP, and
+\fB\-fPIE \-pie\fP (via \fI%PKGDATADIR%/pie-link.specs\fP) to \fBLDFLAGS\fP.
+When the setting is disabled and gcc injects the flags, it adds
+\fB\-fno\-PIE\fP (via \fI%PKGDATADIR%/no-pie-compile.specs\fP) to \fBCFLAGS\fP,
+\fBCXXFLAGS\fP, \fBOBJCFLAGS\fP, \fBOBJCXXFLAGS\fP, \fBGCJFLAGS\fP,
+\fBFFLAGS\fP and \fBFCFLAGS\fP, and
+\fB\-fno\-PIE \-no\-pie\fP (via \fI%PKGDATADIR%/no-pie-link.specs\fP) to
+\fBLDFLAGS\fP.
 
 Position Independent
 Executable are needed to take advantage of Address Space Layout
@@ -469,6 +477,17 @@ This will cause warnings when the \fB__TIME__\fP, \fB__DATE__\fP and
 \fB__TIMESTAMP__\fP macros are used.
 .
 .TP
+.B fixfilepath
+This setting (disabled by default) adds
+.BI \-ffile\-prefix\-map= BUILDPATH =.
+to \fBCFLAGS\fP, \fBCXXFLAGS\fP, \fBOBJCFLAGS\fP, \fBOBJCXXFLAGS\fP,
+\fBGCJFLAGS\fP, \fBFFLAGS\fP and \fBFCFLAGS\fP where \fBBUILDPATH\fP is
+set to the top-level directory of the package being built.
+This has the effect of removing the build path from any generated file.
+
+If both \fBfixdebugpath\fP and \fBfixfilepath\fP are set, this option
+takes precedence, because it is a superset of the former.
+.TP
 .B fixdebugpath
 This setting (enabled by default) adds
 .BI \-fdebug\-prefix\-map= BUILDPATH =.
@@ -557,7 +576,7 @@ Makefile snippet that will load (and optionally export) all flags
 supported by \fBdpkg-buildflags\fP into variables (since dpkg 1.16.1).
 .
 .SH EXAMPLES
-To pass build flags to a build command in a makefile:
+To pass build flags to a build command in a Makefile:
 .PP
 .RS 4
 .nf
diff --git a/man/dpkg-buildpackage.man b/man/dpkg-buildpackage.man
index 12c121c49..9f7efa4d9 100644
--- a/man/dpkg-buildpackage.man
+++ b/man/dpkg-buildpackage.man
@@ -20,6 +20,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-buildpackage 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-buildpackage \- build binary or source packages from sources
@@ -90,7 +91,7 @@ It runs the \fBcheck\fP hook and calls a package checker for the
 \fB.changes\fP file (if a command is specified in \fBDEB_CHECK_COMMAND\fP or
 with \fB\-\-check\-command\fP).
 .IP \fB11.\fP 3
-It runs the \fBsign\fP hook and calls \fBgpg2\fP or \fBgpg\fP (as long as it
+It runs the \fBsign\fP hook and calls \fBgpg\fP (as long as it
 is not an UNRELEASED build, or \fB\-\-no\-sign\fP is specified) to sign the
 \fB.dsc\fP file (if any, unless
 \fB\-us\fP or \fB\-\-unsigned\-source\fP is specified), the \fB.buildinfo\fP
@@ -120,9 +121,10 @@ The allowed values are:
 .B source
 Builds the source package.
 Note: when using this value standalone and if what you want is simply to
-(re-)build the source package, using \fBdpkg\-source\fP is always better
-as it does not require any build dependencies to be installed to be able
-to call the \fBclean\fP target.
+(re-)build the source package from a clean source tree, using
+\fBdpkg\-source\fP directly is always a better option as it does not
+require any build dependencies to be installed which are otherwise
+needed to be able to call the \fBclean\fP target.
 .TP
 .B any
 Builds the architecture specific binary packages.
@@ -276,14 +278,19 @@ Do not check built-in build dependencies and conflicts (since dpkg 1.18.2).
 These are the distribution specific implicit build dependencies usually
 required in a build environment, the so called Build-Essential package set.
 .TP
+.B \-\-rules\-requires\-root
+Do not honor the \fBRules\-Requires\-Root\fP field, falling back to its
+legacy default value (since dpkg 1.19.1).
+.TP
 .BR \-nc ", " \-\-no\-pre\-clean
-Do not clean the source tree (long option since dpkg 1.18.8).
+Do not clean the source tree before building (long option since dpkg 1.18.8).
 Implies \fB\-b\fP if nothing else has been selected among \fB\-F\fP,
 \fB\-g\fP, \fB\-G\fP, \fB\-B\fP, \fB\-A\fP or \fB\-S\fP.
 Implies \fB\-d\fP with \fB\-S\fP (since dpkg 1.18.0).
 .TP
 .BR \-\-pre\-clean
 Clean the source tree before building (since dpkg 1.18.8).
+This is the default behavior.
 .TP
 .BR \-tc ", " \-\-post\-clean
 Clean the source tree (using
@@ -291,6 +298,11 @@ Clean the source tree (using
 .BR "debian/rules clean" )
 after the package has been built (long option since dpkg 1.18.8).
 .TP
+.BR \-\-no\-post\-clean
+Do not clean the source tree after the package has been built
+(since dpkg 1.19.1).
+This is the default behavior.
+.TP
 .BR \-r ", " \-\-root\-command= \fIgain-root-command\fP
 When
 .B dpkg\-buildpackage
@@ -388,9 +400,9 @@ Can be used multiple times.
 When \fBdpkg\-buildpackage\fP needs to execute GPG to sign a source
 control (\fB.dsc\fP) file or a \fB.changes\fP file it will run
 \fIsign-command\fP (searching the \fBPATH\fP if necessary) instead of
-\fBgpg2\fP or \fBgpg\fP (long option since dpkg 1.18.8).
+\fBgpg\fP (long option since dpkg 1.18.8).
 \fIsign-command\fP will get all the arguments
-that \fBgpg2\fP or \fBgpg\fP would have gotten. \fIsign-command\fP
+that \fBgpg\fP would have gotten. \fIsign-command\fP
 should not contain spaces or any other shell metacharacters.
 .TP
 .BR \-k ", " \-\-sign\-key= \fIkey-id\fP
@@ -519,7 +531,14 @@ standalone should be supported.
 parameters forwarded. Any variable that is output by its \fB\-s\fP
 option is integrated in the build environment.
 .TP
-.B DPKG_GAIN_ROOT_CMD
+.B DEB_RULES_REQUIRES_ROOT
+This variable is set to the value obtained from the \fBRules\-Requires\-Root\fP
+field or from the command-line.
+When set, it will be a valid value for the \fBRules\-Requires\-Root\fP field.
+It is used to notify \fBdebian/rules\fP whether the \fBrootless\-builds.txt\fP
+specification is supported.
+.TP
+.B DEB_GAIN_ROOT_CMD
 This variable is set to \fIgain-root-command\fP when the field
 \fBRules\-Requires\-Root\fP is set to a value different to \fBno\fP and
 \fBbinary-targets\fP.
@@ -558,7 +577,6 @@ and initial arguments for
 .IR gain-root-command " and " sign-command .
 .
 .SH SEE ALSO
-.ad l
 .BR dpkg\-source (1),
 .BR dpkg\-architecture (1),
 .BR dpkg\-buildflags (1),
@@ -566,5 +584,4 @@ and initial arguments for
 .BR dpkg\-genchanges (1),
 .BR fakeroot (1),
 .BR lintian (1),
-.BR gpg2 (1),
 .BR gpg (1).
diff --git a/man/dpkg-checkbuilddeps.man b/man/dpkg-checkbuilddeps.man
index fa75e6501..b6ee9a1d7 100644
--- a/man/dpkg-checkbuilddeps.man
+++ b/man/dpkg-checkbuilddeps.man
@@ -18,6 +18,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-checkbuilddeps 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-checkbuilddeps \- check build dependencies and conflicts
diff --git a/man/dpkg-deb.man b/man/dpkg-deb.man
index d3c36748c..f29855cd7 100644
--- a/man/dpkg-deb.man
+++ b/man/dpkg-deb.man
@@ -19,6 +19,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-deb 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-deb \- Debian package archive (.deb) manipulation tool
@@ -65,7 +66,7 @@ the files in it will be put in the binary package's control
 information area.
 
 Unless you specify
-.BR \-\-nocheck ", " dpkg\-deb "
+.BR \-\-nocheck ", " dpkg\-deb
 will read
 .B DEBIAN/control
 and parse it. It will check the file for syntax errors and other problems,
@@ -173,7 +174,7 @@ subdirectory of the specified directory (since dpkg 1.16.1).
 The target directory (but not its parents) will be created if necessary.
 
 The input archive is not (currently) processed sequentially, so reading
-it from standard input («\fB-\fP») is \fBnot\fP supported.
+it from standard input («\fB\-\fP») is \fBnot\fP supported.
 .TP
 .BR \-\-ctrl\-tarfile " \fIarchive\fP"
 Extracts the control data from a binary package and sends it to standard
@@ -207,7 +208,7 @@ necessary.
 .BR \-? ", " \-\-help
 Show the usage message and exit.
 .TP
-.BR \-\-version
+.B \-\-version
 Show the version and exit.
 .
 .SH OPTIONS
@@ -276,7 +277,7 @@ now obsolete; its only use is when building packages to be parsed by
 versions of dpkg older than 0.93.76 (September 1995), which was released
 as i386 a.out only.
 .TP
-.BR \-\-nocheck
+.B \-\-nocheck
 Inhibits
 .BR "dpkg\-deb \-\-build" 's
 usual checks on the proposed contents of an archive. You can build
diff --git a/man/dpkg-distaddfile.man b/man/dpkg-distaddfile.man
index 12d758e17..da82b5476 100644
--- a/man/dpkg-distaddfile.man
+++ b/man/dpkg-distaddfile.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-distaddfile 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-distaddfile \- add entries to debian/files
@@ -76,5 +77,4 @@ prepared.
 can be used to add additional files.
 .
 .SH SEE ALSO
-.ad l
 .BR deb\-src\-files (5).
diff --git a/man/dpkg-divert.man b/man/dpkg-divert.man
index c9d7e1ce7..b37a4852f 100644
--- a/man/dpkg-divert.man
+++ b/man/dpkg-divert.man
@@ -3,7 +3,7 @@
 .\" Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
 .\" Copyright © 1999 Wichert Akkerman <wakkerma@debian.org>
 .\" Copyright © 2004 Scott James Remnant <keybuk@debian.org>
-.\" Copyright © 2007-2013, 2015 Guillem Jover <guillem@debian.org>
+.\" Copyright © 2007-2013, 2015-2018 Guillem Jover <guillem@debian.org>
 .\"
 .\" This is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -19,6 +19,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-divert 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-divert \- override a package's version of a file
@@ -46,9 +47,11 @@ contains those files.
 .TP
 .RB [ \-\-add "] \fIfile\fP"
 Add a diversion for \fIfile\fP.
+The file is currently not renamed, see \fB\-\-rename\fP.
 .TP
 .BI \-\-remove " file"
 Remove a diversion for \fIfile\fP.
+The file is currently not renamed, see \fB\-\-rename\fP.
 .TP
 .BI \-\-list " glob-pattern"
 List diversions matching \fIglob-pattern\fP.
@@ -64,8 +67,17 @@ Print the real name for a diverted file.
 .SH OPTIONS
 .TP
 .BI \-\-admindir " directory"
-Set the \fBdpkg\fP data directory to \fIdirectory\fP (default:
-\fI%ADMINDIR%\fP).
+Set the administrative directory to \fIdirectory\fP.
+Defaults to «\fI%ADMINDIR%\fP».
+.TP
+.BI \-\-instdir " directory"
+Set the installation directory, which refers to the directory where
+packages get installed (since dpkg 1.19.2). Defaults to «\fI/\fP».
+.TP
+.BI \-\-root " directory"
+Set the root directory to \fBdirectory\fP, which sets the installation
+directory to «\fIdirectory\fP» and the administrative
+directory to «\fIdirectory\fP\fB%ADMINDIR%\fP» (since dpkg 1.19.2).
 .TP
 .BI \-\-divert " divert-to"
 \fIdivert-to\fP is the location where the versions of \fIfile\fP, as
@@ -88,6 +100,16 @@ Quiet mode, i.e. no verbose output.
 .B \-\-rename
 Actually move the file aside (or back). \fBdpkg\-divert\fP will abort operation
 in case the destination file already exists.
+This is the common behavior used for diversions of files from the
+non-\fBEssential\fP package set (see \fB\-\-no\-rename\fP for more details).
+.TP
+.B \-\-no\-rename
+Specifies that the file should not be renamed while adding or removing the
+diversion into the database (since dpkg 1.19.1).
+This is intended for diversions of files from the \fBEssential\fP package set,
+where the temporary disappearance of the original file is not acceptable, as
+it can render the system non-functional.
+This is the default behavior, but that will change in the dpkg 1.20.x cycle.
 .TP
 .B \-\-test
 Test mode, i.e. don't actually perform any changes, just demonstrate.
@@ -110,9 +132,14 @@ memory allocations, etc.
 .
 .SH ENVIRONMENT
 .TP
+.B DPKG_ROOT
+If set and the \fB\-\-instdir\fP or \fB\-\-root\fP options have not been
+specified, it will be used as the filesystem root directory
+(since dpkg 1.19.2).
+.TP
 .B DPKG_ADMINDIR
-If set and the \fB\-\-admindir\fP option has not been specified, it will
-be used as the \fBdpkg\fP data directory.
+If set and the \fB\-\-admindir\fP or \fB\-\-root\fP options have not been
+specified, it will be used as the \fBdpkg\fP data directory.
 .TP
 .B DPKG_MAINTSCRIPT_PACKAGE
 If set and the \fB\-\-local\fP and \fB\-\-package\fP options have not been
diff --git a/man/dpkg-genbuildinfo.man b/man/dpkg-genbuildinfo.man
index e756e9fe3..7f500cc1d 100644
--- a/man/dpkg-genbuildinfo.man
+++ b/man/dpkg-genbuildinfo.man
@@ -20,6 +20,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-genbuildinfo 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-genbuildinfo \- generate Debian .buildinfo files
diff --git a/man/dpkg-genchanges.man b/man/dpkg-genchanges.man
index ab9b07413..44d41d15b 100644
--- a/man/dpkg-genchanges.man
+++ b/man/dpkg-genchanges.man
@@ -19,6 +19,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-genchanges 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-genchanges \- generate Debian .changes files
@@ -215,7 +216,6 @@ reads the data here when producing a
 file.
 .
 .SH SEE ALSO
-.ad l
 .BR deb\-substvars (5),
 .BR deb\-src\-control (5),
 .BR deb\-src\-files (5),
diff --git a/man/dpkg-gencontrol.man b/man/dpkg-gencontrol.man
index 897ecb5b0..e33df2cb4 100644
--- a/man/dpkg-gencontrol.man
+++ b/man/dpkg-gencontrol.man
@@ -19,6 +19,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-gencontrol 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-gencontrol \- generate Debian control files
@@ -172,7 +173,6 @@ prepared.
 adds the presumed filenames of binary packages whose control files it
 generates here.
 .SH SEE ALSO
-.ad l
 .BR deb\-substvars (5),
 .BR deb\-src\-control (5),
 .BR deb\-changelog (5),
diff --git a/man/dpkg-gensymbols.man b/man/dpkg-gensymbols.man
index a708b5e96..6e72e3903 100644
--- a/man/dpkg-gensymbols.man
+++ b/man/dpkg-gensymbols.man
@@ -18,6 +18,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-gensymbols 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-gensymbols \- generate symbols files (shared library dependency information)
@@ -59,15 +60,23 @@ Furthermore if the difference is too significant, it will even fail (you
 can customize how much difference you can tolerate, see the \fB\-c\fR
 option).
 .SH MAINTAINING SYMBOLS FILES
+The base interchange format of the symbols file is described in
+\fBdeb\-symbols\fP(5), which is used by the symbols files included in
+binary packages. These are generated from template symbols files
+with a format based on the former, described in \fBdeb\-src\-symbols\fP(5)
+and included in source packages.
+.P
 The symbols files are really useful only if they reflect the evolution of
 the package through several releases. Thus the maintainer has to update
 them every time that a new symbol is added so that its associated minimal
 version matches reality.
+.P
 The diffs contained in the build logs can be used as a starting point,
 but the maintainer, additionally, has to make sure that the behaviour
 of those symbols has not changed in a way that would make anything
 using those symbols and linking against the new version, stop working
 with the old version.
+.P
 In most cases, the diff applies directly to the
 debian/\fIpackage\fR.symbols file. That said, further tweaks are usually
 needed: it's recommended for example to drop the Debian revision
@@ -81,11 +90,7 @@ Before applying any patch to the symbols file, the maintainer should
 double-check that it's sane. Public symbols are not supposed to disappear,
 so the patch should ideally only add new lines.
 .P
-Note that you can put comments in symbols files: any line with ‘#’ as
-the first character is a comment except if it starts with ‘#include’
-(see section \fBUsing includes\fP).
-Lines starting with ‘#MISSING:’ are special comments documenting
-symbols that have disappeared.
+Note that you can put comments in symbols files.
 .P
 Do not forget to check if old symbol versions need to be increased.
 There is no way \fBdpkg\-gensymbols\fP can warn about this. Blindly
@@ -94,307 +99,6 @@ no diff, without checking for such changes, can lead to packages with
 loose dependencies that claim they can work with older packages they
 cannot work with. This will introduce hard to find bugs with (partial)
 upgrades.
-.SS Using #PACKAGE# substitution
-.P
-In some rare cases, the name of the library varies between architectures.
-To avoid hardcoding the name of the package in the symbols file, you can
-use the marker \fI#PACKAGE#\fR. It will be replaced by the real package
-name during installation of the symbols files. Contrary to the
-\fI#MINVER#\fR marker, \fI#PACKAGE#\fR will never appear in a symbols file
-inside a binary package.
-.SS Using symbol tags
-.P
-Symbol tagging is useful for marking symbols that are special in some way.  Any
-symbol can have an arbitrary number of tags associated with it. While all tags are
-parsed and stored, only some of them are understood by
-\fBdpkg\-gensymbols\fR and trigger special handling of the symbols. See
-subsection \fBStandard symbol tags\fR for reference of these tags.
-.P
-Tag specification comes right before the symbol name (no whitespace is allowed
-in between). It always starts with an opening bracket \fB(\fR, ends with a
-closing bracket \fB)\fR and must contain at least one tag. Multiple tags are
-separated by the \fB|\fR character. Each tag can optionally have a value which
-is separated form the tag name by the \fB=\fR character. Tag names and values
-can be arbitrary strings except they cannot contain any of the special \fB)\fR
-\fB|\fR \fB=\fR characters. Symbol names following a tag specification can
-optionally be quoted with either \fB'\fR or \fB"\fR characters to allow
-whitespaces in them. However, if there are no tags specified for the symbol,
-quotes are treated as part of the symbol name which continues up until the
-first space.
-.P
- (tag1=i am marked|tag name with space)"tagged quoted symbol"@Base 1.0
- (optional)tagged_unquoted_symbol@Base 1.0 1
- untagged_symbol@Base 1.0
-.P
-The first symbol in the example is named \fItagged quoted symbol\fR and has two
-tags: \fItag1\fR with value \fIi am marked\fR and \fItag name with space\fR
-that has no value. The second symbol named \fItagged_unquoted_symbol\fR is
-only tagged with the tag named \fIoptional\fR. The last symbol is an
-example of the normal untagged symbol.
-.P
-Since symbol tags are an extension of the \fBdeb\-symbols\fP(5) format, they
-can only be part of the symbols files used in source packages (those files
-should then be seen as templates used to build the symbols files that are
-embedded in binary packages). When
-\fBdpkg\-gensymbols\fR is called without the \fB\-t\fP option, it will
-output symbols files compatible to the \fBdeb\-symbols\fP(5) format:
-it fully processes symbols according to the requirements of their standard tags
-and strips all tags from the output. On the contrary, in template mode
-(\fB\-t\fP) all symbols and their tags (both standard and unknown ones)
-are kept in the output and are written in their original form as they were
-loaded.
-.SS Standard symbol tags
-.TP
-.B optional
-A symbol marked as optional can disappear from the library at any time and that
-will never cause \fBdpkg\-gensymbols\fR to fail. However, disappeared optional
-symbols will continuously appear as MISSING in the diff in each new package
-revision.  This behaviour serves as a reminder for the maintainer that such a
-symbol needs to be removed from the symbol file or readded to the library. When
-the optional symbol, which was previously declared as MISSING, suddenly
-reappears in the next revision, it will be upgraded back to the “existing”
-status with its minimum version unchanged.
-
-This tag is useful for symbols which are private where their disappearance do
-not cause ABI breakage. For example, most of C++ template instantiations fall
-into this category. Like any other tag, this one may also have an arbitrary
-value: it could be used to indicate why the symbol is considered optional.
-.TP
-.B arch=\fIarchitecture-list\fR
-.TQ
-.B arch\-bits=\fIarchitecture-bits\fR
-.TQ
-.B arch\-endian=\fIarchitecture-endianness\fR
-These tags allow one to restrict the set of architectures where the symbol
-is supposed to exist. The \fBarch\-bits\fP and \fBarch\-endian\fP tags
-are supported since dpkg 1.18.0. When the symbols list is updated with
-the symbols
-discovered in the library, all arch-specific symbols which do not concern
-the current host architecture are treated as if they did not exist. If an
-arch-specific symbol matching the current host architecture does not exist
-in the library, normal procedures for missing symbols apply and it may
-cause \fBdpkg\-gensymbols\fR to fail. On the other hand, if the
-arch-specific symbol is found when it was not supposed to exist (because
-the current host architecture is not listed in the tag or does not match
-the endianness and bits), it is made arch neutral (i.e. the arch, arch-bits
-and arch-endian tags are dropped and the symbol will appear in the diff due
-to this change), but it is not considered as new.
-
-When operating in the default non-template mode, among arch-specific symbols
-only those that match the current host architecture are written to the
-symbols file. On the contrary, all arch-specific symbols (including those
-from foreign arches) are always written to the symbol file when operating
-in template mode.
-
-The format of \fIarchitecture-list\fR is the same as the one used in the
-\fBBuild\-Depends\fP field of \fIdebian/control\fR (except the enclosing
-square brackets []). For example, the first symbol from the list below
-will be considered only on alpha, any\-amd64 and ia64 architectures,
-the second only on linux architectures, while the third one anywhere
-except on armel.
-
- (arch=alpha any\-amd64 ia64)64bit_specific_symbol@Base 1.0
- (arch=linux\-any)linux_specific_symbol@Base 1.0
- (arch=!armel)symbol_armel_does_not_have@Base 1.0
-
-The \fIarchitecture-bits\fP is either \fB32\fP or \fB64\fP.
-
- (arch-bits=32)32bit_specific_symbol@Base 1.0
- (arch-bits=64)64bit_specific_symbol@Base 1.0
-
-The \fIarchitecture-endianness\fP is either \fBlittle\fP or \fBbig\fP.
-
- (arch-endian=little)little_endian_specific_symbol@Base 1.0
- (arch-endian=big)big_endian_specific_symbol@Base 1.0
-
-Multiple restrictions can be chained.
-
- (arch-bits=32|arch-endian=little)32bit_le_symbol@Base 1.0
-.TP
-.B ignore\-blacklist
-dpkg\-gensymbols has an internal blacklist of symbols that should not
-appear in symbols files as they are usually only side-effects of
-implementation details of the toolchain. If for some reason, you really
-want one of those symbols to be included in the symbols file, you should
-tag the symbol with \fBignore\-blacklist\fP. It can be necessary for
-some low level toolchain libraries like libgcc.
-.TP
-.B c++
-Denotes \fIc++\fR symbol pattern. See \fBUsing symbol patterns\fR subsection
-below.
-.TP
-.B symver
-Denotes \fIsymver\fR (symbol version) symbol pattern. See \fBUsing symbol
-patterns\fR subsection below.
-.TP
-.B regex
-Denotes \fIregex\fR symbol pattern. See \fBUsing symbol patterns\fR subsection
-below.
-.SS Using symbol patterns
-.P
-Unlike a standard symbol specification, a pattern may cover multiple real
-symbols from the library. \fBdpkg\-gensymbols\fR will attempt to match each
-pattern against each real symbol that does \fInot\fR have a specific symbol
-counterpart defined in the symbol file. Whenever the first matching pattern is
-found, all its tags and properties will be used as a basis specification of the
-symbol. If none of the patterns matches, the symbol will be considered as new.
-
-A pattern is considered lost if it does not match any symbol in the library. By
-default this will trigger a \fBdpkg\-gensymbols\fP failure under \fB\-c1\fP or
-higher level. However, if the failure is undesired, the pattern may be marked
-with the \fIoptional\fR tag. Then if the pattern does not match anything, it
-will only appear in the diff as MISSING. Moreover, like any symbol, the pattern
-may be limited to the specific architectures with the \fIarch\fR tag. Please
-refer to \fBStandard symbol tags\fR subsection above for more information.
-
-Patterns are an extension of the \fBdeb\-symbols\fP(5) format hence they are
-only valid in symbol file templates. Pattern specification syntax is not any
-different from the one of a specific symbol. However, symbol name part of the
-specification serves as an expression to be matched against \fIname@version\fR
-of the real symbol. In order to distinguish among different pattern types, a
-pattern will typically be tagged with a special tag.
-
-At the moment, \fBdpkg\-gensymbols\fR supports three basic pattern types:
-.TP 3
-.B c++
-This pattern is denoted by the \fIc++\fR tag. It matches only C++ symbols by
-their demangled symbol name (as emitted by \fBc++filt\fR(1) utility). This
-pattern is very handy for matching symbols which mangled names might vary
-across different architectures while their demangled names remain the same. One
-group of such symbols is \fInon\-virtual thunks\fR which have architecture
-specific offsets embedded in their mangled names. A common instance of this
-case is a virtual destructor which under diamond inheritance needs a
-non-virtual thunk symbol. For example, even if _ZThn8_N3NSB6ClassDD1Ev@Base on
-32bit architectures will probably be _ZThn16_N3NSB6ClassDD1Ev@Base on 64bit
-ones, it can be matched with a single \fIc++\fR pattern:
-
-libdummy.so.1 libdummy1 #MINVER#
- [...]
- (c++)"non\-virtual thunk to NSB::ClassD::~ClassD()@Base" 1.0
- [...]
-
-The demangled name above can be obtained by executing the following command:
-
- $ echo '_ZThn8_N3NSB6ClassDD1Ev@Base' | c++filt
-
-Please note that while mangled name is unique in the library by definition,
-this is not necessarily true for demangled names. A couple of distinct real
-symbols may have the same demangled name. For example, that's the case with
-non-virtual thunk symbols in complex inheritance configurations or with most
-constructors and destructors (since g++ typically generates two real symbols
-for them). However, as these collisions happen on the ABI level, they should
-not degrade quality of the symbol file.
-.TP
-.B symver
-This pattern is denoted by the \fIsymver\fR tag. Well maintained libraries have
-versioned symbols where each version corresponds to the upstream version where
-the symbol got added. If that's the case, you can use a \fIsymver\fR pattern to
-match any symbol associated to the specific version. For example:
-
-libc.so.6 libc6 #MINVER#
- (symver)GLIBC_2.0 2.0
- [...]
- (symver)GLIBC_2.7 2.7
- access@GLIBC_2.0 2.2
-
-All symbols associated with versions GLIBC_2.0 and GLIBC_2.7 will lead to
-minimal version of 2.0 and 2.7 respectively with the exception of the symbol
-access@GLIBC_2.0. The latter will lead to a minimal dependency on libc6 version
-2.2 despite being in the scope of the "(symver)GLIBC_2.0" pattern because
-specific symbols take precedence over patterns.
-
-Please note that while old style wildcard patterns (denoted by "*@version" in
-the symbol name field) are still supported, they have been deprecated by new
-style syntax "(symver|optional)version". For example, "*@GLIBC_2.0 2.0" should
-be written as "(symver|optional)GLIBC_2.0 2.0" if the same behaviour is needed.
-.TP
-.B regex
-Regular expression patterns are denoted by the \fIregex\fR tag. They match by
-the perl regular expression specified in the symbol name field. A regular
-expression is matched as it is, therefore do not forget to start it with the
-\fI^\fR character or it may match any part of the real symbol
-\fIname@version\fR string. For example:
-
-libdummy.so.1 libdummy1 #MINVER#
- (regex)"^mystack_.*@Base$" 1.0
- (regex|optional)"private" 1.0
-
-Symbols like "mystack_new@Base", "mystack_push@Base", "mystack_pop@Base" etc.
-will be matched by the first pattern while e.g. "ng_mystack_new@Base" won't.
-The second pattern will match all symbols having the string "private" in their
-names and matches will inherit \fIoptional\fR tag from the pattern.
-.P
-Basic patterns listed above can be combined where it makes sense. In that case,
-they are processed in the order in which the tags are specified. For example,
-both
-
- (c++|regex)"^NSA::ClassA::Private::privmethod\\d\\(int\\)@Base" 1.0
- (regex|c++)N3NSA6ClassA7Private11privmethod\\dEi@Base 1.0
-
-will match symbols "_ZN3NSA6ClassA7Private11privmethod1Ei@Base" and
-"_ZN3NSA6ClassA7Private11privmethod2Ei@Base". When matching the first pattern,
-the raw symbol is first demangled as C++ symbol, then the demangled name is
-matched against the regular expression. On the other hand, when matching the
-second pattern, regular expression is matched against the raw symbol name, then
-the symbol is tested if it is C++ one by attempting to demangle it. A failure
-of any basic pattern will result in the failure of the whole pattern.
-Therefore, for example, "__N3NSA6ClassA7Private11privmethod\\dEi@Base" will not
-match either of the patterns because it is not a valid C++ symbol.
-
-In general, all patterns are divided into two groups: aliases (basic \fIc++\fR
-and \fIsymver\fR) and generic patterns (\fIregex\fR, all combinations of
-multiple basic patterns). Matching of basic alias-based patterns is fast (O(1))
-while generic patterns are O(N) (N - generic pattern count) for each symbol.
-Therefore, it is recommended not to overuse generic patterns.
-
-When multiple patterns match the same real symbol, aliases (first \fIc++\fR,
-then \fIsymver\fR) are preferred over generic patterns. Generic patterns are
-matched in the order they are found in the symbol file template until the first
-success.  Please note, however, that manual reordering of template file entries
-is not recommended because \fBdpkg\-gensymbols\fR generates diffs based on the
-alphanumerical order of their names.
-.SS Using includes
-.P
-When the set of exported symbols differ between architectures, it may become
-inefficient to use a single symbol file. In those cases, an include directive
-may prove to be useful in a couple of ways:
-.IP • 4
-You can factorize the common part in some external file
-and include that file in your \fIpackage\fR.symbols.\fIarch\fR file by
-using an include directive like this:
-
-#include "\fIpackages\fR.symbols.common"
-.IP •
-The include directive may also be tagged like any symbol:
-
-(tag|...|tagN)#include "file-to-include"
-
-As a result, all symbols included from \fIfile-to-include\fR will be considered
-to be tagged with \fItag\fR ... \fItagN\fR by default. You can use this feature
-to create a common \fIpackage\fR.symbols file which includes architecture
-specific symbol files:
-
-  common_symbol1@Base 1.0
- (arch=amd64 ia64 alpha)#include "package.symbols.64bit"
- (arch=!amd64 !ia64 !alpha)#include "package.symbols.32bit"
-  common_symbol2@Base 1.0
-.P
-The symbols files are read line by line, and include directives are processed
-as soon as they are encountered. This means that the content of the included
-file can override any content that appeared before the include directive and
-that any content after the directive can override anything contained in the
-included file. Any symbol (or even another #include directive) in the included
-file can specify additional tags or override values of the inherited tags in
-its tag specification. However, there is no way for the symbol to remove
-any of the inherited tags.
-.P
-An included file can repeat the header line containing the SONAME of the
-library. In that case, it overrides any header line previously read.
-However, in general it's best to avoid duplicating header lines. One way
-to do it is the following:
-.PP
-#include "libsomething1.symbols.common"
- arch_specific_symbol@Base 1.0
 .SS Good library management
 .P
 A well-maintained library has the following features:
@@ -436,6 +140,17 @@ the \fBFile::Glob\fP(3perl) manual page for details) in \fIlibrary-file\fR
 to match multiple libraries with a single argument (otherwise you need
 multiple \fB\-e\fR).
 .TP
+.BI \-l directory
+Prepend
+.I directory
+to the list of directories to search for private shared libraries
+(since dpkg 1.19.1). This option can be used multiple times.
+
+Note: Use this option instead of setting \fBLD_LIBRARY_PATH\fP,
+as that environment variable is used to control the run-time linker
+and abusing it to set the shared library paths at build-time can be
+problematic when cross-compiling for example.
+.TP
 .BI \-I filename
 Use \fIfilename\fR as reference file to generate the symbols file
 that is integrated in the package itself.
@@ -525,5 +240,6 @@ The accepted values are: \fB0\fP and \fB1\fP (default).
 .br
 .BR https://people.redhat.com/drepper/dsohowto.pdf
 .br
+.BR deb\-src\-symbol (5),
 .BR deb\-symbols (5),
 .BR dpkg\-shlibdeps (1).
diff --git a/man/dpkg-maintscript-helper.man b/man/dpkg-maintscript-helper.man
index a927b9f0f..1cb0cbe74 100644
--- a/man/dpkg-maintscript-helper.man
+++ b/man/dpkg-maintscript-helper.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-maintscript\-helper 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-maintscript\-helper \- works around known dpkg limitations in maintainer scripts
@@ -263,5 +264,4 @@ The currently accepted values are: \fBauto\fP (default), \fBalways\fP and
 \fBnever\fP.
 .
 .SH SEE ALSO
-.ad l
 .BR dh_installdeb (1).
diff --git a/man/dpkg-mergechangelogs.man b/man/dpkg-mergechangelogs.man
index 9cda23ef0..6ff993e05 100644
--- a/man/dpkg-mergechangelogs.man
+++ b/man/dpkg-mergechangelogs.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-mergechangelogs 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-mergechangelogs \- 3-way merge of debian/changelog files
@@ -75,8 +76,8 @@ The accepted values are: \fB0\fP and \fB1\fP (default).
 .SH LIMITATIONS
 .P
 Anything that is not parsed by Dpkg::Changelog is lost during the merge.
-This might include stuff like Vim modelines, Emacs variables, comments
-which were not supposed to be there, etc.
+This might include stuff like comments which were not supposed to be
+there, etc.
 .
 .SH INTEGRATION WITH GIT
 .P
diff --git a/man/dpkg-name.man b/man/dpkg-name.man
index fc007e9f4..a686d5e4c 100644
--- a/man/dpkg-name.man
+++ b/man/dpkg-name.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-name 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-name \- rename Debian packages to full package names
diff --git a/man/dpkg-parsechangelog.man b/man/dpkg-parsechangelog.man
index fd73fc8db..fba9de361 100644
--- a/man/dpkg-parsechangelog.man
+++ b/man/dpkg-parsechangelog.man
@@ -20,6 +20,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-parsechangelog 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-parsechangelog \- parse Debian changelog files
@@ -74,7 +75,7 @@ Set the output format. Currently supported values are
 option existed) and the default. It consists of one paragraph
 in Debian control format (see \fBdeb\-control\fP(5)). If more
 than one entry is requested, then most fields are taken from the
-most recent entry, except otherwise stated:
+first entry (usually the most recent entry), except otherwise stated:
 .RS
 .TP
 .BI Source: " pkg-name"
@@ -122,6 +123,10 @@ The \fBrfc822\fP format uses the same fields but outputs
 a separate paragraph for each changelog entry so that all
 metadata for each entry is preserved.
 .TP
+.B \-\-reverse
+Include all changes in reverse order (since dpkg 1.19.1).
+Note: for the \fBdpkg\fP format the first entry will be the most ancient entry.
+.TP
 .B \-\-all
 Include all changes. Note: other options have no effect when this is in use.
 .TP
@@ -160,7 +165,8 @@ The part in parentheses should be the name of the format. For example:
 
        @@@ changelog-format: \fIotherformat\fP @@@
 
-Changelog format names are non-empty strings of alphanumerics.
+Changelog format names are non-empty strings of lowercase alphanumerics
+(“a-z0-9”).
 
 If such a line exists then \fBdpkg\-parsechangelog\fP will look for
 the parser as a \fBDpkg::Changelog::\fP\fIOtherformat\fP perl module;
diff --git a/man/dpkg-query.man b/man/dpkg-query.man
index 7e02cc5d7..db5bc71c7 100644
--- a/man/dpkg-query.man
+++ b/man/dpkg-query.man
@@ -19,6 +19,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-query 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-query \- a tool to query the dpkg database
@@ -34,14 +35,16 @@ the \fBdpkg\fP database.
 .SH COMMANDS
 .TP
 .BR \-l ", " \-\-list " [\fIpackage-name-pattern\fP...]"
-List packages matching given pattern. If no \fIpackage-name-pattern\fP
-is given, list all packages in \fI%ADMINDIR%/status\fP, excluding
-the ones marked as not-installed (i.e. those which have been previously
-purged). Normal shell wildcard characters are allowed
-in \fIpackage-name-pattern\fP. Please note you will probably have to
-quote \fIpackage-name-pattern\fP to prevent the shell from performing
-filename expansion. For example this will list all package names starting
-with \*(lqlibc6\*(rq:
+List all known packages matching one or more patterns, regardless of their
+status, which includes any real or virtual package referenced in any
+dependency relationship field (such as \fBBreaks\fP, \fBEnhances\fP, etc.).
+If no \fIpackage-name-pattern\fP is given, list all packages in
+\fI%ADMINDIR%/status\fP, excluding the ones marked as not-installed (i.e.
+those which have been previously purged).
+Normal shell wildcard characters are allowed in \fIpackage-name-pattern\fP.
+Please note you will probably have to quote \fIpackage-name-pattern\fP to
+prevent the shell from performing filename expansion.
+For example this will list all package names starting with \*(lqlibc6\*(rq:
 
 .nf
   \fBdpkg\-query \-l 'libc6*'\fP
@@ -95,11 +98,14 @@ having the name (extended with the architecture qualifier for
 \fBMulti\-Arch\fP \fBsame\fP packages) and installed version of the package,
 separated by a tab.
 .TP
-.BR \-s ", " \-\-status " \fIpackage-name\fP..."
+.BR \-s ", " \-\-status " [\fIpackage-name\fP...]"
 Report status of specified package. This just displays the entry in
-the installed package status database. When multiple \fIpackage-name\fP
-are listed, the requested status entries are separated by an empty line,
-with the same order as specified on the argument list.
+the installed package status database.
+If no \fIpackage-name\fP is specified it will display all package entries
+in the status database (since dpkg 1.19.1).
+When multiple \fIpackage-name\fP entries are listed, the requested status
+entries are separated by an empty line, with the same order as specified
+on the argument list.
 .TP
 .BR \-L ", " \-\-listfiles " \fIpackage-name\fP..."
 List files installed to your system from \fIpackage-name\fP. When multiple
@@ -135,7 +141,7 @@ for that, this command will not get removed.
 Search for packages that own files corresponding to the given pattern.
 Standard shell wildcard characters can be used in the pattern, where
 asterisk (\fB*\fP) and question mark (\fB?\fP) will match a slash,
-and blackslash (\fB\\\fP) will be used as an escape character.
+and backslash (\fB\\\fP) will be used as an escape character.
 
 If the first character in the \fIfilename-search-pattern\fP is none of
 ‘\fB*[?/\fP’ then it will be considered a substring match and will be
@@ -148,11 +154,13 @@ handled like a glob pattern, otherwise any trailing ‘\fB/\fP’ or
 This command will not list extra files created by maintainer scripts,
 nor will it list alternatives.
 .TP
-.BR \-p ", " \-\-print\-avail " \fIpackage-name\fP..."
-Display details about \fIpackage-name\fP, as found in
-\fI%ADMINDIR%/available\fP. When multiple \fIpackage-name\fP are
-listed, the requested \fIavailable\fP entries are separated by an empty
-line, with the same order as specified on the argument list.
+.BR \-p ", " \-\-print\-avail " [\fIpackage-name\fP...]"
+Display details about packages, as found in \fI%ADMINDIR%/available\fP.
+If no \fIpackage-name\fP is specified, it will display all package entries
+in the \fIavailable\fP database (since dpkg 1.19.1).
+When multiple \fIpackage-name\fP are listed, the requested \fIavailable\fP
+entries are separated by an empty line, with the same order as specified
+on the argument list.
 
 Users of APT-based frontends
 should use \fBapt\-cache show\fP \fIpackage-name\fP instead
@@ -176,10 +184,13 @@ Also load the available file when using the \fB\-\-show\fP and \fB\-\-list\fP
 commands, which now default to only querying the status file
 (since dpkg 1.16.2).
 .TP
+.B \-\-no\-pager
+Disables the use of any pager when showing information (since dpkg 1.19.2).
+.TP
 .BR \-f ", " \-\-showformat=\fIformat\fR
 This option is used to specify the format of the output \fB\-\-show\fP
-will produce. The format is a string that will be output for each package
-listed.
+will produce (short option since dpkg 1.13.1).
+The format is a string that will be output for each package listed.
 
 In the format string, “\fB\e\fP” introduces escapes:
 
@@ -249,8 +260,11 @@ An architecture qualifier will be present to make the package name unambiguous,
 for example if the package has a \fBMulti\-Arch\fP field with a value of
 \fBsame\fP or the package is of a foreign architecture.
 .TP
+.B binary:Synopsis
+It contains the package short description (since dpkg 1.19.1).
+.TP
 .B binary:Summary
-It contains the package short description (since dpkg 1.16.2).
+This is an alias for \fBbinary:Synopsis\fP (since dpkg 1.16.2).
 .TP
 .B db:Status\-Abbrev
 It contains the abbreviated package status (as three characters),
@@ -269,6 +283,14 @@ It contains the package status word, part of the Status field
 It contains the package status error flag, part of the Status field
 (since dpkg 1.17.11).
 .TP
+.B db-fsys:Files
+It contains the list of the package filesystem entries separated by newlines
+(since dpkg 1.19.3).
+.TP
+.B db-fsys:Last\-Modified
+It contains the timestamp in seconds of the last time the package filesystem
+entries were modified (since dpkg 1.19.3).
+.TP
 .B source:Package
 It contains the source package name for this binary package
 (since dpkg 1.16.2).
@@ -309,6 +331,20 @@ interactions with the system, such as accesses to the database,
 memory allocations, etc.
 .
 .SH ENVIRONMENT
+.SS External environment
+.TP
+.B SHELL
+Sets the program to execute when spawning a command via a shell
+(since dpkg 1.19.2).
+.TP
+.B PAGER
+.TQ
+.B DPKG_PAGER
+Sets the pager command to use (since dpkg 1.19.1), which will be executed
+with «\fB$SHELL -c\fP».
+If \fBSHELL\fP is not set, «\fBsh\fP» will be used instead.
+The \fBDPKG_PAGER\fP overrides the \fBPAGER\fP environment variable
+(since dpkg 1.19.2).
 .TP
 .B DPKG_ADMINDIR
 If set and the \fB\-\-admindir\fP option has not been specified, it will
@@ -318,10 +354,15 @@ be used as the \fBdpkg\fP data directory.
 Sets the color mode (since dpkg 1.18.5).
 The currently accepted values are: \fBauto\fP (default), \fBalways\fP and
 \fBnever\fP.
+.SS Internal environment
 .TP
-\fBCOLUMNS\fP
-This setting influences the output of the \fB\-\-list\fP option by changing
-the width of its output.
+.B LESS
+Defined by \fBdpkg\-query\fP to “\fB-FRSXMQ\fP”, if not already set, when
+spawning a pager (since dpkg 1.19.2).
+To change the default behavior, this variable can be preset to some other
+value including an empty string, or the \fBPAGER\fP or \fBDPKG_PAGER\fP
+variables can be set to disable specific options with «\fB\-+\fP», for
+example \fBDPKG_PAGER="less \-+F"\fP.
 .
 .SH SEE ALSO
 .BR dpkg (1).
diff --git a/man/dpkg-scanpackages.man b/man/dpkg-scanpackages.man
index 21770547c..dc8202da8 100644
--- a/man/dpkg-scanpackages.man
+++ b/man/dpkg-scanpackages.man
@@ -19,6 +19,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-scanpackages 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-scanpackages \- create Packages index files
@@ -135,7 +136,6 @@ field in their control file, are missing from the override file, or have
 maintainer substitutions which do not take effect.
 .
 .SH SEE ALSO
-.ad l
 .BR dpkg (1),
 .BR dselect (1),
 .BR deb\-override (5),
diff --git a/man/dpkg-scansources.man b/man/dpkg-scansources.man
index 6b19f1867..6186dacbc 100644
--- a/man/dpkg-scansources.man
+++ b/man/dpkg-scansources.man
@@ -18,6 +18,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-scansources 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-scansources \- create Sources index files
diff --git a/man/dpkg-shlibdeps.man b/man/dpkg-shlibdeps.man
index d4c8ea27f..9c0dca8dd 100644
--- a/man/dpkg-shlibdeps.man
+++ b/man/dpkg-shlibdeps.man
@@ -20,6 +20,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-shlibdeps 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-shlibdeps \- generate shared library substvar dependencies
diff --git a/man/dpkg-source.man b/man/dpkg-source.man
index 2233d7a8d..972b2d393 100644
--- a/man/dpkg-source.man
+++ b/man/dpkg-source.man
@@ -21,6 +21,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-source 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-source \- Debian source package (.dsc) manipulation tool
@@ -400,7 +401,7 @@ was specified (this is equivalent to
 or raise an error if
 .B \-sa
 was specified.
-.B \-sA
+.B \-sa
 is the default.
 .TP
 .B \-\-abort\-on\-upstream\-changes
@@ -467,8 +468,8 @@ an original tarball (\fB.orig.tar.\fP\fIext\fP where \fIext\fP can be
 \fBgz\fP, \fBbz2\fP, \fBlzma\fP and \fBxz\fP) and a debian tarball
 (\fB.debian.tar.\fP\fIext\fP). It can also contain additional original
 tarballs (\fB.orig\-\fP\fIcomponent\fP\fB.tar.\fP\fIext\fP).
-\fIcomponent\fP can only contain alphanumeric characters and hyphens
-(‘\-’).
+\fIcomponent\fP can only contain alphanumeric (‘a-zA-Z0-9’) characters
+and hyphens (‘\-’).
 Optionally each original tarball can be accompanied by a detached
 upstream signature (\fB.orig.tar.\fP\fIext\fP\fB.asc\fP and
 \fB.orig\-\fP\fIcomponent\fP\fB.tar.\fP\fIext\fP\fB.asc\fP), extraction
@@ -486,18 +487,31 @@ debian tarball must contain a \fBdebian\fP sub-directory but it
 can also contain binary files outside of that directory (see
 \fB\-\-include\-binaries\fP option).
 .PP
-All patches listed in \fBdebian/patches/debian.series\fP or
-\fBdebian/patches/series\fP are then applied.
+All patches listed in \fBdebian/patches/\fP\fIvendor\fP\fB.series\fP or
+\fBdebian/patches/series\fP are then applied, where \fIvendor\fP will be
+the lowercase name of the current vendor, or \fBdebian\fP if there is
+no vendor defined.
 If the former file is used and the latter one doesn't exist (or is a
-symlink), then the latter is replaced with a symlink to the former. This
-is meant to simplify usage of \fBquilt\fP to manage the set of patches. Note
-however that while \fBdpkg\-source\fP parses correctly series files with
-explicit options used for patch application (stored on each line
+symlink), then the latter is replaced with a symlink to the former.
+This is meant to simplify usage of \fBquilt\fP to manage the set of patches.
+Vendor-specific series files are intended to make it possible to serialize
+multiple development branches based on the vendor, in a declarative way,
+in preference to open-coding this handling in \fBdebian/rules\fP.
+This is particularly useful when the source would need to be patched
+conditionally because the affected files do not have built-in conditional
+occlusion support.
+Note however that while \fBdpkg\-source\fP parses correctly series files
+with explicit options used for patch application (stored on each line
 after the patch filename and one or more spaces), it does ignore those
 options and always expect patches that can be applied with the \fB\-p1\fP
 option of \fBpatch\fP. It will thus emit a warning when it encounters
 such options, and the build is likely to fail.
 .PP
+Note that \fBlintian\fP(1) will emit unconditional warnings when using
+vendor series due to a controversial Debian specific ruling, which should
+not affect any external usage; to silence these, the dpkg lintian profile
+can be used by passing «\fB--profile dpkg\fP» to \fBlintian\fP(1).
+.PP
 The timestamp of all patched files is reset to the extraction time of
 the source package (this avoids timestamp skews leading to problems
 when autogenerated files are patched).
@@ -848,10 +862,15 @@ the source package is maintained.
 Free form text that is put on top of the automatic patch generated
 in formats “2.0” or “3.0 (quilt)”. \fBlocal\-patch\-header\fP is not
 included in the generated source package while \fBpatch\-header\fP is.
+.SS debian/patches/\fIvendor\fP.series
 .SS debian/patches/series
 This file lists all patches that have to be applied (in the given order)
 on top of the upstream source package. Leading and trailing spaces are
 stripped.
+The \fIvendor\fP will be the lowercase name of the current vendor, or
+\fBdebian\fP if there is no vendor defined.
+If the vendor-specific series file does not exist, the vendor-less series
+file will be used.
 Lines starting with ‘\fB#\fP’ are comments and are skipped.
 Empty lines are ignored.
 Remaining lines start with a patch filename (relative
@@ -863,7 +882,6 @@ start of a comment up to the end of line).
 The point at which field overriding occurs compared to certain
 standard output field settings is rather confused.
 .SH SEE ALSO
-.ad l
 .BR deb\-src\-control (5),
 .BR deb\-changelog (5),
 .BR dsc (5).
diff --git a/man/dpkg-split.man b/man/dpkg-split.man
index 8f7fdde43..e08cfb3a3 100644
--- a/man/dpkg-split.man
+++ b/man/dpkg-split.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-split 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-split \- Debian package archive split/join tool
@@ -145,7 +146,7 @@ specified then only parts of the relevant package(s) are deleted.
 .BR \-? ", " \-\-help
 Show the usage message and exit.
 .TP
-.BR \-\-version
+.B \-\-version
 Show the version and exit.
 .
 .SH OPTIONS
@@ -178,7 +179,7 @@ message, to allow programs such as
 to cope with both split and unsplit packages without producing
 spurious messages.
 .TP
-.BR \-\-msdos
+.B \-\-msdos
 Forces the output filenames generated by
 .B \-\-split
 to be msdos-compatible.
diff --git a/man/dpkg-statoverride.man b/man/dpkg-statoverride.man
index 800801683..e6e64945b 100644
--- a/man/dpkg-statoverride.man
+++ b/man/dpkg-statoverride.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-statoverride 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-statoverride \- override ownership and mode of files
@@ -64,18 +65,61 @@ to overrides which match the glob.
 .B \-\-help
 Show the usage message and exit.
 .TP
+.B \-\-force\-help
+Give help about the \fB\-\-force\-\fP\fIthing\fP options (since dpkg 1.19.5).
+.TP
 .B \-\-version
 Show the version and exit.
 .
 .SH OPTIONS
 .TP
 .BI \-\-admindir " directory"
-Change the \fIdirectory\fP of the \fBdpkg\fP database where the statoverride
-file is also stored. Defaults to \fI%ADMINDIR%\fP.
+Set the administrative directory to \fIdirectory\fP.
+This is where the \fIstatoverride\fP file is stored.
+Defaults to «\fI%ADMINDIR%\fP».
+.TP
+.BI \-\-instdir " directory"
+Set the installation directory, which refers to the directory where
+packages get installed (since dpkg 1.19.2).
+Defaults to «\fI/\fP».
+.TP
+.BI \-\-root " directory"
+Set the root directory to \fBdirectory\fP, which sets the installation
+directory to «\fIdirectory\fP» and the administrative
+directory to «\fIdirectory\fP\fB%ADMINDIR%\fP» (since dpkg 1.19.2).
+.TP
+.B \-\-force\-\fIthings\fP
+.TQ
+.BR \-\-no\-force\-\fIthings\fP ", " \-\-refuse\-\fIthings\fP
+Force or refuse (\fBno\-force\fP and \fBrefuse\fP mean the same thing)
+to do some things (since dpkg 1.19.5).
+\fIthings\fP is a comma separated list of things specified below.
+\fB\-\-force\-help\fP displays a message describing them.
+Things marked with (*) are forced by default.
+
+\fIWarning: These options are mostly intended to be used by experts only.
+Using them without fully understanding their effects may break your whole
+system.\fP
+
+\fBall\fP:
+Turns on (or off) all force options.
+
+\fBstatoverride\-add\fP:
+Overwrite an existing stat override when adding it (since dpkg 1.19.5).
+
+\fBstatoverride\-remove\fP:
+Ignore a missing stat override when removing it (since dpkg 1.19.5).
+
+\fBsecurity\-mac\fP(*):
+Use platform-specific Mandatory Access Controls (MAC) based security when
+installing files into the filesystem (since dpkg 1.19.5).
+On Linux systems the implementation uses SELinux.
 .TP
 .B \-\-force
 Force an action, even if a sanity check would otherwise prohibit it.
 This is necessary to override an existing override.
+This option is deprecated (since dpkg 1.19.5), it is replaced by
+\fB\-\-force\-all\fP.
 .TP
 .B \-\-update
 Immediately try to change the \fIpath\fP to the new owner and mode if it
@@ -100,9 +144,18 @@ memory allocations, etc.
 .
 .SH ENVIRONMENT
 .TP
+.B DPKG_ROOT
+If set and the \fB\-\-instdir\fP or \fB\-\-root\fP options have not been
+specified, it will be used as the filesystem root directory
+(since dpkg 1.19.2).
+.TP
 .B DPKG_ADMINDIR
-If set and the \fB\-\-admindir\fP option has not been specified, it will
-be used as the \fBdpkg\fP data directory.
+If set and the \fB\-\-admindir\fP or \fB\-\-root\fP options have not been
+specified, it will be used as the \fBdpkg\fP data directory.
+.TP
+.B DPKG_FORCE
+If set and none of the \fB\-\-force\-\fP\fI...\fP options have been
+specified, it will be used as the force options to use (since dpkg 1.19.5).
 .TP
 .B DPKG_COLORS
 Sets the color mode (since dpkg 1.18.5).
diff --git a/man/dpkg-trigger.man b/man/dpkg-trigger.man
index 5e4877144..cf6d9d3dd 100644
--- a/man/dpkg-trigger.man
+++ b/man/dpkg-trigger.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-trigger 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-trigger \- a package trigger utility
@@ -41,7 +42,7 @@ Unrecognized trigger name syntaxes are an error for \fBdpkg\-trigger\fP.
 .
 .SH COMMANDS
 .TP
-.BR \-\-check\-supported
+.B \-\-check\-supported
 Check if the running \fBdpkg\fP supports triggers (usually called from a
 postinst). Will exit \fB0\fP if a triggers-capable \fBdpkg\fP has run,
 or \fB1\fP with an error message to stderr if not. Normally, however,
@@ -59,24 +60,26 @@ Show the version and exit.
 Change the location of the \fBdpkg\fR database. The default location is
 \fI%ADMINDIR%\fP.
 .TP
-.BR \-\-by\-package=\fIpackage\fR
+.BI \-\-by\-package= package
 Override trigger awaiter (normally set by \fBdpkg\fP through the
 \fBDPKG_MAINTSCRIPT_PACKAGE\fP environment variable of the maintainer scripts,
 naming the package to which the script belongs, and this will be used
 by default).
 .TP
-.BR \-\-no\-await
+.B \-\-no\-await
 This option arranges that the calling package T (if any) need not await
 the processing of this trigger; the interested package(s) I, will not be
 added to T's trigger processing awaited list and T's status is unchanged.
 T may be considered installed even though I may not yet have processed
 the trigger.
 .TP
-.BR \-\-await
+.B \-\-await
 This option does the inverse of \fB\-\-no\-await\fP (since dpkg 1.17.21).
+If the interested package has declared a “noawait” directive, then this
+option will not be effective.
 It is currently the default behavior.
 .TP
-.BR \-\-no\-act
+.B \-\-no\-act
 Just test, do not actually change anything.
 .
 .SH EXIT STATUS
diff --git a/man/dpkg-vendor.man b/man/dpkg-vendor.man
index 2e1eb8f82..b4aec46a8 100644
--- a/man/dpkg-vendor.man
+++ b/man/dpkg-vendor.man
@@ -16,6 +16,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg\-vendor 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg\-vendor \- queries information about distribution vendors
diff --git a/man/dpkg.cfg.man b/man/dpkg.cfg.man
index 680c55f8b..fecb9f801 100644
--- a/man/dpkg.cfg.man
+++ b/man/dpkg.cfg.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg.cfg 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg.cfg \- dpkg configuration file
diff --git a/man/dpkg.man b/man/dpkg.man
index 4f6f14bb9..5f0a5e973 100644
--- a/man/dpkg.man
+++ b/man/dpkg.man
@@ -24,6 +24,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dpkg 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dpkg \- package manager for Debian
@@ -95,8 +96,10 @@ The package is correctly unpacked and configured.
 The package is selected for installation.
 .TP
 .B hold
-A package marked to be on \fBhold\fP is not handled by \fBdpkg\fP,
-unless forced to do that with option \fB\-\-force\-hold\fP.
+A package marked to be on \fBhold\fP is kept on the same version, that is,
+no automatic new installs, upgrades or removals will be performed on them,
+unless these actions are requested explicitly, or are permitted to be done
+automatically with the \fB\-\-force\-hold\fP option.
 .TP
 .B deinstall
 The package is selected for deinstallation (i.e. we want to remove all
@@ -105,6 +108,11 @@ files, except configuration files).
 .B purge
 The package is selected to be purged (i.e. we want to remove everything
 from system directories, even configuration files).
+.TP
+.B unknown
+The package selection is unknown.
+A package that is also in a \fBnot\-installed\fP state, and with an
+\fBok\fP flag will be forgotten in the next database store.
 .SS Package flags
 .TP
 .B ok
@@ -183,10 +191,14 @@ improper \fBtriggers\-awaited\fP and \fBtriggers\-pending\fP states. This
 can be fixed later by running: \fBdpkg \-\-configure \-\-pending\fP.
 .TP
 \fB\-r\fP, \fB\-\-remove\fP \fIpackage\fP...|\fB\-a\fP|\fB\-\-pending\fP
-Remove an installed package. This removes everything except conffiles,
+Remove an installed package.
+This removes everything except conffiles and other data cleaned up by
+the \fIpostrm\fP script,
 which may avoid having to reconfigure the package if it is reinstalled
 later (conffiles are configuration files that are listed in the
 \fIDEBIAN/conffiles\fP control file).
+If there is no \fIDEBIAN/conffiles\fP control file nor \fIDEBIAN/postrm\fP
+script, this command is equivalent to calling \fB\-\-purge\fP.
 If \fB\-a\fP or \fB\-\-pending\fP is given instead of a package name,
 then all packages unpacked, but marked to be removed in file
 \fI%ADMINDIR%/status\fP, are removed.
@@ -206,7 +218,7 @@ Removing of a package consists of the following steps:
 .TP
 \fB\-P\fP, \fB\-\-purge\fP \fIpackage\fP...|\fB\-a\fP|\fB\-\-pending\fP
 Purge an installed or already removed package. This removes everything,
-including conffiles.
+including conffiles, and anything else cleaned up from \fIpostrm\fP.
 If \fB\-a\fP or \fB\-\-pending\fP is given instead of a package name,
 then all packages unpacked or removed, but marked to be purged in file
 \fI%ADMINDIR%/status\fP, are purged.
@@ -314,6 +326,9 @@ to deinstall any packages not in list given to \fB\-\-set\-selections\fP.
 .B \-\-yet\-to\-unpack
 Searches for packages selected for installation, but which for some
 reason still haven't been installed.
+.IP
+Note: This command makes use of both the available file and the package
+selections.
 .TP
 .B \-\-predep\-package
 Print a single package which is the target of one or more relevant
@@ -322,6 +337,9 @@ pre-dependencies and has itself no unsatisfied pre-dependencies.
 If such a package is present, output it as a Packages file entry,
 which can be massaged as appropriate.
 .IP
+Note: This command makes use of both the available file and the package
+selections.
+.IP
 Returns 0 when a package is printed, 1 when no suitable package is
 available and 2 on error.
 .TP
@@ -539,7 +557,9 @@ Configure also any unpacked but unconfigured packages on which the current
 package depends.
 
 \fBhold\fP:
-Process packages even when marked “hold”.
+Allow automatic installs, upgrades or removals of packages even when marked
+to be on “hold”.
+Note: This does not prevent these actions when requested explicitly.
 
 \fBremove\-reinstreq\fP:
 Remove a package, even if it's broken and marked to require
@@ -553,16 +573,20 @@ cause the whole system to stop working, so use with caution.
 
 \fBdepends\fP:
 Turn all dependency problems into warnings.
+This affects the \fBPre\-Depends\fP and \fBDepends\fP fields.
 
 \fBdepends\-version\fP:
 Don't care about versions when checking dependencies.
+This affects the \fBPre\-Depends\fP and \fBDepends\fP fields.
 
 \fBbreaks\fP:
 Install, even if this would break another package (since dpkg 1.14.6).
+This affects the \fBBreaks\fP field.
 
 \fBconflicts\fP:
 Install, even if it conflicts with another package. This is dangerous,
 for it will usually cause overwriting of some files.
+This affects the \fBConflicts\fP field.
 
 \fBconfmiss\fP:
 Always install the missing conffile without prompting. This is dangerous,
@@ -604,6 +628,17 @@ Overwrite one package's directory with another's file.
 \fBoverwrite\-diverted\fP:
 Overwrite a diverted file with an undiverted version.
 
+\fBstatoverride\-add\fP:
+Overwrite an existing stat override when adding it (since dpkg 1.19.5).
+
+\fBstatoverride\-remove\fP:
+Ignore a missing stat override when removing it (since dpkg 1.19.5).
+
+\fBsecurity\-mac\fP(*):
+Use platform-specific Mandatory Access Controls (MAC) based security when
+installing files into the filesystem (since dpkg 1.19.5).
+On Linux systems the implementation uses SELinux.
+
 \fBunsafe\-io\fP:
 Do not perform safe I/O operations when unpacking (since dpkg 1.15.8.6).
 Currently this
@@ -623,7 +658,7 @@ any software not doing syncs before atomic renames.
 losing data, use with care.\fP
 
 \fBscript-chrootless\fP:
-Run maintainer scrips without \fBchroot\fP(2)ing into \fBinstdir\fP even
+Run maintainer scripts without \fBchroot\fP(2)ing into \fBinstdir\fP even
 if the package does not support this mode of operation (since dpkg 1.18.5).
 
 \fIWarning: This can destroy your host system, use with extreme care.\fP
@@ -647,6 +682,7 @@ Install a package even if it fails authenticity check.
 \fB\-\-ignore\-depends\fP=\fIpackage\fP,...
 Ignore dependency-checking for specified packages (actually, checking is
 performed, but only warnings about conflicts are given, nothing else).
+This affects the \fBPre\-Depends\fP, \fBDepends\fP and \fBBreaks\fP fields.
 .TP
 \fB\-\-no\-act\fP, \fB\-\-dry\-run\fP, \fB\-\-simulate\fP
 Do everything which is supposed to be done, but don't write any
@@ -669,20 +705,22 @@ Don't install a package if a newer version of the same package is already
 installed. This is an alias of \fB\-\-refuse\-downgrade\fP.
 .TP
 .BI \-\-admindir= dir
-Change default administrative directory, which contains many files that
-give information about status of installed or uninstalled packages, etc.
-(Defaults to «\fI%ADMINDIR%\fP»)
+Set the administrative directory to \fIdirectory\fP.
+This directory contains many files that give information about status of
+installed or uninstalled packages, etc.
+Defaults to «\fI%ADMINDIR%\fP».
 .TP
 .BI \-\-instdir= dir
-Change default installation directory which refers to the directory where
+Set the installation directory, which refers to the directory where
 packages are to be installed. \fBinstdir\fP is also the directory passed
 to \fBchroot\fP(2) before running package's installation scripts, which
 means that the scripts see \fBinstdir\fP as a root directory.
-(Defaults to «\fI/\fP»)
+Defaults to «\fI/\fP».
 .TP
 .BI \-\-root= dir
-Changing \fBroot\fP changes \fBinstdir\fP to «\fIdir\fP» and
-\fBadmindir\fP to «\fIdir\fP\fB%ADMINDIR%\fP».
+Set the root directory to \fBdirectory\fP, which sets the installation
+directory to «\fIdir\fP» and the administrative
+directory to «\fIdir\fP\fB%ADMINDIR%\fP».
 .TP
 \fB\-O\fP, \fB\-\-selected\-only\fP
 Only process the packages that are selected for installation. The
@@ -827,6 +865,9 @@ For conffile changes where \fIdecision\fP is either \fBinstall\fP or
 \fBkeep\fP.
 .RE
 .TP
+.B \-\-no\-pager
+Disables the use of any pager when showing information (since dpkg 1.19.2).
+.TP
 \fB\-\-no\-debsig\fP
 Do not try to verify package signatures.
 .TP
@@ -873,23 +914,48 @@ specific configuration file.
 If set, \fBdpkg\fP will use it as the directory in which to create
 temporary files and directories.
 .TP
-.B PAGER
-The program \fBdpkg\fP will execute when displaying the conffiles.
-.TP
 .B SHELL
-The program \fBdpkg\fP will execute when starting a new interactive shell.
+The program \fBdpkg\fP will execute when starting a new interactive shell,
+or when spawning a command via a shell.
 .TP
-.B COLUMNS
-Sets the number of columns \fBdpkg\fP should use when displaying formatted
-text.
-Currently only used by \fB\-\-list\fP.
+.B PAGER
+.TQ
+.B DPKG_PAGER
+The program \fBdpkg\fP will execute when running a pager,
+which will be executed with «\fB$SHELL -c\fP»,
+for example when displaying the conffile differences.
+If \fBSHELL\fP is not set, «\fBsh\fP» will be used instead.
+The \fBDPKG_PAGER\fP overrides the \fBPAGER\fP environment variable
+(since dpkg 1.19.2).
 .TP
 .B DPKG_COLORS
 Sets the color mode (since dpkg 1.18.5).
 The currently accepted values are: \fBauto\fP (default), \fBalways\fP and
 \fBnever\fP.
+.TP
+.B DPKG_FORCE
+Sets the force flags (since dpkg 1.19.5).
+When this variable is present, no built-in force defaults will be applied.
+If the variable is present but empty, all force flags will be disabled.
+.TP
+.B DPKG_ADMINDIR
+If set and the \fB\-\-admindir\fP or \fB\-\-root\fP options have not been
+specified, it will be used as the \fBdpkg\fP administrative directory
+(since dpkg 1.20.0).
+.TP
+.B DPKG_FRONTEND_LOCKED
+Set by a package manager frontend to notify dpkg that it should not acquire
+the frontend lock (since dpkg 1.19.1).
 .SS Internal environment
 .TP
+.B LESS
+Defined by \fBdpkg\fP to “\fB-FRSXMQ\fP”, if not already set, when
+spawning a pager (since dpkg 1.19.2).
+To change the default behavior, this variable can be preset to some other
+value including an empty string, or the \fBPAGER\fP or \fBDPKG_PAGER\fP
+variables can be set to disable specific options with «\fB\-+\fP», for
+example \fBDPKG_PAGER="less \-+F"\fP.
+.TP
 .B DPKG_ROOT
 Defined by \fBdpkg\fP on the maintainer script environment to indicate
 which installation to act on (since dpkg 1.18.5).
@@ -907,6 +973,10 @@ Defined by \fBdpkg\fP on the maintainer script environment to indicate
 the \fBdpkg\fP administrative directory to use (since dpkg 1.16.0).
 This variable is always set to the current \fB\-\-admindir\fP value.
 .TP
+.B DPKG_FORCE
+Defined by \fBdpkg\fP on the subprocesses environment to all the currently
+enabled force option names separated by commas (since dpkg 1.19.5).
+.TP
 .B DPKG_SHELL_REASON
 Defined by \fBdpkg\fP on the shell spawned on the conffile prompt to
 examine the situation (since dpkg 1.15.6).
@@ -1057,7 +1127,6 @@ Additional functionality can be gained by installing any of the
 following packages: \fBapt\fR, \fBaptitude\fR and \fBdebsums\fR.
 .
 .SH SEE ALSO
-.ad l
 \fBaptitude\fP(1),
 \fBapt\fP(1),
 \fBdselect\fP(1),
diff --git a/man/dsc.man b/man/dsc.man
index 957b164ed..8dab12625 100644
--- a/man/dsc.man
+++ b/man/dsc.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dsc 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dsc \- Debian source packages' control file format
@@ -49,15 +50,17 @@ The value of this field declares the format version of the source package.
 The field value is used by programs acting on a source package to
 interpret the list of files in the source package and determine how
 to unpack it.
-The syntax of the field value is a numeric major revision, a period,
-a numeric minor revision, and then an optional subtype after whitespace,
-which if specified is an alphanumeric word in parentheses.
+The syntax of the field value is a numeric major revision (“0-9”), a
+period (“.”), a numeric minor revision (“0-9”), and then an optional
+subtype after whitespace (“\ \\t”), which if specified is a lowercase
+alphanumeric (“a-z0-9”) word in parentheses (“()”).
 The subtype is optional in the syntax but may be mandatory for particular
 source format revisions.
 
 The source formats currently supported by \fBdpkg\fP are \fB1.0\fP,
 \fB2.0\fP, \fB3.0 (native)\fP, \fB3.0 (quilt)\fP, \fB3.0 (git)\fP,
 \fB3.0 (bzr)\fP and \fB3.0 (custom)\fP.
+See \fBdpkg\-source\fP(1) for their description.
 .TP
 .BR Source: " \fIsource-name\fP (required)"
 The value of this field determines the package name, and is used to
@@ -156,9 +159,9 @@ expected to be present, if the file is present but not the value, then
 .BI Testsuite\-Triggers: " package-list"
 This field declares the comma-separated union of all test dependencies
 (\fBDepends\fP fields in \fIdebian/tests/control\fP file), with all
-restrictions removed, and OR dependencies flattened, except for binaries
-generated by this source package and meta-dependencies such as \fB@\fP or
-\fB@builddeps@\fP.
+restrictions removed, and OR dependencies flattened (that is, converted to
+separate AND relationships), except for binaries generated by this source
+package and its meta-dependency equivalent \fB@\fP.
 
 Rationale: this field is needed because otherwise to be able to get the
 test dependencies, each source package would need to be unpacked.
diff --git a/man/dselect.cfg.man b/man/dselect.cfg.man
index ee0d597fc..7afa496ea 100644
--- a/man/dselect.cfg.man
+++ b/man/dselect.cfg.man
@@ -17,6 +17,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dselect.cfg 5 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dselect.cfg \- dselect configuration file
diff --git a/man/dselect.man b/man/dselect.man
index 206caa3b1..0c963e23e 100644
--- a/man/dselect.man
+++ b/man/dselect.man
@@ -20,6 +20,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH dselect 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 dselect \- Debian package management frontend
@@ -45,7 +46,7 @@ privileges, packages can be installed, upgraded and removed. Various
 access methods can be configured to retrieve available package version
 information and installable packages from package repositories.
 Depending on the used access method, these repositories can be public
-archive servers on the internet, local archive servers or cdroms.
+archive servers on the internet, local archive servers or CD-ROMs.
 The recommended access method is \fIapt\fP, which is provided by the
 package \fBapt\fP.
 .PP
@@ -77,7 +78,9 @@ Turn on debugging. Debugging information is sent to \fIfile\fP.
 Turns on expert mode, i.e. doesn't display possibly annoying help
 messages.
 .TP
-.BR \-\-colour | \-\-color " \fIscreenpart\fP:[\fIforeground\fP],[\fIbackground\fP][:\fIattr\fP[\fI+attr\fP]...]"
+.BR \-\-color " \fIscreenpart\fP:[\fIforeground\fP],[\fIbackground\fP][:\fIattr\fP[\fI+attr\fP]...]"
+.TQ
+.BR \-\-colour " \fIscreenpart\fP:[\fIforeground\fP],[\fIbackground\fP][:\fIattr\fP[\fI+attr\fP]...]"
 Configures screen colors. This works only if your display supports colors.
 This option may be used multiple times (and is best used in
 \fIdselect.cfg\fP). Each use changes the color (and optionally, other
diff --git a/man/po/de.add b/man/po/de.add
index 826348a1d..ea1f451d2 100644
--- a/man/po/de.add
+++ b/man/po/de.add
@@ -1,6 +1,6 @@
 PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary
 .SH ÜBERSETZUNG
-Die deutsche Übersetzung wurde 2004, 2006-2017 von Helge Kreutzmann
+Die deutsche Übersetzung wurde 2004, 2006-2019 von Helge Kreutzmann
 <debian@helgefjell.de>, 2007 von Florian Rehnisch <eixman@gmx.de> und
 2008 von Sven Joachim <svenjoac@gmx.de>
 angefertigt. Diese Übersetzung ist Freie Dokumentation; lesen Sie die
diff --git a/man/po/de.po b/man/po/de.po
index af3e95a9b..a80afdda4 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -1,6 +1,6 @@
 # German translation of the manpages in the dpkg package
 # This file is distributed under the same license as the dpkg package.
-# (C) Helge Kreutzmann <debian@helgefjell.de>, 2004, 2006-2017.
+# (C) Helge Kreutzmann <debian@helgefjell.de>, 2004, 2006-2019.
 # (C) Florian Rehnisch <eixman@gmx.de>, 2007.
 # (C) Sven Joachim <svenjoac@gmx.de>, 2008.
 #
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg-man 1.19.0\n"
+"Project-Id-Version: dpkg-man 1.20.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-11-03 19:02+0100\n"
-"PO-Revision-Date: 2017-11-03 19:09+0100\n"
+"POT-Creation-Date: 2019-11-01 05:32+0100\n"
+"PO-Revision-Date: 2019-11-01 06:53+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -738,7 +738,7 @@ msgid ""
 "backward compatible changes (such as field additions) will bump the minor "
 "version.  The current format version is B<1.0>."
 msgstr ""
-"Das Wert dieses Feldes legt die Formatversion der Datei fest. Die Syntax des "
+"Das Wert dieses Feldes gibt die Formatversion der Datei an. Die Syntax des "
 "Feldwertes ist eine Versionsnummer mit einer Haupt- und einer "
 "Nebenkomponente. Rückwärtsinkompatible Änderungen im Format führen zu einer "
 "Erhöhung der Hauptversion und rückwärtskompatible Änderungen (wie die "
@@ -767,15 +767,18 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man deb-changes.man
 #, no-wrap
-msgid "B<Binary:> I<binary-package-list> (required)"
-msgstr "B<Binary:> I<Binärpaketliste> (verpflichtend)"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Binary:> I<Binärpaketliste> (verpflichtend im Kontext)"
 
 #. type: Plain text
 #: deb-buildinfo.man
-msgid "This folded field is a space-separated list of binary packages built."
+msgid ""
+"This folded field is a space-separated list of binary packages built.  If "
+"the build is source-only, then the field is omitted (since dpkg 1.20.0)."
 msgstr ""
 "Dieses gefaltete Feld ist eine durch Leerzeichen getrennte Liste von "
-"gebauten binären Paketen."
+"gebauten binären Paketen. Falls es sich um einen reinen Quell-Upload "
+"handelt, wird dieses Feld ausgelassen (seit Dpkg 1.20.0)."
 
 #. type: TP
 #: deb-buildinfo.man
@@ -993,6 +996,113 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, no-wrap
+msgid "B<Build-Tainted-By:>"
+msgstr "B<Build-Tainted-By:>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr "I<taint-reason-list>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+"Dieses gefaltete Feld enthält eine durch Leerzeichen getrennte, nicht "
+"abschließende Liste von Markierungen (die durch alphanumerische und "
+"Bindestrichzeichen aufgebaut werden), die identifizieren, warum der aktuelle "
+"Bau unsauber (tainted) wurde (seit Dpkg 1.19.5)."
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+"Unter Debian und abgeleiteten Distributionen können die folgenden "
+"Begründungsmarkierungen ausgeben werden."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr "B<merged-usr-via-symlinks>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+"Das System hat ein mittels Symlinks zusammengeführtes I</usr>. Dies wird "
+"B<dpkg-query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> "
+"und weitere Werkzeuge, die Pfadnamen als Schlüssel in ihren Datenbanken "
+"verwenden, durcheinanderbringen, da es Dateisystem-Alias-Probleme erzeugt "
+"und bringt das Verständnis, das B<dpkg> in seiner Datenbank aufnotiert hat, "
+"durcheinander. Für Bausysteme, die Pfadnamen auf bestimmte Programme oder "
+"Bibliotheken auf den enstandenen Artefakten hartkodieren, kann dies auch zu "
+"Paketen führen, die mit nichtzusammengeführten usr-Dateisystemen "
+"inkompatibel sind."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-configs>"
+msgstr "B<usr-local-has-configs>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr "Das System hat Konfigurationsdateien unter I</usr/local/etc>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-includes>"
+msgstr "B<usr-local-has-includes>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr "Das System hat Header-Dateien unter I</usr/local/include>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr "B<usr-local-has-programs>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+"Das System hat Programme unter I</usr/local/bin> oder I</usr/local/sbin>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-libraries>"
+msgstr "B<usr-local-has-libraries>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+"Das System hat Bibliotheken, entweder statische oder Laufzeit-, unter I</usr/"
+"local/lib>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
 msgid "B<Installed-Build-Depends:> (required)"
 msgstr "B<Installed-Build-Depends:> (verpflichtend)"
 
@@ -1253,7 +1363,7 @@ msgid ""
 "of RFC2822 and RFC5322, or what «date -R» generates):"
 msgstr ""
 "Das I<Datum> hat das folgende Format (kompatibel zu und mit der gleichen "
-"Semantik von RFC2822 und RFC5322 bzw. der Ausgabe von »date -R«):"
+"Semantik von RFC2822 und RFC5322 bzw. der Ausgabe von „date -R“):"
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1389,23 +1499,24 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 "Jede Zeile, die komplett (d.h. ohne einführende Leerzeichen) aus Kommentaren "
-"im Stil B<#> oder B</* */>, RCS-Schlüsselwörtern, Modelines von Vim oder "
-"lokalen Emacs-Variablen besteht, sollte ignoriert werden."
+"im Stil B<#> oder B</* */> oder RCS-Schlüsselwörtern besteht, sollte "
+"ignoriert werden."
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
-"Uralte Changelog-Einträge in anderen Formaten am Ende der Datei sollten "
-"akzeptiert und in der Ausgabe erhalten werden. Ihr Inhalt darf ansonsten "
-"aber ignoriert und die Auswertung an diesem Punkt beendet werden."
+"Modelines von Vim oder lokale Emacs-Variablen sowie uralte Changelog-"
+"Einträge in anderen Formaten am Ende der Datei sollten akzeptiert und in der "
+"Ausgabe erhalten werden. Ihr Inhalt darf ansonsten aber ignoriert und die "
+"Auswertung an diesem Punkt beendet werden."
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1536,7 +1647,7 @@ msgid ""
 "backward compatible changes (such as field additions) will bump the minor "
 "version.  The current format version is B<1.8>."
 msgstr ""
-"Das Wert dieses Feldes legt die Formatversion der Datei fest. Die Syntax des "
+"Das Wert dieses Feldes gibt die Formatversion der Datei an. Die Syntax des "
 "Feldwertes ist eine Versionsnummer mit einer Haupt- und einer "
 "Nebenkomponente. Rückwärtsinkompatible Änderungen im Format führen zu einer "
 "Erhöhung der Hauptversion und rückwärtskompatible Änderungen (wie die "
@@ -1582,10 +1693,12 @@ msgstr ""
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 "Dieses gefaltete Feld ist eine durch Leerzeichen getrennte Liste von "
-"hochzuladenen binären Paketen."
+"hochzuladenen binären Paketen. Falls es sich um einen reinen Quell-Upload "
+"handelt, wird dieses Feld ausgelassen (seit Dpkg 1.19.3)."
 
 #. type: TP
 #: deb-changes.man
@@ -1690,11 +1803,13 @@ msgstr " I<Binärpaketname> B<-> I<Binärpaketzusammenfassung>"
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 "Dieses mehrzeilige Feld enthält eine Liste von Binärpaketnamen, gefolgt von "
 "einem Leerzeichen, einem Gedankenstrich (‚B<->’) und ihren, möglicherweise "
-"abgeschnittenen, Kurzbeschreibungen."
+"abgeschnittenen, Kurzbeschreibungen. Falls es sich um einen reinen Quell-"
+"Upload handelt, wird dieses Feld ausgelassen (seit Dpkg 1.19.3)."
 
 #. type: TP
 #: deb-changes.man
@@ -1726,7 +1841,7 @@ msgstr "B<Binary-Only: yes>"
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 "Das Feld kennzeichnet, dass der Upload ein rein binärer, nicht-Betreuer-"
 "Upload ist. Er stammt aus dem Schlüssel/Werte-Paar B<binary-only=yes> aus "
@@ -1846,8 +1961,8 @@ msgstr ""
 "und den anderen zugehörigen B<Checksums>-Feldern passen."
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr "FEHLER"
@@ -1856,12 +1971,12 @@ msgstr "FEHLER"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
 "Das Feld B<Files> ist inkonsistent gegenüber den anderen B<Checksums>-"
-"Feldern. Die Felder B<Change-By> und B<Maintainer> haben verwirrende Namen. "
+"Feldern. Die Felder B<Changed-By> und B<Maintainer> haben verwirrende Namen. "
 "Das Feld B<Distribution> enthält Informationen darüber, was normalerweise "
 "als Suite bezeichnet wird."
 
@@ -2264,7 +2379,7 @@ msgstr ""
 "vom Namen des Pakets selbst unterscheidet. Falls die Quellversion sich von "
 "der Binärversion unterscheidet, folgt dem I<Quellnamen> in Klammern eine "
 "I<Quellversion>. Dies kann zum Beispiel bei einem rein-binären, nicht "
-"Betreuer-Upload passieren, oder wenn mittels »B<dpkg-gencontrol -v>« eine "
+"Betreuer-Upload passieren, oder wenn mittels „B<dpkg-gencontrol -v>“ eine "
 "andere Binärversion gesetzt wird."
 
 #. type: TP
@@ -2640,6 +2755,31 @@ msgstr ""
 "I<debian/control> auftauchen. Die einzige derzeit verwandte Begründung ist "
 "B<debug-symbols>."
 
+#. type: TP
+#: deb-control.man
+#, no-wrap
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Build-Ids:>I< ELF-Baukennungsliste >"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+"Das Feld gibt eine durch Leerraum getrennte Liste von ELF-Baukennugen an. "
+"Dies sind eindeutige Kennzeichner für semantisch identische ELF-Objekte, für "
+"jedes von diesen innerhalb des Pakets."
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+"Das Format oder die Art, jede Baukennung zu berechnen, ist designbedingt "
+"nicht festgelegt."
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2651,7 +2791,6 @@ msgstr "BEISPIEL"
 #: deb-control.man
 #, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2672,7 +2811,6 @@ msgid ""
 " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
 " will run more slowly, however).\n"
 msgstr ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2697,9 +2835,22 @@ msgstr ""
 #. type: Plain text
 #: deb-control.man
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
 msgstr ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"Das Feld B<Build-Ids> verwendet einen eher generischen Namen aus seinem "
+"ursprünglichen Zusammenhang innerhalb eines ELF-Objektes, das einem sehr "
+"speziellen Zweck und ausführbaren Format dient."
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
+msgstr ""
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: TH
 #: deb-conffiles.man
@@ -2723,7 +2874,7 @@ msgid ""
 "A package declares its list of conffiles by including a I<conffiles> file in "
 "its control archive (i.e. I<DEBIAN/conffiles> during package creation)."
 msgstr ""
-"Ein Paket erklärt seine Liste an Conffiles, indem es eine Datei I<conffiles> "
+"Ein Paket gibt seine Liste an Conffiles an, indem es eine Datei I<conffiles> "
 "in seinem Steuerarchiv (d.h. I<DEBIAN/conffiles> während der "
 "Paketerstellung) hinzunimmt."
 
@@ -2795,7 +2946,7 @@ msgid ""
 "see below). To insert empty lines into a multi-line field, insert a dot "
 "after the space.  Lines starting with a ‘B<#>’ are treated as comments."
 msgstr ""
-"Jedes Debian-Quellpaket enhält die Hauptsteuerdatei »control«, die "
+"Jedes Debian-Quellpaket enhält die Hauptsteuerdatei „control“, die "
 "mindestens zwei Absätze enthält, die durch eine Leerzeile getrennt werden. "
 "Der erste Absatz führt alle allgemeinen Informationen über das Quellpaket "
 "auf, während jeder folgende Absatz genau ein Binärpaket beschreibt. Jeder "
@@ -2827,15 +2978,17 @@ msgstr "B<Source:> I<Quellpaketname> (verpflichtend)"
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 "Der Wert dieses Feldes ist der Name des Quellpakets und sollte mit dem Namen "
 "des Quellpakets in der Datei debian/changelog übereinstimmen. Ein Paketname "
 "darf nur aus Kleinbuchstaben (a-z), Ziffern (0-9), Plus- (+) und "
 "Minuszeichen (-) und Satzpunkten (.) bestehen. Paketnamen müssen mindestens "
-"zwei Zeichen lang sein und mit einem alphanumerischen Zeichen beginnen."
+"zwei Zeichen lang sein und mit einem klein geschriebenen alphanumerischen "
+"Zeichen (a-z0-9) beginnen."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -2844,7 +2997,7 @@ msgid ""
 "references the person who currently maintains the package, as opposed to the "
 "author of the software or the original packager."
 msgstr ""
-"Sollte in dem Format »Joe Bloggs E<lt>jbloggs@foo.comE<gt>« sein und "
+"Sollte in dem Format „Joe Bloggs E<lt>jbloggs@foo.comE<gt>“ sein und "
 "verweist auf die Person, die derzeit das Paket betreut, im Gegensatz zum "
 "Autor der Software, die paketiert wurde, oder dem ursprünglichen Paketierer."
 
@@ -3010,6 +3163,29 @@ msgstr ""
 #. type: TP
 #: deb-src-control.man dsc.man
 #, no-wrap
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<Testsuite:>I< Namenliste>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, no-wrap
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<Testsuite-Triggers:>I< Paketliste>"
+
+#. type: Plain text
+#: deb-src-control.man
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+"Diese Felder sind in der Handbuchseite B<dsc>(5) beschrieben, da sie aus "
+"Informationen, die aus B<debian/tests/control> abgeleitet sind, erstellt "
+"oder wörtlich in die control-Datei der Quellen kopiert werden."
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, no-wrap
 msgid "B<Vcs-Arch:>I< url>"
 msgstr "B<Vcs-Arch*:>I< URL>"
 
@@ -3566,8 +3742,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3580,8 +3756,8 @@ msgstr ""
 "# dieses Feld wird in das Binär- und Quellpaket kopiert\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3667,8 +3843,8 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
-msgstr "I<Dateiname> I<Sektion> I<Priorität>"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
+msgstr "I<Dateiname> I<Sektion> I<Priorität> [ I<Schlüsselwort=Wert\\&…\\&> ]"
 
 #. type: Plain text
 #: deb-src-files.man
@@ -3686,6 +3862,18 @@ msgstr ""
 "I<section> der control-Datei in dem .deb. Die erlaubten Werte hängen vom "
 "Archiv der jeweiligen Distribution ab."
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+"I<Schlüsselwort=Wert\\&.…\\&> entspricht einer optionalen, Leerraum-"
+"getrennten Liste von Attributen für diesen Eintrag. Derzeit ist das einzige "
+"unterstützte Schlüsselwort B<automatic> mit dem Wert B<yes>, um automatisch "
+"erstellte Dateien zu markieren."
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -3790,7 +3978,7 @@ msgstr "B<build-indep>"
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -4802,17 +4990,20 @@ msgstr ""
 #: deb-substvars.man
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 "Eine Variablensubstitution hat die Form B<${>I<Variablenname>B<}>. "
-"Variablennamen bestehen aus alphanumerischen Zeichen (womit sie auch "
-"beginnen), Gedankenstrichen und Doppelpunkten. Variablensubstitutionen "
-"werden wiederholt durchgeführt, bis keine übrig geblieben sind; der "
-"komplette Text des Feldes nach der Substitution wird erneut auf weitere "
-"Substitutionen geprüft."
+"Variablennamen bestehen aus alphanumerischen Zeichen (a-zA-Z0-9, womit sie "
+"auch beginnen), Gedankenstrichen (-) und Doppelpunkten (:). Bei "
+"Variablennamen ist die Klein-/Großschreibung relevant, auch wenn sie sich "
+"auf Gebilde beziehen, die die Klein-/Großschreibung erhalten. "
+"Variablensubstitutionen werden wiederholt durchgeführt, bis keine übrig "
+"geblieben sind; der komplette Text des Feldes nach der Substitution wird "
+"erneut auf weitere Substitutionen geprüft."
 
 #. type: Plain text
 #: deb-substvars.man
@@ -5335,6 +5526,26 @@ msgstr ""
 #. type: TP
 #: deb-symbols.man
 #, no-wrap
+msgid "B<Build-Depends-Packages>"
+msgstr "B<Build-Depends-Packages>"
+
+#. type: Plain text
+#: deb-symbols.man
+msgid ""
+"The same as B<Build-Depends-Package> but accepts a comma-separated list of "
+"package names (since dpkg 1.20.0).  This field will override any B<Build-"
+"Depends-Package> field present, and is mostly useful with “-dev” packages "
+"and metapackages depending on these, say for a transition period."
+msgstr ""
+"Identisch zu B<Build-Depends-Package>, akzeptiert aber eine Kommata-"
+"getrennte Liste an Paketnamen (seit Dpkg 1.20.0). Dieses Feld setzt jedes "
+"vorhandende Feld B<Build-Depends-Package> außer Kraft und ist mit »-dev«-"
+"Paketen und davon abhängigen Metapaketen, beispielsweise für eine "
+"Übergangsperiode, am nützlichsten."
+
+#. type: TP
+#: deb-symbols.man
+#, no-wrap
 msgid "B<Ignore-Blacklist-Groups>"
 msgstr "B<Ignore-Blacklist-Groups>"
 
@@ -5837,8 +6048,8 @@ msgid ""
 "I<triggers> file in its control archive (i.e. I<DEBIAN/triggers> during "
 "package creation)."
 msgstr ""
-"Ein Paket erklärt seine Beziehung zu einigen Trigger(n) (deutsch: Auslösern) "
-"indem es eine Datei I<triggers> in seinem Steuerarchiv (d.h. I<DEBIAN/"
+"Ein Paket gibt seine Beziehung zu einigen Trigger(n) (deutsch: Auslösern) "
+"an, indem es eine Datei I<triggers> in seinem Steuerarchiv (d.h. I<DEBIAN/"
 "triggers> während der Paketerstellung) hinzunimmt."
 
 #. type: Plain text
@@ -5880,16 +6091,31 @@ msgstr "B<interest-noawait> I<Trigger-Name>"
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
-"functionality provided by the trigger is not crucial."
+"triggers control file."
 msgstr ""
 "Gibt an, dass das Paket an dem benannten Trigger interessiert ist. Alle "
 "Trigger, an denen ein Paket interessiert ist, müssen mit dieser Direktive in "
-"der Trigger-Steuerdatei aufgeführt werden. Die Variante „noawait“ setzt die "
-"triggernden Pakete nicht in den Zustand »triggers-awaited«. Dies sollte "
-"verwandt werden, wenn die von den Triggern bereitgestellte Funktionalität "
-"nicht äußerst wichtig ist."
+"der Trigger-Steuerdatei aufgeführt werden."
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
+"functionality provided by the trigger is not crucial."
+msgstr ""
+"Die Variante „await“ setzt die triggernden Pakete in den Zustand „triggers-"
+"awaited“. Die Variante „noawait“ setzt die triggernden Pakete nicht in den "
+"Zustand „triggers-awaited“, selbst falls das triggernde Paket eine „await“-"
+"Aktivierung angegeben hat (entweder mit den Direktiven B<activate-await> "
+"oder B<activate> oder durch Verwendung der Befehlszeilenoption B<dpkg-"
+"trigger> B<--no-await>). Die Variante „noawait“ sollte verwandt werden, wenn "
+"die von den Triggern bereitgestellte Funktionalität nicht äußerst wichtig "
+"ist."
 
 #. type: TP
 #: deb-triggers.man
@@ -5915,17 +6141,27 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
 msgstr ""
 "Sorgt dafür, dass Änderungen an dem Zustand dieses Pakets einen "
 "spezifizierten Trigger aktiviert. Der Trigger wird am Beginn folgender "
 "Operationen aktiviert: unpack, configure, remove (hinzugefügt zum Nutzen von "
-"Paketen, die im Konflikt zueinander stehen), purge und deconfigure. Die "
+"Paketen, die im Konflikt zueinander stehen), purge und deconfigure."
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
+msgstr ""
+"Die „await“-Varianten setzen das Trigger-auslösende Paket in den Zustand "
+"„triggers-awaited“, falls die Direktive „interest“ auch „await“ ist. Die "
 "Variante „noawait“ setzt die triggernden Pakete nicht in den Zustand "
-"»triggers-awaited«. Dies sollte verwandt werden, wenn die von den Triggern "
-"bereitgestellte Funktionalität nicht äußerst wichtig ist."
+"„triggers-awaited“. Die Variante „noawait“ sollte verwandt werden, wenn die "
+"von den Triggern bereitgestellte Funktionalität nicht äußerst wichtig ist."
 
 #. type: Plain text
 #: deb-triggers.man
@@ -5989,6 +6225,23 @@ msgstr ""
 "Die Alias-Varianten „-await“ werden seit Dpkg 1.17.21 unterstützt und bei "
 "älteren Dpkg zu Fehlern führen."
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+"Wenn ein Paket eine Direktive B<interest-noawait> bereitstellt, wird jede "
+"Aktivierung das triggernde Paket in den Modus „noawait“ setzen, unabhängig "
+"von dem durch die Aktivierung erbetenen Awaiting-Modus (entweder „await“ "
+"oder „noawait“). Wenn ein Paket eine Direktive B<interest> oder B<interest-"
+"await> bereitstellt, werden alle Aktivierungen des triggernden Paketes in "
+"„await“ oder „noawait“ gebracht, abhängig von der Art der Aktivierung."
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -6041,30 +6294,32 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 "Der Wert des Feldes gibt die Formatversion des Quellpaketes an. Der Feldwert "
 "wird von Programmen, die mit Quellpaketen arbeiten, verwandt, um die Liste "
 "der Dateien in dem Quellpaket zu interpretieren und zu bestimmen, wie es "
-"entpackt wird. Die Syntax des Feldwertes ist eine numerische Hauptrevision, "
-"ein Satzpunkt, eine numerische Unterrevision und dann ein optionaler "
-"Untertyp nach einem Leerzeichen. Falls dieser spezifiziert wird, ist er ein "
-"alphanumerisches Wort in Anführungszeichen. Der Untertyp ist in der Syntax "
-"optional, kann aber für eine bestimmte Quellformatrevision verpflichtend "
-"sein."
+"entpackt wird. Die Syntax des Feldwertes ist eine numerische Hauptrevision "
+"(„0-9“), ein Satzpunkt („.“), eine numerische Unterrevision („0-9“) und dann "
+"ein optionaler Untertyp nach Leerraum (»\\ \\et«). Falls dieser spezifiziert "
+"wird, ist er ein klein geschriebenes alphanumerisches („a-z0-9“) Wort in "
+"Klammern („()“). Der Untertyp ist in der Syntax optional, kann aber für eine "
+"bestimmte Quellformatrevision verpflichtend sein."
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 "Die von B<dpkg> derzeit unterstützten Quellformate sind B<1.0>, B<2.0>, "
 "B<3.0 (native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> und B<3.0 "
-"(custom)>."
+"(custom)>. Siehe B<dpkg-source>(1) für ihre Beschreibung."
 
 #. type: TP
 #: dsc.man
@@ -6169,16 +6424,10 @@ msgid ""
 "These fields declare the I<url> of the Version Control System repository "
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
-"Diese Felder verkünden die I<URL> des Versionskontrollsystem-Depots, das für "
-"die Betreuung des Pakets verwandt wird. Siehe B<deb-src-control>(5) für "
+"Diese Felder gibt die I<URL> des Versionskontrollsystem-Depots, das für die "
+"Betreuung des Pakets verwandt wird, an. Siehe B<deb-src-control>(5) für "
 "weitere Details."
 
-#. type: TP
-#: dsc.man
-#, no-wrap
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<Testsuite:>I< Namenliste>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -6188,33 +6437,27 @@ msgid ""
 "present, if the file is present but not the value, then B<dpkg-source> will "
 "automatically add it, preserving previous values."
 msgstr ""
-"Dieses Feld verkündigt, dass das Quellpaket die angegebene Testsammlung "
+"Dieses Feld gbit an, dass das Quellpaket die angegebene Testsammlung "
 "enthält. Der Wert ist eine durch Kommata getrennte Liste von Testsammlungen. "
 "Falls der Wert B<autopkgtest> vorkommt, wird erwartet, dass I<debian/tests/"
 "control> vorhanden ist. Falls nur die Datei aber nicht der Wert vorhanden "
 "ist, wird B<dpkg-source> den Wert automatisch (unter Beibehaltung der "
 "vorherigen Werte) hinzufügen."
 
-#. type: TP
-#: dsc.man
-#, no-wrap
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<Testsuite-Triggers:>I< Paketliste>"
-
 #. type: Plain text
 #: dsc.man
-#, fuzzy
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
-"Dieses Feld verkündigt die Vereinigung aller Testabhängigkeiten (Felder "
-"B<Depends> in der Datei I<debian/tests/control>) mit allen Einschränkungen "
-"entfernt und ODER-Abhängigkeiten FIXME, außer für Programme, die vom "
-"Quellpaket und Meta-Abhängigkeiten wie B<@> oder B<@builddeps@> erstellt "
-"wurden."
+"Dieses Feld gibt die Vereinigung aller Testabhängigkeiten (Felder B<Depends> "
+"in der Datei I<debian/tests/control>) mit allen Einschränkungen entfernt und "
+"ODER-Abhängigkeiten verflacht (d.h. in separate UND-Beziehungen "
+"umgewandelt), außer für Programme, die vom Quellpaket und Meta-"
+"Abhängigkeiten wie B<@> oder B<@builddeps@> erstellt wurden, an."
 
 #. type: Plain text
 #: dsc.man
@@ -6231,8 +6474,8 @@ msgid ""
 "These fields declare relationships between the source package and packages "
 "used to build it.  They are discussed in the B<deb-src-control>(5) manpage."
 msgstr ""
-"Diese Felder verkünden die Beziehungen zwischen dem Quellpaket und Paketen, "
-"die daraus gebaut werden. Sie werden in der Handbuchseite B<deb-control>(5) "
+"Diese Felder geben die Beziehungen zwischen dem Quellpaket und Paketen, die "
+"daraus gebaut werden, an. Sie werden in der Handbuchseite B<deb-control>(5) "
 "beschrieben."
 
 #. type: TP
@@ -6650,6 +6893,23 @@ msgstr ""
 "wollen alle Dateien aus den Systemverzeichnissen inklusive der "
 "Konfigurationsdateien entfernen)."
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr "B<unknown>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+"Die Paketauswahl ist unbekannt. Ein Paket, das auch im Zustand B<not-"
+"installed> und ohne Schalter B<ok> ist, wird beim nächsten Abspeichern der "
+"Datenbank vergessen."
+
 #. type: SS
 #: dpkg.man
 #, no-wrap
@@ -6862,20 +7122,24 @@ msgstr "B<-r>, B<--remove> I<Paket>…|B<-a>|B<--pending>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
-"Entfernt ein installiertes Paket. Dies entfernt alles außer Conffiles, da "
-"damit eine erneute Konfiguration des Paketes vermieden wird, falls es später "
-"nochmals installiert wird. Conffiles sind Konfigurationsdateien, die in der "
-"Steuerdatei I<DEBIAN/conffiles> aufgeführt sind. Falls statt des Paketnamens "
-"B<-a> oder B<--pending> angegeben wird, werden alle Pakete, die entpackt, "
-"aber in der Datei I<%ADMINDIR%/status> zur Entfernung vorgemerkt sind, "
-"entfernt."
+"Entfernt ein installiertes Paket. Dies entfernt alles außer Conffiles und "
+"anderen Daten, die vom Skript I<postrm> bereinigt werden, da damit eine "
+"erneute Konfiguration des Paketes vermieden wird, falls es später nochmals "
+"installiert wird. Conffiles sind Konfigurationsdateien, die in der "
+"Steuerdatei I<DEBIAN/conffiles> aufgeführt sind. Falls es keine Steuerdatei "
+"I<DEBIAN/conffiles> oder kein Skript I<DEBIAN/postrm> gibt, ist dieser "
+"Befehl äquivalent zum Aufruf von B<--purge>. Falls statt des Paketnamens B<-"
+"a> oder B<--pending> angegeben wird, werden alle Pakete, die entpackt, aber "
+"in der Datei I<%ADMINDIR%/status> zur Entfernung vorgemerkt sind, entfernt."
 
 #. type: Plain text
 #: dpkg.man
@@ -6907,15 +7171,17 @@ msgstr "B<-P>, B<--purge> I<Paket>…|B<-a>|B<--pending>"
 #: dpkg.man
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 "Löscht ein installiertes oder bereits entferntes Paket vollständig. Damit "
-"wird alles entfernt, auch Conffiles. Falls statt des Paketnamens B<-a> oder "
-"B<--pending> angegeben wird, werden alle Pakete, die entpackt oder entfernt, "
-"aber in der Datei I<%ADMINDIR%/status> zum vollständigen Löschen vorgemerkt "
-"sind, vollständig gelöscht."
+"wird alles entfernt, auch Conffiles und alles, was im Skript I<postrm> "
+"bereinigt wird. Falls statt des Paketnamens B<-a> oder B<--pending> "
+"angegeben wird, werden alle Pakete, die entpackt oder entfernt, aber in der "
+"Datei I<%ADMINDIR%/status> zum vollständigen Löschen vorgemerkt sind, "
+"vollständig gelöscht."
 
 #. type: Plain text
 #: dpkg.man
@@ -7056,8 +7322,8 @@ msgstr ""
 "der Information aus der I<Packages-Datei> zusammengeführt. Mit der Aktion "
 "B<--update-avail> wird die alte Information durch die Information aus der "
 "I<Packages-Datei> ersetzt. Die mit Debian vertriebene I<Packages-Datei> "
-"heißt einfach »I<Packages>«. Falls das Argument I<Packages-file> fehlt oder "
-"»B<->« benannt ist, wird es aus der Standardeingabe lesen (seit Dpkg "
+"heißt einfach „I<Packages>“. Falls das Argument I<Packages-file> fehlt oder "
+"„B<->“ benannt ist, wird es aus der Standardeingabe lesen (seit Dpkg "
 "1.17.7). B<dpkg> hält seine Aufzeichnungen über die verfügbaren Pakete in I<"
 "%ADMINDIR%/available>."
 
@@ -7204,6 +7470,15 @@ msgstr ""
 "Sucht nach Paketen, die zur Installation ausgewählt wurden, die aber aus "
 "irgendeinem Grund noch nicht installiert wurden."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+"Beachten Sie: Dieser Befehl verwendet sowohl die Datei available als auch "
+"die Paketauswahlen."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -7514,7 +7789,7 @@ msgid "Display a brief help message."
 msgstr "Zeige eine kurze Hilfenachricht an."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
@@ -7764,13 +8039,13 @@ msgstr ""
 "   2000   Verrückte Mengen an Gelaber\n"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force->I<things>"
 msgstr "B<--force->I<Sachen>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--no-force->I<Sachen>, B<--refuse->I<Sachen>"
@@ -7800,7 +8075,7 @@ msgstr ""
 "gesamtes System zerstören.>"
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Schaltet alle »force«-Optionen ein (oder aus)."
 
@@ -7870,34 +8145,41 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
-msgstr "B<depends>: Verwandle alle Abhängigkeitsprobleme in Warnungen."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
+msgstr ""
+"B<depends>: Verwandle alle Abhängigkeitsprobleme in Warnungen. Dies betrifft "
+"die Felder B<Pre-Depends> und B<Depends>."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
-"B<depends-version>: Ignoriere Versionen bei der Prüfung von Abhängigkeiten."
+"B<depends-version>: Ignoriere Versionen bei der Prüfung von Abhängigkeiten. "
+"Dies betrifft die Felder B<Pre-Depends> und B<Depends>."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr ""
 "B<breaks>: Installiere, selbst falls dies ein anderes Paket beschädigt (seit "
-"Dpkg 1.14.6)."
+"Dpkg 1.14.6). Dies betrifft das Feld B<Breaks>."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 "B<conflicts>: Installiere, selbst wenn es mit einem anderen Paket in "
 "Konflikt steht. Dies ist gefährlich, da dies gewöhnlich dazu führt, dass "
-"einige Dateien überschrieben werden."
+"einige Dateien überschrieben werden. Dies betrifft das Feld B<Conflicts>."
 
 #. type: Plain text
 #: dpkg.man
@@ -7990,6 +8272,36 @@ msgstr ""
 "einer nicht umgeleiteten."
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+"B<statoverride-add>: Überschreibt eine existierende Status-Hinwegsetzung "
+"beim Hinzufügen (seit Dpkg 1.19.5)."
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+"B<statoverride-remove>: Ignoriert eine fehlende Status-Hinwegsetzung beim "
+"Entfernen (seit Dpkg 1.19.5)."
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+"B<security-mac>(*): Verwendet plattformspezifische »Mandatory Access Control "
+"(MAC)«-basierende Sicherheit bei der Installation von Dateien in das "
+"Dateisystem (seit Dpkg 1.19.5). Auf Linux-Systemen verwendet die "
+"Implementierung SELinux."
+
+#. type: Plain text
 #: dpkg.man
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking (since dpkg "
@@ -8036,7 +8348,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -8097,11 +8409,13 @@ msgstr "B<--ignore-depends>=I<Paket>, …"
 #: dpkg.man
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "Ignoriere Abhängigkeitsüberprüfungen für bestimmte Pakete (tatsächlich wird "
 "die Überprüfung durchgeführt, aber nur Warnungen über Konflikte werden "
-"angezeigt, sonst nichts)."
+"angezeigt, sonst nichts). Dies betrifft die Felder B<Pre-Depends>, "
+"B<Depends> und B<Breaks>."
 
 #. type: TP
 #: dpkg.man
@@ -8177,13 +8491,14 @@ msgstr "B<--admindir=>I<Verz>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
-"Ändere das voreingestellte administrative Verzeichnis (standardmäßig »I<"
-"%ADMINDIR%>«), in dem viele Dateien liegen, die Informationen über den "
-"Status von installierten und deinstallierten Pakete usw. liegen."
+"Setzt das Standardadministrationsverzeichnis auf I<Verzeichnis>. Diess "
+"Verzeichnis enthält viele Dateien, die Informationen über den Status von "
+"installierten und deinstallierten Paketen usw. enthalten. Standardmäßig „I<"
+"%ADMINDIR%>“."
 
 #. type: TP
 #: dpkg.man
@@ -8194,16 +8509,16 @@ msgstr "B<--instdir=>I<Verz>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
-"Ändere das voreingestellte Installationsverzeichnis. Dieses Verzeichnis gibt "
-"an, wo Pakete installiert werden. B<instdir> (standardmäßig »I</>«) ist auch "
-"das Verzeichnis, das an B<chroot>(2) vor dem Aufruf der Installationsskripte "
-"des Paketes übergeben wird, was bedeutet, dass die Skripte B<instdir> als "
-"ein Wurzelverzeichnis sehen."
+"Setzt das voreingestellte Installationsverzeichnis. Dieses Verzeichnis gibt "
+"an, wo Pakete installiert werden. B<instdir> ist auch das Verzeichnis, das "
+"an B<chroot>(2) vor dem Aufruf der Installationsskripte des Paketes "
+"übergeben wird, was bedeutet, dass die Skripte B<instdir> als ein "
+"Wurzelverzeichnis sehen. Standardmäßig „I</>“."
 
 #. type: TP
 #: dpkg.man
@@ -8214,11 +8529,13 @@ msgstr "B<-root=>I<Verz>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
-"Durch Ändern von B<root> wird B<instdir> auf »I<Verz>« und B<admindir> auf "
-"»I<Verz>B<%ADMINDIR%>« geändert."
+"Setzt das Wurzelverzeichnis auf I<Verzeichnis>, wodurch das "
+"Installationsverzeichnis auf „I<Verz>“ und das administrative Verzeichnis "
+"auf „I<Verz>B<%ADMINDIR%>“ gesetzt wird."
 
 #. type: TP
 #: dpkg.man
@@ -8339,8 +8656,8 @@ msgid ""
 msgstr ""
 "Das Glob-Muster kann die gleichen Platzhalter wie in der Shell verwenden, "
 "wobei ‚*’ auf eine beliebige Folge von Zeichen, auch dem Leerzeichen und "
-"‚/’, passt. Beispielsweise passt »I</usr/*/READ*>« auf »I</usr/share/doc/"
-"package/README>«. Wie gewöhnlich passt ‚?’ auf ein einzelnes Zeichen (wieder "
+"‚/’, passt. Beispielsweise passt „I</usr/*/READ*>“ auf „I</usr/share/doc/"
+"package/README>“. Wie gewöhnlich passt ‚?’ auf ein einzelnes Zeichen (wieder "
 "auch auf ‚/’). Und ‚[’ beginnt eine Zeichenklasse, die eine Liste von "
 "Zeichen, Bereiche und Komplemente enthalten kann. Lesen Sie B<glob>(7) für "
 "detaillierte Informationen über das Globben. Hinweis: Aktuelle "
@@ -8617,6 +8934,20 @@ msgstr ""
 "B<keep> ist."
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<--no-pager>"
+msgstr "B<--no-pager>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr ""
+"Deaktiviert die Verwendung jeglichen Pagers bei der Anzeige von "
+"Informationen (seit Dpkg 1.19.2)."
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -8734,7 +9065,7 @@ msgid "ENVIRONMENT"
 msgstr "UMGEBUNG"
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr "Externe Umgebung"
@@ -8788,44 +9119,45 @@ msgstr ""
 "temporäre Dateien und Verzeichnisse erstellt werden."
 
 #. type: TP
-#: dpkg.man
-#, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
-
-#. type: Plain text
-#: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
-msgstr ""
-"Das Programm, das B<dpkg> ausführen wird, wenn es die Conffiles anzeigt."
-
-#. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr ""
 "Das Programm, das B<dpkg> ausführen wird, wenn es eine neue interaktive "
-"Shell startet."
+"Shell startet oder einen Befehl über eine Shell ausführt."
 
 #. type: TP
 #: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<PAGER>"
+msgstr "B<PAGER>"
+
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<DPKG_PAGER>"
+msgstr "B<DPKG_PAGER>"
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"The program B<dpkg> will execute when running a pager, which will be "
+"executed with «B<$SHELL -c>», for example when displaying the conffile "
+"differences.  If B<SHELL> is not set, «B<sh>» will be used instead.  The "
+"B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
 msgstr ""
-"Setzt die Anzahl von Spalten die B<dpkg> verwenden soll, wenn es "
-"formatierten Text anzeigt. Derzeit nur von B<--list> verwendet."
+"Das Programm, das B<dpkg> ausführen wird, wenn es einen Pager mit »B<$SHELL -c>« ausführt, "
+"beispielsweise zur Anzeige von Conffile-Dateiunterschieden. Falls B<SHELL> "
+"nicht gesetzt ist, wird stattdessen „B<sh>“ verwandt. B<DPKG_PAGER> setzt "
+"die Umgebungsvariable B<PAGER> außer Kraft (seit Dpkg 1.19.2)."
 
 #. type: TP
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -8854,14 +9186,71 @@ msgstr ""
 "Setzt den Farbmodus (seit Dpkg 1.18.5). Die derzeit unterstützten Werte "
 "sind: B<auto> (Vorgabe), B<always> und B<never>."
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_FORCE>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
+msgstr ""
+"Setzt die Erzwingungsschalter (seit Dpkg 1.19.5). Wenn diese Variable "
+"vorhanden ist, werden keine eingebauten Vorgaben für Erzwingungen angewandt. "
+"Falls diese Variable vorhanden aber leer ist, werden alle "
+"Erzwingungsschalter deaktiviert."
+
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<DPKG_FRONTEND_LOCKED>"
+msgstr "B<DPKG_FRONTEND_LOCKED>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
+msgstr ""
+"Wird von einer Paketverwalterprogrammoberfläche gesetzt, um Dpkg zu "
+"informieren, dass es nicht die Sperre der Oberfläche erlangen soll (seit "
+"Dpkg 1.19.1)."
+
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr "Interne Umgebung"
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr "B<LESS>"
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+"Von B<dpkg> auf »B<-FRSXMQ>« definiert, falls es nicht bereits gesetzt ist "
+"oder wenn ein Pager gestartet wird (seit Dpkg 1.19.2). Um das "
+"Vorgabeverhalten zu verändern, kann diese Variable auf einen anderen Wert "
+"einschließlich der leeren Zeichenkette voreingestellt werden oder die "
+"Variablen B<PAGER> oder B<DPKG_PAGER> können gesetzt werden, um bestimmte "
+"Optionen mit „B<-+>“ zu deaktivieren, beispielsweise B<DPKG_PAGER=\"less -+F"
+"\">."
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<DPKG_ROOT>"
 msgstr "B<DPKG_ROOT>"
@@ -8906,6 +9295,16 @@ msgstr ""
 "1.16.0). Diese Variable wird immer auf den aktuellen Wert von B<--admindir> "
 "gesetzt."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+"Wird von B<dpkg> für alle Unterprozessumgebungen auf alle aktuell "
+"aktivierten Erzwingungsoptionennamen (getrennt durch Kommata) gesetzt (seit "
+"Dpkg 1.19.5)."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -9858,8 +10257,12 @@ msgstr "VARIABLEN"
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
-msgstr "Die folgenden Variablen werden von B<dpkg-architecture> gesetzt:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
+msgstr ""
+"Die folgenden Variablen werden von B<dpkg-architecture> gesetzt (siehe den "
+"Abschnitt B<AUSDRÜCKE> für eine Beschreibung des Benennungsschematas):"
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10524,7 +10927,7 @@ msgid ""
 msgstr ""
 "Falls dies gesetzt ist, wird es als Datenverzeichnis von B<dpkg> verwandt, "
 "in dem sich die Architekturtabellen befinden (seit Dpkg 1.14.17). "
-"Standardmäßig »%PKGDATADIR%«."
+"Standardmäßig „%PKGDATADIR%“."
 
 #. type: TP
 #: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -10551,8 +10954,8 @@ msgid ""
 msgstr ""
 "Falls dies gesetzt ist, wird es zur Entscheidung, ob Native Language "
 "Support, auch als Internationalisierung (oder i18n) Unterstützung bekannt, "
-"aktiviert wird (seit Dpkg 1.19.0). Die akzeptierten Werte sind: B<0> und B<1> "
-"(Vorgabe)."
+"aktiviert wird (seit Dpkg 1.19.0). Die akzeptierten Werte sind: B<0> und "
+"B<1> (Vorgabe)."
 
 #. type: Plain text
 #: dpkg-architecture.man
@@ -10619,7 +11022,7 @@ msgid ""
 "B<dpkg-buildflags> is a tool to retrieve compilation flags to use during "
 "build of Debian packages."
 msgstr ""
-"B<dpkg-buildflags> ist ein Werkzeug, das zum Abfragen der zu verwendenden "
+"B<dpkg-buildflags> ist ein Werkzeug, das zum Abfragen der zu verwendenen "
 "Kompilierungsschalter für den Bau von Debian-Paketen eingesetzt wird."
 
 #. type: Plain text
@@ -10903,7 +11306,7 @@ msgstr "B<make>"
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 "Make-Direktiven, um alle Kompilierungsschalter in der Umgebung zu setzen und "
@@ -11401,9 +11804,9 @@ msgid ""
 "D__DEB_CANARY_>I<flag>_I<random-id>B<__>, and B<LDFLAGS> set to B<-Wl,-z,deb-"
 "canary->I<random-id>."
 msgstr ""
-"Diese Einstellung (standardmäßig deaktiviert) fügt Pseudo-Kanarienvögel-"
+"Diese Einstellung (standardmäßig deaktiviert) fügt Pseudo-Zufallsbarieren-"
 "Optionen zu den Bauschaltern hinzu, so dass die Bauprotokolle überprüft "
-"werden können, wie die Bauschalter sich fortpflanzen. Dies erlaubt, "
+"werden können, wie die Bauschalter weitergereicht werden. Dies erlaubt, "
 "Auslassungen in den normalen Bauschaltereinstellungen zu finden. Derzeit "
 "werden nur die Schalter B<CPPFLAGS>, B<CFLAGS>, B<OBJCFLAGS>, B<CXXFLAGS> "
 "und B<OBJCXXFLAGS> unterstützt, wobei die Schalter auf B<-"
@@ -11711,29 +12114,41 @@ msgstr "B<pie>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
-msgstr ""
-"Diese Einstellung (seit Dpkg 1.18.13 ohne Vorgabe und standardmäßig von GCC "
-"auf den Debian-Architekturen Amd64, Arm64, Armel, Armhf, I386, Kfreebsd-"
-"amd64, Kfreebsd-i386, Mips, Mipsel, Mips64el, PPC64el, S390x, Sparc und "
-"Sparc64 hinzugefügt) fügt die benötigten Optionen mittels GCC-Spec-Dateien "
-"hinzu, falls sie zum Aktivieren oder Deaktivieren von PIE benötigt werden. "
-"Falls aktiviert und von GCC hinzugefügt, ergänzt nichts. Wenn aktiviert und "
-"nicht von GCC hinzugefügt, fügt B<-fPIE> zu B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> und B<FCFLAGS> hinzu "
-"und B<-fPIE -pie> zu B<LDFLAGS>. Wenn deaktiviert und von GCC hinzugefügt, "
-"fügt B<-fno-PIE> zu B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, "
-"B<GCJFLAGS>, B<FFLAGS> und B<FCFLAGS> hinzu und B<-fno-PIE -no-pie> zu "
-"B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
+msgstr ""
+"Diese Einstellung (seit Dpkg 1.18.23 ohne globale Vorgabe, da sie jetzt "
+"standardmäßig durch GCC auf den Debian-Architekturen Amd64, Arm64, Armel, "
+"Armhf, Hurd-i386, I386, Kfreebsd-amd64, Kfreebsd-i386, Mips, Mipsel, "
+"Mips64el, Powerpc, PPC64, PPC64el, Riscv64, S390x, Sparc und Sparc64 "
+"aktiviert ist) fügt, falls benötigt, die benötigten Optionen, um PIE zu "
+"aktivieren oder zu deaktiveren, über GCC-Spezifikationsdateien hinzu, "
+"abhängig davon, ob GCC auf diesen Architekturen die Schalter selbst "
+"einspeist oder nicht. Wenn die Einstellung aktiviert ist und GCC den "
+"Schalter einspeist, fügt dies nichts hinzu. Wenn die Einstellung aktiviert "
+"ist und GCC den Schalter nicht einspeist, dann fügt es B<-fPIE> (mittels I<"
+"%PKGDATADIR%/pie-compiler.specs>) zu B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, "
+"B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> und B<FCFLAGS> und B<-fPIE -pie> "
+"(mittels I<%PKGDATADIR%/pie-link.specs>) zu B<LDFLAGS> hinzu.  Wenn die "
+"Einstellung deaktiviert ist und GCC den Schalter einspeist, dann fügt es B<-"
+"fno-PIE> (mittels I<%PKGDATADIR%/no-pie-compile.specs>) zu B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> und "
+"B<FCFLAGS> und B<-fno-PIE -no-pie> (mittels I<%PKGDATADIR%/no-pie-link."
+"specs>) zu B<LDFLAGS> hinzu."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11908,6 +12323,36 @@ msgstr ""
 #. type: TP
 #: dpkg-buildflags.man
 #, no-wrap
+msgid "B<fixfilepath>"
+msgstr "B<fixfilepath>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+"Diese Einstellung (standardmäßig deaktiviert) fügt B<-ffile-prefix-"
+"map=>I<BUILDPATH>B<=.> zu B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, "
+"B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> und B<FCFLAGS> hinzu, wobei "
+"B<BUILDPATH> auf das oberste Verzeichnis des bauenden Pakets gesetzt wird. "
+"Dies führt dazu, dass der Baupfad aus allen erstellten Dateien entfernt wird."
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+"Falls sowohl B<fixdebugpath> als auch B<fixfilepath> gesetzt sind, hat diese "
+"Option Vorrang, da sie eine Obermenge erster ist."
+
+#. type: TP
+#: dpkg-buildflags.man
+#, no-wrap
 msgid "B<fixdebugpath>"
 msgstr "B<fixdebugpath>"
 
@@ -12140,7 +12585,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr "Um Bauschalter an eine Baubefehl in einer Makefile zu übergeben:"
 
 #. type: Plain text
@@ -12508,14 +12953,14 @@ msgstr "B<11.>"
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
-"It runs the B<sign> hook and calls B<gpg2> or B<gpg> (as long as it is not "
-"an UNRELEASED build, or B<--no-sign> is specified) to sign the B<.dsc> file "
-"(if any, unless B<-us> or B<--unsigned-source> is specified), the B<."
-"buildinfo> file (unless B<-ui>, B<--unsigned-buildinfo>, B<-uc> or B<--"
-"unsigned-changes> is specified) and the B<.changes> file (unless B<-uc> or "
-"B<--unsigned-changes> is specified)."
+"It runs the B<sign> hook and calls B<gpg> (as long as it is not an "
+"UNRELEASED build, or B<--no-sign> is specified) to sign the B<.dsc> file (if "
+"any, unless B<-us> or B<--unsigned-source> is specified), the B<.buildinfo> "
+"file (unless B<-ui>, B<--unsigned-buildinfo>, B<-uc> or B<--unsigned-"
+"changes> is specified) and the B<.changes> file (unless B<-uc> or B<--"
+"unsigned-changes> is specified)."
 msgstr ""
-"Es führt den Hook B<sign> aus und ruft B<gpg2> oder B<gpg> auf (so lange es "
+"Es führt den Hook B<sign> aus und ruft B<gpg> auf (so lange es "
 "sich nicht um einen »UNRELEASED«-Bau handelt oder B<--no-sign> angegeben "
 "wurde), um die B<.dsc>-Datei (falls vorhanden und B<-us> oder B<--unsigned-"
 "source> nicht angegeben wurde), die B<.buildinfo>-Datei (falls B<-ui>, B<--"
@@ -12579,14 +13024,16 @@ msgstr "B<source>"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 "Baut das Quellpaket: Hinweis: Falls Sie diesen Wert alleine verwenden und "
-"falls Sie einfach das Quellpaket (neu) bauen möchten, ist die Verwendung von "
-"B<dpkg-source> immer besser, da dafür keine Bauabhängigkeiten installiert "
-"sein müssen, um das Ziel B<clean> aufzurufen."
+"falls Sie einfach das Quellpaket aus einem sauberen Quellbaum (neu) bauen "
+"möchten, ist die Verwendung von B<dpkg-source> immer die bessere Option, da "
+"dafür keine Bauabhängigkeiten installiert sein müssen, die ansonsten "
+"benötigt werden, um das Ziel B<clean> aufzurufen."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genbuildinfo.man dpkg-genchanges.man
@@ -12936,7 +13383,7 @@ msgstr ""
 "B<parallel=>I<Aufträge> oder die Option B<parallel> in der Umgebungsvariable "
 "B<DEB_BUILD_OPTIONS> außer Kraft. Beachten Sie, dass der Wert B<auto> durch "
 "die tatsächliche Anzahl der derzeitig aktiven Prozessoren ersetzt wird und "
-"somit nicht an irgendeinen Kindprozess weitergegeben wird. Falls die Anzahl "
+"somit nicht an irgendeinen Kindprozess weitergereicht wird. Falls die Anzahl "
 "der verfügbaren Prozessoren nicht ermittelt werden kann, fällt der Code auf "
 "eine serielle Abarbeitung zurück (seit Dpkg 1.18.15). Dies sollte aber nur "
 "auf exotischen und nicht unterstützten Systemen passieren."
@@ -13020,19 +13467,35 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, no-wrap
+msgid "B<--rules-requires-root>"
+msgstr "B<--rules-requires-root>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+"Berücksichtigt das Feld B<Rules-Requires-Root> nicht, sondern fällt auf den "
+"alten Vorgabewert zurück (seit Dpkg 1.19.1)."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr "B<-nc>, B<--no-pre-clean>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
-"Bereinige den Quellbaum nicht (lange Option seit Dpkg 1.18.8). Impliziert B<-"
-"b>, falls ansonsten nichts aus B<-F>, B<-g>, B<-G>, B<-B>, B<-A> oder B<-S> "
-"gewählt wurde. Impliziert B<-d> mit B<-S> (seit Dpkg 1.18.0)."
+"Bereinige den Quellbaum vor dem Bau nicht (lange Option seit Dpkg 1.18.8). "
+"Impliziert B<-b>, falls ansonsten nichts aus B<-F>, B<-g>, B<-G>, B<-B>, B<-"
+"A> oder B<-S> gewählt wurde. Impliziert B<-d> mit B<-S> (seit Dpkg 1.18.0)."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13042,8 +13505,12 @@ msgstr "B<--pre-clean>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
-msgstr "Bereinige den Quellbaum vor dem Bau (seit Dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
+msgstr ""
+"Bereinige den Quellbaum vor dem Bau (seit Dpkg 1.18.8). Dies ist das "
+"Standardverhalten."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13063,6 +13530,21 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, no-wrap
+msgid "B<--no-post-clean>"
+msgstr "B<--no-post-clean>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+"Bereinigt den Quellbaum nicht, nachdem das Paket gebaut wurde (seit Dpkg "
+"1.19.1). Dies ist das Standardverhalten."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr "B<-r>, B<--root-command=>I<root-werde-Befehl>"
 
@@ -13306,16 +13788,15 @@ msgstr "B<-p>, B<--sign-command=>I<Unterschreibbefehl>"
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG to sign a source control (B<."
 "dsc>) file or a B<.changes> file it will run I<sign-command> (searching the "
-"B<PATH> if necessary) instead of B<gpg2> or B<gpg> (long option since dpkg "
-"1.18.8).  I<sign-command> will get all the arguments that B<gpg2> or B<gpg> "
-"would have gotten. I<sign-command> should not contain spaces or any other "
-"shell metacharacters."
+"B<PATH> if necessary) instead of B<gpg> (long option since dpkg 1.18.8).  "
+"I<sign-command> will get all the arguments that B<gpg> would have gotten. "
+"I<sign-command> should not contain spaces or any other shell metacharacters."
 msgstr ""
 "Wenn B<dpkg-buildpackage> GPG zum Unterschreiben einer Quellsteuerdatei (B<."
-"dsc>) oder einer B<.changes>-Datei benötigt, wird es statt B<gpg> oder "
-"B<gpg2> den I<Unterschreibbefehl> ausführen (und dabei falls notwendig den "
+"dsc>) oder einer B<.changes>-Datei benötigt, wird es statt B<gpg> "
+"den I<Unterschreibbefehl> ausführen (und dabei falls notwendig den "
 "B<PATH> durchsuchen) (lange Option seit Dpkg 1.18.8). I<Unterschreibbefehl> "
-"wird alle Argumente erhalten, die B<gpg> oder B<gpg2> erhalten hätte. "
+"wird alle Argumente erhalten, die B<gpg> erhalten hätte. "
 "I<Unterschreibbefehl> sollte keine Leerzeichen oder andere Metazeichen der "
 "Shell enthalten."
 
@@ -13648,8 +14129,28 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, no-wrap
-msgid "B<DPKG_GAIN_ROOT_CMD>"
-msgstr "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr "B<DEB_RULES_REQUIRES_ROOT>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+"Diese Variable wird auf den Wert, der aus dem Feld B<Rules-Requires-Root> "
+"oder von der Befehlszeile erhalten wird, gesetzt. Wenn gesetzt, wird er ein "
+"gültiger Wert für das Feld B<Rules-Requires-Root> sein. Er wird dazu "
+"verwandt, B<debian/rules> anzugeben, ob die Spezifikation B<rootless-builds."
+"txt> unterstützt wird."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_GAIN_ROOT_CMD>"
+msgstr "B<DEB_GAIN_ROOT_CMD>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -13755,11 +14256,11 @@ msgstr ""
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
 "genbuildinfo>(1), B<dpkg-genchanges>(1), B<fakeroot>(1), B<lintian>(1), "
-"B<gpg2>(1), B<gpg>(1)."
+"B<gpg>(1)."
 msgstr ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
 "genbuildinfo>(1), B<dpkg-genchanges>(1), B<fakeroot>(1), B<lintian>(1), "
-"B<gpg2>(1), B<gpg>(1)."
+"B<gpg>(1)."
 
 #. type: TH
 #: dpkg-genbuildinfo.man
@@ -14340,7 +14841,7 @@ msgid ""
 msgstr ""
 "Bei den meisten Befehlen, die ein Archiv als Eingabeargument erwarten, kann "
 "der Archivname von der Standardeingabe gelesen werden, wenn er als einzelnes "
-"Minuszeichen (»B<->«) angegeben ist. Falls dies nicht unterstützt wird, ist "
+"Minuszeichen („B<->“) angegeben ist. Falls dies nicht unterstützt wird, ist "
 "dies in der jeweiligen Beschreibung des Befehls dokumentiert."
 
 #. type: TP
@@ -14408,7 +14909,7 @@ msgstr ""
 "I<Verzeichnis>B</>I<Paket>B<_>I<Version>B<_>I<Arch>B<.deb.> schreiben. Wenn "
 "ein Zielverzeichnis statt einer Datei angegeben ist, darf die Option B<--"
 "nocheck> nicht verwendet werden (da B<dpkg-deb> die Paketsteuerdatei lesen "
-"und auswerten muss, um den zu verwendenden Dateinamen zu bestimmen)."
+"und auswerten muss, um den zu verwendenen Dateinamen zu bestimmen)."
 
 #. type: TP
 #: dpkg-deb.man
@@ -14600,7 +15101,7 @@ msgid ""
 "from standard input («B<->») is B<not> supported."
 msgstr ""
 "Das Eingebearchiv wird (derzeit) nicht sequenziell verarbeitet, daher wird "
-"das Einlesen von der Standardeingabe (»B<->«) B<nicht> unterstützt."
+"das Einlesen von der Standardeingabe („B<->“) B<nicht> unterstützt."
 
 #. type: TP
 #: dpkg-deb.man
@@ -14672,7 +15173,7 @@ msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<Format>"
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -15000,8 +15501,12 @@ msgstr "[B<--add>] I<Datei>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
-msgstr "Fügt eine Umleitung für I<Datei> hinzu."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
+"Fügt eine Umleitung für I<Datei> hinzu. Die Datei wird derzeit nicht "
+"umbenannt, siehe B<--rename>."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15011,8 +15516,12 @@ msgstr "B<--remove>I< Datei>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
-msgstr "Entferne eine Umleitung für I<Datei>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
+"Entfernt eine Umleitung für I<Datei>. Die Datei wird derzeit nicht "
+"umbenannt, siehe B<--rename>."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15062,10 +15571,44 @@ msgstr "B<--admindir>I< Verzeichnis>"
 #. type: Plain text
 #: dpkg-divert.man
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
 msgstr ""
-"Setze das B<dpkg>-Datenverzeichnis auf I<Verzeichnis> (Standard: I<%ADMINDIR"
-"%>)."
+"Setze das adminitrative Verzeichnis auf I<Verzeichnis> (Standard: „I<"
+"%ADMINDIR%>“)."
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<--instdir>I< directory>"
+msgstr "B<--instdir>I< Verzeichnis>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+"Setzt das Installationsverzeichnis, das sich auf das Verzeichnis bezieht, in "
+"dem Pakete installiert werden (seit Dpkg 1.19.2). Standardmäßig „I</>“."
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<--root>I< directory>"
+msgstr "B<--root>I< Verzeichnis>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
+msgstr ""
+"Setzt das Wurzelverzeichnis auf I<Verzeichnis>, wodurch das "
+"Installationsverzeichnis auf „I<Verzeichnis>“ und das administrative "
+"Verzeichnis auf „I<Verzeichnis>B<%ADMINDIR%>“ gesetzt wird (seit Dpkg "
+"1.19.2)."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15137,10 +15680,38 @@ msgstr "B<--rename>"
 #: dpkg-divert.man
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
 msgstr ""
 "Schiebe die Dateien tatsächlich beiseite (oder zurück). B<dpkg-divert> wird "
-"den Arbeitsvorgang abbrechen, falls die Zieldatei bereits existiert."
+"den Arbeitsvorgang abbrechen, falls die Zieldatei bereits existiert. Dies "
+"ist das typische Verhalten, das für Umleitungen von Dateien aus der Gruppe "
+"der non-B<Essential>-Pakete verwandt wird (siehe B<--no-rename> für weitere "
+"Details)."
+
+#. type: TP
+#: dpkg-divert.man
+#, no-wrap
+msgid "B<--no-rename>"
+msgstr "B<--no-rename>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
+msgstr ""
+"Legt fest, dass die Datei beim Hinzufügen oder Entfernen der Umleitung in "
+"die Datenbank nicht umbenannt werden soll (seit Dpkg 1.19.1). Dies ist für "
+"Umleitungen von Dateien aus der Paketgruppe B<Essential> gedacht, bei der "
+"das vorübergehende Verschwinden der ursprünglichen Datei nicht akzeptiert "
+"werden kann, da es zu einem nicht funktionalen System führen kann. Dies ist "
+"das Standardverhalten, was sich allerdings im Dpkg 1.20.x-Zyklus ändern wird."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15155,13 +15726,22 @@ msgstr ""
 "Testmodus, d.h. führe keine Änderungen durch, sondern zeige sie lediglich."
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
 msgstr ""
-"Falls gesetzt und die Option B<--admindir> nicht verwandt wurde, wird dies "
-"als Datenverzeichnis von B<dpkg> verwandt."
+"Falls gesetzt und die Option B<--instdir> oder B<--root> nicht angegeben "
+"wurde, wird dies als Dateisystemwurzelverzeichnis verwandt."
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
+msgstr ""
+"Falls gesetzt und die Option B<--admindir> oder B<--root> nicht verwandt "
+"wurde, wird dies als Datenverzeichnis von B<dpkg> verwandt."
 
 #. type: Plain text
 #: dpkg-divert.man
@@ -16134,8 +16714,8 @@ msgstr ""
 "in dem Diff in jeder neuen Paketversion auftauchen. Dieses Verhalten dient "
 "als Erinnerung für den Betreuer, dass so ein Symbol aus der Symboldatei "
 "entfernt oder wieder der Bibliothek hinzugefügt werden muss. Wenn das "
-"optionale Symbol, dass bisher als MISSING bezeichnet gewesen war, plötzlich "
-"in der nächsten Version wieder auftaucht, wird es wieder auf den Status "
+"optionale Symbol, das bisher als MISSING angegeben gewesen war, plötzlich in "
+"der nächsten Version wieder auftaucht, wird es wieder auf den Status "
 "„existing“ (existierend) gebracht, wobei die minimale Version unverändert "
 "bleibt."
 
@@ -16911,6 +17491,35 @@ msgstr ""
 "benötigen Sie mehrere B<-e>)."
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, no-wrap
+msgid "B<-l>I<directory>"
+msgstr "B<-l>I<Verzeichnis>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+"Stellt I<Verzeichnis> der Liste der zu durchsuchenden privaten "
+"Laufzeitbibliotheken voran (seit Dpkg 1.19.1). Diese Option kann mehrfach "
+"angegeben werden."
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+"Hinweis: Verwenden Sie diese Variable, statt B<LD_LIBRARY_PATH> zu setzten, "
+"da diese Umgebungsvariable verwandt wird, um den Laufzeit-Linker zu steuern "
+"und ihr Missbrauch zum Setzen von Pfaden zu Laufzeitbibliotheken zur Bauzeit "
+"kann beispielsweise beim Cross-Übersetzen problematisch werden."
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<-I>I<filename>"
@@ -17839,12 +18448,12 @@ msgstr "EINSCHRÄNKUNGEN"
 #: dpkg-mergechangelogs.man
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 "Alles, was nicht von Dpkg::Changelog ausgewertet werden kann, geht beim "
-"Zusammenführen verloren. Dies betrifft Zeug wie Modelines von Vim, Emacs-"
-"Variablen, Kommentare, die eigentlich nicht da sein sollten, usw."
+"Zusammenführen verloren. Dies betrifft Zeug wie Kommentare, die eigentlich "
+"nicht da sein sollten, usw."
 
 #. type: SH
 #: dpkg-mergechangelogs.man
@@ -17989,10 +18598,10 @@ msgstr ""
 "existierende Verzeichnis existiert, dann werden die Dateien in das "
 "Verzeichnis verschoben, andernfalls wird das Zielverzeichnis aus dem "
 "»section«-Feld des Steuerteils des Pakets entnommen. Das Zielverzeichnis "
-"wird »unstable/binary-I<Architektur>/I<Bereich>« sein. Falls die Sektion "
+"wird „unstable/binary-I<Architektur>/I<Bereich>“ sein. Falls die Sektion "
 "nicht in der Steuerdatei gefunden werden kann, dann wird B<no-section> "
 "angenommen, und in diesem Fall, wie auch für die Sektionen B<non-free> und "
-"B<contrib> ist das Zielverzeichnis »I<Bereich>/binary-I<Architektur>«. Das "
+"B<contrib> ist das Zielverzeichnis „I<Bereich>/binary-I<Architektur>“. Das "
 "Sektionsfeld muss nicht angegeben werden, daher werden viele Pakete ihren "
 "Weg in das B<no-section>-Gebiet finden. Verwenden Sie diese Option mit "
 "Vorsicht, sie ist unordentlich."
@@ -18227,14 +18836,16 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 "Setze das Ausgabeformat. Derzeit werden die Werte B<dpkg> und B<rfc822> "
 "unterstützt. B<dpkg> ist das klassische Ausgabeformat (es existiert länger "
 "als diese Option), das voreingestellt ist. Es besteht aus einem Absatz im "
 "Debian-Steuerformat (lesen Sie B<deb-control>(5)). Falls mehr als ein "
-"Eintrag angefordert wird, dann werden die meisten Felder aus dem neusten "
-"Eintrag verwendet, falls dies nicht anders angegeben wird:"
+"Eintrag angefordert wird, dann werden die meisten Felder aus dem ersten "
+"Eintrag (normalerweise der neuste Eintrag) verwendet, falls dies nicht "
+"anders angegeben wird:"
 
 #. type: TP
 #: dpkg-parsechangelog.man
@@ -18369,6 +18980,22 @@ msgstr ""
 "Eintrag erhalten bleiben."
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, no-wrap
+msgid "B<--reverse>"
+msgstr "B<--reverse>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+"füge alle Änderungen in umgekehrter Reihenfolge hinzu (seit Dpkg 1.19.1). "
+"Beachten Sie: Für das B<dpkg>-Format ist der erste Eintrag der älteste "
+"Eintrag."
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, no-wrap
 msgid "B<--all>"
@@ -18505,8 +19132,12 @@ msgstr "       @@@ changelog-format: I<Anderesformat> @@@\n"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
-msgstr "Changelog-Formatnamen sind nichtleere alphanumerische Zeichenketten."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
+msgstr ""
+"Changelog-Formatnamen sind nichtleere kleine alphanumerische Zeichenketten "
+"(„a-z0-9“)."
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
@@ -18645,22 +19276,28 @@ msgstr "B<-l>, B<--list> [I<Paketname-Muster> …]"
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
-msgstr ""
-"Liste Pakete auf, deren Namen auf ein bestimmtes Muster passt. Falls kein "
-"I<Paketname-Muster> angegeben ist, liste alle Pakete in I<%ADMINDIR%/status> "
-"auf. Dabei werden alle Pakete ausgeschlossen, die als »nicht-installiert« "
-"markiert sind (d.h. früher endgültig entfernt wurden). Normale Shell-"
-"Jokerzeichen sind im I<Paketname-Muster> erlaubt. Beachten Sie, dass Sie "
-"wahrscheinlich I<Paketname-Muster> durch Anführungszeichen schützen müssen, "
-"um die Shell an der Dateinamen-Expansion zu hindern. Folgender Befehl listet "
-"beispielsweise alle Paketnamen, die mit »libc6« beginnen, auf:"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
+msgstr ""
+"Liste alle bekannten Pakete auf, deren Namen auf ein oder mehrere bestimmte "
+"Muster passen, unabhängig ihres Status, dazu gehören alle echten und "
+"virtuellen Pakete, die in irgendeinem Abhängigkeitsbeziehungsfeld (wie "
+"B<Breaks>, B<Enhances> usw.) referenziert sind. Falls kein I<Paketname-"
+"Muster> angegeben ist, liste alle Pakete in I<%ADMINDIR%/status> auf. Dabei "
+"werden alle Pakete ausgeschlossen, die als »nicht-installiert« markiert sind "
+"(d.h. früher endgültig entfernt wurden). Normale Shell-Jokerzeichen sind im "
+"I<Paketname-Muster> erlaubt. Beachten Sie, dass Sie wahrscheinlich "
+"I<Paketname-Muster> durch Anführungszeichen schützen müssen, um die Shell an "
+"der Dateinamen-Expansion zu hindern. Folgender Befehl listet beispielsweise "
+"alle Paketnamen, die mit »libc6« beginnen, auf:"
 
 #. type: Plain text
 #: dpkg-query.man
@@ -18791,21 +19428,25 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
-msgstr "B<-s>, B<--status> I<Paketname> …"
+msgid "B<-s>, B<--status> [I<package-name>...]"
+msgstr "B<-s>, B<--status> [I<Paketname> …]"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 "Berichte Zustand des angegebenen Paketes. Dies zeigt nur den Eintrag in der "
-"Datenbank der Zustände der installierten Pakete. Wenn mehrere I<Paketname> "
-"aufgeführt sind, werden die angeforderten Statuseinträge durch Leerzeilen "
-"getrennt, wobei die Reihenfolge identisch zu der in der Argumentenliste ist."
+"Datenbank der Zustände der installierten Pakete. Falls kein I<Paketname> "
+"festgelegt ist, werden alle Paketeinträge in der Statusdatenbank angezeigt "
+"(seit dpkg 1.19.1). Wenn mehrere I<Paketname>-Einträge aufgeführt sind, "
+"werden die angeforderten Statuseinträge durch Leerzeilen getrennt, wobei die "
+"Reihenfolge identisch zu der in der Argumentenliste ist."
 
 #. type: TP
 #: dpkg-query.man
@@ -18906,7 +19547,7 @@ msgstr "B<-S>, B<--search> I<Dateiname-Suchmuster> …"
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 "Suche nach Paketen, denen Paketen, die auf ein bestimmtes Muster passen, "
@@ -18945,21 +19586,24 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
-msgstr "B<-p>, B<--print-avail> I<Paketname> …"
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
+msgstr "B<-p>, B<--print-avail> [I<Paketname> …]"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
-"Zeige Details über I<Paketname> an, wie diese in I<%ADMINDIR%/available> "
-"vorliegen. Wenn mehrere I<Paketname> aufgeführt sind, werden die "
-"angeforderten I<available>-Einträge durch Leerzeilen getrennt, wobei die "
-"Reihenfolge identisch zu der in der Argumentenliste ist."
+"Zeige Details über Pakete an, wie diese in I<%ADMINDIR%/available> "
+"vorliegen. Falls kein I<Paketname> festgelegt ist, werden alle in der "
+"Datenbank I<available> verfügbaren Paketeinträge angezeigt (seit Dpkg "
+"1.19.1). Wenn mehrere I<Paketname> aufgeführt sind, werden die angeforderten "
+"I<available>-Einträge durch Leerzeilen getrennt, wobei die Reihenfolge "
+"identisch zu der in der Argumentenliste ist."
 
 #. type: Plain text
 #: dpkg-query.man
@@ -19006,6 +19650,17 @@ msgstr "B<-f>, B<--showformat=>I<Format>"
 
 #. type: Plain text
 #: dpkg-query.man
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+"Diese Option wird dazu verwendet, das Format der Ausgabe anzugeben, das B<--"
+"show> verwenden wird (kurze Option seit Dpkg 1.13.1). Das Format ist eine "
+"Zeichenkette, die für jedes aufgeführte Paket ausgegeben wird."
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr "In der Formatzeichenkette leitet „B<\\e>“ Escape-Sequenzen ein:"
 
@@ -19157,13 +19812,24 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
+msgid "B<binary:Synopsis>"
+msgstr "B<binary:Synopsis>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid "It contains the package short description (since dpkg 1.19.1)."
+msgstr "Es enthält die Kurzbeschreibung des Pakets (seit Dpkg 1.19.1)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
 msgid "B<binary:Summary>"
 msgstr "B<binary:Summary>"
 
 #. type: Plain text
 #: dpkg-query.man
-msgid "It contains the package short description (since dpkg 1.16.2)."
-msgstr "Es enthält die Kurzbeschreibung des Pakets (seit Dpkg 1.16.2)."
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
+msgstr "Dies ist ein Alias für B<binary:Synopsis> (seit Dpkg 1.16.2)."
 
 #. type: TP
 #: dpkg-query.man
@@ -19229,6 +19895,36 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
+msgid "B<db-fsys:Files>"
+msgstr "B<db-fsys:Files>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr ""
+"Es enthält die Liste der Paketdateisystemeinträge, getrennt durch "
+"Zeilenumbrüche (seit Dpkg 1.19.3)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr "B<db-fsys:Last-Modified>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+"Es enthält den Zeitstempel in Sekunden des letzten Zeitpunkts, zu dem der "
+"Paketdateisystemeintrag geändert wurde (seit Dpkg 1.19.3)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
 msgid "B<source:Package>"
 msgstr "B<source:Package>"
 
@@ -19299,11 +19995,50 @@ msgstr ""
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr ""
+"Setzt das auszuführende Programm, wenn ein Befehl über eine Shell ausgeführt "
+"wird (seit Dpkg 1.19.2)."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+"Setzt den zu verwendenen Pager-Befehl (seit Dpkg 1.19.1), der mit „B<$SHELL -"
+"c>“ ausgeführt wird. Falls B<SHELL> nicht gesetzt ist, wird stattdessen "
+"„B<sh>“ verwandt. B<DPKG_PAGER> setzt die Umgebungsvariable B<PAGER> außer "
+"Kraft (seit Dpkg 1.19.2)."
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+"Falls gesetzt und die Option B<--admindir> nicht verwandt wurde, wird dies "
+"als Datenverzeichnis von B<dpkg> verwandt."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
 msgstr ""
-"Diese Einstellung beeinflusst die Ausgabe der B<--list>-Option durch "
-"Verändern der Breite ihrer Ausgabe."
+"Von B<dpkg-query> auf »B<-FRSXMQ>« definiert, falls es nicht bereits gesetzt "
+"ist oder wenn ein Pager gestartet wird (seit Dpkg 1.19.2). Um das "
+"Vorgabeverhalten zu verändern, kann diese Variable auf einen anderen Wert "
+"einschließlich der leeren Zeichenkette voreingestellt werden oder die "
+"Variablen B<PAGER> oder B<DPKG_PAGER> können gesetzt werden, um bestimmte "
+"Optionen mit „B<-+>“ zu deaktivieren, beispielsweise B<DPKG_PAGER=\"less -+F"
+"\">."
 
 #. type: TH
 #: dpkg-scanpackages.man
@@ -19661,8 +20396,8 @@ msgstr ""
 "in beiden Dateien auftaucht, dann nimmt die Quell-override Vorrang für die "
 "Einstellung des Bereichs."
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
@@ -19978,12 +20713,6 @@ msgstr ""
 "Laufzeitbibliotheken angemessen sind. Diese Option kann mehrfach angegeben "
 "werden."
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, no-wrap
-msgid "B<-l>I<directory>"
-msgstr "B<-l>I<Verzeichnis>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 msgid ""
@@ -19994,19 +20723,6 @@ msgstr ""
 "Laufzeitbibliotheken voran (seit Dpkg 1.17.0). Diese Option kann mehrfach "
 "angegeben werden."
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-"Hinweis: Verwenden Sie diese Variable, statt B<LD_LIBRARY_PATH> zu setzten, "
-"da diese Umgebungsvariable verwandt wird, um den Laufzeit-Linker zu steuern "
-"und ihr Missbrauch zum Setzen von Pfaden zu Laufzeitbibliotheken zur Bauzeit "
-"kann beispielsweise beim Cross-Übersetzen problematisch werden."
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
@@ -21323,7 +22039,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 "Gibt an, dass nach dem Original-Quellarchiv als Tar-Datei oder als "
 "Verzeichnis gesucht werden soll - das zweite Argument, falls vorhanden, kann "
@@ -21337,7 +22053,7 @@ msgstr ""
 "äquivalent zu B<-sn>). Falls sowohl ein Verzeichnis als auch eine Tar-Datei "
 "gefunden werden, dann ignoriert B<dpkg-source> das Verzeichnis, und "
 "überschreibt es, falls B<-sA> angegeben wurde (dies ist äquivalent zu B<-"
-"sP>) oder löst einen Fehler aus, falls B<-sa> angegeben wurde. B<-sA> ist "
+"sP>) oder löst einen Fehler aus, falls B<-sa> angegeben wurde. B<-sa> ist "
 "die Voreinstellung."
 
 #. type: TP
@@ -21499,22 +22215,22 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 "Seit Dpkg 1.14.17 unterstützt. Ein Quellpaket in diesem Format enthält "
 "mindestens einen Original-Tarball (B<.orig.tar.>I<Erw>, wobei I<Erw> B<gz>, "
 "B<bz2>, B<lzma> und B<xz> sein kann) und einen Debian-Tarball (B<.debian.tar."
 ">I<Erw>). Es kann auch zusätzliche Original-Tarbälle (B<.orig-"
 ">I<Komponente>B<.tar.>I<Erw>) enthalten. I<Komponente> kann nur "
-"alphanumerische Zeichen und Bindestriche (‚-’) enthalten. Optional kann "
-"jeder Original-Tarball von einer separaten Signatur der Originalautoren (B<."
-"orig.tar.>I<Erw>B<.asc> und B<.orig->I<Komponente>B<.tar.>I<Erw>B<.asc>) "
-"begleitet werden. Das Entpacken wird seit Dpkg 1.17.20, das Bauen seit Dpkg "
-"1.18.5 unterstützt."
+"alphanumerische Zeichen (‚a-zA-Z0-9’) und Bindestriche (‚-’) enthalten. "
+"Optional kann jeder Original-Tarball von einer separaten Signatur der "
+"Originalautoren (B<.orig.tar.>I<Erw>B<.asc> und B<.orig->I<Komponente>B<.tar."
+">I<Erw>B<.asc>) begleitet werden. Das Entpacken wird seit Dpkg 1.17.20, das "
+"Bauen seit Dpkg 1.18.5 unterstützt."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -21540,29 +22256,58 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
 "of B<patch>. It will thus emit a warning when it encounters such options, "
 "and the build is likely to fail."
 msgstr ""
-"Dann werden alle in B<debian/patches/debian.series> oder B<debian/patches/"
-"series> aufgeführten Patches angewandt. Falls die erstere Datei verwandt "
-"wird und die letztere nicht existiert (oder ein Symlink ist), dann wird die "
-"letztere mit einem Symlink zu ersterer ersetzt. Dies ist zur Vereinfachung "
-"der Verwendung von B<quilt> gedacht, um die Gruppe von Patches zu verwalten. "
-"Beachten Sie allerdings, dass B<dpkg-source> zwar Seriendateien auswertet, "
-"in denen explizite Optionen für die Anwendung der Patches verwandt werden "
-"(diese werden auf jede Zeile nach dem Patch-Dateinamen und einem oder "
-"mehreren Leerzeichen gespeichert), diese Optionen dann aber ignoriert und "
-"immer erwartet, dass die Patches mit der Option B<-p1> von B<patch> "
-"angewandt werden können. Es wird daher eine Warnung ausgeben, wenn es auf "
-"solche Optionen trifft, und der Bau wird wahrscheinlich fehlschlagen."
+"Dann werden alle in B<debian/patches/>I<Lieferant>B<.series> oder B<debian/"
+"patches/series> aufgeführten Patches angewandt, wobei I<Lieferant> der Name "
+"des aktuellen Lieferanten in Kleinbuchstaben ist oder B<debian>, falls kein "
+"Lieferant definiert ist. Falls die erstere Datei verwandt wird und die "
+"letztere nicht existiert (oder ein Symlink ist), dann wird die letztere mit "
+"einem Symlink zu ersterer ersetzt. Dies ist zur Vereinfachung der Verwendung "
+"von B<quilt> gedacht, um die Gruppe von Patches zu verwalten. "
+"Lieferantenspezifische Seriendateien sind dazu gedacht, es zu ermöglichen, "
+"mehrere Entwicklungszweige basierend auf dem Lieferanten auf eine "
+"deklarative Art zu serialisieren, und diese gegenüber der offenen Codierung "
+"dieser Handhabung in B<debian/rules> zu bevorzugen. Dies ist insbesondere "
+"nützlich, wenn die Quellen mit Bedingungen gepacht werden müssten, da die "
+"betroffenen Dateien keine eingebaute abhängige Okklusionsunterstützung "
+"haben. Beachten Sie allerdings, dass B<dpkg-source> zwar Seriendateien "
+"auswertet, in denen explizite Optionen für die Anwendung der Patches "
+"verwandt werden (diese werden auf jede Zeile nach dem Patch-Dateinamen und "
+"einem oder mehreren Leerzeichen gespeichert), diese Optionen dann aber "
+"ignoriert und immer erwartet, dass die Patches mit der Option B<-p1> von "
+"B<patch> angewandt werden können. Es wird daher eine Warnung ausgeben, wenn "
+"es auf solche Optionen trifft, und der Bau wird wahrscheinlich fehlschlagen."
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+"Beachten Sie, dass B<lintian>(1) aufgrund Debian-spezifischer Regularien "
+"bedingungslos Warnungen ausgeben wird, wenn Lieferantenserien verwandt "
+"werden. Dies sollte die Verwendung außerhalb von Debian nicht betreffen. Um "
+"diese Warnungen auszublenden, kann das Dpkg-Lintian-Profil mittels Übergabe "
+"von „B<--profile dpkg>“ an B<lintian>(1) verwandt werden."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22485,6 +23230,12 @@ msgstr ""
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr "debian/patches/I<Lieferant>.series"
+
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
 
@@ -22493,22 +23244,29 @@ msgstr "debian/patches/series"
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
 "Diese Datei führt alle Patches auf, die (in der angegebenen Reihenfolge) auf "
 "das Quellpaket der Originalautoren angewandt werden müssen. Leerzeichen am "
-"Anfang und Ende werden entfernt. Zeilen, die mit ‚B<#>’ anfangen, sind "
-"Kommentare und werden übersprungen. Leere Zeilen werden ignoriert. Die "
-"verbleibenen Zeilen beginnen mit dem Dateinamen eines Patches (relativ zum "
-"Verzeichnis B<debian/patches/>) bis zum ersten Leerzeichen oder bis zum "
-"Zeilenende. Bis zum Ende der Zeile oder bis zum ersten ‚B<#>’ gefolgt von "
-"einem oder mehreren Leerzeichen (dies markiert den Beginn eines Kommentars, "
-"der bis zum Zeilenende geht) können optionale B<quilt>-Befehle folgen."
+"Anfang und Ende werden entfernt. I<Lieferant> ist der Name des aktuellen "
+"Lieferanten in Kleinschreibung oder B<debian>, falls kein Lieferant "
+"definiert ist. Falls die lieferantenspezifische Seriendatei nicht existiert, "
+"wird eine lieferantenfreie Seriendatei verwandt. Zeilen, die mit ‚B<#>’ "
+"anfangen, sind Kommentare und werden übersprungen. Leere Zeilen werden "
+"ignoriert. Die verbleibenen Zeilen beginnen mit dem Dateinamen eines Patches "
+"(relativ zum Verzeichnis B<debian/patches/>) bis zum ersten Leerzeichen oder "
+"bis zum Zeilenende. Bis zum Ende der Zeile oder bis zum ersten ‚B<#>’ "
+"gefolgt von einem oder mehreren Leerzeichen (dies markiert den Beginn eines "
+"Kommentars, der bis zum Zeilenende geht) können optionale B<quilt>-Befehle "
+"folgen."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -23105,12 +23863,52 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr ""
+"Gebe Hilfe über die B<--force->I<Sache>-Optionen aus (seit Dpkg 1.19.5)."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
+msgstr ""
+"Setzt das administrative Verzeichnis auf I<Verzeichnis>. Hier wird auch die "
+"Datei I<statoverride> gelagert. Standardmäßig „I<%ADMINDIR%>“."
+
+#. type: Plain text
+#: dpkg-statoverride.man
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+"Setzt das Installationsverzeichnis, das sich auf das Verzeichnis bezieht, in "
+"dem Pakete installiert werden (seit Dpkg 1.19.2). Standardmäßig „I</>“."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
 msgstr ""
-"Wechsle das I<Verzeichnis> der B<dpkg>-Datenbank, wo auch die statoverride-"
-"Datei gelagert ist. Der Standard ist I<%ADMINDIR%>."
+"Erzwinge oder verweigere (B<no-force> und B<refuse> bedeuten das gleiche) "
+"bestimmte Sachen (seit Dpkg 1.19.5). I<Sachen> ist eine Komma-separierte "
+"Liste von Dingen, die im folgenden beschrieben sind. B<--force-help> zeigt "
+"eine Nachricht an, die diese beschreibt. Mit (*) markierte Dinge werden "
+"standardmäßig erzwungen."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Warnung. Diese Optionen sind hauptsächlich für den Einsatz durch Experten "
+"gedacht. Der Einsatz ohne komplettes Verständnis der Effekte kann Ihr "
+"gesamtes System zerstören.>"
 
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
@@ -23122,11 +23920,13 @@ msgstr "B<--force>"
 #: dpkg-statoverride.man
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 "Erzwinge eine Aktion, selbst wenn eine Sinn-Überprüfung diese normalerweise "
 "verböte. Dies ist notwendig, um sich über eine existierende Hinwegsetzung "
-"hinwegzusetzen."
+"hinwegzusetzen. Diese Option ist (seit Dpkg 1.19.5) veraltet. Sie wurde "
+"durch B<--force-all> ersetzt."
 
 #. type: TP
 #: dpkg-statoverride.man
@@ -23155,6 +23955,15 @@ msgstr ""
 "Für B<--list>, falls es keine Hinwegsetzungen gab oder keine auf die "
 "angegebenen Metazeichen passte."
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+"Falls gesetzt und keine der B<--force->I<…>-Optionen festgelegt wurde, wird "
+"es als die zu verwendenen Erzwingungsoptionen verwandt (seit Dpkg 1.19.5)."
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -23302,11 +24111,13 @@ msgstr "B<--await>"
 #. type: Plain text
 #: dpkg-trigger.man
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 "Dies Option führt das inverse von B<--no-await> aus (seit Dpkg 1.17.21). "
-"Derzeit ist sie die Voreinstellung."
+"Falls das interessierte Paket eine Direktive „noawait“ angegeben hat, dann "
+"wird diese Option nicht wirksam sein. Derzeit ist sie die Voreinstellung."
 
 #. type: TP
 #: dpkg-trigger.man
@@ -23477,8 +24288,8 @@ msgid ""
 "methods can be configured to retrieve available package version information "
 "and installable packages from package repositories.  Depending on the used "
 "access method, these repositories can be public archive servers on the "
-"internet, local archive servers or cdroms.  The recommended access method is "
-"I<apt>, which is provided by the package B<apt>."
+"internet, local archive servers or CD-ROMs.  The recommended access method "
+"is I<apt>, which is provided by the package B<apt>."
 msgstr ""
 "B<dselect> arbeitet als Oberfläche von B<dpkg>(1), dem systemnahen Debian-"
 "Paket-Handhabungswerkzeug. Es bietet einen Vollbildschirm-Paketauswahl-"
@@ -23564,8 +24375,14 @@ msgstr ""
 #. type: TP
 #: dselect.man
 #, no-wrap
-msgid "B<--colour>|B<--color> I<screenpart>:[I<foreground>],[I<background>][:I<attr>[I<+attr>]...]"
-msgstr "B<--colour>|B<--color> I<Bildschirmteil>:[I<Vordergrund>],[I<Hintergrund>][:I<Attr>[I<+Attr>]…]"
+msgid "B<--color> I<screenpart>:[I<foreground>],[I<background>][:I<attr>[I<+attr>]...]"
+msgstr "B<--color> I<Bildschirmteil>:[I<Vordergrund>],[I<Hintergrund>][:I<Attr>[I<+Attr>]…]"
+
+#. type: TQ
+#: dselect.man
+#, no-wrap
+msgid "B<--colour> I<screenpart>:[I<foreground>],[I<background>][:I<attr>[I<+attr>]...]"
+msgstr "B<--colour> I<Bildschirmteil>:[I<Vordergrund>],[I<Hintergrund>][:I<Attr>[I<+Attr>]…]"
 
 #. type: Plain text
 #: dselect.man
@@ -24513,7 +25330,7 @@ msgid ""
 msgstr ""
 "Der gegenteilige Effekt, um alle Auswahländerungen zurückzusetzen und zurück "
 "auf die vorherige Auswahlliste zu gehen, wird durch Drücken der Tasten "
-"‚B<X>’ oder B<»Esc«> erreicht. Durch wiederholtes Drücken dieser Tasten "
+"‚B<X>’ oder »B<Esc>« erreicht. Durch wiederholtes Drücken dieser Tasten "
 "können möglicherweise schädliche Änderungen an der angeforderten "
 "Paketauswahl komplett auf die letzten bestehenden Einstellungen "
 "zurückgesetzt werden."
@@ -24813,20 +25630,46 @@ msgstr ""
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
-msgid "B<-p>, B<--pidfile> I<pid-file>"
-msgstr "B<-p>, B<--pidfile> I<pid-Datei>"
+msgid "B<-p>, B<--pidfile> I<pidfile>"
+msgstr "B<-p>, B<--pidfile> I<PID-Datei>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pidfile>."
+msgstr "Überprüfe, ob ein Prozess die Datei I<PID-Datei> angelegt hat."
 
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pidfile>."
 msgstr ""
-"Prüfe, ob ein Prozess I<pid-Datei> erstellt hat. Hinweis: Wird diese "
-"Abgleichoption alleine verwandt, könnte auf nicht geplante Prozesse "
-"eingewirkt werden, falls der alte Prozess beendet wurde, ohne dass er I<pid-"
-"Datei> entfernen konnte."
+"Hinweis: Wird diese Abgleichoption alleine verwandt, könnte auf nicht "
+"geplante Prozesse eingewirkt werden, falls der alte Prozess beendet wurde, "
+"ohne dass er I<PID-Datei> entfernen konnte."
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
+msgstr ""
+"B<Warnung>: Wird diese Abgleichoption mit einer weltschreibbaren PID-Datei "
+"oder alleine mit einem Daemon, der als nicht privilegierter Benutzer (d.h. "
+"nicht als root) in eine PID-Datei schreibt, verwandt, dann wird dies mit "
+"einem Fehler abgelehnt (seit Version 1.19.3), da dies ein Sicherheitsrisiko "
+"darstellt, da entweder jeder Benutzer hineinschreiben kann oder, falls der "
+"Daemon kompromitiert wird, dem Inhalt der PID-Datei nicht vertraut werden "
+"kann und dann ein privilegierter Ausführer (wie ein als Root ausgeführtes "
+"Init-Skript) am Ende auf jeden Systemprozess agieren würde. Die Verwendung "
+"von I</dev/null> ist von diesen Prüfungen ausgenommen."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -25074,10 +25917,10 @@ msgstr "B<-r>, B<--chroot> I<Wurzel>"
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"Chdir and chroot to I<root> before starting the process. Please note that "
-"the pidfile is also written after the chroot."
+"Change directory and chroot to I<root> before starting the process. Please "
+"note that the pidfile is also written after the chroot."
 msgstr ""
-"Chdir und chroot vor dem Start des Prozesse zu I<Wurzel>. Bitte beachten "
+"Wechselt das Verzeichnis und chroot vor dem Start des Prozesse zu I<Wurzel>. Bitte beachten "
 "Sie, dass die PID-Datei auch nach dem chroot geschrieben wird."
 
 #. type: TP
@@ -25089,11 +25932,12 @@ msgstr "B<-d>, B<--chdir> I<Pfad>"
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"Chdir to I<path> before starting the process. This is done after the chroot "
-"if the B<-r>|B<--chroot> option is set. When not specified, B<start-stop-"
-"daemon> will chdir to the root directory before starting the process."
+"Change directory to I<path> before starting the process. This is done after "
+"the chroot if the B<-r>|B<--chroot> option is set. When not specified, "
+"B<start-stop-daemon> will change directory to the root directory before "
+"starting the process."
 msgstr ""
-"Chdir vor dem Starten des Prozesses zu I<Pfad>. Dies wird, falls die B<-r>|"
+"Wechselt vor dem Starten des Prozesses zum Verzeichnis I<Pfad>. Dies wird, falls die B<-r>|"
 "B<--chroot> Option gesetzt ist, nach dem chroot durchgeführt. Falls nicht "
 "angegeben, wird B<start-stop-daemon> vor dem Prozess-Start in das "
 "Wurzelverzeichnis wechseln."
@@ -25126,6 +25970,88 @@ msgstr ""
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
+msgid "B<--notify-await>"
+msgstr "B<--notify-await>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+"Wartet, dass der Hintergrundprozess eine Bereitschaftsbenachrichtigung "
+"sendet, bevor der Dienst als gestartet betrachtet wird (seit Version "
+"1.19.3). Dies implementiert Teil des Bereitschaftsprotokolls von Systemd, "
+"wie es in der Handbuchseite B<sd_notify>(3) festgelegt ist. Die folgenden "
+"Variablen werden unterstützt:"
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr "B<READY=1>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+"Das Programm ist bereit, den Dienst zu leisten, daher kann sicher beendet "
+"werden."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr "B<EXTEND_TIMEOUT_USEC=>I<Anzahl>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+"Das Programm erbittet die Verlängerung der Zeitüberschreitung um I<Anzahl> "
+"Mikrosekunden. Dies wird die aktuelle Zeitüberschreitung auf den "
+"festgelegten Wert zurücksetzen."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<ERRNO=>I<number>"
+msgstr "B<ERRNO=>I<Nummer>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+"Das Programm beendete sich mit einem Fehler. Macht das gleiche und gibt die "
+"benutzerfreundliche Zeichenkette für den Wert von B<errno> aus."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr "B<--notify-timeout>I<Zeitüberschreitung>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+"Setzt eine Zeitüberschreitung für die Option B<--notify-await> (seit Version "
+"1.19.3). Wenn die Zeitüberschreitung erreicht wird, wird sich B<start-stop-"
+"daemon> mit einem Fehler-Code beenden und es wird auf keine "
+"Bereitschaftsbenachrichtigung gewartet. Die Vorgabe ist B<60> Sekunden."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<-C>, B<--no-close>"
 
@@ -26072,6 +26998,11 @@ msgstr ""
 "automatische Modus konfiguriert sind. Diese Option ist nur mit B<--config> "
 "oder B<--all> relevant."
 
+#. type: Plain text
+#: update-alternatives.man
+msgid "Do not generate any comments unless errors occur."
+msgstr "Erzeuge keine Kommentare, es sei denn, ein Fehler tritt auf."
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -26085,8 +27016,12 @@ msgstr "Erzeugt mehr Kommentare darüber, was getan wird."
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
-msgstr "Erzeuge keine Kommentare, es sei denn, ein Fehler tritt auf."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr ""
+"Erzeugt mehr Kommentare darüber, hilfreich für die Fehlersuche, was getan "
+"wird (seit Version 1.19.3)."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -26431,12 +27366,48 @@ msgstr ""
 "B<ln>(1), FHS, der Dateisystem Hierarchie-Standard (Filesystem Hierarchy "
 "Standard)."
 
+#~ msgid "B<Binary:> I<binary-package-list> (required)"
+#~ msgstr "B<Binary:> I<Binärpaketliste> (verpflichtend)"
+
+#~ msgid ""
+#~ "This folded field is a space-separated list of binary packages built."
+#~ msgstr ""
+#~ "Dieses gefaltete Feld ist eine durch Leerzeichen getrennte Liste von "
+#~ "gebauten binären Paketen."
+
+#~ msgid "The program B<dpkg> will execute when displaying the conffiles."
+#~ msgstr ""
+#~ "Das Programm, das B<dpkg> ausführen wird, wenn es die Conffiles anzeigt."
+
+#~ msgid "B<COLUMNS>"
+#~ msgstr "B<COLUMNS>"
+
+#~ msgid ""
+#~ "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~ "text.  Currently only used by B<--list>."
+#~ msgstr ""
+#~ "Setzt die Anzahl von Spalten die B<dpkg> verwenden soll, wenn es "
+#~ "formatierten Text anzeigt. Derzeit nur von B<--list> verwendet."
+
+#~ msgid ""
+#~ "This setting influences the output of the B<--list> option by changing "
+#~ "the width of its output."
+#~ msgstr ""
+#~ "Diese Einstellung beeinflusst die Ausgabe der B<--list>-Option durch "
+#~ "Verändern der Breite ihrer Ausgabe."
+
+#~ msgid "Add a diversion for I<file>."
+#~ msgstr "Fügt eine Umleitung für I<Datei> hinzu."
+
+#~ msgid "Remove a diversion for I<file>."
+#~ msgstr "Entferne eine Umleitung für I<Datei>."
+
 #~ msgid ""
 #~ "These fields declare relationships between packages. They are discussed "
 #~ "in the B<deb-control>(5)  manpage."
 #~ msgstr ""
-#~ "Diese Felder deklarieren die Beziehungen zwischen Paketen. Sie werden in "
-#~ "der Handbuchseite B<deb-control>(5) beschrieben."
+#~ "Diese Felder gibt die Beziehungen zwischen Paketen an. Sie werden in der "
+#~ "Handbuchseite B<deb-control>(5) beschrieben."
 
 #~ msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 #~ msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
@@ -26448,7 +27419,7 @@ msgstr ""
 #~ "major version, and backward compatible changes (such as field additions) "
 #~ "will bump the minor version.  The current format version is B<0.2>."
 #~ msgstr ""
-#~ "Das Wert dieses Feldes legt die Formatversion der Datei fest. Die Syntax "
+#~ "Das Wert dieses Feldes gibt die Formatversion der Datei an. Die Syntax "
 #~ "des Feldwertes ist eine Versionsnummer mit einer Haupt- und einer "
 #~ "Nebenkomponente. Rückwärtsinkompatible Änderungen im Format führen zu "
 #~ "einer Erhöhung der Hauptversion und rückwärtskompatible Änderungen (wie "
@@ -26469,9 +27440,9 @@ msgstr ""
 #~ "This field declares the comma-separated union of all test restrictions "
 #~ "(B<Restrictions> fields in I<debian/tests/control> file)."
 #~ msgstr ""
-#~ "Dieses Feld verkündigt die durch Kommata getrennte Vereinigung aller "
+#~ "Dieses Feld gibt die durch Kommata getrennte Vereinigung aller "
 #~ "Testeinschränkungen (Feld B<Restrictions> in der Datei I<debian/tests/"
-#~ "control>)."
+#~ "control>) an."
 
 #~ msgid ""
 #~ "Rationale: this field is needed because otherwise to be able to get the "
@@ -26527,7 +27498,7 @@ msgstr ""
 #~ "Set the name of the changelog file to use in error messages, instead of "
 #~ "using the name from the B<--file> option, or its default value."
 #~ msgstr ""
-#~ "Setzt die bei Fehlermeldungen zu verwendenden Changelog-Datei, statt den "
+#~ "Setzt die bei Fehlermeldungen zu verwendenen Changelog-Datei, statt den "
 #~ "Namen von der Option B<--file> oder den Vorgabewert zu verwenden."
 
 #~ msgid "The B<.buildinfo> filename by default has the following form:"
@@ -26542,8 +27513,8 @@ msgstr ""
 #~ "B<strftime>(2) «%Y%m%dT%H%M%Sz», followed by a minus ‘-’ and the eight "
 #~ "left-most characters from the B<.buildinfo>'s file contents MD5 digest."
 #~ msgstr ""
-#~ "wobei I<Buildinfo-ID> aus der Bauzeit (formatiert als B<strftime>(2) »%Y%m"
-#~ "%dT%H%M%Sz«), gefolgt von einem Minus ,-´ und den acht ganz links "
+#~ "wobei I<Buildinfo-ID> aus der Bauzeit (formatiert als B<strftime>(2) „%Y%m"
+#~ "%dT%H%M%Sz“), gefolgt von einem Minus ,-´ und den acht ganz links "
 #~ "stehenden Zeichen aus dem MD5-Hash des Dateiinhaltes der Datei B<."
 #~ "buildinfo> zusammengesetzt ist."
 
@@ -27606,9 +28577,6 @@ msgstr ""
 #~ "dass wir nur zur »natürlichen« Kompilierung rückwärtskompatibel sein "
 #~ "wollen)."
 
-#~ msgid "Check whether a process has created the file I<pid-file>."
-#~ msgstr "Überprüfe, ob ein Prozess die Datei I<pid-Datei> angelegt hat."
-
 #~ msgid ""
 #~ "Check for processes that are instances of this executable (according to "
 #~ "B</proc/>I<pid>B</exe>)."
diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index 11ff9d57b..a072c3111 100644
--- a/man/po/dpkg-man.pot
+++ b/man/po/dpkg-man.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg-man 1.19.0\n"
+"Project-Id-Version: dpkg-man 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 02:06+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -605,7 +605,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, no-wrap
 msgid "B<Binary:> I<binary-package-list> (required)"
 msgstr ""
@@ -792,6 +792,94 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, no-wrap
+msgid "B<Build-Tainted-By:>"
+msgstr ""
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse "
+"B<dpkg-query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> "
+"and any other tool using pathnames as keys into their databases, as it "
+"creates filesystem aliasing problems, and messes with the understanding of "
+"the filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with "
+"non-/usr-merged filesystems."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-configs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-includes>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-libraries>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
 msgid "B<Installed-Build-Depends:> (required)"
 msgstr ""
 
@@ -1109,16 +1197,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or "
-"B</* */> style comments, RCS keywords, Vim modelines or Emacs local "
-"variables should be ignored."
+"B</* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1265,9 +1353,17 @@ msgid ""
 "binary-only non-maintainer upload."
 msgstr ""
 
+#. type: TP
+#: deb-changes.man
+#, no-wrap
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr ""
+
 #. type: Plain text
 #: deb-changes.man
-msgid "This folded field is a space-separated list of binary packages to upload."
+msgid ""
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1355,7 +1451,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1384,7 +1481,7 @@ msgstr ""
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 
 #. type: TP
@@ -1476,8 +1573,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -1486,7 +1583,7 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
@@ -2085,6 +2182,25 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, no-wrap
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid "The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2096,7 +2212,6 @@ msgstr ""
 #: deb-control.man
 #, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2120,7 +2235,17 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
-msgid "B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
 
 #. type: TH
@@ -2221,9 +2346,10 @@ msgstr ""
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character "
+"(a-z0-9)."
 msgstr ""
 
 #. type: Plain text
@@ -2363,6 +2489,26 @@ msgstr ""
 #. type: TP
 #: deb-src-control.man dsc.man
 #, no-wrap
+msgid "B<Testsuite:>I< name-list>"
+msgstr ""
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, no-wrap
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-src-control.man
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, no-wrap
 msgid "B<Vcs-Arch:>I< url>"
 msgstr ""
 
@@ -2788,8 +2934,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -2854,7 +3000,7 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
 msgstr ""
 
 #. type: Plain text
@@ -2870,6 +3016,14 @@ msgid ""
 "archive."
 msgstr ""
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -2965,7 +3119,7 @@ msgstr ""
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -3084,11 +3238,7 @@ msgid ""
 msgstr ""
 
 #. type: IP
-#: deb-split.man deb-split.man deb-split.man deb-split.man deb-split.man
-#: deb-split.man deb-split.man deb-split.man dpkg-gensymbols.man
-#: dpkg-gensymbols.man dpkg-gensymbols.man dpkg-gensymbols.man
-#: dpkg-gensymbols.man dpkg-gensymbols.man dpkg-gensymbols.man
-#: dpkg-gensymbols.man dpkg-gensymbols.man
+#: deb-split.man dpkg-gensymbols.man
 #, no-wrap
 msgid "•"
 msgstr ""
@@ -3766,10 +3916,11 @@ msgstr ""
 #: deb-substvars.man
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 
 #. type: Plain text
@@ -4690,9 +4841,19 @@ msgstr ""
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
-"functionality provided by the trigger is not crucial."
+"triggers control file."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an "
+"B<activate-await> or B<activate> directive, or by using the B<dpkg-trigger> "
+"B<--no-await> command-line option).  The “noawait” variant should be used "
+"when the functionality provided by the trigger is not crucial."
 msgstr ""
 
 #. type: TP
@@ -4719,9 +4880,17 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
 msgstr ""
 
 #. type: Plain text
@@ -4766,6 +4935,17 @@ msgid ""
 "to errors if used with an older dpkg."
 msgstr ""
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -4807,17 +4987,19 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric "
+"(“a-z0-9”) word in parentheses (“()”).  The subtype is optional in the "
+"syntax but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 #. type: TP
@@ -4905,12 +5087,6 @@ msgid ""
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, no-wrap
-msgid "B<Testsuite:>I< name-list>"
-msgstr ""
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -4921,19 +5097,14 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, no-wrap
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr ""
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -5300,6 +5471,20 @@ msgid ""
 "system directories, even configuration files)."
 msgstr ""
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a "
+"B<not-installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+
 #. type: SS
 #: dpkg.man
 #, no-wrap
@@ -5473,12 +5658,14 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the "
-"I<DEBIAN/conffiles> control file).  If B<-a> or B<--pending> is given "
-"instead of a package name, then all packages unpacked, but marked to be "
-"removed in file I<%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or "
+"B<--pending> is given instead of a package name, then all packages unpacked, "
+"but marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 
 #. type: Plain text
@@ -5511,9 +5698,10 @@ msgstr ""
 #: dpkg.man
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 
 #. type: Plain text
@@ -5733,6 +5921,13 @@ msgid ""
 "still haven't been installed."
 msgstr ""
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -5999,7 +6194,7 @@ msgid "Display a brief help message."
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force-help>"
 msgstr ""
@@ -6186,13 +6381,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force->I<things>"
 msgstr ""
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr ""
@@ -6215,7 +6410,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr ""
 
@@ -6267,26 +6462,31 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends-version>: Don't care about versions when checking dependencies."
+msgid ""
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 
 #. type: Plain text
@@ -6351,6 +6551,28 @@ msgid "B<overwrite-diverted>: Overwrite a diverted file with an undiverted versi
 msgstr ""
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking (since dpkg "
@@ -6381,7 +6603,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -6428,7 +6650,8 @@ msgstr ""
 #: dpkg.man
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 
 #. type: TP
@@ -6491,9 +6714,9 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 
 #. type: TP
@@ -6505,10 +6728,10 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 
 #. type: TP
@@ -6520,7 +6743,8 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to "
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to "
 "«I<dir>B<%ADMINDIR%>»."
 msgstr ""
 
@@ -6838,6 +7062,17 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<--no-pager>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+msgid "Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -6887,7 +7122,7 @@ msgstr ""
 #. type: TP
 #: dpkg.man dpkg-deb.man dpkg-divert.man dpkg-query.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dselect.man start-stop-daemon.man
-#: start-stop-daemon.man update-alternatives.man
+#: update-alternatives.man
 #, no-wrap
 msgid "B<0>"
 msgstr ""
@@ -6901,7 +7136,7 @@ msgstr ""
 
 #. type: TP
 #: dpkg.man dpkg-query.man dpkg-split.man dpkg-statoverride.man
-#: dpkg-trigger.man start-stop-daemon.man start-stop-daemon.man
+#: dpkg-trigger.man start-stop-daemon.man
 #, no-wrap
 msgid "B<1>"
 msgstr ""
@@ -6930,8 +7165,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, no-wrap
@@ -6939,7 +7177,7 @@ msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -6985,61 +7223,115 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<SHELL>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<PAGER>"
 msgstr ""
 
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<DPKG_PAGER>"
+msgstr ""
+
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+msgid ""
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, no-wrap
-msgid "B<SHELL>"
+msgid "B<DPKG_COLORS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.man
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
+msgid ""
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 msgstr ""
 
 #. type: TP
-#: dpkg.man dpkg-query.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
-msgid "B<COLUMNS>"
+msgid "B<DPKG_FORCE>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
 msgstr ""
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man
 #, no-wrap
-msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man
 msgid ""
-"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
-"B<auto> (default), B<always> and B<never>."
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
 msgstr ""
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with "
+"«B<-+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<DPKG_ROOT>"
 msgstr ""
@@ -7072,6 +7364,13 @@ msgid ""
 "is always set to the current B<--admindir> value."
 msgstr ""
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -7872,7 +8171,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr ""
 
 #. type: IP
@@ -8431,7 +8732,7 @@ msgid "DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)\n"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-architecture.man dpkg-architecture.man
+#: dpkg-architecture.man
 #, no-wrap
 msgid ""
 "ifeq ($(DEB_HOST_ARCH),alpha)\n"
@@ -8480,6 +8781,30 @@ msgid ""
 "«%PKGDATADIR%»."
 msgstr ""
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, no-wrap
+msgid "B<DPKG_NLS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -8773,7 +9098,7 @@ msgstr ""
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 
@@ -9138,7 +9463,7 @@ msgstr ""
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding "
-"B<-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"B<-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
 
 #. type: SS
@@ -9414,17 +9739,22 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and "
-"B<-fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds "
-"B<-fno-PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, "
-"B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to "
-"B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -9549,6 +9879,29 @@ msgstr ""
 #. type: TP
 #: dpkg-buildflags.man
 #, no-wrap
+msgid "B<fixfilepath>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"This setting (disabled by default) adds "
+"B<-ffile-prefix-map=>I<BUILDPATH>B<=.> to B<CFLAGS>, B<CXXFLAGS>, "
+"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS> where "
+"B<BUILDPATH> is set to the top-level directory of the package being built.  "
+"This has the effect of removing the build path from any generated file."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.man
+#, no-wrap
 msgid "B<fixdebugpath>"
 msgstr ""
 
@@ -9746,7 +10099,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr ""
 
 #. type: Plain text
@@ -10096,9 +10449,10 @@ msgstr ""
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using "
-"B<dpkg-source> is always better as it does not require any build "
-"dependencies to be installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -10461,15 +10815,29 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, no-wrap
+msgid "B<--rules-requires-root>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, "
+"B<-g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
 
 #. type: TP
@@ -10480,7 +10848,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr ""
 
 #. type: TP
@@ -10499,6 +10869,19 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, no-wrap
+msgid "B<--no-post-clean>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr ""
 
@@ -10782,7 +11165,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-buildpackage.man dpkg-source.man dpkg-source.man
+#: dpkg-buildpackage.man dpkg-source.man
 #, no-wrap
 msgid "B<-sn>"
 msgstr ""
@@ -10806,7 +11189,7 @@ msgid "B<-sk>"
 msgstr ""
 
 #. type: TP
-#: dpkg-buildpackage.man dpkg-source.man dpkg-source.man
+#: dpkg-buildpackage.man dpkg-source.man
 #, no-wrap
 msgid "B<-su>"
 msgstr ""
@@ -10997,7 +11380,22 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, no-wrap
-msgid "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_GAIN_ROOT_CMD>"
 msgstr ""
 
 #. type: Plain text
@@ -11751,7 +12149,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-deb.man
+#: dpkg-deb.man
 msgid "The target directory (but not its parents) will be created if necessary."
 msgstr ""
 
@@ -11819,7 +12217,7 @@ msgid "B<--showformat=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -12076,7 +12474,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see "
+"B<--rename>."
 msgstr ""
 
 #. type: TP
@@ -12087,7 +12487,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see "
+"B<--rename>."
 msgstr ""
 
 #. type: TP
@@ -12134,7 +12536,36 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+msgid ""
+"Set the administrative directory to I<directory>.  Defaults to "
+"«I<%ADMINDIR%>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<--instdir>I< directory>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<--root>I< directory>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
 msgstr ""
 
 #. type: TP
@@ -12199,7 +12630,26 @@ msgstr ""
 #: dpkg-divert.man
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see "
+"B<--no-rename> for more details)."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man
+#, no-wrap
+msgid "B<--no-rename>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
 msgstr ""
 
 #. type: TP
@@ -12214,10 +12664,17 @@ msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 
 #. type: Plain text
@@ -12285,7 +12742,7 @@ msgid "dpkg-divert --divert /usr/bin/example.foo --rename /usr/bin/example"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-divert.man
+#: dpkg-divert.man
 msgid "To remove that diversion:"
 msgstr ""
 
@@ -13083,7 +13540,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.man dpkg-gensymbols.man
+#: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<c++>"
 msgstr ""
@@ -13096,7 +13553,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.man dpkg-gensymbols.man
+#: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<symver>"
 msgstr ""
@@ -13109,7 +13566,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.man dpkg-gensymbols.man
+#: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<regex>"
 msgstr ""
@@ -13504,6 +13961,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, no-wrap
+msgid "B<-l>I<directory>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when "
+"cross-compiling for example."
+msgstr ""
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<-I>I<filename>"
@@ -13895,7 +14374,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-maintscript-helper.man dpkg-maintscript-helper.man
+#: dpkg-maintscript-helper.man
 msgid ""
 "Graceful renaming can be implemented by putting the following shell snippet "
 "in the B<preinst>, B<postinst> and B<postrm> maintainer scripts:"
@@ -14103,6 +14582,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 msgid "B<dh_installdeb>(1)."
 msgstr ""
 
@@ -14176,8 +14662,8 @@ msgstr ""
 #: dpkg-mergechangelogs.man
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 
 #. type: SH
@@ -14494,7 +14980,8 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 
 #. type: TP
@@ -14610,6 +15097,19 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, no-wrap
+msgid "B<--reverse>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, no-wrap
 msgid "B<--all>"
@@ -14732,7 +15232,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics "
+"(“a-z0-9”)."
 msgstr ""
 
 #. type: Plain text
@@ -14847,13 +15349,16 @@ msgstr ""
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 
 #. type: Plain text
@@ -14954,16 +15459,18 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 
 #. type: TP
@@ -15045,7 +15552,7 @@ msgstr ""
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 
@@ -15070,16 +15577,17 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"Display details about I<package-name>, as found in "
-"I<%ADMINDIR%/available>. When multiple I<package-name> are listed, the "
-"requested I<available> entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
 
 #. type: Plain text
@@ -15119,6 +15627,14 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr ""
 
@@ -15215,12 +15731,23 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
+msgid "B<binary:Synopsis>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid "It contains the package short description (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
 msgid "B<binary:Summary>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
-msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
 msgstr ""
 
 #. type: TP
@@ -15279,6 +15806,32 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
+msgid "B<db-fsys:Files>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
 msgid "B<source:Package>"
 msgstr ""
 
@@ -15337,8 +15890,34 @@ msgstr ""
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with "
+"«B<-+>», for example B<DPKG_PAGER=\"less -+F\">."
 msgstr ""
 
 #. type: TH
@@ -15611,8 +16190,8 @@ msgid ""
 "the source override takes precedence for setting the section."
 msgstr ""
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr ""
@@ -15729,7 +16308,7 @@ msgid "Output from “B<dpkg-query --control-path> I<package> symbols”"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-shlibdeps.man dpkg-shlibdeps.man
+#: dpkg-shlibdeps.man
 msgid ""
 "Package-provided shared library dependency information.  Unless overridden "
 "by B<--admindir>, those files are located in %ADMINDIR%."
@@ -15857,12 +16436,6 @@ msgid ""
 "I<executable>.  This option can be used multiple times."
 msgstr ""
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, no-wrap
-msgid "B<-l>I<directory>"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 msgid ""
@@ -15870,15 +16443,6 @@ msgid ""
 "libraries (since dpkg 1.17.0). This option can be used multiple times."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when "
-"cross-compiling for example."
-msgstr ""
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
@@ -16737,7 +17301,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.man dpkg-source.man dpkg-source.man dpkg-source.man
+#: dpkg-source.man
 msgid "B<Extracting>"
 msgstr ""
 
@@ -16755,7 +17319,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.man dpkg-source.man dpkg-source.man dpkg-source.man
+#: dpkg-source.man
 msgid "B<Building>"
 msgstr ""
 
@@ -16803,7 +17367,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-source.man dpkg-source.man
+#: dpkg-source.man
 #, no-wrap
 msgid "B<-sp>"
 msgstr ""
@@ -16863,11 +17427,11 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if "
 "B<-sA> was specified (this is equivalent to B<-sP>)  or raise an error if "
-"B<-sa> was specified.  B<-sA> is the default."
+"B<-sa> was specified.  B<-sa> is the default."
 msgstr ""
 
 #. type: TP
-#: dpkg-source.man dpkg-source.man
+#: dpkg-source.man
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr ""
@@ -16920,7 +17484,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-source.man dpkg-source.man
+#: dpkg-source.man
 #, no-wrap
 msgid "B<--skip-debianization>"
 msgstr ""
@@ -16993,8 +17557,8 @@ msgid ""
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs "
 "(B<.orig->I<component>B<.tar.>I<ext>).  I<component> can only contain "
-"alphanumeric characters and hyphens (‘-’).  Optionally each original tarball "
-"can be accompanied by a detached upstream signature "
+"alphanumeric (‘a-zA-Z0-9’) characters and hyphens (‘-’).  Optionally each "
+"original tarball can be accompanied by a detached upstream signature "
 "(B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<.tar.>I<ext>B<.asc>), "
 "extraction supported since dpkg 1.17.20, building supported since dpkg "
 "1.18.5."
@@ -17015,16 +17579,32 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or "
-"B<debian/patches/series> are then applied.  If the former file is used and "
-"the latter one doesn't exist (or is a symlink), then the latter is replaced "
-"with a symlink to the former. This is meant to simplify usage of B<quilt> to "
-"manage the set of patches. Note however that while B<dpkg-source> parses "
-"correctly series files with explicit options used for patch application "
-"(stored on each line after the patch filename and one or more spaces), it "
-"does ignore those options and always expect patches that can be applied with "
-"the B<-p1> option of B<patch>. It will thus emit a warning when it "
-"encounters such options, and the build is likely to fail."
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or "
+"B<debian/patches/series> are then applied, where I<vendor> will be the "
+"lowercase name of the current vendor, or B<debian> if there is no vendor "
+"defined.  If the former file is used and the latter one doesn't exist (or is "
+"a symlink), then the latter is replaced with a symlink to the former.  This "
+"is meant to simplify usage of B<quilt> to manage the set of patches.  "
+"Vendor-specific series files are intended to make it possible to serialize "
+"multiple development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
+"files with explicit options used for patch application (stored on each line "
+"after the patch filename and one or more spaces), it does ignore those "
+"options and always expect patches that can be applied with the B<-p1> option "
+"of B<patch>. It will thus emit a warning when it encounters such options, "
+"and the build is likely to fail."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
 msgstr ""
 
 #. type: Plain text
@@ -17150,7 +17730,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.man dpkg-source.man dpkg-source.man
+#: dpkg-source.man
 msgid "B<Build options>"
 msgstr ""
 
@@ -17394,7 +17974,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: dpkg-source.man dpkg-source.man
+#: dpkg-source.man
 msgid ""
 "Before going any further, some checks are done to ensure that we don't have "
 "any non-ignored uncommitted changes."
@@ -17727,6 +18307,12 @@ msgstr ""
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
@@ -17735,10 +18321,13 @@ msgstr ""
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -18207,9 +18796,38 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
 msgstr ""
 
 #. type: TP
@@ -18222,7 +18840,8 @@ msgstr ""
 #: dpkg-statoverride.man
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 
 #. type: TP
@@ -18248,6 +18867,13 @@ msgstr ""
 msgid "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -18367,8 +18993,9 @@ msgstr ""
 #. type: Plain text
 #: dpkg-trigger.man
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 
 #. type: TP
@@ -19527,10 +20154,28 @@ msgstr ""
 
 #. type: Plain text
 #: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-root)  "
+"user will be refused with an error (since version 1.19.3) as this is a "
+"security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
@@ -19767,6 +20412,73 @@ msgstr ""
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
+msgid "B<--notify-await>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<ERRNO=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the "
+"user-friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> "
+"seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr ""
 
@@ -19895,7 +20607,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.man start-stop-daemon.man
+#: start-stop-daemon.man
 #, no-wrap
 msgid "B<3>"
 msgstr ""
@@ -20491,6 +21203,11 @@ msgid ""
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
+#. type: Plain text
+#: update-alternatives.man
+msgid "Do not generate any comments unless errors occur."
+msgstr ""
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -20504,7 +21221,9 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
 msgstr ""
 
 #. type: Plain text
@@ -20584,7 +21303,7 @@ msgid "The generic name of the alternative."
 msgstr ""
 
 #. type: TP
-#: update-alternatives.man update-alternatives.man
+#: update-alternatives.man
 #, no-wrap
 msgid "B<Slaves:>I< list-of-slaves>"
 msgstr ""
diff --git a/man/po/es.po b/man/po/es.po
index adeefb5bb..952fdcb72 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -38,8 +38,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2016-12-17 16:41+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-02-24 18:25+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
 "Language: es\n"
@@ -742,7 +742,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<Package:> I<binary-package-name> (required)"
 msgid "B<Binary:> I<binary-package-list> (required)"
@@ -971,6 +971,99 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, fuzzy, no-wrap
+#| msgid "B<Building>"
+msgid "B<Build-Tainted-By:>"
+msgstr "B<Construcción>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<-L>I<local-shlibs-file>"
+msgid "B<usr-local-has-configs>"
+msgstr "B<-L>I<fichero-shlibs-local>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<--single-debian-patch>"
+msgid "B<usr-local-has-includes>"
+msgstr "B<--single-debian-patch>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<-L>I<local-shlibs-file>"
+msgid "B<usr-local-has-libraries>"
+msgstr "B<-L>I<fichero-shlibs-local>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
 #| msgid "B<reinst-required>"
 msgid "B<Installed-Build-Depends:> (required)"
 msgstr "B<reinst-required>"
@@ -1298,16 +1391,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1481,10 +1574,18 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Package:> I<binary-package-name> (required)"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Package:> I<nombre-del-paquete-binario> (obligatorio)"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1604,7 +1705,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1635,7 +1737,7 @@ msgstr "B<binary:Version>"
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 
 #. type: TP
@@ -1742,8 +1844,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr "FALLOS"
@@ -1752,7 +1854,7 @@ msgstr "FALLOS"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
@@ -2608,6 +2710,27 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+#| msgid "B<Date:>I< date>"
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Date:>I< fecha>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2617,9 +2740,29 @@ msgstr "EJEMPLO"
 
 #. type: Plain text
 #: deb-control.man
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# Comment\n"
+#| "Package: grep\n"
+#| "Essential: yes\n"
+#| "Priority: required\n"
+#| "Section: base\n"
+#| "Maintainer: Wichert Akkerman E<lt>wakkerma@debian.orgE<gt>\n"
+#| "Architecture: sparc\n"
+#| "Version: 2.4-1\n"
+#| "Pre-Depends: libc6 (E<gt>= 2.0.105)\n"
+#| "Provides: rgrep\n"
+#| "Conflicts: rgrep\n"
+#| "Description: GNU grep, egrep and fgrep.\n"
+#| " The GNU family of grep utilities may be the \"fastest grep in the west\".\n"
+#| " GNU grep is based on a fast lazy-state deterministic matcher (about\n"
+#| " twice as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper\n"
+#| " search for a fixed string that eliminates impossible text from being\n"
+#| " considered by the full regexp matcher without necessarily having to\n"
+#| " look at every character. The result is typically many times faster\n"
+#| " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
+#| " will run more slowly, however).\n"
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2662,11 +2805,20 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
 #, fuzzy
 #| msgid ""
 #| "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 
@@ -2812,12 +2964,20 @@ msgstr "B<Source:> I<nombre-del-paquete-fuente> (obligatorio)"
 
 #. type: Plain text
 #: deb-src-control.man
+#, fuzzy
+#| msgid ""
+#| "The value of this field is the name of the source package, and should "
+#| "match the name of the source package in the debian/changelog file. A "
+#| "package name must consist only of lower case letters (a-z), digits (0-9), "
+#| "plus (+) and minus (-) signs, and periods (.). Package names must be at "
+#| "least two characters long and must start with an alphanumeric character."
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 "El valor de este campo es el nombre del paquete fuente, y debería coincidir "
 "con el nombre del paquete fuente en el fichero «debian/changelog». Un nombre "
@@ -3003,6 +3163,34 @@ msgstr ""
 #. type: TP
 #: deb-src-control.man dsc.man
 #, fuzzy, no-wrap
+#| msgid "B<Suggests:>I< package-list>"
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<Suggests:>I< lista-de-paquetes>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:>I< package-list>"
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<Suggests:>I< lista-de-paquetes>"
+
+#. type: Plain text
+#: deb-src-control.man
+#, fuzzy
+#| msgid ""
+#| "These fields are described in the B<deb-control>(5)  manual page, as they "
+#| "are copied literally to the control file of the binary package."
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+"Estos campos se describen en la página de manual B<deb-control>(5), ya que "
+"se copian de forma literal al fichero «control» del paquete binario."
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
 #| msgid "B<Vcs-*:>I< url>"
 msgid "B<Vcs-Arch:>I< url>"
 msgstr "B<Vcs-*:>I< url>"
@@ -3593,8 +3781,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3703,8 +3891,10 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
-msgstr ""
+#, fuzzy
+#| msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
+msgstr "I<paquete> I<prioridad> I<sección> [I<información-del-mantenedor>]"
 
 #. type: Plain text
 #: deb-src-files.man
@@ -3729,6 +3919,14 @@ msgstr ""
 "control disponibles en el «.deb». Los valores permitidos se listan en el "
 "Manual de Normas de Debian."
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -3835,7 +4033,7 @@ msgstr "B<Construcción>"
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -4912,12 +5110,20 @@ msgstr ""
 
 #. type: Plain text
 #: deb-substvars.man
+#, fuzzy
+#| msgid ""
+#| "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+#| "names consist of alphanumerics, hyphens and colons and start with an "
+#| "alphanumeric. Variable substitutions are performed repeatedly until none "
+#| "are left; the full text of the field after the substitution is rescanned "
+#| "to look for more substitutions."
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 "Una sustitución de variable tiene la forma B<${>I<nombre-de-variable>B<}>. "
 "Los nombres de variable consisten de caracteres alfanuméricos, guiones y dos "
@@ -6084,9 +6290,7 @@ msgstr "B<interest-noawait> I<nombre-disparador>"
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
-"functionality provided by the trigger is not crucial."
+"triggers control file."
 msgstr ""
 "Define que el paquete tiene un interés en el disparador nombrado. Todos los "
 "disparadores por los que un paquete tiene interés se deben listar usando "
@@ -6095,6 +6299,18 @@ msgstr ""
 "awaited». Se debe utilizar cuando la funcionalidad ofrecida por el "
 "disparador no es crucial."
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
+"functionality provided by the trigger is not crucial."
+msgstr ""
+
 #. type: TP
 #: deb-triggers.man
 #, no-wrap
@@ -6129,9 +6345,7 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
 msgstr ""
 "Especifica que el disparador definido se activa si el estado de este paquete "
 "cambia. El disparador se activa al iniciarse las siguientes operaciones: "
@@ -6142,6 +6356,29 @@ msgstr ""
 
 #. type: Plain text
 #: deb-triggers.man
+#, fuzzy
+#| msgid ""
+#| "Specifies that the package is interested in the named trigger. All "
+#| "triggers in which a package is interested must be listed using this "
+#| "directive in the triggers control file. The \"noawait\" variant does not "
+#| "put the triggering packages in triggers-awaited state. This should be "
+#| "used when the functionality provided by the trigger is not crucial."
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
+msgstr ""
+"Define que el paquete tiene un interés en el disparador nombrado. Todos los "
+"disparadores por los que un paquete tiene interés se deben listar usando "
+"esta directiva en el fichero de control de disparadores. La variante "
+"«noawait» no pone los paquetes con disparadores en un estado «triggers-"
+"awaited». Se debe utilizar cuando la funcionalidad ofrecida por el "
+"disparador no es crucial."
+
+#. type: Plain text
+#: deb-triggers.man
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -6210,6 +6447,17 @@ msgstr ""
 "ello, se recomienda añadir «Pre-Depends: dpkg (E<gt>= 1.16.1)» a cualquier "
 "paquete que utiliza esas directivas."
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -6278,17 +6526,19 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 #. type: TP
@@ -6387,13 +6637,6 @@ msgid ""
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<Suggests:>I< lista-de-paquetes>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -6404,20 +6647,14 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<Suggests:>I< lista-de-paquetes>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -6834,6 +7071,20 @@ msgstr ""
 "borrar todo en los directorios del sistema, incluyendo los ficheros de "
 "configuración)."
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+
 #. type: SS
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -7059,12 +7310,14 @@ msgstr "B<-r>, B<--remove>, B<-P>, B<--purge >I<paquete>...|B<-a>|B<--pending>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 
 #. type: Plain text
@@ -7098,9 +7351,10 @@ msgstr "B<--configure >I<paquete>...|B<-a>|B<--pending>"
 #: dpkg.man
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 
 #. type: Plain text
@@ -7422,6 +7676,13 @@ msgstr ""
 "Busca los paquetes seleccionados para su instalación, pero que por alguna "
 "razón todavía no se han instalado."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -7763,7 +8024,7 @@ msgid "Display a brief help message."
 msgstr "Muestra un resumen de las instrucciones de uso."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
@@ -8039,14 +8300,14 @@ msgstr ""
 "  2000   Montañas de parrafadas (perjudica la salud)\n"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force>"
 msgid "B<--force->I<things>"
 msgstr "B<--force>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
@@ -8077,7 +8338,7 @@ msgstr ""
 "funcionamiento.>"
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Activa (o desactiva) todas las opciones de forzar."
 
@@ -8154,13 +8415,21 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+#, fuzzy
+#| msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends>: Convierte todos los problemas de dependencias en avisos."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<depends-version>: Don't care about versions when checking dependencies."
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 "B<depends-version>: No tiene en cuenta las versiones al comprobar las "
 "dependencias."
@@ -8171,14 +8440,19 @@ msgstr ""
 #| msgid "B<breaks>: Install, even if this would break another package."
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr "B<breaks>: Instala, aunque suponga romper otro paquete."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<conflicts>: Install, even if it conflicts with another package. This is "
+#| "dangerous, for it will usually cause overwriting of some files."
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 "B<conflicts>: Instala, incluso si entra en conflicto con otro paquete. Esta "
 "opción es peligrosa dado que generalmente sobreescribirá algunos ficheros."
@@ -8291,6 +8565,28 @@ msgstr ""
 "una no desviada."
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
 #, fuzzy
 #| msgid ""
@@ -8344,7 +8640,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -8399,9 +8695,14 @@ msgstr "B<--ignore-depends>=I<paquete>,..."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Ignore dependency-checking for specified packages (actually, checking is "
+#| "performed, but only warnings about conflicts are given, nothing else)."
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "Ignora la comprobación de dependencias para los paquetes definidos (en "
 "realidad, se hacen las comprobaciones pero se imprimen avisos en vez de "
@@ -8490,9 +8791,9 @@ msgstr "B<--admindir=>I<directorio>"
 #| "give information about status of installed or uninstalled packages, etc.  "
 #| "(Defaults to I<%ADMINDIR%>)"
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "Cambia el directorio de administración predefinido. Éste contiene muchos "
 "ficheros que ofrecen información relativa al estado de paquetes instalados o "
@@ -8513,10 +8814,10 @@ msgstr "B<--instdir=>I<directorio>"
 #| "B<chroot>(2) before running package's installation scripts, which means "
 #| "that the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 "Cambia el directorio de instalación predefinido, la ubicación en la que se "
 "instalarán los paquetes. B<instdir> es también el directorio introducido a "
@@ -8537,8 +8838,9 @@ msgstr "B<--root=>I<directorio>"
 #| "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 #| "var/lib/dpkg>."
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
 "Cambiar B<root> da el valor de I<directorio> a B<instdir>, y el valor "
 "I<dir>B<%ADMINDIR%> a B<admindir>."
@@ -8949,6 +9251,21 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<--no-triggers>"
+msgid "B<--no-pager>"
+msgstr "B<--no-triggers>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+#, fuzzy
+#| msgid "The Debian system name of the host machine."
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr "El nombre de sistema Debian de la máquina anfitrión."
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -9060,8 +9377,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, no-wrap
@@ -9069,7 +9389,7 @@ msgid "ENVIRONMENT"
 msgstr "ENTORNO"
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -9120,20 +9440,7 @@ msgstr ""
 "directorios temporales."
 
 #. type: TP
-#: dpkg.man
-#, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
-
-#. type: Plain text
-#: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
-msgstr ""
-"El programa que B<dpkg> ejecutará al mostrar los ficheros de configuración "
-"«conffiles»."
-
-#. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
@@ -9142,51 +9449,113 @@ msgstr "B<SHELL>"
 #: dpkg.man
 #, fuzzy
 #| msgid "The program B<dpkg> will execute when starting a new shell."
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr ""
 "El programa que B<dpkg> ejecutará al iniciar un nuevo intérprete de órdenes."
 
 #. type: TP
 #: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<PAGER>"
+msgstr "B<PAGER>"
+
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<PAGER>"
+msgid "B<DPKG_PAGER>"
+msgstr "B<PAGER>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
-"Define el número de columnas que B<dpkg> puede utilizar para mostrar la "
-"información. Por ahora sólo la usa la opción «-l»."
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
 msgid "B<DPKG_COLORS>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 msgid ""
 "Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
 "B<auto> (default), B<always> and B<never>."
 msgstr ""
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
+msgstr ""
+
+#. type: TP
+#: dpkg.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
+msgstr ""
+
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_SHELL_REASON>"
 msgid "B<DPKG_ROOT>"
@@ -9226,6 +9595,19 @@ msgstr ""
 "Definido por B<dpkg> en el script de entorno del mantenedor con el valor de "
 "la arquitectura de paquete para la cual se compiló."
 
+#. type: Plain text
+#: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the "
+#| "architecture the package got built for."
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+"Definido por B<dpkg> en el script de entorno del mantenedor con el valor de "
+"la arquitectura de paquete para la cual se compiló."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -10263,7 +10645,11 @@ msgstr "VARIABLES"
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+#, fuzzy
+#| msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr "Las siguientes variables se definen mediante B<dpkg-architecture>:"
 
 #. type: IP
@@ -11068,6 +11454,31 @@ msgid ""
 "«%PKGDATADIR%»."
 msgstr ""
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_NLS>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -11443,7 +11854,7 @@ msgstr ""
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 
@@ -11896,7 +12307,7 @@ msgstr ""
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
 
 #. type: SS
@@ -12276,16 +12687,22 @@ msgstr "B<pie>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -12461,6 +12878,45 @@ msgstr ""
 #: dpkg-buildflags.man
 #, fuzzy, no-wrap
 #| msgid "B<--debug>"
+msgid "B<fixfilepath>"
+msgstr "B<--debug>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+#, fuzzy
+#| msgid ""
+#| "This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+#| "buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks "
+#| "against stack overwrites. This renders many potential code injection "
+#| "attacks into aborting situations. In the best case this turns code "
+#| "injection vulnerabilities into denial of service or into non-issues "
+#| "(depending on the application)."
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+"Esta opción (activa por omisión) añade B<-fstack-protector --param=ssp-"
+"buffer-size=4> a B<CFLAGS> y B<CXXFLAGS>. Esto añade comprobaciones de "
+"seguridad frente a sobrescrituras de pila. Provoca que varios ataques "
+"potenciales de inyección de código se deriven en interrupciones del proceso. "
+"En el mejor de los casos, convierte vulnerabilidades frente a una inyección "
+"de código en una negación de servicio o bien en un problema sin efecto "
+"(depende de la aplicación)."
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.man
+#, fuzzy, no-wrap
+#| msgid "B<--debug>"
 msgid "B<fixdebugpath>"
 msgstr "B<--debug>"
 
@@ -12705,7 +13161,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr ""
 
 #. type: Plain text
@@ -13143,9 +13599,10 @@ msgstr "B<--force>"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -13625,6 +14082,20 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<--as-root>"
+msgid "B<--rules-requires-root>"
+msgstr "B<--as-root>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<-C>, B<--no-close>"
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr "B<-C>, B<--no-close>"
@@ -13636,9 +14107,10 @@ msgstr "B<-C>, B<--no-close>"
 #| "Do not clean the source tree (implies B<-b> if nothing else has been "
 #| "selected among B<-B>, B<-A> or B<-S>)."
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
 "No limpia el árbol de fuentes (implica B<-b> si no se introdujo B<-B>, B<-A> "
 "o B<-S>)."
@@ -13654,7 +14126,9 @@ msgstr "B<-p>I<paquete>"
 #: dpkg-buildpackage.man
 #, fuzzy
 #| msgid "The Debian cpu name of the build machine."
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr "El nombre de Debian del procesador de la máquina de construcción."
 
 #. type: TP
@@ -13680,6 +14154,20 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<-C>, B<--no-close>"
+msgid "B<--no-post-clean>"
+msgstr "B<-C>, B<--no-close>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<--pre-invoke=>I<command>"
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr "B<--pre-invoke=>I<orden>"
@@ -14292,9 +14780,24 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_SHELL_REASON>"
-msgid "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_GAIN_ROOT_CMD>"
 msgstr "B<DPKG_SHELL_REASON>"
 
 #. type: Plain text
@@ -15420,7 +15923,7 @@ msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -15779,8 +16282,10 @@ msgstr "[B<--add>] I<fichero>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
-msgstr "Añade una redirección para el I<fichero>."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
 
 #. type: TP
 #: dpkg-divert.man
@@ -15790,8 +16295,10 @@ msgstr "B<--remove>I< fichero>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
-msgstr "Elimina una redirección para el I<fichero>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
 
 #. type: TP
 #: dpkg-divert.man
@@ -15848,12 +16355,42 @@ msgstr "B<--admindir>I< directorio>"
 #| msgid ""
 #| "Set the dpkg data directory to I<directory> (default: I<%ADMINDIR%>)."
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
 msgstr ""
 "Define el directorio de datos de dpkg como I<directorio> (por omisión: I</"
 "var/lib/dpkg>)."
 
 #. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--admindir>I< directory>"
+msgid "B<--instdir>I< directory>"
+msgstr "B<--admindir>I< directorio>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--depotdir>I< directory>"
+msgid "B<--root>I< directory>"
+msgstr "B<--depotdir>I< directorio>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: TP
 #: dpkg-divert.man
 #, no-wrap
 msgid "B<--divert>I< divert-to>"
@@ -15922,15 +16459,39 @@ msgstr "B<--rename>"
 
 #. type: Plain text
 #: dpkg-divert.man
+#, fuzzy
+#| msgid ""
+#| "Actually move the file aside (or back). B<dpkg-divert> will abort "
+#| "operation in case the destination file already exists."
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
 msgstr ""
 "Mueve el archivo a un lado (o atrás). B<dpkg-divert> interrumpirá la "
 "operación en caso de que el fichero destino ya exista."
 
 #. type: TP
 #: dpkg-divert.man
+#, fuzzy, no-wrap
+#| msgid "B<--rename>"
+msgid "B<--no-rename>"
+msgstr "B<--rename>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man
 #, no-wrap
 msgid "B<--test>"
 msgstr "B<--test>"
@@ -15942,14 +16503,27 @@ msgstr ""
 "Modo de prueba, esto es, no realiza ningún cambio, sólo muestra su ejecución."
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the base administrative directory."
+msgid ""
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+"Si se define, y no se define la opción B<--admindir>, se utiliza como el "
+"directorio base de gestión."
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
 #, fuzzy
 #| msgid ""
 #| "If set and the B<--admindir> option has not been specified, it will be "
 #| "used as the dpkg data directory."
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 "Si se define, y no se define la opción B<--admindir>, se utiliza como el "
 "directorio de datos de dpkg."
@@ -17844,6 +18418,35 @@ msgstr ""
 "necesita varias B<-e>)."
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, fuzzy, no-wrap
+#| msgid "B<--altdir>I< directory>"
+msgid "B<-l>I<directory>"
+msgstr "B<--altdir> I<directorio>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+#, fuzzy
+#| msgid ""
+#| "Include dependencies appropriate for the shared libraries required by "
+#| "I<executable>."
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+"Incluye dependencias apropiadas para las bibliotecas compartidas requeridas "
+"por el I<ejecutable>."
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<-I>I<filename>"
@@ -18768,6 +19371,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 #, fuzzy
 #| msgid "B<installed>"
 msgid "B<dh_installdeb>(1)."
@@ -18875,8 +19485,8 @@ msgstr "LIMITACIONES"
 #| "supposed to be there, etc."
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 "Se perderá durante la fusión todo lo que «Dpkg::Changelog» no analice. Esto "
 "puede incluir cosas como «modelines» de vim, comentarios donde no deberían "
@@ -19319,7 +19929,8 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 "Define el formato de la salidA. Los valores compatibles son I<dpkg> y "
 "I<rfc822>. I<dpkg> es el formato de salida clásico (anterior a la existencia "
@@ -19455,6 +20066,20 @@ msgstr ""
 "preservan los metadatos de cada entrada."
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, fuzzy, no-wrap
+#| msgid "B<--verbose>"
+msgid "B<--reverse>"
+msgstr "B<--verbose>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, no-wrap
 msgid "B<--all>"
@@ -19619,7 +20244,11 @@ msgstr "       @@@ formato-fichero-de-cambios: I<otro-formato> @@@\n"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+#, fuzzy
+#| msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
 "Los nombres de formato del fichero de registro de cambios son cadenas no "
 "vacías compuestas de caracteres alfanuméricos."
@@ -19790,13 +20419,16 @@ msgstr "B<-l>, B<--list> [I<patrón-nombre-paquete>...]"
 #| "the shell from performing filename expansion. For example this will list "
 #| "all package names starting with ``libc6'':"
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 "Lista los paquetes que encajan con el patrón dado. Si no se entrega un "
 "I<patrón-nombre-paquete>, lista los paquetes en I<%ADMINDIR%/status>, "
@@ -19943,17 +20575,26 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
+#, fuzzy, no-wrap
+#| msgid "B<-s>, B<--status> I<package-name>..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
 msgstr "B<-s>, B<--status> I<nombre-paquete>..."
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Report status of specified package. This just displays the entry in the "
+#| "installed package status database. When multiple I<package-name> are "
+#| "listed, the requested status entries are separated by an empty line, with "
+#| "the same order as specified on the argument list."
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 "Informa del estado del paquete definido. Esto sólo muestra la entrada de los "
 "paquetes con el estado de instalado en la base de datos. Cuando se enumeran "
@@ -20073,7 +20714,7 @@ msgstr "B<-S>, B<--search> I<patrón-búsqueda-fichero>..."
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 "Busca un paquete del que proviene un fichero que concuerda con el patrón "
@@ -20111,17 +20752,25 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
+#, fuzzy, no-wrap
+#| msgid "B<-p>, B<--print-avail> I<package-name>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
 msgstr "B<-p>, B<--print-avail> I<nombre-paquete>..."
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I<%ADMINDIR%/"
+#| "available>. When multiple I<package-name> are listed, the requested "
+#| "I<available> entries are separated by an empty line, with the same order "
+#| "as specified on the argument list."
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
 "Muestra detalles de I<nombre-paquete>, tal y como aparece en I<%ADMINDIR%/"
 "available>. Cuando se enumeran varios I<nombre-paquete>, las entradas "
@@ -20182,6 +20831,22 @@ msgstr "B<-f>, B<--showformat=>I<formato>"
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "This option is used to specify the format of the output B<--show> will "
+#| "produce. The format is a string that will be output for each package "
+#| "listed."
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+"Esta opción sirve para especificar el formato de la salida que B<--show> "
+"producirá. El formato es una cadena que será la salida de cada paquete "
+"listado."
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr "En la cadena de formato, “B<\\e>” introduce escapes:"
 
@@ -20328,19 +20993,31 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
-#| msgid "B<binary:Version>"
-msgid "B<binary:Summary>"
-msgstr "B<binary:Version>"
+#| msgid "B<source:Version>"
+msgid "B<binary:Synopsis>"
+msgstr "B<source:Version>"
 
 #. type: Plain text
 #: dpkg-query.man
 #, fuzzy
 #| msgid "The package architecture (since dpkg 1.16.1)."
-msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid "It contains the package short description (since dpkg 1.19.1)."
 msgstr "La arquitectura del paquete (a partir de la versión de dpkg 1.16.1)."
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<binary:Version>"
+msgid "B<binary:Summary>"
+msgstr "B<binary:Version>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<db:Status-Abbrev>"
 msgstr ""
@@ -20396,6 +21073,35 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
+#| msgid "B<debian/files>"
+msgid "B<db-fsys:Files>"
+msgstr "B<debian/files>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid "The package architecture (since dpkg 1.16.1)."
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "La arquitectura del paquete (a partir de la versión de dpkg 1.16.1)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
+#, fuzzy, no-wrap
 #| msgid "B<source:Version>"
 msgid "B<source:Package>"
 msgstr "B<source:Version>"
@@ -20474,12 +21180,44 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid "The Debian cpu name of the build machine."
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr "El nombre de Debian del procesador de la máquina de construcción."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the dpkg data directory."
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+"Si se define, y no se define la opción B<--admindir>, se utiliza como el "
+"directorio de datos de dpkg."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
 msgstr ""
-"Esta opción influencia la salida de B<--list> al modificar el ancho de la "
-"salida."
 
 #. type: TH
 #: dpkg-scanpackages.man
@@ -20885,8 +21623,8 @@ msgstr ""
 "Si un paquete aparece en ambos ficheros, el fichero «override» de las "
 "fuentes tiene preferencia."
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
@@ -21216,13 +21954,6 @@ msgstr ""
 "Incluye dependencias apropiadas para las bibliotecas compartidas requeridas "
 "por el I<ejecutable>."
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, fuzzy, no-wrap
-#| msgid "B<--altdir>I< directory>"
-msgid "B<-l>I<directory>"
-msgstr "B<--altdir> I<directorio>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 #, fuzzy
@@ -21236,15 +21967,6 @@ msgstr ""
 "Incluye dependencias apropiadas para las bibliotecas compartidas requeridas "
 "por el I<ejecutable>."
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
@@ -22818,6 +23540,20 @@ msgstr "B<-sa> or B<-sA>"
 
 #. type: Plain text
 #: dpkg-source.man
+#, fuzzy
+#| msgid ""
+#| "Specifies to look for the original source archive as a tarfile or as a "
+#| "directory - the second argument, if any, may be either, or the empty "
+#| "string (this is equivalent to using B<-sn>).  If a tarfile is found it "
+#| "will unpack it to create the diff and remove it afterwards (this is "
+#| "equivalent to B<-sp>); if a directory is found it will pack it to create "
+#| "the original source and remove it afterwards (this is equivalent to B<-"
+#| "sr>); if neither is found it will assume that the package has no "
+#| "debianization diffs, only a straightforward source archive (this is "
+#| "equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
+#| "the directory, overwriting it, if B<-sA> was specified (this is "
+#| "equivalent to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> "
+#| "is the default."
 msgid ""
 "Specifies to look for the original source archive as a tarfile or as a "
 "directory - the second argument, if any, may be either, or the empty string "
@@ -22829,7 +23565,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 "Defina una búsqueda de la fuente original como directorio o como archivo tar "
 "- el segundo argumento, de existir, puede ser cualquiera de las dos cosas o "
@@ -23032,11 +23768,11 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 "Un paquete fuente con este formato contiene al menos un archivo tar original "
 "(B<.orig.tar.>I<ext>, siendo I<ext> B<gz>, B<bz2>, B<lzma> o B<xz>) y un "
@@ -23079,11 +23815,18 @@ msgstr ""
 #| "with the B<-p1> option of B<patch>. It will thus emit a warning when it "
 #| "encounters such options, and the build is likely to fail."
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
@@ -23105,6 +23848,15 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
 "The timestamp of all patched files is reset to the extraction time of the "
 "source package (this avoids timestamp skews leading to problems when "
 "autogenerated files are patched)."
@@ -24201,6 +24953,13 @@ msgstr ""
 
 #. type: SS
 #: dpkg-source.man
+#, fuzzy, no-wrap
+#| msgid "debian/patches/series"
+msgid "debian/patches/I<vendor>.series"
+msgstr "debian/patches/series"
+
+#. type: SS
+#: dpkg-source.man
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
@@ -24220,10 +24979,13 @@ msgstr "debian/patches/series"
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -24849,17 +25611,66 @@ msgstr ""
 #. type: Plain text
 #: dpkg-statoverride.man
 #, fuzzy
+#| msgid "Give help about the B<--force->I<thing> options."
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr "Muestra la ayuda de las opciones B<--force->I<algo>."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
 #| msgid ""
 #| "Change the I<directory> of the dpkg database where the statoverride file "
 #| "is also stored. Defaults to I<%ADMINDIR%>."
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "Cambia el I<directorio> con la base de datos de dpkg, donde también se "
 "guarda la información relativa al fichero «statoverride». Por omisión es «/"
 "var/lib/dpkg»."
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do "
+#| "some things. I<things> is a comma separated list of things specified "
+#| "below. B<--force-help> displays a message describing them.  Things marked "
+#| "with (*) are forced by default."
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
+msgstr ""
+"Fuerza o rechaza (B<no-force> y B<refuse> significan lo mismo) hacer ciertas "
+"cosas. El parámetro I<cosas> es una lista de cosas definidas a continuación "
+"y separadas por comas. La opción B<--force-help> muestra un mensaje que las "
+"describe. Las cosas marcadas con (*) se fuerzan por omisión."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "I<Warning: These options are mostly intended to be used by experts only. "
+#| "Using them without fully understanding their effects may break your whole "
+#| "system.>"
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Aviso: Estas opciones están pensadas básicamente para un uso experto. "
+"Usarlas sin conocer totalmente sus efectos podría dejar su sistema sin "
+"funcionamiento.>"
+
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -24868,9 +25679,14 @@ msgstr "B<--force>"
 
 #. type: Plain text
 #: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force an action, even if a sanity check would otherwise prohibit it.  "
+#| "This is necessary to override an existing override."
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 "Fuerza una acción, incluso si ésta pudiese resultar perjudicial. Es "
 "necesario para poder modificar una sustitución existente."
@@ -24903,6 +25719,19 @@ msgid ""
 "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the base administrative directory."
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+"Si se define, y no se define la opción B<--admindir>, se utiliza como el "
+"directorio base de gestión."
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -25062,8 +25891,9 @@ msgstr "B<--no-await>"
 #. type: Plain text
 #: dpkg-trigger.man
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 
 #. type: TP
@@ -26758,15 +27588,39 @@ msgstr "B<-p>, B<--pidfile> I<fichero-pid>"
 
 #. type: Plain text
 #: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+#, fuzzy
+#| msgid ""
+#| "Check whether a process has created the file I<pid-file>. Note: using "
+#| "this matching option alone might cause unintended processes to be acted "
+#| "on, if the old process terminated without being able to remove the I<pid-"
+#| "file>."
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
 msgstr ""
 "Comprueba si un proceso ha creado el I<fichero-pid>. Nota: utilizar solo "
 "esta opción de búsqueda puede afectar a procesos de forma no deseada si el "
 "proceso antiguo ha finalizado sin poder eliminar el I<fichero-pid>. "
 
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -27084,6 +27938,74 @@ msgstr ""
 
 #. type: TP
 #: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<--no-await>"
+msgid "B<--notify-await>"
+msgstr "B<--no-await>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<-n>I<filename>"
+msgid "B<ERRNO=>I<number>"
+msgstr "B<-n>I<nombrefichero>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
 #, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<-C>, B<--no-close>"
@@ -28089,6 +29011,13 @@ msgstr ""
 "adecuadamente en modo automático. Esta opción solo tiene sentido con B<--"
 "config> o B<--all>."
 
+#. type: Plain text
+#: update-alternatives.man
+#, fuzzy
+#| msgid "Don't generate any comments unless errors occur."
+msgid "Do not generate any comments unless errors occur."
+msgstr "No genera ningún comentario a menos que ocurra algún error."
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -28106,8 +29035,14 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
-msgstr "No genera ningún comentario a menos que ocurra algún error."
+#, fuzzy
+#| msgid "Generate more comments about what B<update-alternatives> is doing."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr ""
+"Genera una salida con más información acerca de lo que B<update-"
+"alternatives> está haciendo."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -28461,6 +29396,38 @@ msgstr "B<update-alternatives --auto vi>"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, el estándar de la jerarquía del sistema de ficheros."
 
+#~ msgid "The program B<dpkg> will execute when displaying the conffiles."
+#~ msgstr ""
+#~ "El programa que B<dpkg> ejecutará al mostrar los ficheros de "
+#~ "configuración «conffiles»."
+
+#~ msgid "B<COLUMNS>"
+#~ msgstr "B<COLUMNS>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~| "text. Currently only used by -l."
+#~ msgid ""
+#~ "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~ "text.  Currently only used by B<--list>."
+#~ msgstr ""
+#~ "Define el número de columnas que B<dpkg> puede utilizar para mostrar la "
+#~ "información. Por ahora sólo la usa la opción «-l»."
+
+#~ msgid "Add a diversion for I<file>."
+#~ msgstr "Añade una redirección para el I<fichero>."
+
+#~ msgid "Remove a diversion for I<file>."
+#~ msgstr "Elimina una redirección para el I<fichero>."
+
+#~ msgid ""
+#~ "This setting influences the output of the B<--list> option by changing "
+#~ "the width of its output."
+#~ msgstr ""
+#~ "Esta opción influencia la salida de B<--list> al modificar el ancho de la "
+#~ "salida."
+
 #, fuzzy
 #~| msgid ""
 #~| "These fields declare relationships between packages. They are discussed "
diff --git a/man/po/fr.po b/man/po/fr.po
index 9c2973446..fd7399528 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -5,21 +5,22 @@
 # Nicolas François <nicolas.francois@centraliens.net>, 2006, 2007.
 # Florent USSEIL <swiip81@free.fr>, 2008.
 # Christian Perrier <bubulle@debian.org>, 2009, 2010, 2011, 2012.
-# Vincent Thomas <thomas@vinc-net.fr>, 2014
-# Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2014.
+# Vincent Thomas <thomas@vinc-net.fr>, 2014.
+# Sébastien Poher <sbphr@volted.net>, 2014,2016.
+# Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>, 2014, 2018-2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2016-12-17 16:41+0100\n"
-"Last-Translator: Sébastien Poher <sbphr@volted.net>\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-09-30 04:34+0200\n"
+"Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. type: TH
@@ -45,7 +46,7 @@ msgstr "deb"
 #: dselect.cfg.man start-stop-daemon.man update-alternatives.man
 #, no-wrap
 msgid "%RELEASE_DATE%"
-msgstr ""
+msgstr "%RELEASE_DATE%"
 
 #. type: TH
 #: deb.man deb822.man deb-buildinfo.man deb-changelog.man deb-changes.man
@@ -64,7 +65,7 @@ msgstr ""
 #: dselect.cfg.man start-stop-daemon.man update-alternatives.man
 #, no-wrap
 msgid "%VERSION%"
-msgstr ""
+msgstr "%VERSION%"
 
 #. type: TH
 #: deb.man deb822.man deb-buildinfo.man deb-changelog.man deb-changes.man
@@ -159,8 +160,8 @@ msgid ""
 "and 1.1.1elf (i386/ELF builds)."
 msgstr ""
 "Le format B<.deb> est le format des paquets binaires de Debian. Il est "
-"compatible depuis la version 0.93.76 de dpkg, et il est généré par défaut "
-"depuis les versions 1.2.0 de dpkg et 1.1.1elf (constructions i386/ELF)."
+"compatible depuis la version 0.93.76 de dpkg, et il est généré par défaut "
+"depuis les versions 1.2.0 de dpkg et 1.1.1elf (constructions i386/ELF)."
 
 #. type: Plain text
 #: deb.man
@@ -168,7 +169,7 @@ msgid ""
 "The format described here is used since Debian 0.93; details of the old "
 "format are described in B<deb-old>(5)."
 msgstr ""
-"Le format décrit ici est utilisé depuis la version 0.93 de Debian ; les "
+"Le format décrit ici est utilisé depuis la version 0.93 de Debian ; les "
 "détails concernant le vieux format sont consultables dans B<deb-old>(5)."
 
 #. type: SH
@@ -190,20 +191,13 @@ msgstr ""
 "Ce fichier est une archive B<ar> avec une valeur magique de B<!"
 "E<lt>archE<gt>>. Seul le format commun B<ar> est géré, sans extension pour "
 "les noms longs de fichiers, mais avec optionnellement un caractère « / » "
-"final, ce qui limite leur longueur utile à 15 caractères (sur les 16 "
-"autorisés). Les tailles de fichiers sont limitées à 10 chiffres décimaux "
+"final, ce qui limite leur longueur utile à 15 caractères (sur les "
+"16 autorisés). Les tailles de fichiers sont limitées à 10 chiffres décimaux "
 "ASCII, ce qui permet d'utiliser des fichiers membres d'une taille jusqu'à "
-"environ 9536,74 Mio."
+"environ 9536,74 Mio."
 
 #. type: Plain text
 #: deb.man
-#, fuzzy
-#| msgid ""
-#| "The B<tar> archives currently allowed are, the old-style (v7) format, the "
-#| "pre-POSIX ustar format, a subset of the GNU format (only the new style "
-#| "long pathnames and long linknames, supported since dpkg 1.4.1.17), and "
-#| "the POSIX ustar format (long names supported since dpkg 1.15.0).  "
-#| "Unrecognized tar typeflags are considered an error."
 msgid ""
 "The B<tar> archives currently allowed are, the old-style (v7) format, the "
 "pre-POSIX ustar format, a subset of the GNU format (new style long pathnames "
@@ -215,11 +209,17 @@ msgid ""
 "permits 95-bit tar entry sizes and negative timestamps, and 63-bit UID, GID "
 "and device numbers."
 msgstr ""
-"Les archives B<tar> actuellement gérées sont le format v7 d'origine, le "
+"Les archives B<tar> actuellement gérées sont le format v7 d'origine, le "
 "format ustar pré-POSIX, un sous-ensemble du format GNU (uniquement le "
 "nouveau format de noms longs pour les chemins et les liens, gérés depuis "
-"dpkg 1.4.1.17) et le format ustar POSIX (noms longs gérés depuis dpkg "
-"1.15.0). Les marqueurs tar (« typeflags ») inconnus provoquent une erreur."
+"dpkg 1.4.1.17 ; « large file metadata » depuis dpkg 1.18.24) et le format "
+"ustar POSIX (noms longs gérés depuis dpkg 1.15.0). Les marqueurs tar "
+"(« typeflags ») inconnus provoquent une erreur. La taille de chaque entrée "
+"dans une archive tar est limitée à 11 chiffres en octal ASCII ce qui permet "
+"d'utiliser des entrées tar d'une taille jusqu'à 8 Gio. La gestion des "
+"« large file metadata » de GNU permet des entrées tar 95 bits et des "
+"horodatages négatifs, ainsi que des numéros de 63 bits d'UID, GID et de "
+"périphériques."
 
 #. type: Plain text
 #: deb.man
@@ -255,15 +255,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb.man
-#, fuzzy
-#| msgid ""
-#| "The second required member is named B<control.tar>.  It is a tar archive "
-#| "containing the package control information, either not compressed "
-#| "(supported since dpkg 1.17.6), or compressed with gzip (with B<.gz> "
-#| "extension) or xz (with B<.xz> extension, supported since 1.17.6), as a "
-#| "series of plain files, of which the file B<control> is mandatory and "
-#| "contains the core control information. The control tarball may optionally "
-#| "contain an entry for `B<.>', the current directory."
 msgid ""
 "The second required member is named B<control.tar>.  It is a tar archive "
 "containing the package control information, either not compressed (supported "
@@ -276,13 +267,16 @@ msgid ""
 "tarball may optionally contain an entry for ‘B<.>’, the current directory."
 msgstr ""
 "Le second membre requis est nommé B<control.tar>. Il s'agit d'une archive "
-"tar, soit non compressée (gérée depuis dpkg 1.17.6) ou compressée grâce à "
-"gzip (avec extension B<.gz>) ou xz (avec extension B<.xz>, gérée depuis dpkg "
-"1.17.6), contenant les informations de contrôle du paquet, sous la forme "
-"d'une série de fichiers, parmi lesquels le fichier B<control> est  "
-"strictement requis et contient les principales informations de contrôle. "
-"L'archive de contrôle peut éventuellement contenir une entrée pour « . », le "
-"répertoire courant."
+"tar contenant les informations de contrôle du paquet, soit non compressée "
+"(gérée depuis dpkg 1.17.6) ou compressée grâce à gzip (avec extension B<."
+"gz>) ou xz (avec extension B<.xz>, gérée depuis dpkg 1.17.6), sous la forme "
+"d'une série de fichiers simples, parmi lesquels le fichier B<control> est "
+"strictement requis et contient les principales informations de contrôle, les "
+"fichiers B<conffiles>, B<triggers>, B<shlibs> et B<symbols> qui contiennent "
+"des informations de contrôle optionnelles, et les fichiers B<preinst>, "
+"B<postinst>, B<prerm> et B<postrm> qui sont des scripts optionnels du "
+"responsable. L'archive de contrôle peut éventuellement contenir une entrée "
+"pour « . », le répertoire courant."
 
 #. type: Plain text
 #: deb.man
@@ -296,22 +290,13 @@ msgid ""
 msgstr ""
 "Le troisième et dernier membre obligatoire est appelé B<data.tar>. Il "
 "contient le système de fichiers sous forme d'une archive tar, soit non "
-"compressée (gérée depuis dpkg 1.10.24) ou compressée avec gzip (avec "
-"extension B<.gz>), xz (avec extensions B<.xz>, gérée depuis dpkg 1.15.6), "
-"bzip2 (avec extensions B<.bz2>, gérée depuis dpkg 1.10.24) ou lzma (avec "
-"extension B<.lzma>, gérée depuis dpkg 1.13.25)."
+"compressée (gérée depuis dpkg 1.10.24) ou compressée avec gzip (avec "
+"extension B<.gz>), xz (avec extensions B<.xz>, gérée depuis dpkg 1.15.6), "
+"bzip2 (avec extensions B<.bz2>, gérée depuis dpkg 1.10.24) ou lzma (avec "
+"extension B<.lzma>, gérée depuis dpkg 1.13.25)."
 
 #. type: Plain text
 #: deb.man
-#, fuzzy
-#| msgid ""
-#| "These members must occur in this exact order. Current implementations "
-#| "should ignore any additional members after B<data.tar>.  Further members "
-#| "may be defined in the future, and (if possible) will be placed after "
-#| "these three. Any additional members that may need to be inserted after "
-#| "B<debian-binary> and before B<control.tar> or B<data.tar> and which "
-#| "should be safely ignored by older programs, will have names starting with "
-#| "an underscore, `B<_>'."
 msgid ""
 "These members must occur in this exact order. Current implementations should "
 "ignore any additional members after B<data.tar>.  Further members may be "
@@ -320,13 +305,13 @@ msgid ""
 "and before B<control.tar> or B<data.tar> and which should be safely ignored "
 "by older programs, will have names starting with an underscore, ‘B<_>’."
 msgstr ""
-"Ces trois membres doivent apparaître dans cet ordre exact. Les "
-"implémentations actuelles devraient ignorer tout membre additionnel suivant "
-"B<data.tar>. D'autres membres seront éventuellement proposés, et (si "
-"possible) seront placés après ces trois derniers. Tout autre membre qui "
-"nécessitera d'être inséré après B<debian-binary> et avant B<control.tar> ou "
-"B<data.tar> et qui pourra être ignoré sans problème par des programmes plus "
-"anciens, aura un nom commençant par un caractère de soulignement, « B<_> »."
+"Ces membres doivent apparaître dans cet ordre exact. Les implémentations "
+"actuelles devraient ignorer tout membre additionnel après B<data.tar>. "
+"D'autres membres seront éventuellement proposés, et (si possible) seront "
+"placés après ces trois derniers. Tout autre membre qui nécessitera d'être "
+"inséré après B<debian-binary> et avant B<control.tar> ou B<data.tar> et qui "
+"pourra être ignoré sans problème par des programmes plus anciens, aura un "
+"nom commençant par un caractère de soulignement, « B<_> »."
 
 #. type: Plain text
 #: deb.man
@@ -399,19 +384,20 @@ msgid ""
 "triggers>(5), B<deb-shlibs>(5), B<deb-symbols>(5), B<deb-preinst>(5), B<deb-"
 "postinst>(5), B<deb-prerm>(5), B<deb-postrm>(5)."
 msgstr ""
+"B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5), B<deb-conffiles>(5), B<deb-"
+"triggers>(5), B<deb-shlibs>(5), B<deb-symbols>(5), B<deb-preinst>(5), B<deb-"
+"postinst>(5), B<deb-prerm>(5), B<deb-postrm>(5)."
 
 #. type: TH
 #: deb822.man
 #, no-wrap
 msgid "deb822"
-msgstr ""
+msgstr "deb822"
 
 #. type: Plain text
 #: deb822.man
-#, fuzzy
-#| msgid "deb - Debian binary package format"
 msgid "deb822 - Debian RFC822 control data format"
-msgstr "deb - Format des paquets binaires Debian"
+msgstr "deb822 - Format des données de contrôle RFC822 Debian"
 
 #. type: Plain text
 #: deb822.man
@@ -422,12 +408,18 @@ msgid ""
 "which control the installation of uploaded files (B<dpkg>'s internal "
 "databases are in a similar format)."
 msgstr ""
+"Le système de gestion de paquets manipule des données représentées dans un "
+"format commun, connues comme I<données de contrôle>, stockées dans les "
+"I<fichiers de contrôle>. Les fichiers de contrôle sont utilisés pour les "
+"paquets source, les paquets binaires et les fichiers B<.changes> qui "
+"contrôlent l'installation des fichiers téléversés (les bases de données "
+"internes de B<dpkg> sont dans un format similaire)."
 
 #. type: SH
 #: deb822.man
 #, no-wrap
 msgid "SYNTAX"
-msgstr ""
+msgstr "SYNTAXE"
 
 #. type: Plain text
 #: deb822.man
@@ -443,6 +435,18 @@ msgid ""
 "from the source.)  The ordering of the paragraphs in control files is "
 "significant."
 msgstr ""
+"Un fichier de contrôle consiste en un ou plusieurs paragraphes de champs "
+"(les paragraphes sont aussi parfois appelés strophes, « stanzas »). Les "
+"paragraphes sont séparés par des lignes vides. Les analyseurs peuvent "
+"accepter des lignes qui ne contiennent que des caractères U+0020 B<ESPACE> "
+"et U+0009 B<TABULATION> comme séparateurs de paragraphes, mais les fichiers "
+"de contrôle utiliseront des lignes vides. Certains fichiers de contrôle "
+"acceptent seulement un paragraphe unique, d'autres plusieurs, dans ce cas, "
+"chaque paragraphe fait référence habituellement à un paquet différent. (Par "
+"exemple, dans les paquets source, le premier paragraphe fait référence au "
+"paquet source, et les paragraphes suivants font références aux paquets "
+"binaires créés à partir du source.) L'ordre des paragraphes dans les "
+"fichiers de contrôles est important."
 
 #. type: Plain text
 #: deb822.man
@@ -455,6 +459,14 @@ msgid ""
 "U+007E ‘B<~>’, inclusive).  Field names must not begin with the comment "
 "character (U+0023 ‘B<#>’), nor with the hyphen character (U+002D ‘B<->’)."
 msgstr ""
+"Chaque paragraphe consiste en une série de champs de données. Chaque champ "
+"est constitué d'un nom de champ suivi de deux-points (U+003A « B<:> »), puis "
+"les données ou valeur associées à ce champ. Le nom du champ est composé de "
+"caractères US-ASCII à l'exception des caractères de contrôle, de l'espace et "
+"des deux-points (c'est-à dire des caractères entre U+0021 « B<!> » et U+0039 "
+"« B<9> », et entre U+003B « B<;> » et U+007E « B<~> » compris). Les noms de "
+"champ ne doivent pas commencer par le caractère de commentaire « (U+0023 "
+"B<#> », ni par le caractère trait d'union (U+002D « B<-> »."
 
 #. type: Plain text
 #: deb822.man
@@ -465,18 +477,22 @@ msgid ""
 "conventional to put a single space after the colon.  For example, a field "
 "might be:"
 msgstr ""
+"Les champs se terminent à la fin de la ligne ou à la fin de la dernière "
+"ligne de continuation (voir ci-dessous). Une espace horizontale (U+0020 "
+"B<ESPACE> et U+0009 B<TABULATION>) peut apparaître immédiatement avant ou "
+"après la valeur et est ignorée dans ce cas ; par convention, il y une espace "
+"unique après les deux-points. Par exemple, un champ pourrait être :"
 
 #. type: Plain text
 #: deb822.man
-#, fuzzy, no-wrap
-#| msgid "Package flags"
+#, no-wrap
 msgid "Package: dpkg\n"
-msgstr "Drapeaux du paquet :"
+msgstr "Package: dpkg\n"
 
 #. type: Plain text
 #: deb822.man
 msgid "the field name is B<Package> and the field value B<dpkg>."
-msgstr ""
+msgstr "le nom du champ est B<Package> et la valeur du champ B<dpkg>."
 
 #. type: Plain text
 #: deb822.man
@@ -484,6 +500,8 @@ msgid ""
 "Empty field values are only permitted in source package control files "
 "(I<debian/control>).  Such fields are ignored."
 msgstr ""
+"Des valeurs de champ vides ne sont permises que dans les fichiers de "
+"contrôle des paquets source (I<debian/control>). Ces champs sont ignorés."
 
 #. type: Plain text
 #: deb822.man
@@ -491,18 +509,19 @@ msgid ""
 "A paragraph must not contain more than one instance of a particular field "
 "name."
 msgstr ""
+"Un paragraphe ne doit pas contenir plus d'une instance d'un nom de champ "
+"particulier."
 
 #. type: Plain text
 #: deb822.man
 msgid "There are three types of fields:"
-msgstr ""
+msgstr "Il y a trois types de champ :"
 
 #. type: TP
 #: deb822.man
-#, fuzzy, no-wrap
-#| msgid "B<Example>"
+#, no-wrap
 msgid "B<simple>"
-msgstr "B<Exemple>"
+msgstr "B<simple>"
 
 #. type: Plain text
 #: deb822.man
@@ -511,12 +530,15 @@ msgid ""
 "is not permitted.  This is the default field type if the definition of the "
 "field does not specify a different type."
 msgstr ""
+"Ce champ, y compris sa valeur, doit être une ligne unique. La coupure du "
+"champ est interdite. Il s'agit du type de champ par défaut lorsque la "
+"définition du champ ne précise pas un type différent. "
 
 #. type: TP
 #: deb822.man
 #, no-wrap
 msgid "B<folded>"
-msgstr ""
+msgstr "B<coupé>"
 
 #. type: Plain text
 #: deb822.man
@@ -526,6 +548,11 @@ msgid ""
 "a U+0020 B<SPACE> or a U+0009 B<TAB>.  Whitespace, including any newlines, "
 "is not significant in the field values of folded fields."
 msgstr ""
+"La valeur d'un champ coupé (« folded ») est une ligne logique qui peut "
+"s'étendre sur plusieurs lignes. Les lignes qui suivent la première sont "
+"appelées ligne de continuation et doivent commencer par un caractère U+0020 "
+"B<ESPACE> ou U+0009 B<TABULATION>. Une espace, y compris les caractères saut "
+"de ligne, n'est pas importante dans les valeurs de champ des champs coupés."
 
 #. type: Plain text
 #: deb822.man
@@ -534,13 +561,15 @@ msgid ""
 "contain only one paragraph and no multiline fields to be read by parsers "
 "written for RFC5322."
 msgstr ""
+"La méthode de coupure est similaire à RFC5322, permettant des fichiers de "
+"contrôle, qui contiennent seulement un paragraphe et pas des champs à "
+"plusieurs lignes, d'être lus par les analyseurs écrits pour RFC5322."
 
 #. type: TP
 #: deb822.man
-#, fuzzy, no-wrap
-#| msgid "B<half-configured>"
+#, no-wrap
 msgid "B<multiline>"
-msgstr "B<half-configured>"
+msgstr "B<à lignes multiples>"
 
 #. type: Plain text
 #: deb822.man
@@ -552,6 +581,13 @@ msgid ""
 "fields.  Whitespace, including newlines, is significant in the values of "
 "multiline fields."
 msgstr ""
+"La valeur d'un champ à lignes multiples peut comprendre de multiples lignes "
+"de continuation. La première ligne de la valeur, la partie sur la même ligne "
+"que le nom du champ, a souvent une signification particulière ou peut devoir "
+"être vide. Les autres lignes sont ajoutées avec la même syntaxe que les "
+"lignes de continuation des champs coupés. Une espace, y compris les "
+"caractères saut de ligne, est importante dans les valeurs des champs à "
+"lignes multiples."
 
 #. type: Plain text
 #: deb822.man
@@ -560,6 +596,9 @@ msgid ""
 "or anything else) or version numbers, or between the characters of multi-"
 "character version relationships."
 msgstr ""
+"Aucune espace ne doit apparaître dans les noms (de paquet, d'architecture, "
+"de fichier ou n'importe quoi d'autre) ou les numéros de version, ou entre "
+"les caractères des relations des versions multi-caractères."
 
 #. type: Plain text
 #: deb822.man
@@ -567,6 +606,8 @@ msgid ""
 "The presence and purpose of a field, and the syntax of its value may differ "
 "between types of control files."
 msgstr ""
+"La présence et le but d'un champ, ainsi que la syntaxe de sa valeur peuvent "
+"différer selon les types de fichiers de contrôle."
 
 #. type: Plain text
 #: deb822.man
@@ -575,6 +616,10 @@ msgid ""
 "names using mixed case as shown below.  Field values are case-sensitive "
 "unless the description of the field says otherwise."
 msgstr ""
+"Les noms de champ ne sont pas sensibles à la casse, mais il est habituel de "
+"mettre en capitale l'initiale des noms de champ utilisant une casse mixte "
+"comme indiqué plus bas. Les valeurs de champ sont sensibles à la casse à "
+"moins que la description du champ ne dise le contraire."
 
 #. type: Plain text
 #: deb822.man
@@ -584,6 +629,11 @@ msgid ""
 "fields.  Empty lines in field values are usually escaped by representing "
 "them by a U+0020 B<SPACE> followed by a dot (U+002E ‘B<.>’)."
 msgstr ""
+"Les séparateurs de paragraphes (lignes vides) et les lignes constituées "
+"uniquement de U+0020 B<ESPACE> et U+0009 B<TABULATION>, ne sont pas permis "
+"dans les valeurs de champ ou entre les champs. Les lignes vides dans les "
+"valeurs de champ sont habituellement protégées par une U+0020 B<ESPACE> "
+"suivie par un point (U+002E « B<.> »)."
 
 #. type: Plain text
 #: deb822.man
@@ -593,51 +643,41 @@ msgid ""
 "(I<debian/control>) and in B<deb-origin>(5) files.  These comment lines are "
 "ignored, even between two continuation lines.  They do not end logical lines."
 msgstr ""
+"Les lignes débutant par un U+0023 « B<#> », sans être précédée d'une espace "
+"sont des lignes de commentaires qui ne sont permises que dans les fichiers "
+"de contrôle de paquet source et dans les fichiers B<deb-origin>(5). Ces "
+"lignes de commentaires sont ignorées, même entre deux lignes de "
+"continuation. Elles ne peuvent terminer les lignes logiques."
 
 #. type: Plain text
 #: deb822.man
 msgid "All control files must be encoded in UTF-8."
-msgstr ""
+msgstr "Tous les fichiers de contrôle doivent être encodés en UTF-8."
 
 #. type: Plain text
 #: deb822.man
 msgid "B<RFC822>, B<RFC5322>."
-msgstr ""
+msgstr "B<RFC822>, B<RFC5322>."
 
 #. type: TH
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "deb-origin"
+#, no-wrap
 msgid "deb-buildinfo"
-msgstr "deb-origin"
+msgstr "deb-buildinfo"
 
 #. type: Plain text
 #: deb-buildinfo.man
-#, fuzzy
-#| msgid "deb-shlibs - Debian shared library information file"
 msgid "deb-buildinfo - Debian build information file format"
 msgstr ""
-"deb-shlibs - Fichier d'information sur les bibliothèques partagées Debian"
+"deb-buildinfo - Format des fichiers d'information de construction de Debian"
 
 #. type: Plain text
 #: deb-buildinfo.man
-#, fuzzy
-#| msgid "I<filename>B<.deb>"
 msgid "I<filename>B<.buildinfo>"
-msgstr "I<nom-du-fichier>B<.deb>"
+msgstr "I<nom-du-fichier>B<.buildinfo>"
 
 #. type: Plain text
 #: deb-buildinfo.man
-#, fuzzy
-#| msgid ""
-#| "Each Debian package contains the master `control' file, which contains a "
-#| "number of fields, or comments when the line starts with B<'#'>. Each "
-#| "field begins with a tag, such as B<Package> or B<Version> (case "
-#| "insensitive), followed by a colon, and the body of the field.  Fields are "
-#| "delimited only by field tags. In other words, field text may be multiple "
-#| "lines in length, but the installation tools will generally join lines "
-#| "when processing the body of the field (except in the case of the "
-#| "B<Description> field, see below)."
 msgid ""
 "Each Debian source package build can record the build information in a B<."
 "buildinfo> control file, which contains a number of fields.  Each field "
@@ -649,15 +689,17 @@ msgid ""
 "Changes>, B<Installed-Build-Depends>, B<Environment>, B<Checksums-Md5>, "
 "B<Checksums-Sha1> and B<Checksums-Sha256>, see below)."
 msgstr ""
-"Chaque paquet Debian possède un fichier principal de contrôle qui contient "
-"un certain nombre de champs ou de commentaires pour les lignes commençant "
-"par un caractère « B<#> ». Chaque champ commence par une étiquette, telle "
-"que B<Package> ou B<Version> (la casse n'importe pas), suivie d'un « : », et "
-"du contenu du champ. Les champs sont séparés seulement par des étiquettes de "
-"champ. En d'autres termes, le contenu d'un champ peut s'étendre sur "
-"plusieurs lignes, mais les outils d'installation joindront en général les "
-"lignes pendant le traitement du contenu du champ (sauf pour le champ "
-"B<Description>, voyez ci-dessous)."
+"Chaque construction de paquet source Debian peut enregistrer les "
+"informations de construction dans un fichier de contrôle B<.buildinfo> qui "
+"contient un certain nombre de champs. Chaque champ commence par une "
+"étiquette, telle que B<Source> ou B<Binary> (la casse n'importe pas), suivie "
+"d'un « : » et du contenu du champ. Les champs sont séparés seulement par des "
+"étiquettes de champ. En d'autres termes, le contenu d'un champ peut "
+"s'étendre sur plusieurs lignes, mais les outils d'installation joindront en "
+"général les lignes pendant le traitement du contenu du champ (sauf dans le "
+"cas des champs à lignes multiples  B<Binary-Only-Changes>, B<Installed-Build-"
+"Depends>, B<Environment>, B<Checksums-Md5>, B<Checksums-Sha1> et B<Checksums-"
+"Sha256>, voir ci-dessous)."
 
 #. type: Plain text
 #: deb-buildinfo.man deb-changes.man dsc.man
@@ -665,6 +707,8 @@ msgid ""
 "The control data might be enclosed in an OpenPGP ASCII Armored signature, as "
 "specified in RFC4880."
 msgstr ""
+"Les données de contrôle pourraient être incluses dans une signature OpenPGP "
+"« ASCII Armored », comme spécifié dans RFC4880."
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -677,20 +721,25 @@ msgid ""
 "build that includes B<source> the name will be I<source-name>B<_>I<source-"
 "version>B<_>B<source.buildinfo>."
 msgstr ""
+"Le nom du fichier B<.buildinfo> dépendra du type de construction et sera "
+"aussi spécifique que nécessaire mais pas plus ; lorsque la construction "
+"inclut B<any>, le nom sera I<nom-source>B<_>I<version-binaire>B<_>I<arch>B<."
+"buildinfo>, ou sinon pour une construction B<all> le nom sera I<nom-"
+"source>B<_>I<binary-version>B<_>B<all.buildinfo> ou encore pour une "
+"construction qui inclut B<source> le nom sera I<nom-source>B<_>I<version-"
+"source>B<_>B<source.buildinfo>."
 
 #. type: SH
 #: deb-buildinfo.man deb-changes.man deb-control.man deb-origin.man dsc.man
-#, fuzzy, no-wrap
-#| msgid "SOURCE FIELDS"
+#, no-wrap
 msgid "FIELDS"
-msgstr "LES CHAMPS SOURCE"
+msgstr "LES CHAMPS"
 
 #. type: TP
 #: deb-buildinfo.man deb-changes.man dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Description:> I<short-description> (required)"
+#, no-wrap
 msgid "B<Format:> I<format-version> (required)"
-msgstr "B<Description:> I<description courte> (requis)"
+msgstr "B<Format:> I<version-format> (requis)"
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -701,13 +750,18 @@ msgid ""
 "backward compatible changes (such as field additions) will bump the minor "
 "version.  The current format version is B<1.0>."
 msgstr ""
+"La valeur de ce champ déclare la version du format du fichier. La syntaxe de "
+"la valeur du champ est un numéro de version avec un composant majeur et "
+"mineur. Les modifications incompatibles avec les versions précédentes du "
+"format incrémenteront la version majeure, tandis que les modifications "
+"compatibles (telles que les ajouts de champ) incrémenteront la version "
+"mineure. La version de format actuelle est B<1.0>."
 
 #. type: TP
 #: deb-buildinfo.man deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Source:> I<source-package-name> (required)"
+#, no-wrap
 msgid "B<Source:> I<source-name> [B<(>I<source-version>B<)>] (required)"
-msgstr "B<Source:> I<nom-du-paquet-source> (requis)"
+msgstr "B<Source:> I<nom-source> [B<(>I<version-source>B<)>] (requis)"
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -717,35 +771,32 @@ msgid ""
 "version> in parenthesis.  This can happen when the build is for a binary-"
 "only non-maintainer upload."
 msgstr ""
+"Le nom du paquet source. Si la version du source diffère de la version "
+"binaire, alors le I<nom-source> sera suivi par une I<version-source> entre "
+"parenthèses. Cela peut arriver quand la construction concerne un envoi "
+"seulement binaire NMU (« non-maintainer upload »)."
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Package:> I<binary-package-name> (required)"
+#: deb-buildinfo.man
+#, no-wrap
 msgid "B<Binary:> I<binary-package-list> (required)"
-msgstr "B<Package:> I<nom-du-paquet-binaire> (requis)"
+msgstr "B<Binary:> I<liste-paquets-binaires> (requis)"
 
 #. type: Plain text
 #: deb-buildinfo.man
 msgid "This folded field is a space-separated list of binary packages built."
 msgstr ""
+"Ce champ coupé est une liste, séparée par des espaces, de paquets binaires "
+"construits."
 
 #. type: TP
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
+#, no-wrap
 msgid "B<Architecture:> I<arch-list> (required)"
-msgstr "B<Architecture:> I<arch>|B<all>|B<any> (requis)"
+msgstr "B<Architecture:> I<liste-architectures> (requis)"
 
 #. type: Plain text
 #: deb-buildinfo.man
-#, fuzzy
-#| msgid ""
-#| "The architecture specifies which type of hardware this package was "
-#| "compiled for. Common architectures are `i386', `m68k', `sparc', `alpha', "
-#| "`powerpc' etc. Note that the B<all> option is meant for packages that are "
-#| "architecture independent. Some examples of this are shell and Perl "
-#| "scripts, and documentation."
 msgid ""
 "This space-separated field lists the architectures of the files currently "
 "being built.  Common architectures are B<amd64>, B<armel>, B<i386>, etc.  "
@@ -754,28 +805,21 @@ msgid ""
 "entry B<source> is also present.  Architecture wildcards must never be "
 "present in the list."
 msgstr ""
-"L'architecture précise pour quel type de matériel le paquet a été compilé. "
-"Voici quelques architectures habituelles : « i386 », « m68k », « sparc », "
-"« alpha », « powerpc », etc. Remarquez que l'option B<all> signifie que le "
-"paquet est indépendant de toute architecture. C'est le cas, par exemple, des "
-"scripts d'interpréteur de commandes (shell) ou Perl, ainsi que de la "
-"documentation."
+"Ce champ, séparé par des espaces, liste les architectures des fichiers "
+"actuellement en construction. Voici quelques architectures habituelles : "
+"B<amd64>, B<armel>, B<i386>, etc. Remarquez que l'option B<all> signifie que "
+"le paquet est indépendant de toute architecture. Si le source du paquet est "
+"aussi en construction, l'entrée spéciale B<source> est aussi présente. Les "
+"architectures joker ne doivent jamais être présentes dans la liste."
 
 #. type: TP
 #: deb-buildinfo.man deb-changes.man deb-control.man dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Version:>I< version-string>"
+#, no-wrap
 msgid "B<Version:> I<version-string> (required)"
-msgstr "B<Version:>I< chaîne-de-la-version>"
+msgstr "B<Version:> I<chaîne-de-la-version> (requis)"
 
 #. type: Plain text
 #: deb-buildinfo.man deb-changes.man dsc.man
-#, fuzzy
-#| msgid ""
-#| "Typically, this is the original package's version number in whatever form "
-#| "the program's author uses. It may also include a Debian revision number "
-#| "(for non-native packages). The exact format and sorting algorithm are "
-#| "described in B<deb-version>(5)."
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses.  It may also include a Debian revision number "
@@ -785,30 +829,22 @@ msgstr ""
 "C'est classiquement le numéro de version du paquet d'origine dans la forme "
 "choisie par l'auteur du programme. Il peut y avoir aussi un numéro de "
 "révision Debian (pour les paquets non natifs). Le format exact et "
-"l'algorithme de tri sont décrits dans B<deb-version>(5)."
+"l'algorithme de tri sont décrits dans B<deb-version>(7)."
 
 #. type: TP
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<binary:Version>"
+#, no-wrap
 msgid "B<Binary-Only-Changes:>"
-msgstr "B<binary:Version>"
+msgstr "B<Binary-Only-Changes:>"
 
 #. type: TQ
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<Changes:>I< changelog-entries>"
+#, no-wrap
 msgid "I<changelog-entry>"
-msgstr "B<Changes:>I< entrées-du-fichier-des-changements>"
+msgstr "I<entrées-du-changelog>"
 
 #. type: Plain text
 #: deb-buildinfo.man
-#, fuzzy
-#| msgid ""
-#| "The text of all changelog entries is concatenated. To make this field a "
-#| "valid Debian control format multiline field empty lines are replaced with "
-#| "a single full stop and all lines is intended by one space character. The "
-#| "exact content depends on the changelog format."
 msgid ""
 "This multiline field contains the concatenated text of the changelog entry "
 "for a binary-only non-maintainer upload (binNMU) if that is the case.  To "
@@ -816,36 +852,35 @@ msgid ""
 "full stop (‘.’) and all lines are indented by one space character.  The "
 "exact content depends on the changelog format."
 msgstr ""
-"Les textes de toutes les entrées de changelog sont concaténés. Pour faire de "
-"ce champ un champ de contrôle Debian valide, les lignes multiples qui sont "
-"vides sont remplacées par un point B<« . »> et toutes les lignes sont "
-"indentées par une seule espace. Le contenu exact dépend du format du "
-"changelog."
+"Ce champ à lignes multiples contient le texte concaténé des entrées de "
+"changelog pour un envoi seulement binaire (binNMU), si c'est le cas. Pour "
+"faire de ce champ un champ à lignes multiples valable, les lignes vides sont "
+"remplacées par un point B<« . »> et toutes les lignes sont indentées par une "
+"seule espace. Le contenu exact dépend du format du changelog."
 
 #. type: TP
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<Package:> I<binary-package-name> (required)"
+#, no-wrap
 msgid "B<Checksums-Md5:> (required)"
-msgstr "B<Package:> I<nom-du-paquet-binaire> (requis)"
+msgstr "B<Checksums-Md5:> (requis)"
 
 #. type: TQ
 #: deb-buildinfo.man deb-changes.man dsc.man
 #, no-wrap
 msgid "B<Checksums-Sha1:> (required)"
-msgstr ""
+msgstr "B<Checksums-Sha1:> (requis)"
 
 #. type: TQ
 #: deb-buildinfo.man deb-changes.man dsc.man
 #, no-wrap
 msgid "B<Checksums-Sha256:> (required)"
-msgstr ""
+msgstr "B<Checksums-Sha256:> (requis)"
 
 #. type: TQ
 #: deb-buildinfo.man deb-changes.man dsc.man
 #, no-wrap
 msgid " I<checksum> I<size> I<filename>"
-msgstr ""
+msgstr "I<somme-de-contrôle> I<taille> I<nom-du-fichier>"
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -855,6 +890,11 @@ msgid ""
 "algorithm used: MD5 for B<Checksums-Md5>, SHA-1 for B<Checksums-Sha1> and "
 "SHA-256 for B<Checksums-Sha256>."
 msgstr ""
+"Ces champs à lignes multiples contiennent la liste des fichiers avec la "
+"somme de contrôle et la taille de chacun. Ces champs ont la même syntaxe et "
+"ne diffèrent que par l'algorithme de somme de contrôle utilisé : MD5 pour "
+"B<Checksums-Md5>, SHA-1 pour B<Checksums-Sha1> et SHA-256 pour B<Checksums-"
+"Sha256>."
 
 #. type: Plain text
 #: deb-buildinfo.man deb-changes.man
@@ -865,18 +905,22 @@ msgid ""
 "space-separated entries describing the file: the checksum, the file size, "
 "and the file name."
 msgstr ""
+"La première ligne de la valeur du champ (la partie sur la même ligne que le "
+"nom du champ suivi par deux-points) est toujours vide. Le contenu du champ "
+"est exprimé par des lignes de continuation, une ligne par fichier. Chaque "
+"ligne consiste en des entrées séparées par des espaces décrivant le fichier :"
+"la somme de contrôle, la taille du fichier et le nom du fichier."
 
 #. type: Plain text
 #: deb-buildinfo.man
 msgid "These fields list all files that make up the build."
-msgstr ""
+msgstr "Ces champs listent tous les fichiers qui composent la construction."
 
 #. type: TP
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<Origin:>I< name>"
+#, no-wrap
 msgid "B<Build-Origin:> I<name>"
-msgstr "B<Origin:>I< nom>"
+msgstr "B<Build-Origin:> I<nom>"
 
 #. type: Plain text
 #: deb-buildinfo.man deb-control.man dsc.man
@@ -885,10 +929,9 @@ msgstr "Nom de la distribution dont ce paquet provient."
 
 #. type: TP
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
+#, no-wrap
 msgid "B<Build-Architecture:> I<arch> (required)"
-msgstr "B<Architecture:> I<arch>|B<all>|B<any> (requis)"
+msgstr "B<Build-Architecture:> I<arch> (requis)"
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -896,13 +939,14 @@ msgid ""
 "The Debian architecture for the installation the packages is being built "
 "in.  Common architectures are B<amd64>, B<armel>, B<i386>, etc."
 msgstr ""
+"L'architecture Debian pour l'installation des paquets en construction. Les "
+"architectures habituelles sont B<amd64>, B<armel>, B<i386>, etc."
 
 #. type: TP
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<Date:>I< date>"
+#, no-wrap
 msgid "B<Build-Date:> I<build-date>"
-msgstr "B<Date:>I< date>"
+msgstr "B<Build-Date:> I<date-construction>"
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -910,13 +954,14 @@ msgid ""
 "The date the package was built.  It must be in the same format as the date "
 "in a B<deb-changelog>(5)  entry."
 msgstr ""
+"La date à laquelle le paquet a été construit. Elle peut être au même format "
+"que la date dans les entrées dans B<deb-changelog>(5)."
 
 #. type: TP
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<Kernel-Version:>I< value>"
+#, no-wrap
 msgid "B<Build-Kernel-Version:> I<build-kernel-version>"
-msgstr "B<Kernel-Version:>I< valeur>"
+msgstr "B<Build-Kernel-Version:> I<version-du-noyau-de-construction>"
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -925,12 +970,16 @@ msgid ""
 "the build system.  This field is only going to be present if the builder has "
 "explicitly requested it, to avoid leaking possibly sensitive information."
 msgstr ""
+"La publication et la version (dans un format non spécifié) du noyau exécuté "
+"dans le système de construction. Ce champ va seulement être présent si le "
+"constructeur l'a demandé explicitement, pour éviter de révéler des "
+"informations potentiellement sensibles."
 
 #. type: TP
 #: deb-buildinfo.man
 #, no-wrap
 msgid "B<Build-Path:> I<build-path>"
-msgstr ""
+msgstr "B<Build-Path:> I<chemin-de-construction>"
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -939,6 +988,10 @@ msgid ""
 "field is only going to be present if the vendor has whitelisted it via some "
 "pattern match to avoid leaking possibly sensitive information."
 msgstr ""
+"Le chemin de construction absolu qui correspond à l'arborescence des sources "
+"dépaquetée. Ce champ va seulement être présent si le distributeur l'a mis en "
+"liste blanche grâce à une recherche de motif pour éviter de révéler des "
+"informations potentiellement sensibles."
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -946,20 +999,127 @@ msgid ""
 "On Debian and derivatives only build paths starting with I</build/> will "
 "emit this field."
 msgstr ""
+"Dans Debian et ses dérivés, seuls les chemins de construction débutant par "
+"I</build/> émettront ce champ."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<Build-Tainted-By:>"
+msgstr "B<Build-Tainted-By:>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr "I<liste-des-raisons-de-souillure>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+"Ce champ coupé est une liste, séparée par des espaces, non exhaustive des "
+"étiquettes de raison (formées de caractères alphanumériques et de tirets) "
+"qui définissent pourquoi la construction actuelle a été souillée (depuis "
+"dpkg 1.19.5)."
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+"Dans Debian et ses dérivées, les étiquettes de raisons suivantes peuvent "
+"être émises."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr "B<merged-usr-via-symlinks>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+"Le système possède un I</usr> fusionné au moyen de liens symboliques. Cela "
+"peut tromper B<dpkg-query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-"
+"alternatives> et tous les autres outils qui utilisent les noms de chemin "
+"comme clés de leurs bases de données, parce que cela crée des problèmes "
+"d'alias du système de fichiers, et perturbe la compréhension du système de "
+"fichiers que B<dpkg> a enregistré dans sa base de données. Pour des systèmes "
+"construits qui codent en dur les noms de chemin vers des binaires ou des "
+"bibliothèques particuliers sur les objets produits, cela peut aussi produire "
+"des paquets qui seront incompatibles avec des systèmes de fichiers sans I</"
+"usr> fusionné."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-configs>"
+msgstr "B<usr-local-has-configs>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr "Le système a des fichiers de configuration dans I</usr/local/etc>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-includes>"
+msgstr "B<usr-local-has-includes>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr "Le système a des fichiers d'en-tête dans I</usr/local/include>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr "B<usr-local-has-programs>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+"Le système a des programmes dans I</usr/local/bin> ou I</usr/local/sbin>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-libraries>"
+msgstr "B<usr-local-has-libraries>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+"Le système a des bibliothèques statiques ou partagées dans I</usr/local/lib>."
 
 #. type: TP
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<reinst-required>"
+#, no-wrap
 msgid "B<Installed-Build-Depends:> (required)"
-msgstr "B<reinst-required>"
+msgstr "B<Installed-Build-Depends:> (requis)"
 
 #. type: TQ
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "I<package>"
+#, no-wrap
 msgid "I<package-list>"
-msgstr "I<paquet>"
+msgstr "I<liste-paquets>"
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -967,6 +1127,8 @@ msgid ""
 "The list of installed and configured packages that might affect the package "
 "build process."
 msgstr ""
+"La liste des paquets installés et configurés que pourrait affecter le "
+"processus de construction du paquet."
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -975,6 +1137,9 @@ msgid ""
 "foreign architectures, with an exact version restriction, separated by "
 "commas."
 msgstr ""
+"La liste contient le nom de chaque paquet, éventuellement avec une "
+"qualification d'architecture pour celles différentes, avec une restriction "
+"de version précise, séparés par des virgules."
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -985,6 +1150,11 @@ msgid ""
 "dependencies.  On Debian and derivatives the dependency builtin is B<build-"
 "essential>."
 msgstr ""
+"La liste inclut tous les paquets essentiels, les paquets listés dans les "
+"champs de contrôle des sources B<Build-Depends>, B<Build-Depends-Arch>, "
+"B<Build-Depends-Indep>, chaque dépendance interne spécifique au "
+"distributeur, et toutes leurs dépendances récursives. Dans Debian et ses "
+"dérivés, une dépendance interne est B<build-essential>."
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -993,18 +1163,21 @@ msgid ""
 "alternatives and all providers of virtual packages depended on will be "
 "included."
 msgstr ""
+"Pour les dépendances provenant des champs de contrôle des sources, toutes "
+"les alternatives de dépendance et tous les fournisseurs de paquets virtuels "
+"dépendants seront inclus."
 
 #. type: TP
 #: deb-buildinfo.man
 #, no-wrap
 msgid "B<Environment:>"
-msgstr ""
+msgstr "B<Environment:>"
 
 #. type: TQ
 #: deb-buildinfo.man
 #, no-wrap
 msgid "I<variable-list>"
-msgstr ""
+msgstr "I<liste-de-variables>"
 
 #. type: Plain text
 #: deb-buildinfo.man
@@ -1014,36 +1187,33 @@ msgid ""
 "the variable's quoted value, using double quotes (‘\"’), and backslashes "
 "escaped (‘\\e\\e’)."
 msgstr ""
+"La liste des variables d'environnement qui sont connues pour affecter le "
+"processus de construction du paquet. Chaque variable d'environnement est "
+"suivie d'un signe égal (« = ») et de la valeur de la variable protégé avec "
+"des guillemets doubles (« \" ») et des barres obliques inverses (« \\e\\e »)."
 
 #. type: Plain text
 #: deb-buildinfo.man
-#, fuzzy
-#| msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgid "B<deb-changes>(5), B<deb-version>(7), B<dpkg-genbuildinfo>(1)."
-msgstr "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
+msgstr "B<deb-changes>(5), B<deb-version>(7), B<dpkg-genbuildinfo>(1)."
 
 #. type: TH
 #: deb-changelog.man
-#, fuzzy, no-wrap
-#| msgid "B<debian/changelog>"
+#, no-wrap
 msgid "deb-changelog"
-msgstr "B<debian/changelog>"
+msgstr "deb-changelog"
 
 #. type: Plain text
 #: deb-changelog.man
-#, fuzzy
-#| msgid "deb-src-control - Debian source packages' master control file format"
 msgid "deb-changelog - dpkg source packages' changelog file format"
 msgstr ""
-"deb-src-control - Format du fichier principal de contrôle dans les paquets "
-"source Debian"
+"deb-changelog - Format du fichier de journal des modifications "
+"(« changelog ») des paquets source dpkg"
 
 #. type: Plain text
 #: deb-changelog.man
-#, fuzzy
-#| msgid "dpkg-parsechangelog"
 msgid "changelog"
-msgstr "dpkg-parsechangelog"
+msgstr "changelog"
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1053,6 +1223,10 @@ msgid ""
 "package compared to the upstream one as well as other changes and updates to "
 "the package."
 msgstr ""
+"Les modifications de la version empaquetée d'un projet sont expliquées dans "
+"le fichier I<debian/changelog>. Cela comprend les modifications réalisées "
+"dans les sources par rapport au paquet amont ainsi que les autres "
+"modifications et mises à jour du paquet."
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1061,11 +1235,14 @@ msgid ""
 "discover which version of the package is being built and find out other "
 "release-specific information."
 msgstr ""
+"Le format de I<debian/changelog> permet aux outils de construction du paquet "
+"de découvrir la version du paquet en construction et de découvrir d'autres "
+"informations spécifiques à la version."
 
 #. type: Plain text
 #: deb-changelog.man
 msgid "That format is a series of entries like this:"
-msgstr ""
+msgstr "Ce format est une série d'entrées comme celles-ci :"
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1080,12 +1257,23 @@ msgid ""
 "          [optional blank line(s), stripped]\n"
 " -- I<maintainer-name> E<lt>I<email-address>E<gt>  I<date>\n"
 msgstr ""
+"I<paquet> (I<version>) I<distributions>; I<métadonnées>\n"
+"          [ligne(s) blanches(s) facultative(s), retirée(s)]\n"
+"  * I<détails-de-modification>\n"
+"    I<plus-de-détails-de-modification>\n"
+"          [ligne(s) blanches(s), y compris dans la sortie de\n"
+"          B<dpkg-parsechangelog>(1)]\n"
+"  * I<encore-plus-de-détails-de-modification>\n"
+"          [ligne(s) blanches(s) facultative(s), retirée(s)]\n"
+" -- I<nom-responsable> E<lt>I<adresse-électronique>E<gt>  I<date>\n"
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
 "I<package> and I<version> are the source package name and version number."
 msgstr ""
+"I<paquet> et (I<version>) sont le nom et le numéro de version du paquet "
+"source."
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1094,6 +1282,10 @@ msgid ""
 "version should be installed when it is uploaded; it is copied to the "
 "B<Distribution> field in the I<.changes> file."
 msgstr ""
+"I<distributions> liste une ou plusieurs distributions, séparées par une "
+"espace, dans lesquelles cette version peut être installée après "
+"téléchargement ; l'entrée est copiée dans le champ B<Distribution> dans le "
+"fichier I<.changes>."
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1106,6 +1298,14 @@ msgid ""
 "upload (an automatic binary rebuild with the only change being the changelog "
 "entry)."
 msgstr ""
+"I<metadata> est une liste séparée par des virgules de paires I<mot-"
+"clé>=I<valeur>. Les seuls I<mots-clés> gérés actuellement par B<dpkg> sont "
+"B<urgency> et B<binary-only>. La valeur d'B<urgency> est utilisée pour le "
+"champ B<Urgency> dans le fichier I<.changes> pour l'envoi. B<binary-only> "
+"avec une valeur B<yes> est utilisé pour indiquer que cette entrée de "
+"changelog est liée à un envoi seulement binaire (binNMU) (une reconstruction "
+"automatique du binaire avec uniquement une modification de l'entrée du "
+"changelog)."
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1116,6 +1316,12 @@ msgid ""
 "line with the start of the text above.  Blank lines may be used here to "
 "separate groups of changes, if desired."
 msgstr ""
+"Les détails de modification peuvent être en fait une série de lignes "
+"démarrant par au moins deux espaces, mais par convention, chaque "
+"modification débute par un astérisque et une espace de séparation et les "
+"lignes de continuation sont indentées de telle manière qu'elles s'alignent "
+"sur le début du texte au-dessus. Des lignes blanches peuvent être utilisées "
+"pour séparer des groupes de modifications, si désiré."
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1124,12 +1330,16 @@ msgid ""
 "system, they may be automatically closed on the inclusion of this package "
 "into the distribution archive by including the string:"
 msgstr ""
+"Si cet envoi résout des bogues enregistrés dans le système de suivi de "
+"bogues de la distribution, ceux-ci peuvent être automatiquement fermés lors "
+"de l'inclusion de ce paquet dans l'archive de la distribution en incluant la "
+"chaîne :"
 
 #. type: Plain text
 #: deb-changelog.man
 #, no-wrap
 msgid "  B<Closes: Bug#>I<nnnnn>\n"
-msgstr ""
+msgstr "  B<Closes: Bug#>I<nnnnn>\n"
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1138,6 +1348,10 @@ msgid ""
 "\\es*(?:bug)?\\e#?\\es?\\ed+(?:,\\es*(?:bug)?\\e#?\\es?\\ed+)*/i>).  This "
 "information is conveyed via the B<Closes> field in the I<.changes> file."
 msgstr ""
+"dans les détails de modification (l'expression rationnelle précise en Perl "
+"est B</closes:\\es*(?:bug)?\\e#?\\es?\\ed+(?:,\\es*(?:bug)?\\e#?\\es?\\ed+)*/"
+"i>). Cette information est transmise à travers le champs B<Closes> dans le "
+"I<.changes>."
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1149,6 +1363,13 @@ msgid ""
 "changes> file, and then later might be used to send an acknowledgement when "
 "the upload has been installed in the distribution archive."
 msgstr ""
+"Le nom du responsable et l'adresse électronique utilisés dans le changelog "
+"seront les détails sur la personne qui a préparé cette version du paquet. Ce "
+"ne sont B<pas> nécessairement ceux de celui qui fait l'envoi ou du "
+"responsable habituel du paquet. Ces informations seront copiées dans le "
+"champ B<Changed-By> du fichier I<.changes>, et pourront plus tard être "
+"utilisées pour envoyer une confirmation lorsque l'envoi a été installé dans "
+"l'archive de la distribution."
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1156,45 +1377,50 @@ msgid ""
 "The I<date> has the following format (compatible and with the same semantics "
 "of RFC2822 and RFC5322, or what «date -R» generates):"
 msgstr ""
+"La I<date> est au format suivant (compatible et avec la même sémantique que "
+"RFC2822 et RFC5322, ou avec ce que crée « date -R ») :"
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
 "I<day-of-week>B<,> I<dd> I<month> I<yyyy> I<hh>B<:>I<mm>B<:>I<ss> B<+>I<zzzz>"
 msgstr ""
+"I<jour-de-la-semaine>B<,> I<jj> I<mois> I<aaaa> I<hh>B<:>I<mm>B<:>I<ss> B<"
+"+>I<zzzz>"
 
 #. type: Plain text
 #: deb-changelog.man
 msgid "where:"
-msgstr ""
+msgstr "où :"
 
 #. type: TP
 #: deb-changelog.man
 #, no-wrap
 msgid "I<day-of-week>"
-msgstr ""
+msgstr "I<jour-de-la-semaine>"
 
 #. type: Plain text
 #: deb-changelog.man
 msgid "Is one of: B<Mon>, B<Tue>, B<Wed>, B<Thu>, B<Fri>, B<Sat>, B<Sun>."
 msgstr ""
+"C'est au choix : B<Mon>, B<Tue>, B<Wed>, B<Thu>, B<Fri>, B<Sat>, B<Sun>."
 
 #. type: TP
 #: deb-changelog.man
 #, no-wrap
 msgid "I<dd>"
-msgstr ""
+msgstr "I<jj>"
 
 #. type: Plain text
 #: deb-changelog.man
 msgid "Is a one- or two-digit day of the month (B<01>-B<31>)."
-msgstr ""
+msgstr "C'est le numéro, à un ou deux chiffres, du jour du mois (B<01>-B<31>)."
 
 #. type: TP
 #: deb-changelog.man
 #, no-wrap
 msgid "I<month>"
-msgstr ""
+msgstr "I<mois>"
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1202,56 +1428,58 @@ msgid ""
 "Is one of: B<Jan>, B<Feb>, B<Mar>, B<Apr>, B<May>, B<Jun>, B<Jul>, B<Aug>, "
 "B<Sep>, B<Oct>, B<Nov>, B<Dec>."
 msgstr ""
+"C'est au choix : B<Jan>, B<Feb>, B<Mar>, B<Apr>, B<May>, B<Jun>, B<Jul>, "
+"B<Aug>, B<Sep>, B<Oct>, B<Nov>, B<Dec>."
 
 #. type: TP
 #: deb-changelog.man
 #, no-wrap
 msgid "I<yyyy>"
-msgstr ""
+msgstr "I<aaaa>"
 
 #. type: Plain text
 #: deb-changelog.man
 msgid "Is the four-digit year (e.g. 2010)."
-msgstr ""
+msgstr "C'est l'année en chiffre (par exemple 2010)."
 
 #. type: TP
 #: deb-changelog.man
 #, no-wrap
 msgid "I<hh>"
-msgstr ""
+msgstr "I<hh>"
 
 #. type: Plain text
 #: deb-changelog.man
 msgid "Is the two-digit hour (B<00>-B<23>)."
-msgstr ""
+msgstr "Il s'agit de l'heure en deux chiffres (B<00>-B<23>)."
 
 #. type: TP
 #: deb-changelog.man
 #, no-wrap
 msgid "I<mm>"
-msgstr ""
+msgstr "I<mm>"
 
 #. type: Plain text
 #: deb-changelog.man
 msgid "Is the two-digit minutes (B<00>-B<59>)."
-msgstr ""
+msgstr "Il s'agit des minutes en deux chiffres (B<00>-B<59>)."
 
 #. type: TP
 #: deb-changelog.man
 #, no-wrap
 msgid "I<ss>"
-msgstr ""
+msgstr "I<ss>"
 
 #. type: Plain text
 #: deb-changelog.man
 msgid "Is the two-digit seconds (B<00>-B<60>)."
-msgstr ""
+msgstr "Il s'agit des secondes en deux chiffres (B<00>-B<59>)."
 
 #. type: TP
 #: deb-changelog.man
 #, no-wrap
 msgid "[B<+->]I<zzzz>"
-msgstr ""
+msgstr "[B<+->]I<zzzz>"
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1263,6 +1491,13 @@ msgid ""
 "additional minutes difference from UTC.  The last two digits must be in the "
 "range B<00>-B<59>."
 msgstr ""
+"Il s'agit du décalage horaire par rapport au temps universel coordonné "
+"(UTC). « B<+> » indique que l'heure est en avance (c'est-à-dire à l'est) par "
+"rapport à l'UTC et « B<-> » indique que l'heure est en retard (c'est-à-dire "
+"à l'ouest) par rapport à l'UTC. Les deux premiers chiffres indiquent la "
+"différence d'heures par rapport à l'UTC et les deux derniers le nombre de "
+"minutes additionnelles par rapport à l'UTC. Ces deux derniers chiffres "
+"doivent être entre B<00> et B<59>."
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1272,27 +1507,37 @@ msgid ""
 "preceded by exactly one space.  The maintainer details and the date must be "
 "separated by exactly two spaces."
 msgstr ""
+"La première ligne de « titre » avec le nom du paquet doit débuter à la marge "
+"gauche. La ligne terminale avec les détails sur le responsable et la date "
+"doit être précédée d'une espace précisément. Les détails sur le responsable "
+"et la date doivent être séparés par exactement deux espaces."
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
+"Toute ligne qui consiste uniquement (c'est-à-dire sans espace au début de la "
+"ligne) en commentaires de style B<#> ou B</* */>, mots-clés RCS."
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
+"Les lignes de mode (« modeline ») de Vim ou variables locales d'Emacs et les "
+"anciennes entrées de changelog avec d'autres formats à la fin du fichier "
+"devraient être acceptées et conservées à la sortie, mais leur contenu "
+"pourrait être autrement ignoré et l'analyse arrêtée à ce moment-là."
 
 #. type: Plain text
 #: deb-changelog.man
 msgid "The entire changelog must be encoded in UTF-8."
-msgstr ""
+msgstr "La totalité du journal des modifications doit être encodé en UTF-8."
 
 #. type: SH
 #: deb-changelog.man deb-substvars.man dpkg.man dpkg-architecture.man
@@ -1306,10 +1551,9 @@ msgstr "FICHIERS"
 
 #. type: TP
 #: deb-changelog.man
-#, fuzzy, no-wrap
-#| msgid "B<debian/changelog>"
+#, no-wrap
 msgid "I<debian/changelog>"
-msgstr "B<debian/changelog>"
+msgstr "I<debian/changelog>"
 
 #. type: SH
 #: deb-changelog.man deb-shlibs.man deb-symbols.man dpkg.man
@@ -1323,7 +1567,7 @@ msgstr "EXEMPLES"
 #: deb-changelog.man
 #, no-wrap
 msgid "dpkg (1.17.18) unstable; urgency=low\n"
-msgstr ""
+msgstr "dpkg (1.17.18) unstable; urgency=low\n"
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1334,6 +1578,10 @@ msgid ""
 "    as the code is mapping the minimum version 0 to '' to avoid outputting\n"
 "    useless versions. Regression introduced in dpkg 1.17.17. Closes: #764929\n"
 msgstr ""
+"  [ Guillem Jover ]\n"
+"  * Handle empty minimum versions when initializing dependency versions,\n"
+"    as the code is mapping the minimum version 0 to '' to avoid outputting\n"
+"    useless versions. Regression introduced in dpkg 1.17.17. Closes: #764929\n"
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1342,6 +1590,8 @@ msgid ""
 "  [ Updated programs translations ]\n"
 "  * Catalan (Guillem Jover).\n"
 msgstr ""
+"  [ Updated programs translations ]\n"
+"  * Catalan (Guillem Jover).\n"
 
 #. type: Plain text
 #: deb-changelog.man
@@ -1351,54 +1601,39 @@ msgid ""
 "  * Catalan (Guillem Jover).\n"
 "  * German (Sven Joachim).\n"
 msgstr ""
+"  [ Updated dselect translations ]\n"
+"  * Catalan (Guillem Jover).\n"
+"  * German (Sven Joachim).\n"
 
 #. type: Plain text
 #: deb-changelog.man
 #, no-wrap
 msgid " -- Guillem Jover E<lt>guillem@debian.orgE<gt>  Sun, 12 Oct 2014 15:47:44 +0200\n"
-msgstr ""
+msgstr " -- Guillem Jover E<lt>guillem@debian.orgE<gt>  Sun, 12 Oct 2014 15:47:44 +0200\n"
 
 #. type: Plain text
 #: deb-changelog.man
-#, fuzzy
-#| msgid ""
-#| "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
 msgid "B<deb-version>(7), B<deb-changes>(5), B<dpkg-parsechangelog>(1)."
-msgstr "B<deb-override>(5), B<deb-extra-override>(5), B<dpkg-scanpackages>(1)."
+msgstr "B<deb-version>(7), B<deb-changes>(5), B<dpkg-parsechangelog>(1)."
 
 #. type: TH
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "dpkg-genchanges"
+#, no-wrap
 msgid "deb-changes"
-msgstr "dpkg-genchanges"
+msgstr "deb-changes"
 
 #. type: Plain text
 #: deb-changes.man
-#, fuzzy
-#| msgid "dpkg-genchanges - generate Debian .changes files"
 msgid "deb-changes - Debian changes file format"
-msgstr "dpkg-genchanges - Créer des fichiers « .changes »."
+msgstr "deb-changes - Format des fichiers « .changes » Debian"
 
 #. type: Plain text
 #: deb-changes.man
-#, fuzzy
-#| msgid "I<filename>B<.deb>"
 msgid "I<filename>B<.changes>"
-msgstr "I<nom-du-fichier>B<.deb>"
+msgstr "I<nom-du-fichier>B<.changes>"
 
 #. type: Plain text
 #: deb-changes.man
-#, fuzzy
-#| msgid ""
-#| "Each Debian package contains the master `control' file, which contains a "
-#| "number of fields, or comments when the line starts with B<'#'>. Each "
-#| "field begins with a tag, such as B<Package> or B<Version> (case "
-#| "insensitive), followed by a colon, and the body of the field.  Fields are "
-#| "delimited only by field tags. In other words, field text may be multiple "
-#| "lines in length, but the installation tools will generally join lines "
-#| "when processing the body of the field (except in the case of the "
-#| "B<Description> field, see below)."
 msgid ""
 "Each Debian upload is composed of a .changes control file, which contains a "
 "number of fields.  Each field begins with a tag, such as B<Source> or "
@@ -1409,15 +1644,15 @@ msgid ""
 "multiline fields B<Description>, B<Changes>, B<Files>, B<Checksums-Sha1> and "
 "B<Checksums-Sha256>, see below)."
 msgstr ""
-"Chaque paquet Debian possède un fichier principal de contrôle qui contient "
-"un certain nombre de champs ou de commentaires pour les lignes commençant "
-"par un caractère « B<#> ». Chaque champ commence par une étiquette, telle "
-"que B<Package> ou B<Version> (la casse n'importe pas), suivie d'un « : », et "
-"du contenu du champ. Les champs sont séparés seulement par des étiquettes de "
-"champ. En d'autres termes, le contenu d'un champ peut s'étendre sur "
-"plusieurs lignes, mais les outils d'installation joindront en général les "
-"lignes pendant le traitement du contenu du champ (sauf pour le champ "
-"B<Description>, voyez ci-dessous)."
+"Chaque envoi dans Debian est composé d'un fichier de contrôle .changes qui "
+"contient un certain nombre de champs. Chaque champ commence par une "
+"étiquette, telle que B<Source> ou B<Binary> (la casse n'importe pas), suivie "
+"d'un « : », et du contenu du champ. Les champs sont séparés seulement par "
+"des étiquettes de champ. En d'autres termes, le contenu d'un champ peut "
+"s'étendre sur plusieurs lignes, mais les outils d'installation joindront en "
+"général les lignes pendant le traitement du contenu du champ (sauf pour les "
+"champs à lignes multiples B<Description>, B<Changes>, B<Files>, B<Checksums-"
+"Sha1> et B<Checksums-Sha256>, voir ci-dessous)."
 
 #. type: Plain text
 #: deb-changes.man
@@ -1428,13 +1663,18 @@ msgid ""
 "backward compatible changes (such as field additions) will bump the minor "
 "version.  The current format version is B<1.8>."
 msgstr ""
+"La valeur de ce champ déclare la version du format du fichier. La syntaxe de "
+"la valeur du champ est un numéro de version avec un composant majeur et "
+"mineur. Les modifications incompatibles avec les versions précédentes du "
+"format incrémenteront la version majeure, tandis que les modifications "
+"compatibles (telles que les ajouts de champ) incrémenteront la version "
+"mineure. La version de format actuelle est B<1.8>."
 
 #. type: TP
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Package:> I<binary-package-name> (required)"
+#, no-wrap
 msgid "B<Date:> I<release-date> (required)"
-msgstr "B<Package:> I<nom-du-paquet-binaire> (requis)"
+msgstr "B<Date:> I<date-publication> (requis)"
 
 #. type: Plain text
 #: deb-changes.man
@@ -1442,15 +1682,18 @@ msgid ""
 "The date the package was built or last edited.  It must be in the same "
 "format as the date in a B<deb-changelog>(5)  entry."
 msgstr ""
+"La date à laquelle le paquet a été construit ou modifié pour la dernière "
+"fois. Elle doit avoir le même format que la date dans l'entrée deB<deb-"
+"changelog>(5)."
 
 #. type: Plain text
 #: deb-changes.man
-#, fuzzy
-#| msgid "The value of this field determines the vendor name."
 msgid ""
 "The value of this field is usually extracted from the I<debian/changelog> "
 "file."
-msgstr "La valeur de ce champ donne le nom du distributeur."
+msgstr ""
+"La valeur de ce champ est habituellement extraite du fichier I<debian/"
+"changelog>."
 
 #. type: Plain text
 #: deb-changes.man
@@ -1460,29 +1703,35 @@ msgid ""
 "version> in parenthesis.  This can happen when the upload is a binary-only "
 "non-maintainer upload."
 msgstr ""
+"Le nom du paquet source. Si la version du source diffère de la version "
+"binaire, alors le I<nom-source> sera suivi par une I<version-source> entre "
+"parenthèses. Cela peut arriver quand il s'agit d'un envoi seulement binaire "
+"NMU (« non-maintainer upload »)."
+
+#. type: TP
+#: deb-changes.man
+#, no-wrap
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Binary:> I<liste-paquets-binaires> (requis selon le contexte)"
 
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
+"Ce champ coupé est une liste, séparée par des espaces, de paquets binaires à "
+"envoyer. Si l'envoi ne concerne que les sources, le champ est omis (depuis "
+"dpkg 1.19.3)."
 
 #. type: TP
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Architecture:> I<arch>|B<all>"
+#, no-wrap
 msgid "B<Architecture:> I<arch-list>"
-msgstr "B<Architecture:> I<arch>|B<all>"
+msgstr "B<Architecture:> I<liste-architectures>"
 
 #. type: Plain text
 #: deb-changes.man
-#, fuzzy
-#| msgid ""
-#| "The architecture specifies which type of hardware this package was "
-#| "compiled for. Common architectures are `i386', `m68k', `sparc', `alpha', "
-#| "`powerpc' etc. Note that the B<all> option is meant for packages that are "
-#| "architecture independent. Some examples of this are shell and Perl "
-#| "scripts, and documentation."
 msgid ""
 "Lists the architectures of the files currently being uploaded.  Common "
 "architectures are B<amd64>, B<armel>, B<i386>, etc.  Note that the B<all> "
@@ -1490,19 +1739,18 @@ msgid ""
 "source for the package is also being uploaded, the special entry B<source> "
 "is also present.  Architecture wildcards must never be present in the list."
 msgstr ""
-"L'architecture précise pour quel type de matériel le paquet a été compilé. "
-"Voici quelques architectures habituelles : « i386 », « m68k », « sparc », "
-"« alpha », « powerpc », etc. Remarquez que l'option B<all> signifie que le "
-"paquet est indépendant de toute architecture. C'est le cas, par exemple, des "
-"scripts d'interpréteur de commandes (shell) ou Perl, ainsi que de la "
-"documentation."
+"Liste des architectures des fichiers actuellement envoyés. Voici quelques "
+"architectures habituelles : B<amd64>, B<armel>, B<i386>, etc. Remarquez que "
+"l'option B<all> signifie que le paquet est indépendant de toute "
+"architecture. Si les sources du paquet sont également envoyées, l'entrée "
+"spéciale B<source> est aussi présente. Les architectures joker ne doivent "
+"jamais être présentes dans la liste."
 
 #. type: TP
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Description:> I<short-description> (required)"
+#, no-wrap
 msgid "B<Distribution:> I<distribution>s (required)"
-msgstr "B<Description:> I<description courte> (requis)"
+msgstr "B<Distribution:> I<distribution>s (requis)"
 
 #. type: Plain text
 #: deb-changes.man
@@ -1510,13 +1758,14 @@ msgid ""
 "Lists one or more space-separated distributions where this version should be "
 "installed when it is uploaded to the archive."
 msgstr ""
+"Liste une ou plusieurs distributions, séparées par des espaces, dans "
+"lesquelles cette version peut être installée après envoi dans l'archive."
 
 #. type: TP
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Urgency:>I< urgency>"
+#, no-wrap
 msgid "B<Urgency:> I<urgency> (recommended)"
-msgstr "B<Urgency:>I< priorité>"
+msgstr "B<Urgency:> I<urgence> (recommandé)"
 
 #. type: Plain text
 #: deb-changes.man
@@ -1524,77 +1773,72 @@ msgid ""
 "The urgency of the upload.  The currently known values, in increasing order "
 "of urgency, are: B<low>, B<medium>, B<high>, B<critical> and B<emergency>."
 msgstr ""
+"L'urgence de l'envoi. Les valeurs actuelles reconnues sont, par ordre "
+"croissant d'urgence : B<low>, B<medium>, B<high>, B<critical> et "
+"B<emergency>."
 
 #. type: TP
 #: deb-changes.man
 #, no-wrap
 msgid "B<Maintainer:> I<fullname-email> (required)"
-msgstr "B<Maintainer:> I<nom complet et adresse électronique> (requis)"
+msgstr "B<Maintainer:> I<nom-complet-et-adresse-électronique> (requis)"
 
 #. type: Plain text
 #: deb-changes.man
-#, fuzzy
-#| msgid ""
-#| "Should be in the format `Joe Bloggs E<lt>jbloggs@foo.comE<gt>', and is "
-#| "typically the person who created the package, as opposed to the author of "
-#| "the software that was packaged."
 msgid ""
 "Should be in the format “Joe Bloggs E<lt>jbloggs@example.orgE<gt>”, and is "
 "typically the person who created the package, as opposed to the author of "
 "the software that was packaged."
 msgstr ""
-"Le format de ce champ sera « Jean Dupont E<lt>jdupont@foo.comE<gt> » ; et "
-"c'est bien sûr le créateur du paquet, par opposition à l'auteur du programme "
-"mis en paquet."
+"Le format de ce champ sera « Jean Dupont E<lt>jdupont@example.orgE<gt> » ; "
+"et c'est bien sûr le créateur du paquet, par opposition à l'auteur du "
+"programme mis en paquet."
 
 #. type: TP
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Maintainer:>I< fullname-email>"
+#, no-wrap
 msgid "B<Changed-By:>I< fullname-email>"
-msgstr "B<Maintainer:>I< nom-complet-et-adresse-électronique>"
+msgstr "B<Changed-By:>I< nom-complet-et-adresse-électronique>"
 
 #. type: Plain text
 #: deb-changes.man
-#, fuzzy
-#| msgid ""
-#| "Should be in the format `Joe Bloggs E<lt>jbloggs@foo.comE<gt>', and is "
-#| "typically the person who created the package, as opposed to the author of "
-#| "the software that was packaged."
 msgid ""
 "Should be in the format “Joe Bloggs E<lt>jbloggs@example.orgE<gt>”, and is "
 "typically the person who prepared the package changes for this release."
 msgstr ""
-"Le format de ce champ sera « Jean Dupont E<lt>jdupont@foo.comE<gt> » ; et "
-"c'est bien sûr le créateur du paquet, par opposition à l'auteur du programme "
-"mis en paquet."
+"Le format de ce champ sera « Jean Dupont E<lt>jdupont@example.orgE<gt> » ; "
+"et c'est bien sûr celui qui a préparé les modifications du paquet pour cette "
+"version."
 
 #. type: TP
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Description:>I< short-description>"
+#, no-wrap
 msgid "B<Description:> (recommended)"
-msgstr "B<Description:>I< description-courte>"
+msgstr "B<Description:> (recommandé)"
 
 #. type: TQ
 #: deb-changes.man
 #, no-wrap
 msgid " I<binary-package-name> B<-> I<binary-package-summary>"
-msgstr ""
+msgstr " I<nom-du-paquet-binaire> B<-> I<résumé-du-paquet-binaire>"
 
 #. type: Plain text
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
+"Ce champ à lignes multiples contient une liste de noms de paquets binaires "
+"suivis d'une espace, d'un tiret (« B<-> ») et de leur description courte "
+"éventuellement tronquée. Si l'envoi ne concerne que les sources, le champ "
+"est omis (depuis dpkg 1.19.3)."
 
 #. type: TP
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Closes:>I< bug-number>"
+#, no-wrap
 msgid "B<Closes:>I< bug-number-list>"
-msgstr "B<Closes:>I< numéro-bogue>"
+msgstr "B<Closes:>I< liste-numéros-bogue>"
 
 #. type: Plain text
 #: deb-changes.man
@@ -1604,28 +1848,33 @@ msgid ""
 "automatically close the referred bug numbers in the distribution bug "
 "tracking system."
 msgstr ""
+"Une liste, séparée par des espaces, de numéros de rapports de bogue qui ont "
+"été résolus par cet envoi. Le logiciel d'archive de la distribution pourrait "
+"utiliser ce champ pour fermer automatiquement les bogues dont les numéros "
+"sont référencés dans le système de suivi de bogues (BTS) de la distribution."
 
 #. type: TP
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<binary:Version>"
+#, no-wrap
 msgid "B<Binary-Only: yes>"
-msgstr "B<binary:Version>"
+msgstr "B<Binary-Only: yes>"
 
 #. type: Plain text
 #: deb-changes.man
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
+"Ce champ indique que l'envoi est une construction seulement binaire "
+"indépendante (NMU). Il est issu de la paire clé/valeur B<binary-only=yes> de "
+"l'entrée metadata du changelog."
 
 #. type: TP
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Build-Conflicts:>I< package list>"
+#, no-wrap
 msgid "B<Built-For-Profiles:>I< profile-list>"
-msgstr "B<Build-Conflicts:>I< liste de paquets>"
+msgstr "B<Built-For-Profiles:>I< liste-de-profils>"
 
 #. type: Plain text
 #: deb-changes.man
@@ -1633,53 +1882,46 @@ msgid ""
 "This field specifies a whitespace separated list of build profiles that this "
 "upload was built with."
 msgstr ""
+"Ce champ définit une liste, séparée par des espaces, de profils de "
+"construction avec lesquels cet envoi a été construit."
 
 #. type: TP
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Package:> I<binary-package-name> (required)"
+#, no-wrap
 msgid "B<Changes:> (required)"
-msgstr "B<Package:> I<nom-du-paquet-binaire> (requis)"
+msgstr "B<Changes:> (requis)"
 
 #. type: TQ
 #: deb-changes.man
-#, fuzzy, no-wrap
-#| msgid "B<Changes:>I< changelog-entries>"
+#, no-wrap
 msgid "I<changelog-entries>"
-msgstr "B<Changes:>I< entrées-du-fichier-des-changements>"
+msgstr "I<entrées-du-journal-des-modifications>"
 
 #. type: Plain text
 #: deb-changes.man
-#, fuzzy
-#| msgid ""
-#| "The text of all changelog entries is concatenated. To make this field a "
-#| "valid Debian control format multiline field empty lines are replaced with "
-#| "a single full stop and all lines is intended by one space character. The "
-#| "exact content depends on the changelog format."
 msgid ""
 "This multiline field contains the concatenated text of all changelog entries "
 "that are part of the upload.  To make this a valid multiline field empty "
 "lines are replaced with a single full stop (‘.’) and all lines are indented "
 "by one space character.  The exact content depends on the changelog format."
 msgstr ""
-"Les textes de toutes les entrées de changelog sont concaténés. Pour faire de "
-"ce champ un champ de contrôle Debian valide, les lignes multiples qui sont "
-"vides sont remplacées par un point B<« . »> et toutes les lignes sont "
-"indentées par une seule espace. Le contenu exact dépend du format du "
-"changelog."
+"Ce champ à lignes multiples fournit le texte concaténé de toutes les entrées "
+"de changelog faisant partie de cet envoi. Pour faire de ce champ à lignes "
+"multiples valable, les lignes vides sont remplacées par un point « B<.> » et "
+"toutes les lignes sont indentées par une seule espace. Le contenu exact "
+"dépend du format du changelog."
 
 #. type: TP
 #: deb-changes.man dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<reinst-required>"
+#, no-wrap
 msgid "B<Files:> (required)"
-msgstr "B<reinst-required>"
+msgstr "B<Files:> (requis)"
 
 #. type: TQ
 #: deb-changes.man
 #, no-wrap
 msgid " I<md5sum> I<size> I<section> I<priority> I<filename>"
-msgstr ""
+msgstr "I<md5sum> I<taille> I<section> I<priorité> I<nom-de-fichier>"
 
 #. type: Plain text
 #: deb-changes.man
@@ -1687,6 +1929,8 @@ msgid ""
 "This multiline field contains a list of files with an md5sum, size, section "
 "and priority for each one."
 msgstr ""
+"Ce champ à lignes multiples fournit une liste de fichiers avec la md5sum, la "
+"taille, la section et la priorité de chacun."
 
 #. type: Plain text
 #: deb-changes.man
@@ -1697,6 +1941,12 @@ msgid ""
 "space-separated entries describing the file: the md5sum, the file size, the "
 "file section, the file priority, and the file name."
 msgstr ""
+"La première ligne de la valeur du champ (la partie sur la même ligne que le "
+"nom du champ suivi par deux-points) est toujours vide. Le contenu du champ "
+"est exprimé sous la forme de lignes de continuation, un ligne par fichier. "
+"Chaque ligne consiste en des entrées, séparées par des espaces, décrivant le "
+"fichier : la md5sum, la taille du fichier, sa section, sa priorité et son "
+"nom."
 
 #. type: Plain text
 #: deb-changes.man
@@ -1705,6 +1955,9 @@ msgid ""
 "this field must match the list of files in the other related B<Checksums> "
 "fields."
 msgstr ""
+"Ce champ liste tous les fichiers qui composent l'envoi. La liste de fichiers "
+"de ce champ doit correspondre à celle présente dans les autres champs "
+"relatifs aux B<Checksums>."
 
 #. type: Plain text
 #: deb-changes.man
@@ -1714,6 +1967,10 @@ msgid ""
 "algorithm used: SHA-1 for B<Checksums-Sha1> and SHA-256 for B<Checksums-"
 "Sha256>."
 msgstr ""
+"Ces champs à lignes multiples fournissent une liste de fichiers avec la "
+"somme de contrôle et la taille de chacun. Ces champs ont la même syntaxe et "
+"ne diffèrent que par l'algorithme de somme de contrôle utilisé : SHA-1 pour "
+"B<Checksums-Sha1> et SHA-256 pour B<Checksums-Sha256>."
 
 #. type: Plain text
 #: deb-changes.man
@@ -1722,10 +1979,13 @@ msgid ""
 "these fields must match the list of files in the B<Files> field and the "
 "other related B<Checksums> fields."
 msgstr ""
+"Ces champs listent tous les fichiers qui composent l'envoi. La liste de "
+"fichiers de ce champ doit correspondre à celle présente dans le champ "
+"B<Files> et les autres champs relatifs aux B<Checksums>."
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr "BOGUES"
@@ -1734,17 +1994,19 @@ msgstr "BOGUES"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
+"Le champ B<Files> n'est pas cohérent avec des autres fichiers B<Checksums>. "
+"Les champs B<Changed-By> et B<Maintainer> ont des noms qui provoquent la "
+"confusion. Le champ B<Distribution> fournit des informations sur ce à quoi "
+"une suite fait référence habituellement."
 
 #. type: Plain text
 #: deb-changes.man
-#, fuzzy
-#| msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgid "B<deb-src-control>(5), B<deb-version>(7)."
-msgstr "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
+msgstr "B<deb-src-control>(5), B<deb-version>(7)."
 
 #. type: TH
 #: deb-control.man
@@ -1754,11 +2016,10 @@ msgstr "deb-control"
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid "deb-control - Debian packages' master control file format"
 msgid "deb-control - Debian binary packages' master control file format"
 msgstr ""
-"deb-control - Format du fichier principal de contrôle dans les paquets Debian"
+"deb-control - Format du fichier principal de contrôle dans les paquets "
+"binaires Debian"
 
 #. type: Plain text
 #: deb-control.man
@@ -1767,16 +2028,6 @@ msgstr "contrôle"
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "Each Debian package contains the master `control' file, which contains a "
-#| "number of fields, or comments when the line starts with B<'#'>. Each "
-#| "field begins with a tag, such as B<Package> or B<Version> (case "
-#| "insensitive), followed by a colon, and the body of the field.  Fields are "
-#| "delimited only by field tags. In other words, field text may be multiple "
-#| "lines in length, but the installation tools will generally join lines "
-#| "when processing the body of the field (except in the case of the "
-#| "B<Description> field, see below)."
 msgid ""
 "Each Debian binary package contains the master I<control> file, which "
 "contains a number of fields.  Each field begins with a tag, such as "
@@ -1786,22 +2037,20 @@ msgid ""
 "generally join lines when processing the body of the field (except in the "
 "case of the B<Description> field, see below)."
 msgstr ""
-"Chaque paquet Debian possède un fichier principal de contrôle qui contient "
-"un certain nombre de champs ou de commentaires pour les lignes commençant "
-"par un caractère « B<#> ». Chaque champ commence par une étiquette, telle "
-"que B<Package> ou B<Version> (la casse n'importe pas), suivie d'un « : », et "
-"du contenu du champ. Les champs sont séparés seulement par des étiquettes de "
+"Chaque paquet Debian possède un fichier I<control> principal qui contient un "
+"certain nombre de champs. Chaque champ commence par une étiquette, telle que "
+"B<Package> ou B<Version> (la casse n'importe pas), suivie d'un « : », et du "
+"contenu du champ. Les champs sont séparés seulement par des étiquettes de "
 "champ. En d'autres termes, le contenu d'un champ peut s'étendre sur "
 "plusieurs lignes, mais les outils d'installation joindront en général les "
 "lignes pendant le traitement du contenu du champ (sauf pour le champ "
-"B<Description>, voyez ci-dessous)."
+"B<Description>, voir ci-dessous)."
 
 #. type: TP
 #: deb-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Package:> I<binary-package-name> (required)"
+#, no-wrap
 msgid "B<Package:> I<package-name> (required)"
-msgstr "B<Package:> I<nom-du-paquet-binaire> (requis)"
+msgstr "B<Package:> I<nom-du-paquet> (requis)"
 
 #. type: Plain text
 #: deb-control.man dsc.man
@@ -1814,37 +2063,24 @@ msgstr ""
 
 #. type: TP
 #: deb-control.man deb-src-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Package-Type:> B<deb>|B<udeb>"
+#, no-wrap
 msgid "B<Package-Type:> B<deb>|B<udeb>|I<type>"
-msgstr "B<Package-Type:> B<deb>|B<udeb>"
+msgstr "B<Package-Type:> B<deb>|B<udeb>|I<type>"
 
 #. type: Plain text
 #: deb-control.man deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "This field defines the type of the package. \"udeb\" is for size-"
-#| "constrained packages used by the debian installer. \"deb\" is the default "
-#| "value, it's assumed if the field is absent. More types might be added in "
-#| "the future."
 msgid ""
 "This field defines the type of the package.  B<udeb> is for size-constrained "
 "packages used by the debian installer.  B<deb> is the default value, it is "
 "assumed if the field is absent.  More types might be added in the future."
 msgstr ""
-"Ce champ indique le type de paquet. La valeur « udeb » est à utiliser pour "
+"Ce champ indique le type de paquet. La valeur B<udeb> est à utiliser pour "
 "les paquets à taille contrôlée utilisés par l'installateur Debian. La valeur "
-"« deb » est la valeur par défaut qui est utilisée si le champ n'est pas "
+"B<deb> est la valeur par défaut qui est utilisée si le champ n'est pas "
 "présent. De nouveaux types pourraient être ajoutés au fil du temps."
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "Typically, this is the original package's version number in whatever form "
-#| "the program's author uses. It may also include a Debian revision number "
-#| "(for non-native packages). The exact format and sorting algorithm are "
-#| "described in B<deb-version>(5)."
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
@@ -1854,22 +2090,16 @@ msgstr ""
 "C'est classiquement le numéro de version du paquet d'origine dans la forme "
 "choisie par l'auteur du programme. Il peut y avoir aussi un numéro de "
 "révision Debian (pour les paquets non natifs). Le format exact et "
-"l'algorithme de tri sont décrits dans B<deb-version>(5)."
+"l'algorithme de tri sont décrits dans B<deb-version>(7)."
 
 #. type: TP
 #: deb-control.man deb-src-control.man dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Maintainer:> I<fullname-email> (required)"
+#, no-wrap
 msgid "B<Maintainer:> I<fullname-email> (recommended)"
-msgstr "B<Maintainer:> I<nom complet et adresse électronique> (requis)"
+msgstr "B<Maintainer:> I<nom-complet-et-adresse-électronique> (recommandé)"
 
 #. type: Plain text
 #: deb-control.man dsc.man
-#, fuzzy
-#| msgid ""
-#| "Should be in the format `Joe Bloggs E<lt>jbloggs@foo.comE<gt>', and is "
-#| "typically the person who created the package, as opposed to the author of "
-#| "the software that was packaged."
 msgid ""
 "Should be in the format “Joe Bloggs E<lt>jbloggs@foo.comE<gt>”, and is "
 "typically the person who created the package, as opposed to the author of "
@@ -1881,10 +2111,9 @@ msgstr ""
 
 #. type: TQ
 #: deb-control.man deb-src-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Description:> I<short-description> (required)"
+#, no-wrap
 msgid "B<Description:> I<short-description> (recommended)"
-msgstr "B<Description:> I<description courte> (requis)"
+msgstr "B<Description:> I<description-courte> (recommandé)"
 
 #. type: TQ
 #: deb-control.man deb-src-control.man dsc.man
@@ -1894,13 +2123,6 @@ msgstr "B< >I<description-longue>"
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "The format for the package description is a short brief summary on the "
-#| "first line (after the \"Description\" field). The following lines should "
-#| "be used as a longer, more detailed description. Each line of the long "
-#| "description must be preceded by a space, and blank lines in the long "
-#| "description must contain a single '.' following the preceding space."
 msgid ""
 "The format for the package description is a short brief summary on the first "
 "line (after the B<Description> field). The following lines should be used as "
@@ -1909,33 +2131,27 @@ msgid ""
 "a single ‘B<.>’ following the preceding space."
 msgstr ""
 "Le format de la description du paquet est un résumé bref sur la première "
-"ligne (après le champ « Description »). Les lignes suivantes peuvent servir "
-"à une description plus longue et plus détaillée. Chaque ligne de cette "
+"ligne (après le champ B<Description>). Les lignes suivantes peuvent servir à "
+"une description plus longue et plus détaillée. Chaque ligne de cette "
 "description longue doit être précédée d'une espace ; quand c'est une ligne "
-"blanche, elle doit contenir un seul « . » après cette espace."
+"blanche, elle doit contenir un seul « B<.> » après cette espace."
 
 #. type: TP
 #: deb-control.man deb-src-control.man
 #, no-wrap
 msgid "B<Section:>I< section>"
-msgstr "B<Section:> I< section>"
+msgstr "B<Section:> I<section>"
 
 #. type: Plain text
 #: deb-control.man deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "This is a general field that gives the package a category based on the "
-#| "software that it installs. Some common sections are \"utils\", \"net\", "
-#| "\"mail\", \"text\", \"x11\", etc."
 msgid ""
 "This is a general field that gives the package a category based on the "
 "software that it installs.  Some common sections are B<utils>, B<net>, "
 "B<mail>, B<text>, B<x11>, etc."
 msgstr ""
 "Champ général qui indique la catégorie d'un paquet ; cette catégorie est "
-"fondée sur le programme que ce paquet installe. « Utils », « net », "
-"« mail », « text », « x11 », etc. représentent quelques catégories "
-"habituelles."
+"fondée sur le programme que ce paquet installe. B<utils>, B<net>, B<mail>, "
+"B<text>, B<x11>, etc., représentent quelques catégories habituelles."
 
 #. type: TP
 #: deb-control.man deb-src-control.man
@@ -1945,46 +2161,35 @@ msgstr "B<Priority:>I< priorité>"
 
 #. type: Plain text
 #: deb-control.man deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "Sets the importance of this package in relation to the system as a "
-#| "whole.  Common priorities are \"required\", \"standard\", \"optional\", "
-#| "\"extra\", etc."
 msgid ""
 "Sets the importance of this package in relation to the system as a whole.  "
 "Common priorities are B<required>, B<standard>, B<optional>, B<extra>, etc."
 msgstr ""
 "Définit l'importance du paquet à l'intérieur du système général. "
-"« Required », « standard », « optional », « extra », etc. représentent des "
+"B<required>, B<standard>, B<optional>, B<extra>, etc., représentent des "
 "priorités habituelles."
 
 #. type: Plain text
 #: deb-control.man deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "In Debian, the B<Section> and B<Priority> fields have a defined set of "
-#| "accepted values based on the Policy Manual.  A list of these values can "
-#| "be obtained from the latest version of the B<debian-policy> package."
 msgid ""
 "The B<Section> and B<Priority> fields usually have a defined set of accepted "
 "values based on the specific distribution policy."
 msgstr ""
 "Les champs B<Section> et B<Priority> possèdent un ensemble défini de valeurs "
-"acceptées, tiré de la Charte Debian (« Debian Policy »). On peut en trouver "
-"une liste dans la version la plus récente du paquet B<debian-policy>."
+"acceptées, tiré de la Charte particulière de la distribution."
 
 #. type: TP
 #: deb-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Installed-Size>"
+#, no-wrap
 msgid "B<Installed-Size:> size"
-msgstr "B<Installed-Size>"
+msgstr "B<Installed-Size:> I<taille>"
 
 #. type: Plain text
 #: deb-control.man
 msgid ""
 "The approximate total size of the package's installed files, in KiB units."
 msgstr ""
+"La taille approximative totale des fichiers installés du paquet, en Kio⋅"
 
 #. type: TP
 #: deb-control.man deb-src-control.man
@@ -2008,10 +2213,9 @@ msgstr ""
 
 #. type: TQ
 #: deb-control.man deb-src-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Essential:> B<yes>|B<no>"
+#, no-wrap
 msgid "B<Build-Essential:> B<yes>|B<no>"
-msgstr "B<Essential:> B<yes>|B<no>"
+msgstr "B<Build-Essential:> B<yes>|B<no>"
 
 #. type: Plain text
 #: deb-control.man
@@ -2020,23 +2224,18 @@ msgid ""
 "injected by the archive software.  It denotes a package that is required "
 "when building other packages."
 msgstr ""
+"Ce champ est habituellement nécessaire seulement si la réponse est B<yes>, "
+"et il est généralement injecté par le logiciel d'archive. Il désigne un "
+"paquet qui est requis lors de la construction d'autres paquets."
 
 #. type: TP
 #: deb-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Architecture:> I<arch>|B<all>"
+#, no-wrap
 msgid "B<Architecture:> I<arch>|B<all> (recommended)"
-msgstr "B<Architecture:> I<arch>|B<all>"
+msgstr "B<Architecture:> I<arch>|B<all> (recommandé)"
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "The architecture specifies which type of hardware this package was "
-#| "compiled for. Common architectures are `i386', `m68k', `sparc', `alpha', "
-#| "`powerpc' etc. Note that the B<all> option is meant for packages that are "
-#| "architecture independent. Some examples of this are shell and Perl "
-#| "scripts, and documentation."
 msgid ""
 "The architecture specifies which type of hardware this package was compiled "
 "for.  Common architectures are B<amd64>, B<armel>, B<i386>, B<powerpc>, "
@@ -2045,11 +2244,10 @@ msgid ""
 "documentation."
 msgstr ""
 "L'architecture précise pour quel type de matériel le paquet a été compilé. "
-"Voici quelques architectures habituelles : « i386 », « m68k », « sparc », "
-"« alpha », « powerpc », etc. Remarquez que l'option B<all> signifie que le "
-"paquet est indépendant de toute architecture. C'est le cas, par exemple, des "
-"scripts d'interpréteur de commandes (shell) ou Perl, ainsi que de la "
-"documentation."
+"Voici quelques architectures habituelles : B<amd64>, B<armel>, B<i386>, "
+"B<powerpc>, etc. Remarquez que l'option B<all> signifie que le paquet est "
+"indépendant de toute architecture. C'est le cas, par exemple, des scripts "
+"d'interpréteur de commandes (shell) ou Perl, ainsi que de la documentation."
 
 #. type: TP
 #: deb-control.man deb-src-control.man dsc.man
@@ -2097,15 +2295,14 @@ msgid ""
 "list of supported tags can be found in the B<debtags> package."
 msgstr ""
 "Liste d'étiquettes décrivant les qualités du paquet. La description et la "
-"liste des étiquettes (« tags ») gérées peut être trouvée dans le paquet "
+"liste des étiquettes (« tags ») gérées peuvent être trouvées dans le paquet "
 "B<debtags>."
 
 #. type: TP
 #: deb-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>|B<no>"
+#, no-wrap
 msgid "B<Multi-Arch:> B<no>|B<same>|B<foreign>|B<allowed>"
-msgstr "B<Multi-Arch:> B<same>|B<foreign>|B<allowed>|B<no>"
+msgstr "B<Multi-Arch:> B<no>|B<same>|B<foreign>|B<allowed>"
 
 #. type: Plain text
 #: deb-control.man
@@ -2113,12 +2310,14 @@ msgid ""
 "This field is used to indicate how this package should behave on a multi-"
 "arch installations."
 msgstr ""
+"Ce champ est utilisé pour indiquer comment ce paquet se comportera sur les "
+"installations multi-architectures."
 
 #. type: TP
 #: deb-control.man deb-src-control.man
 #, no-wrap
 msgid "B<no>"
-msgstr ""
+msgstr "B<no>"
 
 #. type: Plain text
 #: deb-control.man
@@ -2126,13 +2325,14 @@ msgid ""
 "This value is the default when the field is omitted, in which case adding "
 "the field with an explicit B<no> value is generally not needed."
 msgstr ""
+"C'est la valeur par défaut quand le champ est omis ; dans ce cas, ajouter le "
+"champ avec une valeur B<no> explicite est généralement inutile."
 
 #. type: TP
 #: deb-control.man
-#, fuzzy, no-wrap
-#| msgid "B<--rename>"
+#, no-wrap
 msgid "B<same>"
-msgstr "B<--rename>"
+msgstr "B<same>"
 
 #. type: Plain text
 #: deb-control.man
@@ -2141,13 +2341,15 @@ msgid ""
 "satisfy the dependency of any package of a different architecture from "
 "itself."
 msgstr ""
+"Ce paquet est co-installable avec lui-même, mais il ne doit pas être utilisé "
+"pour satisfaire la dépendance d'un paquet d'une autre architecture que la "
+"sienne."
 
 #. type: TP
 #: deb-control.man
-#, fuzzy, no-wrap
-#| msgid "B<--force-sign>"
+#, no-wrap
 msgid "B<foreign>"
-msgstr "B<--force-sign>"
+msgstr "B<foreign>"
 
 #. type: Plain text
 #: deb-control.man
@@ -2157,13 +2359,17 @@ msgid ""
 "from itself (if a dependency has an explicit arch-qualifier then the value "
 "B<foreign> is ignored)."
 msgstr ""
+"Ce paquet n'est pas co-installable avec lui-même, mais il pourra être "
+"autorisé pour permettre de satisfaire les dépendances sans qualification "
+"d'architecture d'un paquet d'une architecture différente de la sienne (si "
+"une dépendance a une qualification d'architecture explicite, alors la valeur "
+"B<foreign> est ignorée)."
 
 #. type: TP
 #: deb-control.man
-#, fuzzy, no-wrap
-#| msgid "B<--all>"
+#, no-wrap
 msgid "B<allowed>"
-msgstr "B<--all>"
+msgstr "B<allowed>"
 
 #. type: Plain text
 #: deb-control.man
@@ -2172,13 +2378,15 @@ msgid ""
 "they accept this package from a foreign architecture by qualifying the "
 "package name with B<:any>, but has no effect otherwise."
 msgstr ""
+"Cela permet aux dépendances inverses d'indiquer dans leur champ "
+"B<Depends>qu'elles acceptent ce paquet d'une autre architecture en "
+"qualifiant le nom du paquet avec B<:any>, mais n'a pas d'autres effets."
 
 #. type: TP
 #: deb-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Source:> I<source-package-name> (required)"
+#, no-wrap
 msgid "B<Source:> I<source-name> [B<(>I<source-version>B<)>]"
-msgstr "B<Source:> I<nom-du-paquet-source> (requis)"
+msgstr "B<Source:> I<nom-du-paquet-source> [B<(>I<version-source>B<)>]"
 
 #. type: Plain text
 #: deb-control.man
@@ -2190,6 +2398,12 @@ msgid ""
 "only non-maintainer upload, or when setting a different binary version via "
 "«B<dpkg-gencontrol -v>»."
 msgstr ""
+"Le nom du paquet source d'où est issu ce paquet binaire, s'il est différent "
+"du nom du paquet lui-même. Si la version des sources diffère de la version "
+"du binaire, alors le I<nom-du-paquet-source> sera suivi par la I<version-"
+"source> entre parenthèses. Cela peut arriver par exemple sur un envoi "
+"seulement binaire NMU (« non-maintainer upload »), ou lorsqu'une version "
+"différente de binaire est fixée avec « B<dpkg-gencontrol -v> »."
 
 #. type: TP
 #: deb-control.man deb-src-control.man
@@ -2228,16 +2442,6 @@ msgstr "B<Depends:>I< liste-de-paquets>"
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "List of packages that are required for this package to provide a non-"
-#| "trivial amount of functionality. The package maintenance software will "
-#| "not allow a package to be installed if the packages listed in its "
-#| "B<Depends> field aren't installed (at least not without using the force "
-#| "options).  In an installation, the postinst scripts of packages listed in "
-#| "Depends: fields are run before those of the packages which depend on "
-#| "them. On the opposite, in a removal, the prerm script of a package is run "
-#| "before those of the packages listed in its Depends: field."
 msgid ""
 "List of packages that are required for this package to provide a non-trivial "
 "amount of functionality. The package maintenance software will not allow a "
@@ -2252,10 +2456,11 @@ msgstr ""
 "important de fonctionnalités. Le programme de maintenance des paquets "
 "interdit l'installation d'un paquet quand les paquets répertoriés dans le "
 "champ B<Depends> ne sont pas installés (du moins tant qu'une option de "
-"forçage n'est pas utilisée) ; il lance les scripts « postinst » des paquets "
-"répertoriés dans les champs « Depends: » avant les scripts « postinst » des "
-"paquets qui dépendent d'eux. À l'inverse, lors d'une suppression, les "
-"scripts « prerm » des paquets sont lancés avant ceux de leurs dépendances."
+"forçage n'est pas utilisée). Lors d'une installation, il lance les scripts "
+"« postinst » des paquets répertoriés dans les champs B<Depends> avant les "
+"scripts « postinst » des paquets qui dépendent d'eux. À l'inverse, lors "
+"d'une suppression, le script « prerm » d'un paquet est lancé avant ceux des "
+"paquets listés dans son champ B<Depends>."
 
 #. type: TQ
 #: deb-control.man deb-src-control.man
@@ -2312,14 +2517,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "The syntax of B<Depends>, B<Pre-Depends>, B<Recommends> and B<Suggests> "
-#| "fields is a list of groups of alternative packages. Each group is a list "
-#| "of packages separated by vertical bar (or `pipe') symbols, `|'. The "
-#| "groups are separated by commas. Commas are to be read as `AND', and pipes "
-#| "as `OR', with pipes binding more tightly. Each package name is optionally "
-#| "followed by a version number specification in parentheses."
 msgid ""
 "The syntax of B<Depends>, B<Pre-Depends>, B<Recommends> and B<Suggests> "
 "fields is a list of groups of alternative packages. Each group is a list of "
@@ -2330,13 +2527,14 @@ msgid ""
 "followed by a version number specification in parentheses."
 msgstr ""
 "La syntaxe des champs B<Depends>, B<Pre-Depends>, B<Recommends> et "
-"B<Suggests> est une liste d'ensembles de paquets possibles. Chaque ensemble "
-"est une liste de paquets séparés par une barre verticale (le symbole du "
-"tube) « | ». Les ensembles sont séparés par des virgules. Une virgule "
-"représente un « ET » logique et une barre verticale représente un « OU » "
-"logique ; le tube a la précédence dans l'évaluation de l'expression. Chaque "
-"nom de paquet peut être suivi par une contrainte sur le numéro de version, "
-"celle-ci se trouve alors entre parenthèses."
+"B<Suggests> est une liste d'ensembles de paquets alternatifs. Chaque "
+"ensemble est une liste de paquets séparés par des barres verticales (le "
+"symbole du tube) « B<|> ». Les ensembles sont séparés par des virgules. Une "
+"virgule représente un « ET » logique et une barre verticale représente un "
+"« OU » logique ; le tube a la précédence dans l'évaluation de l'expression. "
+"Chaque nom de paquet est suivi éventuellement par un type d'architecture "
+"après deux-points « B<:> », et par une contrainte sur le numéro de version "
+"mise entre parenthèses."
 
 #. type: Plain text
 #: deb-control.man
@@ -2348,17 +2546,15 @@ msgid ""
 "architecture for that package name if the package has been marked as B<Multi-"
 "Arch: allowed>."
 msgstr ""
+"Un nom de type d'architecture peut être un nom d'architecture réelle de "
+"Debian (depuis dpkg 1.16.5) ou B<any> (depuis dpkg 1.16.2). S'il est omis, "
+"la valeur par défaut est l'architecture du paquet binaire actuel. Un nom "
+"d'architecture réelle de Debian correspondra exactement à l'architecture "
+"pour ce nom de paquet, B<any> correspondra à toute architecture pour ce nom "
+"de paquet si le paquet a été marqué B<Multi-Arch: allowed>."
 
 #. type: Plain text
 #: deb-control.man deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "A version number may start with a `E<gt>E<gt>', in which case any later "
-#| "version will match, and may specify or omit the Debian packaging revision "
-#| "(separated by a hyphen). Accepted version relationships are \"E<gt>E<gt>"
-#| "\" for greater than, \"E<lt>E<lt>\" for less than, \"E<gt>=\" for greater "
-#| "than or equal to, \"E<lt>=\" for less than or equal to, and \"=\" for "
-#| "equal to."
 msgid ""
 "A version number may start with a ‘B<E<gt>E<gt>>’, in which case any later "
 "version will match, and may specify or omit the Debian packaging revision "
@@ -2367,13 +2563,13 @@ msgid ""
 "than or equal to, ‘B<E<lt>=>’ for less than or equal to, and ‘B<=>’ for "
 "equal to."
 msgstr ""
-"Une contrainte sur le numéro de version peut commencer par « E<gt>E<gt> », "
-"et dans ce cas toute version supérieure correspondra, et il peut indiquer "
-"(ou pas) le numéro de révision pour le paquet debian (les deux numéros étant "
-"séparés par un trait d'union). Voici les relations acceptées pour les "
-"versions : « E<gt>E<gt> » pour supérieur à, « E<lt>E<lt> » pour inférieur à, "
-"« E<gt>= » pour supérieur ou égal, « E<lt>= » pour inférieur ou égal, et "
-"« = » pour égal à."
+"Une contrainte sur le numéro de version peut commencer par "
+"« B<E<gt>E<gt>> », et dans ce cas toute version supérieure correspondra, et "
+"il peut indiquer (ou pas) le numéro de révision pour le paquet Debian (les "
+"deux numéros étant séparés par un trait d'union). Voici les relations "
+"acceptées pour les versions : « B<E<gt>E<gt>> » pour supérieur à, "
+"« B<E<lt>E<lt>> » pour inférieur à, « B<E<gt>=> » pour supérieur ou égal, "
+"« B<E<lt>=> » pour inférieur ou égal, et « B<=> » pour égal à."
 
 #. type: TQ
 #: deb-control.man deb-src-control.man
@@ -2392,8 +2588,8 @@ msgstr ""
 "C'est une liste de paquets que ce paquet « casse », par exemple en révélant "
 "des bogues quand les paquets concernés dépendent de celui-ci. Le programme "
 "de maintenance des paquets interdit la configuration de paquets cassés ; une "
-"méthode usuelle de résolution est la mise à jour des paquets mentionnés dans "
-"le champ B<Breaks>."
+"méthode usuelle de résolution est la mise à niveau des paquets mentionnés "
+"dans le champ B<Breaks>."
 
 #. type: TQ
 #: deb-control.man deb-src-control.man
@@ -2436,13 +2632,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "The syntax of B<Breaks>, B<Conflicts>, B<Replaces> and B<Provides> is a "
-#| "list of package names, separated by commas (and optional whitespace).  In "
-#| "the B<Breaks> and B<Conflicts> fields, the comma should be read as `OR'. "
-#| "An optional version can also be given with the same syntax as above for "
-#| "the B<Breaks>, B<Conflicts> and B<Replaces> fields."
 msgid ""
 "The syntax of B<Breaks>, B<Conflicts> and B<Replaces> is a list of package "
 "names, separated by commas (and optional whitespace).  In the B<Breaks> and "
@@ -2452,11 +2641,14 @@ msgid ""
 "package architecture.  An optional version can also be given with the same "
 "syntax as above for the B<Breaks>, B<Conflicts> and B<Replaces> fields."
 msgstr ""
-"La syntaxe des champs B<Breaks>, B<Conflicts>, B<Replaces> et B<Provides> "
-"est une liste de noms de paquets, séparés par des virgules (et des espaces "
-"facultatives). Dans les champs B<Breaks> et B<Conflicts> la virgule sera lue "
-"comme un « OU ». On peut donner une version optionnelle de la même façon que "
-"ci-dessus dans les champs B<Breaks>, B<Conflicts> et B<Replaces>."
+"La syntaxe des champs B<Breaks>, B<Conflicts> et B<Replaces> est une liste "
+"de noms de paquets, séparés par des virgules (et des espaces facultatives). "
+"Dans les champs B<Breaks> et B<Conflicts>, la virgule sera lue comme un "
+"« OU ». Un type d'architecture optionnel peut être aussi ajouté au nom de "
+"paquet avec la même syntaxe que ci-dessus, mais par défaut la valeur est "
+"B<any> plutôt que l'architecture du paquet binaire. On peut donner une "
+"version optionnelle de la même façon que ci-dessus dans les champs "
+"B<Breaks>, B<Conflicts> et B<Replaces>."
 
 #. type: TQ
 #: deb-control.man deb-src-control.man
@@ -2470,6 +2662,8 @@ msgid ""
 "This is a list of packages that this one enhances.  It is similar to "
 "B<Suggests> but in the opposite direction."
 msgstr ""
+"C'est une liste de paquets que ce paquet améliore. C'est similaire à "
+"B<Suggests> mais en sens inverse."
 
 #. type: TQ
 #: deb-control.man deb-src-control.man
@@ -2479,16 +2673,6 @@ msgstr "B<Provides:>I< liste-de-paquets>"
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "This is a list of virtual packages that this one provides. Usually this "
-#| "is used in the case of several packages all providing the same service.  "
-#| "For example, sendmail and exim can serve as a mail server, so they "
-#| "provide a common package (`mail-transport-agent') on which other packages "
-#| "can depend. This will allow sendmail or exim to serve as a valid option "
-#| "to satisfy the dependency. This prevents the packages that depend on a "
-#| "mail server from having to know the package names for all of them, and "
-#| "using `|' to separate the list."
 msgid ""
 "This is a list of virtual packages that this one provides.  Usually this is "
 "used in the case of several packages all providing the same service.  For "
@@ -2499,24 +2683,17 @@ msgid ""
 "having to know the package names for all of them, and using ‘B<|>’ to "
 "separate the list."
 msgstr ""
-"C'est une liste de paquets virtuels que ce paquet procure. On s'en "
-"serthabituellement pour des paquets qui offrent le même service. Par "
-"exemple, sendmail et exim sont des serveurs de courrier, et donc ils "
-"procurent chacun le paquet « mail-transport-agent » ; ainsi les autres "
-"paquets peuvent dépendre de ce paquet virtuel. Sendmail et exim peuvent "
-"ainsi chacun satisfaire la dépendance. Les paquets qui dépendent d'un "
-"serveur de courrier n'ont pas à connaître les noms de tous les serveurs de "
-"courrier et n'ont pas à utiliser « | » comme séparateur de liste."
+"C'est une liste de paquets virtuels que ce paquet procure. On s'en sert "
+"habituellement pour des paquets qui offrent le même service. Par exemple, "
+"sendmail et exim sont des serveurs de courrier, et donc ils procurent chacun "
+"un paquet commun (« mail-transport-agent ») duquel d'autres paquets peuvent "
+"dépendre. Sendmail et exim peuvent ainsi servir d'option valable pour "
+"satisfaire la dépendance. Cela permet aux paquets qui dépendent d'un serveur "
+"de courrier de ne pas avoir à connaître les noms de paquet de tous les "
+"serveurs de courrier, en utilisant « B<|> » comme séparateur de liste."
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "The syntax of B<Breaks>, B<Conflicts>, B<Replaces> and B<Provides> is a "
-#| "list of package names, separated by commas (and optional whitespace).  In "
-#| "the B<Breaks> and B<Conflicts> fields, the comma should be read as `OR'. "
-#| "An optional version can also be given with the same syntax as above for "
-#| "the B<Breaks>, B<Conflicts> and B<Replaces> fields."
 msgid ""
 "The syntax of B<Provides> is a list of package names, separated by commas "
 "(and optional whitespace).  An optional architecture qualifier can also be "
@@ -2525,11 +2702,12 @@ msgid ""
 "(equal to) version can also be given with the same syntax as above (honored "
 "since dpkg 1.17.11)."
 msgstr ""
-"La syntaxe des champs B<Breaks>, B<Conflicts>, B<Replaces> et B<Provides> "
-"est une liste de noms de paquets, séparés par des virgules (et des espaces "
-"facultatives). Dans les champs B<Breaks> et B<Conflicts> la virgule sera lue "
-"comme un « OU ». On peut donner une version optionnelle de la même façon que "
-"ci-dessus dans les champs B<Breaks>, B<Conflicts> et B<Replaces>."
+"La syntaxe du champ B<Provides> est une liste de noms de paquets, séparés "
+"par des virgules (et des espaces facultatives). Un type d'architecture "
+"facultatif peut également être ajouté au nom de paquet de la même façon que "
+"ci-dessus. S'il est omis l'architecture par défaut est celle du paquet "
+"binaire actuel. Un numéro de version précis (égal à) optionnel peut être "
+"donné de la même façon que ci-dessus (pris en compte depuis dpkg 1.17.11)."
 
 #. type: TQ
 #: deb-control.man deb-src-control.man
@@ -2539,16 +2717,6 @@ msgstr "B<Built-Using:>I< liste-de-paquets>"
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "This field lists extra source packages that were used during the build of "
-#| "this binary package.  This is an indication to the archive maintenance "
-#| "software that these extra source packages must be kept whilst this binary "
-#| "package is maintained.  This field must be a list of source package names "
-#| "with strict (=)  version relationships.  Note that the archive "
-#| "maintenance software is likely to refuse to accept an upload which "
-#| "declares a B<Built-Using> relationship which cannot be satisfied within "
-#| "the archive."
 msgid ""
 "This field lists extra source packages that were used during the build of "
 "this binary package.  This is an indication to the archive maintenance "
@@ -2562,17 +2730,16 @@ msgstr ""
 "construction du paquet binaire. Il permet d'indiquer au logiciel de gestion "
 "de l'archive que des paquets source supplémentaires doivent être conservés "
 "tant que le paquet binaire est maintenu. Ce champ doit être une liste de "
-"paquets source avec des références strictes de version (=). Veuillez noter "
-"que le logiciel de gestion de l'archive risque de ne pas accepter un envoi "
-"qui déclare une relation B<Built-Using> qui ne peut pas être satisfaite dans "
-"l'archive."
+"paquets source avec des références strictes de version « B<=> ». Veuillez "
+"noter que le logiciel de gestion de l'archive risque de ne pas accepter un "
+"envoi qui déclare une relation B<Built-Using> qui ne peut pas être "
+"satisfaite dans l'archive."
 
 #. type: TP
 #: deb-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Build-Conflicts:>I< package list>"
+#, no-wrap
 msgid "B<Built-For-Profiles:>I< profile-list (obsolete)>"
-msgstr "B<Build-Conflicts:>I< liste de paquets>"
+msgstr "B<Built-For-Profiles:>I< liste-de-profils> (obsolète)"
 
 #. type: Plain text
 #: deb-control.man
@@ -2582,13 +2749,17 @@ msgid ""
 "The information previously found in this field can now be found in the B<."
 "buildinfo> file, which supersedes it."
 msgstr ""
+"Ce champ sert à spécifier une liste, séparée par des espaces, de profils de "
+"construction avec lesquels ce paquet binaire a été construit (depuis "
+"dpkg 1.17.2 et jusqu'à la version 1.18.18). Les informations précédemment "
+"trouvées dans ce champ sont maintenant dans le champ B<.buildinfo> qui l'a "
+"remplacé."
 
 #. type: TP
 #: deb-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Build-Features:>I< features-list>"
+#, no-wrap
 msgid "B<Auto-Built-Package:>I< reason-list>"
-msgstr "B<Build-Features:>I< liste de fonctionnalités>"
+msgstr "B<Auto-Built-Package:>I< liste-de-raisons>"
 
 #. type: Plain text
 #: deb-control.man
@@ -2598,6 +2769,36 @@ msgid ""
 "in the I<debian/control> master source control file.  The only currently "
 "used reason is B<debug-symbols>."
 msgstr ""
+"Ce champ définit une liste, séparée par des espaces, des raisons pour "
+"lesquelles ce paquet a été généré automatiquement. Les paquets binaires "
+"marqués avec ce champ n'apparaîtront pas dans le fichier principal de "
+"contrôle des sources I<debian/control>. B<debug-symbols> est la seule raison "
+"utilisée actuellement."
+
+#. type: TP
+#: deb-control.man
+#, no-wrap
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Build-Ids:>I< liste-identifiants-de-construction-elf>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+"Ce champ définit une liste, séparée par des espaces, des identifiants de "
+"construction ELF. Il s'agit des identifiants uniques d'objets ELF "
+"sémantiquement identiques, pour chacun de ces objets présents dans le paquet."
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+"Le format ou la manière de calculer chaque identifiant de construction n'est "
+"pas défini par nature."
 
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
@@ -2610,7 +2811,6 @@ msgstr "EXEMPLE"
 #: deb-control.man
 #, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2631,7 +2831,6 @@ msgid ""
 " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
 " will run more slowly, however).\n"
 msgstr ""
-"# Commentaire\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2657,49 +2856,49 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
 msgstr ""
-"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"Le champ B<Build-Ids> utilise un nom plutôt générique à partir de son "
+"contexte original dans l'objet ELF qui sert un objectif très spécifique et a "
+"un format exécutable."
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
+msgstr ""
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: TH
 #: deb-conffiles.man
-#, fuzzy, no-wrap
-#| msgid "I<conffiles>"
+#, no-wrap
 msgid "deb-conffiles"
-msgstr "I<conffiles>"
+msgstr "deb-conffiles"
 
 #. type: Plain text
 #: deb-conffiles.man
-#, fuzzy
-#| msgid "deb-triggers - package triggers"
 msgid "deb-conffiles - package conffiles"
-msgstr "deb-triggers - actions différées du paquet"
+msgstr "deb-conffiles - Fichiers de configuration du paquet"
 
 #. type: Plain text
 #: deb-conffiles.man
-#, fuzzy
-#| msgid "I<conffiles>"
 msgid "conffiles"
-msgstr "I<conffiles>"
+msgstr "conffiles"
 
 #. type: Plain text
 #: deb-conffiles.man
-#, fuzzy
-#| msgid ""
-#| "A package declares its relationship to some trigger(s) by including a "
-#| "I<triggers> file in its control archive (i.e. I<DEBIAN/triggers> during "
-#| "package creation)."
 msgid ""
 "A package declares its list of conffiles by including a I<conffiles> file in "
 "its control archive (i.e. I<DEBIAN/conffiles> during package creation)."
 msgstr ""
-"Un paquet déclare ses relations avec des actions différées en incluant un "
-"fichier I<triggers> dans son archive de contrôle (c'est-à-dire I<DEBIAN/"
-"triggers> au moment de la création du paquet)."
+"Un paquet déclare sa liste de fichiers de configuration en incluant un "
+"fichier I<conffiles> dans son archive de contrôle (c'est-à-dire I<DEBIAN/"
+"conffiles> au moment de la création du paquet)."
 
 #. type: Plain text
 #: deb-conffiles.man
@@ -2710,6 +2909,11 @@ msgid ""
 "to build such binary packages).  Trailing whitespace will be trimmed, and "
 "empty lines will be ignored."
 msgstr ""
+"Ce fichier fournit une liste de fichiers, un par ligne. Ils devront être "
+"listés comme des chemins absolus et exister dans le paquet binaire, "
+"autrement, B<dpkg>(1) les ignorera (même si B<dpkg-deb>(1) refusera par "
+"défaut de construire ces fichiers binaires). Les espaces résiduelles seront "
+"rognées et les lignes vides ignorées."
 
 #. type: Plain text
 #: deb-conffiles.man
@@ -2720,13 +2924,15 @@ msgid ""
 "%PKGCONFDIR%/dpkg.cfg\n"
 "%CONFDIR%/logrotate.d/dpkg\n"
 msgstr ""
+"%CONFDIR%/alternatives/README\n"
+"%CONFDIR%/cron.daily/dpkg\n"
+"%PKGCONFDIR%/dpkg.cfg\n"
+"%CONFDIR%/logrotate.d/dpkg\n"
 
 #. type: Plain text
 #: deb-conffiles.man
-#, fuzzy
-#| msgid "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
 msgid "B<dpkg-deb>(1), B<dpkg>(1)."
-msgstr "B<dpkg-deb>(1), B<dpkg>(1), B<dselect>(1)."
+msgstr "B<dpkg-deb>(1), B<dpkg>(1)."
 
 #. type: TH
 #: deb-src-control.man
@@ -2743,28 +2949,11 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid "B<debian/control>"
 msgid "debian/control"
-msgstr "B<debian/control>"
+msgstr "debian/control"
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "Each Debian source package contains the master \"control\" file, which "
-#| "contains at least 2 paragraphs, separated by a blank line. The first "
-#| "paragraph lists all information about the source package in general, "
-#| "while each following paragraph describes exactly one binary package. Each "
-#| "paragraph consists of at least one field. A field starts with a "
-#| "fieldname, such as B<Package> or B<Section> (case insensitive), followed "
-#| "by a colon, the body of the field and a newline.  Multi-line fields are "
-#| "also allowed, but each supplementary line, without a fieldname, should "
-#| "start with at least one space. The content of the multi-line fields is "
-#| "generally joined to a single line by the tools (except in the case of the "
-#| "B<Description> field, see below). To insert empty lines into a multi-line "
-#| "field, insert a dot after the space. Lines starting with a B<'#'> are "
-#| "treated as comments."
 msgid ""
 "Each Debian source package contains the master «control» file, which "
 "contains at least 2 paragraphs, separated by a blank line.  The first "
@@ -2780,20 +2969,20 @@ msgid ""
 "after the space.  Lines starting with a ‘B<#>’ are treated as comments."
 msgstr ""
 "Chaque paquet source Debian contient un fichier « control » maître, qui "
-"contient au moins 2 paragraphes, séparés par une ligne vide. Le premier "
+"contient au moins deux paragraphes, séparés par une ligne vide. Le premier "
 "paragraphe donne toutes les informations à propos du paquet source en "
 "général et chaque paragraphe qui suit décrit exactement un paquet binaire. "
 "Chaque paragraphe contient au moins un champ. Un champ commence par le nom "
 "du champ, par exemple B<Package> ou B<Section> (la casse n'est pas "
 "significative), suivi d'un caractère « deux-points », du contenu du champ et "
-"d'un retour à la ligne. Les champs multi-lignes sont aussi possibles, mais "
-"chaque ligne supplémentaire, qui ne comporte pas de nom de champ, doit "
-"commencer par au moins une espace. Le contenu des champs multi-lignes est en "
-"général réassemblé en une ligne unique par les outils (sauf pour le champ "
-"B<Description>, voir ci-dessous). Pour inclure des lignes vides dans un "
-"champ multi-lignes, il est nécessaire de mettre un point après l'espace "
-"initiale. Les lignes commençant par B<« # »> sont traitées comme des "
-"commentaires."
+"d'un retour à la ligne. Les champs à lignes multiples sont aussi possibles, "
+"mais chaque ligne supplémentaire, qui ne comporte pas de nom de champ, doit "
+"commencer par au moins une espace. Le contenu des champs à lignes multiples "
+"est en général réassemblé en une ligne unique par les outils (sauf pour le "
+"champ B<Description>, voir ci-dessous). Pour inclure des lignes vides dans "
+"un champ à lignes multiples, il est nécessaire de mettre un point après "
+"l'espace initiale. Les lignes commençant par B<« # »> sont traitées comme "
+"des commentaires."
 
 #. type: SH
 #: deb-src-control.man
@@ -2812,24 +3001,20 @@ msgstr "B<Source:> I<nom-du-paquet-source> (requis)"
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 "La valeur de ce champ est le nom du paquet source et doit correspondre au "
 "nom du paquet source dans le fichier debian/changelog. Un nom de paquet doit "
 "être constitué uniquement de lettres minuscules (a-z), de chiffres (0-9), "
 "des caractères plus (+) et moins (-) et de points (.). Les noms de paquets "
 "doivent comporter au moins deux caractères et doivent commencer par un "
-"caractère alphanumérique."
+"caractère alphanumérique (a-z0-9) en minuscule."
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "Should be in the format \"Joe Bloggs E<lt>jbloggs@foo.comE<gt>\", and "
-#| "references the person who currently maintains the package, as opposed to "
-#| "the author of the software or the original packager."
 msgid ""
 "Should be in the format «Joe Bloggs E<lt>jbloggs@foo.comE<gt>», and "
 "references the person who currently maintains the package, as opposed to the "
@@ -2843,61 +3028,42 @@ msgstr ""
 #: deb-src-control.man
 #, no-wrap
 msgid "B<Uploaders:>I< fullname-email>"
-msgstr "B<Uploaders:>I< nom complet et adresse électronique>"
+msgstr "B<Uploaders:>I< nom-complet-et-adresse-électronique>"
 
 #. type: Plain text
 #: deb-src-control.man dsc.man
-#, fuzzy
-#| msgid ""
-#| "Lists all the names and email addresses of co-maintainers of the package, "
-#| "in the same format as the Maintainer field. Multiple co-maintainers "
-#| "should be separated by a comma."
 msgid ""
 "Lists all the names and email addresses of co-maintainers of the package, in "
 "the same format as the B<Maintainer> field.  Multiple co-maintainers should "
 "be separated by a comma."
 msgstr ""
 "Affiche les noms et les adresses électroniques des co-responsables du "
-"paquet, au même format que le champ Maintainer. Des co-responsables "
-"multiples peuvent être séparés par une virgule."
+"paquet, au même format que le champ B<Maintainer>. Des co-responsables "
+"multiples peuvent être séparés par des virgules."
 
 #. type: TP
 #: deb-src-control.man
 #, no-wrap
 msgid "B<Standards-Version:>I< version-string>"
-msgstr "B<Standards-Version:>I< chaîne de version>"
+msgstr "B<Standards-Version:> I<chaîne-de-la-version>"
 
 #. type: Plain text
 #: deb-src-control.man dsc.man
-#, fuzzy
-#| msgid ""
-#| "This documents the most recent version of the standards (which consists "
-#| "of the Debian Policy Manual and referenced texts from the B<debian-"
-#| "policy> package) this package complies to."
 msgid ""
 "This documents the most recent version of the distribution policy standards "
 "this package complies with."
 msgstr ""
-"Ce champ indique la version la plus récente des normes (constituées par la "
-"Charte Debian et les textes indiqués dans le paquet B<debian-policy>) "
-"auxquelles ce paquet se conforme."
+"Ce champ indique la version la plus récente des normes de la charte de la "
+"distribution auxquelles ce paquet se conforme."
 
 #. type: TP
 #: deb-src-control.man dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Description:> I<short-description> (required)"
+#, no-wrap
 msgid "B<Description>I< short-description>"
-msgstr "B<Description:> I<description courte> (requis)"
+msgstr "B<Description> I<description-courte>"
 
 #. type: Plain text
 #: deb-src-control.man dsc.man
-#, fuzzy
-#| msgid ""
-#| "The format for the package description is a short brief summary on the "
-#| "first line (after the \"Description\" field). The following lines should "
-#| "be used as a longer, more detailed description. Each line of the long "
-#| "description must be preceded by a space, and blank lines in the long "
-#| "description must contain a single '.' following the preceding space."
 msgid ""
 "The format for the source package description is a short brief summary on "
 "the first line (after the B<Description> field).  The following lines should "
@@ -2906,10 +3072,10 @@ msgid ""
 "description must contain a single ‘B<.>’ following the preceding space."
 msgstr ""
 "Le format de la description du paquet est un résumé bref sur la première "
-"ligne (après le champ « Description »). Les lignes suivantes peuvent servir "
-"à une description plus longue et plus détaillée. Chaque ligne de cette "
+"ligne (après le champ B<Description>). Les lignes suivantes peuvent servir à "
+"une description plus longue et plus détaillée. Chaque ligne de cette "
 "description longue doit être précédée d'une espace ; quand c'est une ligne "
-"blanche, elle doit contenir un seul « . » après cette espace."
+"blanche, elle doit contenir un seul « B<.> » après cette espace."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -2931,7 +3097,7 @@ msgstr ""
 #: deb-src-control.man
 #, no-wrap
 msgid "B<Rules-Requires-Root:> B<no>|B<binary-targets>|I<impl-keywords>"
-msgstr ""
+msgstr "B<Rules-Requires-Root:> B<no>|B<binary-targets>|I<mots-clés-implémentation>"
 
 #. type: Plain text
 #: deb-src-control.man
@@ -2939,18 +3105,20 @@ msgid ""
 "This field is used to indicate whether the B<debian/rules> file requires "
 "(fake)root privileges to run some of its targets, and if so when."
 msgstr ""
+"Ce champ est utilisé pour indiquer si le fichier B<debian/rules> exige des "
+"droits (fake)root pour exécuter certaines de ses cibles et quand, si c'est "
+"le cas."
 
 #. type: Plain text
 #: deb-src-control.man
 msgid "The binary targets will not require (fake)root at all."
-msgstr ""
+msgstr "Les cibles binaires n'exigeront aucun (fake)root."
 
 #. type: TP
 #: deb-src-control.man
-#, fuzzy, no-wrap
-#| msgid "B<binary:Package>"
+#, no-wrap
 msgid "B<binary-targets>"
-msgstr "B<binary:Package>"
+msgstr "B<binary-targets>"
 
 #. type: Plain text
 #: deb-src-control.man
@@ -2960,12 +3128,16 @@ msgid ""
 "B<binary-targets> while not strictly needed, marks it as having been "
 "analyzed for this requirement."
 msgstr ""
+"Les cibles binaires doivent toujours être exécutées avec les droits "
+"(fake)root. C'est la valeur par défaut quand le champ est omis ; l'ajout du "
+"champ avec un B<binary-targets> explicite, alors qu'il n'est pas strictement "
+"nécessaire, marque qu'il a été analysé pour cette exigence."
 
 #. type: TP
 #: deb-src-control.man
 #, no-wrap
 msgid "I<impl-keywords>"
-msgstr ""
+msgstr "I<mots-clés-implémentation>"
 
 #. type: Plain text
 #: deb-src-control.man
@@ -2973,6 +3145,8 @@ msgid ""
 "This is a space-separated list of keywords which define when (fake)root is "
 "required."
 msgstr ""
+"Il s'agit d'une liste, séparée par des espaces, de mots-clés qui définissent "
+"quand (fake)root est exigé."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -2981,6 +3155,10 @@ msgid ""
 "contain \"/\" or whitespace.  The I<cases> part cannot contain whitespace.  "
 "Furthermore, both parts must consist entirely of printable ASCII characters."
 msgstr ""
+"Les mots-clés sont composés de I<espace-de-nommage>/I<cas>. La partie "
+"I<espace-de-nommage> ne peut pas inclure de « / » ou d'espace. La partie "
+"I<cas> ne peut pas inclure d'espace. Par ailleurs, les deux parties doivent "
+"être entièrement composées de caractères ASCII imprimables."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -2989,6 +3167,9 @@ msgid ""
 "number of cases where (fake)root is required.  (See \"Implementation "
 "provided keywords\" in I<rootless-builds.txt>)."
 msgstr ""
+"Chaque outil ou paquet définira un espace de nommage nommé d'après lui-même "
+"et fournira le nombre des cas où (fake)root est exigé. (Voir « Mots-clés "
+"fournis par l'implémentation » dans I<rootless-builds.txt>)."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -2997,6 +3178,33 @@ msgid ""
 "expose an interface that is used to run a command under (fake)root.  (See "
 "\"Gain Root API\" in I<rootless-builds.txt>.)"
 msgstr ""
+"Quand le champ est défini pour un des I<mots-clés-implémentation>, le "
+"constructeur exposera une interface qui est utilisée pour exécuter une "
+"commande avec les droits (fake)root. (Voir « API pour obtenir les droits "
+"root » dans I<rootless-builds.txt>)."
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, no-wrap
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<Testsuite:>I< liste-de-noms>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, no-wrap
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<Testsuite-Triggers:>I< liste-de-paquets>"
+
+#. type: Plain text
+#: deb-src-control.man
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+"Ces champs sont décrits dans la page de manuel de B<dsc>(5), car ils sont "
+"créés à partir des informations déduites de B<debian/tests/control> ou "
+"copiés littéralement dans le fichier « control » du paquet source."
 
 #. type: TP
 #: deb-src-control.man dsc.man
@@ -3092,13 +3300,6 @@ msgstr "B<Build-Depends:>I< liste-de-paquets>"
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "A list of packages that need to be installed and configured to be able to "
-#| "build the source package. Including a dependency in this list has the "
-#| "same effect as including it in both B<Build-Depends-Arch> and B<Build-"
-#| "Depends-Indep>, with the additional effect of being used for source-only "
-#| "builds."
 msgid ""
 "A list of packages that need to be installed and configured to be able to "
 "build from source package.  These dependencies need to be satisfied when "
@@ -3108,16 +3309,17 @@ msgid ""
 "Indep>, because the dependency also needs to be satisfied when building the "
 "source package."
 msgstr ""
-"Liste de paquets à installer et configurer pour pouvoir construire le paquet "
-"source. Si une dépendance est ajoutée à cette liste, l'effet sera le même "
-"que si elle était ajoutée à la fois dans  B<Build-Depends-Arch> et B<Build-"
-"Depends-Indep>, en ayant de plus l'effet d'être prise en compte pour les "
-"constructions de paquets source uniquement (« source-only builds »)."
+"Liste de paquets à installer et configurer pour pouvoir construire à partir "
+"du paquet source. Ces dépendances doivent être satisfaites lors de la "
+"construction des paquets binaires dépendant ou non de l'architecture, et des "
+"paquets source. Ajouter une dépendance à ce champ n'aura pas exactement le "
+"même effet que de l'inclure à la fois dans B<Build-Depends-Arch> et B<Build-"
+"Depends-Indep>, parce que la dépendance a aussi besoin d'être prise en "
+"compte lors de la construction du paquet source."
 
 #. type: TQ
 #: deb-src-control.man dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Build-Depends-Arch:>I< package list>"
+#, no-wrap
 msgid "B<Build-Depends-Arch:>I< package-list>"
 msgstr "B<Build-Depends-Arch:>I<liste-de-paquets>"
 
@@ -3132,7 +3334,7 @@ msgstr ""
 "Liste analogue à B<Build-Depends>, mais restreinte aux paquets nécessaires "
 "pour construire les paquets dépendants de l'architecture. Les paquets "
 "indiqués dans B<Build-Depends> sont alors également installés. Ce champ est "
-"géré depuis la version 1.16.4 de dpkg ; pour pouvoir construire des paquets "
+"géré depuis la version 1.16.4 de dpkg ; pour pouvoir construire des paquets "
 "avec des versions plus anciennes de dpkg, il est préférable d'utiliser "
 "B<Build-Depends>."
 
@@ -3155,8 +3357,7 @@ msgstr ""
 
 #. type: TQ
 #: deb-src-control.man dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Build-Conflicts:>I< package list>"
+#, no-wrap
 msgid "B<Build-Conflicts:>I< package-list>"
 msgstr "B<Build-Conflicts:>I< liste de paquets>"
 
@@ -3172,16 +3373,15 @@ msgstr ""
 "Liste de paquets qui ne doivent pas être installés lors de la construction "
 "du paquet, par exemple s'ils interfèrent avec le système de construction "
 "utilisé. Si une dépendance est ajoutée à cette liste, l'effet sera le même "
-"que si elle était ajoutée à la fois dans  B<Build-Conflicts-Arch> et B<Build-"
+"que si elle était ajoutée à la fois dans B<Build-Conflicts-Arch> et B<Build-"
 "Conflicts-Indep>, en ayant de plus l'effet d'être prise en compte pour les "
-"constructions de paquets source uniquement (« source-only builds »)."
+"constructions de paquets uniquement source (« source-only builds »)."
 
 #. type: TQ
 #: deb-src-control.man dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Build-Conflicts-Arch:>I< package list>"
+#, no-wrap
 msgid "B<Build-Conflicts-Arch:>I< package-list>"
-msgstr "B<Build-Conflicts-Arch:>I< liste de paquets>"
+msgstr "B<Build-Conflicts-Arch:>I< liste-de-paquets>"
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3191,9 +3391,10 @@ msgid ""
 "build with older dpkg versions, B<Build-Conflicts> should be used instead."
 msgstr ""
 "Identique à B<Build-Conflicts>, mais n'est prise en compte que pour les "
-"paquets dépendants de l'architecture. Ce champ est géré depuis la version "
-"1.16.4 de dpkg ; pour pouvoir construire des paquets avec des versions plus "
-"anciennes de dpkg, il est préférable d'utiliser B<Build-Conflicts>."
+"paquets dépendants de l'architecture. Ce champ est géré depuis la "
+"version 1.16.4 de dpkg ; pour pouvoir construire des paquets avec des "
+"versions plus anciennes de dpkg, il est préférable d'utiliser B<Build-"
+"Conflicts>."
 
 #. type: TQ
 #: deb-src-control.man dsc.man
@@ -3212,17 +3413,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "The syntax of the B<Build-Depends>, B<Build-Depends-Arch> and B<Build-"
-#| "Depends-Indep> fields is a list of groups of alternative packages. Each "
-#| "group is a list of packages separated by vertical bar (or \"pipe\") "
-#| "symbols, \"|\". The groups are separated by commas. Commas are to be read "
-#| "as \"AND\", and pipes as \"OR\", with pipes binding more tightly. Each "
-#| "package name is optionally followed by a version number specification in "
-#| "parentheses, an architecture specification in square brackets, and a "
-#| "restriction formula consisting of one or more lists of profile names in "
-#| "angle brackets."
 msgid ""
 "The syntax of the B<Build-Depends>, B<Build-Depends-Arch> and B<Build-"
 "Depends-Indep> fields is a list of groups of alternative packages.  Each "
@@ -3239,25 +3429,21 @@ msgid ""
 msgstr ""
 "La syntaxe des champs B<Build-Depends>, B<Build-Depends-Arch> et B<Build-"
 "Depends-Indep> est une liste de groupes contenant des paquets alternatifs. "
-"Chaque groupe est une liste de paquets séparés par une barre verticale (le "
-"symbole du tube) « | ». Les groupes sont séparés par des virgules. Une "
+"Chaque groupe est une liste de paquets séparés par des barres verticales (le "
+"symbole du tube) « B<|> ». Les groupes sont séparés par des virgules « B<,"
+"> », et la liste peut finir par une virgule qui peut être éliminée lors de "
+"la création des champs pour B<deb-control>(5) (depuis dpkg 1.10.14). Une "
 "virgule représente un « ET » logique et une barre verticale représente un "
 "« OU » logique ; le tube représente un lien plus fort. Chaque nom de paquet "
-"est suivi de façon optionnelle par un numéro de version entre parenthèses, "
-"un type d'architecture entre crochets et une formule de restriction "
-"constituée d'une ou plusieurs listes de noms de profil entre chevrons."
+"est suivi de façon optionnelle par un type d'architecture entre crochets "
+"après deux-points « B<:> », éventuellement suivi par un numéro de version "
+"entre parenthèses « B<(> » et « B<)> », une spécification d'architecture "
+"entre crochets « B<[> » et « B<]> », et une formule de restriction "
+"constituée d'une ou plusieurs listes de noms de profil entre chevrons "
+"« B<E<lt>> » et « B<E<gt>> »."
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "The syntax of the B<Build-Conflicts>, B<Build-Conflicts-Arch> and B<Build-"
-#| "Conflicts-Indep> fields is a list of comma-separated package names, where "
-#| "the comma is read as an \"AND\". Specifying alternative packages using a "
-#| "\"pipe\" is not supported.  Each package name is optionally followed by a "
-#| "version number specification in parentheses, an architecture "
-#| "specification in square brackets, and a restriction formula consisting of "
-#| "one or more lists of profile names in angle brackets."
 msgid ""
 "The syntax of the B<Build-Conflicts>, B<Build-Conflicts-Arch> and B<Build-"
 "Conflicts-Indep> fields is a list of comma-separated package names, where "
@@ -3271,10 +3457,12 @@ msgid ""
 msgstr ""
 "La syntaxe des champs B<Build-Conflicts>, B<Build-Conflicts-Arch> et B<Build-"
 "Conflicts-Indep> est une liste de paquets séparés par des virgules qui "
-"représentent le « ET » logique. L'indication de paquets alternatifs avec une "
-"barre verticale (le symbole du tube) « | » n'est pas prise en charge. Chaque "
-"nom de paquet peut être suivi de façon optionnelle par un numéro de version "
-"entre parenthèses, un type d'architecture entre crochets et une formule de "
+"représentent le « ET » logique et peut finir par une virgule qui peut être "
+"éliminée lors de la création des champs pour B<deb-control>(5) (depuis "
+"dpkg 1.10.14). L'indication de paquets alternatifs avec une barre verticale "
+"(le symbole du tube) « | » n'est pas prise en charge. Chaque nom de paquet "
+"peut être suivi de façon optionnelle par un numéro de version entre "
+"parenthèses, un type d'architecture entre crochets et une formule de "
 "restriction constituée d'une ou plusieurs listes de noms de profil entre "
 "chevrons."
 
@@ -3291,14 +3479,18 @@ msgid ""
 "the current build architecture if the package is not marked with B<Multi-"
 "Arch: foreign>."
 msgstr ""
+"Un nom de type d'architecture peut être un nom d'architecture réelle de "
+"Debian (depuis dpkg 1.16.5), B<any> (depuis dpkg 1.16.2) ou B<native> "
+"(depuis dpkg 1.16.5). S'il est omis, la valeur par défaut des champs B<Build-"
+"Depends> est l'architecture de l'hôte actuel, la valeur par défaut des "
+"champs B<Build-Conflicts> est B<any>. Un nom d'architecture réelle de Debian "
+"correspondra exactement à l'architecture pour ce nom de paquet, B<any> "
+"correspondra à toute architecture pour ce nom de paquet si le paquet a été "
+"marqué B<Multi-Arch: allowed>, et B<native> correspondra à l'architecturede "
+"construction actuelle si le paquet n'a été marqué B<Multi-Arch: foreign>."
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "An architecture specification consists of one or more architecture names, "
-#| "separated by whitespace. Exclamation marks may be prepended to each of "
-#| "the names, meaning \"NOT\"."
 msgid ""
 "An architecture specification consists of one or more architecture names, "
 "separated by whitespace. Exclamation marks may be prepended to each of the "
@@ -3310,14 +3502,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "A restriction formula consists of one or more restriction lists, "
-#| "separated by whitespace. Each restriction list is enclosed in angle "
-#| "brackets. Items in the restriction list are build profile names, "
-#| "separated by whitespace and can be prefixed with an exclamation mark, "
-#| "meaning \"NOT\". A restriction formula represents a disjunctive normal "
-#| "form expression."
 msgid ""
 "A restriction formula consists of one or more restriction lists, separated "
 "by whitespace. Each restriction list is enclosed in angle brackets. Items in "
@@ -3406,7 +3590,7 @@ msgstr ""
 #: deb-src-control.man
 #, no-wrap
 msgid "B<Build-Profiles:> I<restriction-formula>"
-msgstr ""
+msgstr "B<Build-Profiles:> I<formule-de-restriction>"
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3415,6 +3599,9 @@ msgid ""
 "does not build.  To express that condition, the same restriction formula "
 "syntax from the B<Build-Depends> field is used."
 msgstr ""
+"Ce champ précise les conditions pour lesquelles ce paquet binaire est ou "
+"n'est pas construit. Cette condition est exprimée en utilisant la même "
+"syntaxe de formule de restriction qui provient du champ B<Build-Depends>."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3423,6 +3610,9 @@ msgid ""
 "implicitly means that it builds with all build profiles (including none at "
 "all)."
 msgstr ""
+"Si un paragraphe de paquet binaire ne contient pas ce champ, cela signifie "
+"de façon implicite que ce paquet se construit avec tous les profils de "
+"construction (y compris aucun profil)."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3432,6 +3622,10 @@ msgid ""
 "if the condition expressed by the conjunctive normal form expression "
 "evaluates to true."
 msgstr ""
+"En d'autres termes, si un paragraphe de paquet binaire est annoté d'un champ "
+"B<Build-Profiles> non vide, alors, ce paquet binaire est créé si et "
+"seulement si la condition exprimée par l'expression en forme normale "
+"conjonctive est évaluée à vrai."
 
 #. type: TQ
 #: deb-src-control.man
@@ -3457,22 +3651,24 @@ msgid ""
 "architecture specifications and restriction formulas which will all get "
 "reduced when generating the fields for B<deb-control>(5)."
 msgstr ""
+"Ces champs déclarent les relations entre les paquets. Ils sont discutés dans "
+"la page de manuel de B<deb-control>(5). Quand ces champs se trouvent dans "
+"I<debian/control>, ils peuvent aussi se terminer par une virgule (depuis "
+"dpkg 1.10.14) ; ils comprennent des spécifications d'architecture et des "
+"formules de restriction qui seront réduites lors de la génération des champs "
+"pour B<deb-control>(5)."
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "These fields are used by the debian-installer and are usually not "
-#| "needed.  See /usr/share/doc/debian-installer/devel/modules.txt from the "
-#| "B<debian-installer> package for more details about them."
 msgid ""
 "These fields are used by the debian-installer in B<udeb>s and are usually "
 "not needed.  See /usr/share/doc/debian-installer/devel/modules.txt from the "
 "B<debian-installer> package for more details about them."
 msgstr ""
-"Ces champs sont utilisés par l'installateur et ne sont en général pas "
-"nécessaires. Veuillez consulter /usr/share/doc/debian-installer/devel/"
-"modules.txt fourni avec le paquet B<debian-installer> pour plus de détails."
+"Ces champs sont utilisés par l'installateur dans les B<udeb> et ne sont en "
+"général pas nécessaires. Veuillez consulter /usr/share/doc/debian-installer/"
+"devel/modules.txt fourni avec le paquet B<debian-installer> pour plus de "
+"détails."
 
 #. type: SH
 #: deb-src-control.man
@@ -3489,45 +3685,47 @@ msgid ""
 "naming scheme: the fields should start with an B<X>, followed by zero or "
 "more of the letters B<SBC> and a hyphen."
 msgstr ""
+"Il est autorisé d'ajouter au fichier de contrôle des champs supplémentaires "
+"définis par l'utilisateur. L'outil ignorera ces champs. Si vous souhaitez "
+"que ces champs soient copiés dans ces fichiers de sortie, tels que les "
+"paquets binaires, vous devez utiliser un schéma de nommage personnalisé : "
+"les champs démarreront par un B<X>, suivi de zéro ou plusieurs des lettres "
+"B<SBC> et un trait d'union."
 
 #. type: TP
 #: deb-src-control.man
 #, no-wrap
 msgid "B<S>"
-msgstr ""
+msgstr "B<S>"
 
 #. type: Plain text
 #: deb-src-control.man
 msgid ""
 "The field will appear in the source package control file, see B<dsc>(5)."
 msgstr ""
+"Ce champ apparaîtra dans le fichier de contrôle du paquet des sources, voir "
+"B<dsc>(5)."
 
 #. type: TP
 #: deb-src-control.man
 #, no-wrap
 msgid "B<B>"
-msgstr ""
+msgstr "B<B>"
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "The I<dependencies> field has the same syntax as the B<Depends> field in "
-#| "a binary control file, see B<deb-control>(5).  See also the Debian Policy "
-#| "Manual for further details."
 msgid ""
 "The field will appear in the control file in the binary package, see B<deb-"
 "control>(5)."
 msgstr ""
-"Le champ I<dépendances> utilise la même syntaxe que le champ B<Depends> d'un "
-"fichier de contrôle d'un paquet binaire, voir B<deb-control>(5). Voir aussi "
-"la Charte Debian pour plus de détails."
+"Le champ apparaîtra dans le fichier de contrôle du paquet binaire, voir "
+"B<deb-control>(5)."
 
 #. type: TP
 #: deb-src-control.man
 #, no-wrap
 msgid "B<C>"
-msgstr ""
+msgstr "B<C>"
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3535,6 +3733,8 @@ msgid ""
 "The field will appear in the upload control (.changes) file, see B<deb-"
 "changes>(5)."
 msgstr ""
+"Le champ apparaîtra dans le fichier de contrôle d'envoi (.changes), voir "
+"B<deb-changes>(5)."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3544,6 +3744,11 @@ msgid ""
 "B<Approved-By> in the changes file and will not appear in the binary or "
 "source package control files."
 msgstr ""
+"Veuillez noter que les préfixes B<X>[B<SBC>]B<-> sont retirés quand les "
+"champs sont copiés dans les fichiers de sortie. Un champ B<XC-Approved-By> "
+"apparaîtra sous la forme B<Approved-By> dans le fichier des modifications et "
+"n'apparaîtra pas dans les fichiers de contrôle des paquets binaires ou "
+"source."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3561,21 +3766,7 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy, no-wrap
-#| msgid ""
-#| "# Comment\n"
-#| "Source: dpkg\n"
-#| "Section: admin\n"
-#| "Priority: required\n"
-#| "Maintainer: Dpkg Developers E<lt>debian-dpkg@lists.debian.orgE<gt>\n"
-#| "# this field is copied to the binary and source packages\n"
-#| "XBS-Upstream-Release-Status: stable\n"
-#| "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-#| "Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-#| "Vcs-Git: git://anonscm.debian.org/dpkg/dpkg.git\n"
-#| "Standards-Version: 3.7.3\n"
-#| "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
-#| " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
+#, no-wrap
 msgid ""
 "# Comment\n"
 "Source: dpkg\n"
@@ -3585,8 +3776,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3599,8 +3790,8 @@ msgstr ""
 "# ce champ est copié dans les paquets source et binaires\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: git://anonscm.debian.org/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3649,31 +3840,24 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgid "B<deb-control>(5), B<deb-version>(7), B<dpkg-source>(1)"
-msgstr "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
+msgstr "B<deb-control>(5), B<deb-version>(7), B<dpkg-source>(1)"
 
 #. type: TH
 #: deb-src-files.man
-#, fuzzy, no-wrap
-#| msgid "I<conffiles>"
+#, no-wrap
 msgid "deb-src-files"
-msgstr "I<conffiles>"
+msgstr "deb-src-files"
 
 #. type: Plain text
 #: deb-src-files.man
-#, fuzzy
-#| msgid "dpkg-genchanges - generate Debian .changes files"
 msgid "deb-src-files - Debian distribute files format"
-msgstr "dpkg-genchanges - Créer des fichiers « .changes »."
+msgstr "deb-src-files - Format des fichiers distribués de Debian"
 
 #. type: Plain text
 #: deb-src-files.man
-#, fuzzy
-#| msgid "B<debian/files>"
 msgid "debian/files"
-msgstr "B<debian/files>"
+msgstr "debian/files"
 
 #. type: Plain text
 #: deb-src-files.man
@@ -3681,46 +3865,49 @@ msgid ""
 "This file contains the list of artifacts that are to be distributed via the "
 "B<.changes> control file."
 msgstr ""
+"Ce fichier fournit la liste des objets qui seront distribués au moyen du "
+"fichier de contrôle B<.changes>."
 
 #. type: Plain text
 #: deb-src-files.man
-#, fuzzy
-#| msgid ""
-#| "The override file has a simple whitespace-delimited format. Comments are "
-#| "allowed (denoted with a B<#>)."
 msgid "The I<debian/files> file has a simple whitespace-delimited format."
 msgstr ""
-"Les éléments du fichier « override » sont séparés simplement par une espace. "
-"Les commentaires commencent par un caractère B<« # »>."
+"Les éléments du fichier I<debian/files> sont séparés simplement par des "
+"espaces."
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
 msgstr ""
+"I<nom-de-fichier> I<section> I<priorité> [ I<mot-clé=valeur\\&...\\&> ]"
 
 #. type: Plain text
 #: deb-src-files.man
-#, fuzzy
-#| msgid "I<conffile> is the filename of the conffile to remove."
 msgid "I<filename> is the name of the artifact to distribute."
-msgstr ""
-"I<fichier-de-configuration> est le nom du fichier de configuration à "
-"supprimer."
+msgstr "I<nom-de-fichier> est le nom de l'objet à distribuer."
 
 #. type: Plain text
 #: deb-src-files.man
-#, fuzzy
-#| msgid ""
-#| "I<priority> and I<section> correspond to the respective control fields "
-#| "available in the .deb. The allowed values are listed in the Debian policy."
 msgid ""
 "I<section> and I<priority> correspond to the respective control fields "
 "available in the .deb.  The allowed values are specific to each distribution "
 "archive."
 msgstr ""
-"I<priority> et I<section> correspondent respectivement aux champs de "
-"contrôle présents dans le fichier .deb. Les valeurs autorisées sont définies "
-"dans la Charte Debian."
+"I<section> et I<priority> correspondent respectivement aux champs de "
+"contrôle présents dans le fichier .deb. Les valeurs autorisées sont "
+"spécifiques pour chaque distribution."
+
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+"I<mot-clé=valeur\\&...\\&> correspond à une liste optionnelle des attributs "
+"séparés par des espaces pour cette entrée. Le seul mot clé pris en charge "
+"actuellement est B<automatic> avec la valeur B<yes>, pour marquer les "
+"fichiers générés automatiquement."
 
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
@@ -3735,26 +3922,25 @@ msgid ""
 "This file is not intended to be modified directly, please use one of B<dpkg-"
 "gencontrol> or B<dpkg-distaddfile> to add entries to it."
 msgstr ""
+"Ce fichier n'est pas censé être modifié directement, veuillez utiliser soit "
+"B<dpkg-gencontrol> ou B<dpkg-distaddfile> pour lui ajouter des entrées."
 
 #. type: Plain text
 #: deb-src-files.man
-#, fuzzy
-#| msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 msgid "B<dpkg-genchanges>(1), B<dpkg-distaddfile>(1)."
-msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
+msgstr "B<dpkg-genchanges>(1), B<dpkg-distaddfile>(1)."
 
 #. type: TH
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "I<conffiles>"
+#, no-wrap
 msgid "deb-src-rules"
-msgstr "I<conffiles>"
+msgstr "deb-src-rules"
 
 #. type: TH
 #: deb-src-rules.man
 #, no-wrap
 msgid "2017-09-05"
-msgstr ""
+msgstr "2017-09-05"
 
 #. type: TH
 #: deb-src-rules.man
@@ -3770,19 +3956,13 @@ msgstr "Utilitaires de dpkg"
 
 #. type: Plain text
 #: deb-src-rules.man
-#, fuzzy
-#| msgid "deb-src-control - Debian source packages' master control file format"
 msgid "deb-src-rules - Debian source package rules file"
-msgstr ""
-"deb-src-control - Format du fichier principal de contrôle dans les paquets "
-"source Debian"
+msgstr "deb-src-rules - Fichier de règles des paquets source Debian"
 
 #. type: Plain text
 #: deb-src-rules.man
-#, fuzzy
-#| msgid "B<debian/files>"
 msgid "debian/rules"
-msgstr "B<debian/files>"
+msgstr "debian/rules"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3790,6 +3970,8 @@ msgid ""
 "This file contains the instructions necessary to build the binary packages "
 "from the source package."
 msgstr ""
+"Ce fichier fournit les instructions nécessaires à la construction des "
+"paquets binaires à partir de paquets sources."
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3797,18 +3979,19 @@ msgid ""
 "The I<debian/rules> file is an executable Makefile, with a shebang that is "
 "usually set to \"#!/usr/bin/make -f\"."
 msgstr ""
+"Le fichier I<debian/rules> est un Makefile exécutable avec un « shebang » "
+"qui est habituellement positionné sur « #!/usr/bin/make -f »."
 
 #. type: Plain text
 #: deb-src-rules.man
 msgid "It must support the following make targets:"
-msgstr ""
+msgstr "Il doit prendre en charge les cibles « make » suivantes :"
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<-p>I<package>"
+#, no-wrap
 msgid "B<clean>"
-msgstr "B<-p>I<paquet>"
+msgstr "B<clean>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3816,29 +3999,35 @@ msgid ""
 "Clean up the source tree, by undoing any change done by any of the build and "
 "binary targets.  This target will be called with root privileges."
 msgstr ""
+"Nettoyer l'arborescence des sources, en supprimant toutes les modifications "
+"réalisées par toutes les constructions et cibles binaires. Cette cible sera "
+"appelée avec les droits du superutilisateur."
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<Building>"
+#, no-wrap
 msgid "B<build-indep>"
-msgstr "B<Construction>"
+msgstr "B<build-indep>"
 
 #. type: Plain text
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
+"Construction des fichiers indépendants de l'architecture requis pour "
+"construire tout paquet binaire indépendant de l'architecture. S'il n'y a pas "
+"de paquet binaire indépendant de l'architecture à créer, la cible doit tout "
+"de même exister mais ne fait rien. Cette cible ne doit pas requérir les "
+"droits du superutilisateur."
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<-a>I<arch>"
+#, no-wrap
 msgid "B<build-arch>"
-msgstr "B<-a>I<arch>"
+msgstr "B<build-arch>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3848,13 +4037,17 @@ msgid ""
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
+"Construction des fichiers dépendants de l'architecture requis pour "
+"construire tout paquet binaire dépendant de l'architecture. S'il n'y a pas "
+"de paquet binaire dépendant de l'architecture à créer, la cible doit tout de "
+"même exister mais ne fait rien. Cette cible ne doit pas requérir les droits "
+"du superutilisateur."
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<Building>"
+#, no-wrap
 msgid "B<build>"
-msgstr "B<Construction>"
+msgstr "B<build>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3863,13 +4056,16 @@ msgid ""
 "least transitively) on B<build-indep> and/or B<build-arch> or by inlining "
 "what those targets would do.  This target must not require root privileges."
 msgstr ""
+"Construction des fichiers indépendants et dépendants de l'architecture, soit "
+"en dépendant (au moins transitivement) de B<build-indep> et/ou de B<build-"
+"arch>, ou en entrant en ligne de commande ce que les cibles feront. Cette "
+"cible ne doit pas requérir les droits du superutilisateur."
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<canary>"
+#, no-wrap
 msgid "B<binary-indep>"
-msgstr "B<canary>"
+msgstr "B<binary-indep>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3878,13 +4074,15 @@ msgid ""
 "least transitively) on either B<build-indep> or B<build>.  This target will "
 "be called with root privileges."
 msgstr ""
+"Construction des paquets binaires indépendants de l'architecture. Cette "
+"cible doit dépendre (au moins transitivement) soit de B<build-indep>, soit "
+"de B<build>. Cette cible sera appelée avec les droits du superutilisateur."
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<canary>"
+#, no-wrap
 msgid "B<binary-arch>"
-msgstr "B<canary>"
+msgstr "B<binary-arch>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3893,14 +4091,16 @@ msgid ""
 "least transitively) on either B<build-arch> or B<build>.  This target will "
 "be called with root privileges."
 msgstr ""
+"Construction des paquets dépendants de l'architecture. Cette cible doit "
+"dépendre (au moins transitivement) soit de B<build-arch>, soit de B<build>. "
+"Cette cible sera appelée avec les droits du superutilisateur."
 
 #. type: TP
 #: deb-src-rules.man dpkg-buildpackage.man dpkg-genbuildinfo.man
 #: dpkg-genchanges.man
-#, fuzzy, no-wrap
-#| msgid "B<canary>"
+#, no-wrap
 msgid "B<binary>"
-msgstr "B<canary>"
+msgstr "B<binary>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3910,20 +4110,22 @@ msgid ""
 "or by inlining what those targets would do.  This target will be called with "
 "root privileges."
 msgstr ""
+"Construction des paquets binaires indépendants et dépendants de "
+"l'architecture, soit en dépendant (au moins transitivement) de B<binary-"
+"indep> et/ou de B<binary-arch>, ou en entrant en ligne de commande ce que "
+"les cibles feront. Cette cible sera appelée avec les droits du "
+"superutilisateur."
 
 #. type: Plain text
 #: deb-src-rules.man
-#, fuzzy
-#| msgid ""
-#| "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
-#| "genchanges>(1), B<fakeroot>(1), B<lintian>(1), B<gpg2>(1), B<gpg>(1)."
 msgid ""
 "B<dpkg-architecture>(1), B<dpkg-vendor>(1), B<dpkg-buildflags>(1), B<dpkg-"
 "parsechangelog>(1), B<dpkg-shlibdeps>(1), B<dpkg-gencontrol>(1), B<dpkg-"
 "deb>(1), B<dpkg-distaddfile>(1)."
 msgstr ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
-"genchanges>(1), B<fakeroot>(1), B<lintian>(1), B<gpg2>(1), B<gpg>(1)."
+"B<dpkg-architecture>(1), B<dpkg-vendor>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"parsechangelog>(1), B<dpkg-shlibdeps>(1), B<dpkg-gencontrol>(1), B<dpkg-"
+"deb>(1), B<dpkg-distaddfile>(1)."
 
 #. type: TH
 #: deb-split.man
@@ -3934,7 +4136,7 @@ msgstr "deb-split"
 #. type: Plain text
 #: deb-split.man
 msgid "deb-split - Debian multi-part binary package format"
-msgstr "deb-split - formatage de paquets binaires Debian en plusieurs parties"
+msgstr "deb-split - Formatage de paquets binaires Debian en plusieurs parties"
 
 # type: Plain text
 #. type: Plain text
@@ -3955,7 +4157,7 @@ msgid ""
 msgstr ""
 "Le fichier est une archive B<ar> avec un numéro magique de B<!E<lt>archE<gt>."
 ">. Les noms de fichiers peuvent comporter un caractère « / » final (depuis "
-"dpkg 1.15.6)."
+"dpkg 1.15.6)."
 
 #. type: Plain text
 #: deb-split.man
@@ -3963,7 +4165,7 @@ msgid ""
 "The first member is named B<debian-split> and contains a series of lines, "
 "separated by newlines. Currently eight lines are present:"
 msgstr ""
-"Le premier membre est appelé B<debians-split> et contient un ensemble de "
+"Le premier membre est appelé B<debian-split> et contient un ensemble de "
 "lignes, séparées par des retours à la ligne. Actuellement, huit lignes sont "
 "présentes :"
 
@@ -4018,7 +4220,7 @@ msgstr ""
 #. type: Plain text
 #: deb-split.man
 msgid "The package architecture (since dpkg 1.16.1)."
-msgstr "Architecture du paquet (depuis dpkg 1.16.1)"
+msgstr "Architecture du paquet (depuis dpkg 1.16.1)"
 
 # type: Plain text
 #. type: Plain text
@@ -4133,14 +4335,6 @@ msgstr "I<version_amont>"
 
 #. type: Plain text
 #: deb-version.man
-#, fuzzy
-#| msgid ""
-#| "This is the main part of the version number.  It is usually the version "
-#| "number of the original (\"upstream\")  package from which the I<.deb> "
-#| "file has been made, if this is applicable.  Usually this will be in the "
-#| "same format as that specified by the upstream author(s); however, it may "
-#| "need to be reformatted to fit into the package management system's format "
-#| "and comparison scheme."
 msgid ""
 "This is the main part of the version number.  It is usually the version "
 "number of the original (“upstream”)  package from which the I<.deb> file has "
@@ -4149,12 +4343,13 @@ msgid ""
 "reformatted to fit into the package management system's format and "
 "comparison scheme."
 msgstr ""
-"Ceci est la partie principale du numéro de version. Cela correspond "
-"normalement au numéro de version du paquet d'origine qui a servi à créer le "
-"fichier I<.deb>. Le format d'origine spécifié par l'auteur est généralement "
-"conservé ; cependant, il arrive qu'il soit nécessaire d'adapter ce numéro "
-"pour qu'il se conforme au format du système de gestion de paquet et du "
-"procédé de comparaison des numéros de version."
+"Cela est la partie principale du numéro de version. Cela correspond "
+"normalement au numéro de version du paquet d'origine (« upstream ») qui a "
+"servi à créer le fichier I<.deb>, si cela peut s'appliquer. Le format "
+"d'origine spécifié par l'auteur est généralement conservé ; cependant, il "
+"arrive qu'il soit nécessaire d'adapter ce numéro pour qu'il se conforme au "
+"format du système de gestion de paquet et du procédé de comparaison des "
+"numéros de version."
 
 #. type: Plain text
 #: deb-version.man
@@ -4169,23 +4364,16 @@ msgstr ""
 
 #. type: Plain text
 #: deb-version.man
-#, fuzzy
-#| msgid ""
-#| "The I<upstream-version> may contain only alphanumerics (\"A-Za-z0-9\") "
-#| "and the characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, "
-#| "colon, tilde) and should start with a digit.  If there is no I<debian-"
-#| "revision> then hyphens are not allowed; if there is no I<epoch> then "
-#| "colons are not allowed."
 msgid ""
 "The I<upstream-version> may contain only alphanumerics (“A-Za-z0-9”) and the "
 "characters B<.> B<+> B<-> B<:> B<~> (full stop, plus, hyphen, colon, tilde) "
 "and should start with a digit.  If there is no I<debian-revision> then "
 "hyphens are not allowed; if there is no I<epoch> then colons are not allowed."
 msgstr ""
-"La I<version_amont> ne doit contenir que des caractères alphanumériques (\"A-"
-"Za-z0-9\") et les caractères B<.> B<+> B<-> B<:> B<~>\" (point, plus, tiret, "
+"La I<version_amont> ne doit contenir que des caractères alphanumériques (« A-"
+"Za-z0-9 ») et les caractères B<.> B<+> B<-> B<:> B<~> (point, plus, tiret, "
 "deux-points, tilde) et devrait commencer par un chiffre. S'il n'y a pas de "
-"partie I<revision_Debian> alors le tiret n'est pas autorisé ; s'il n'y a pas "
+"partie I<révision_Debian> alors le tiret n'est pas autorisé ; s'il n'y a pas "
 "d'I<epoch>, alors c'est le caractère deux-points qui n'est pas autorisé."
 
 #. type: TP
@@ -4209,13 +4397,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-version.man
-#, fuzzy
-#| msgid ""
-#| "It is optional; if it isn't present then the I<upstream-version> may not "
-#| "contain a hyphen.  This format represents the case where a piece of "
-#| "software was written specifically to be turned into a Debian package, and "
-#| "so there is only one \"debianization\" of it and therefore no revision "
-#| "indication is required."
 msgid ""
 "It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
@@ -4226,21 +4407,17 @@ msgstr ""
 "Cette partie est facultative ; si elle n'est pas présente, la "
 "I<version_amont> ne doit pas contenir de tiret. Ce format est prévu pour le "
 "cas où un logiciel a été directement conçu comme paquet Debian, il n'y a "
-"donc qu'une seule « debianization » et donc par la suite pas besoin "
+"donc qu'une seule « debianisation » et donc par la suite pas besoin "
 "d'indication de révision."
 
 #. type: Plain text
 #: deb-version.man
-#, fuzzy
-#| msgid ""
-#| "It is conventional to restart the I<debian-revision> at '1' each time "
-#| "time the I<upstream-version> is increased."
 msgid ""
 "It is conventional to restart the I<debian-revision> at ‘1’ each time the "
 "I<upstream-version> is increased."
 msgstr ""
-"Il est convenu de repartir à 1 pour la I<révision_debian> à chaque fois que "
-"la I<version_amont> est incrémentée."
+"Il est convenu de repartir à « 1 » pour la I<révision_Debian> à chaque fois "
+"que la I<version_amont> est incrémentée."
 
 #. type: Plain text
 #: deb-version.man
@@ -4278,16 +4455,6 @@ msgstr "Les chaînes sont comparées de la gauche vers la droite."
 
 #. type: Plain text
 #: deb-version.man
-#, fuzzy
-#| msgid ""
-#| "First the initial part of each string consisting entirely of non-digit "
-#| "characters is determined.  These two parts (one of which may be empty) "
-#| "are compared lexically.  If a difference is found it is returned.  The "
-#| "lexical comparison is a comparison of ASCII values modified so that all "
-#| "the letters sort earlier than all the non-letters and so that a tilde "
-#| "sorts before anything, even the end of a part.  For example, the "
-#| "following parts are in sorted order: '~~', '~~a', '~', the empty part, "
-#| "'a'."
 msgid ""
 "First the initial part of each string consisting entirely of non-digit "
 "characters is determined.  These two parts (one of which may be empty) are "
@@ -4300,11 +4467,11 @@ msgstr ""
 "Pour commencer, la première partie de chaque chaîne composée uniquement de "
 "caractères non numériques est déterminée. Puis ces deux parties (l'une peut "
 "être vide) sont comparées lexicalement. Si une différence est trouvée, elle "
-"est retournée. La comparaison lexicale est effectuée sur une version "
-"modifiée des valeurs ASCII afin que les lettres passent avant les autres "
-"caractères et que les tildes (\"~\") passent avant tous les caractères, même "
-"la fin d'une partie. Par exemple, les éléments suivants sont ordonnés "
-"ainsi : « ~~ », « ~~a », « ~ », partie vide, « a »."
+"est renvoyée. La comparaison lexicale est effectuée sur une version modifiée "
+"des valeurs ASCII afin que les lettres passent avant les autres caractères "
+"et que les tildes (\"~\") passent avant tous les caractères, même la fin "
+"d'une partie. Par exemple, les éléments suivants sont ordonnés ainsi : "
+"« ~~ », « ~~a », « ~ », partie vide, « a »."
 
 #. type: Plain text
 #: deb-version.man
@@ -4335,13 +4502,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-version.man
-#, fuzzy
-#| msgid ""
-#| "Note that the purpose of epochs is to allow us to leave behind mistakes "
-#| "in version numbering, and to cope with situations where the version "
-#| "numbering scheme changes.  It is B<not> intended to cope with version "
-#| "numbers containing strings of letters which the package management system "
-#| "cannot interpret (such as 'ALPHA' or 'pre-'), or with silly orderings."
 msgid ""
 "Note that the purpose of epochs is to allow us to leave behind mistakes in "
 "version numbering, and to cope with situations where the version numbering "
@@ -4364,7 +4524,7 @@ msgid ""
 "it later in the 1.10.x series."
 msgstr ""
 "Le caractère tilde (« ~ ») et sa propriété spéciale pour les comparaisons "
-"ont été introduites dans la version 1.10 de dpkg. Ce n'est qu'à partir des "
+"ont été introduites dans la version 1.10 de dpkg. Ce n'est qu'à partir des "
 "versions supérieures (1.10.x) que certaines parties des scripts de "
 "construction de dpkg ont commencé à gérer ce système."
 
@@ -4392,7 +4552,7 @@ msgid ""
 "B<deb>(5)  for details of the new format."
 msgstr ""
 "Le format de fichier B<.deb> correspond aux paquets binaires Debian. Cette "
-"page de manuel décrit l'B<ancien> format, utilisé avant la version 0.93 de "
+"page de manuel décrit l'B<ancien> format, utilisé avant la version 0.93 de "
 "Debian. Veuillez consulter B<deb>(5) pour les informations sur le nouveau "
 "format."
 
@@ -4411,7 +4571,7 @@ msgid ""
 "The first line is the format version number padded to 8 digits, and is "
 "B<0.939000> for all old-format archives."
 msgstr ""
-"La première ligne indique la version du format, remplie sur 8 chiffres, "
+"La première ligne indique la version du format, remplie sur 8 chiffres, "
 "c'est-à-dire B<0.939000> pour toutes les archives dans l'ancien format."
 
 #. type: Plain text
@@ -4442,13 +4602,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-old.man
-#, fuzzy
-#| msgid ""
-#| "In some very old archives, the files in the control tarfile may "
-#| "optionally be in a B<DEBIAN> subdirectory. In that case, the B<DEBIAN> "
-#| "subdirectory will be in the control tarfile too, and the control tarfile "
-#| "will have only files in that directory. Optionally the control tarfile "
-#| "may contain an entry for `B<.>', that is, the current directory."
 msgid ""
 "In some very old archives, the files in the control tarfile may optionally "
 "be in a B<DEBIAN> subdirectory. In that case, the B<DEBIAN> subdirectory "
@@ -4460,7 +4613,7 @@ msgstr ""
 "contrôle peuvent se trouver dans un sous-répertoire B<DEBIAN>. Dans ce cas, "
 "le sous-répertoire B<DEBIAN> se trouve également dans l'archive de contrôle, "
 "qui ne contiendra que des fichiers de ce répertoire. En option, l'archive de "
-"contrôle peut contenir une entrée pour B<.>, le répertoire courant."
+"contrôle peut contenir une entrée pour « B<.> », le répertoire courant."
 
 #. type: Plain text
 #: deb-old.man
@@ -4469,10 +4622,10 @@ msgid ""
 "relative to the root directory of the system to be installed on. The "
 "pathnames do not have leading slashes."
 msgstr ""
-"La seconde archive compressée avec gzip correspond à l'archive à placer dans "
-"le système de fichiers. Elle contient des chemins relatifs à la racine du "
-"système dans lequel se fera l'installation. Les noms de fichiers ne débutent "
-"pas par des barres obliques (« / »)."
+"La seconde archive compressée avec gzip correspond à l'archive du système de "
+"fichiers. Elle contient des chemins relatifs à la racine du système dans "
+"lequel se fera l'installation. Les noms de fichiers ne débutent pas par des "
+"barres obliques (« / »)."
 
 #. type: Plain text
 #: deb-old.man
@@ -4488,7 +4641,7 @@ msgstr "deb-origin"
 #. type: Plain text
 #: deb-origin.man
 msgid "deb-origin - Vendor-specific information files"
-msgstr "deb-origin - Fichiers d'informations propre à l'éditeur"
+msgstr "deb-origin - Fichiers d'informations propre au distributeur"
 
 #. type: Plain text
 #: deb-origin.man
@@ -4501,18 +4654,11 @@ msgid ""
 "The files in B<%PKGCONFDIR%/origins> can provide information about various "
 "vendors who are providing Debian packages."
 msgstr ""
+"Les fichiers de B<%PKGCONFDIR%/origins> peuvent fournir des informations sur "
+"les différents distributeurs qui fournissent des paquets Debian."
 
 #. type: Plain text
 #: deb-origin.man
-#, fuzzy
-#| msgid ""
-#| "The files in B<%PKGCONFDIR%/origins> can provide information about "
-#| "various vendors who are providing Debian packages. They contain a number "
-#| "of fields, or comments when the line starts with B<'#'>.  Each field "
-#| "begins with a tag, such as B<Vendor> or B<Parent>, followed by a colon "
-#| "and the body of the field. Fields are delimited only by field tags. In "
-#| "other words, field text may be multiple lines in length, but the tools "
-#| "will join lines when processing the body of the field."
 msgid ""
 "They contain a number of fields, or comments when the line starts with "
 "‘B<#>’.  Each field begins with a tag, such as B<Vendor> or B<Parent>, "
@@ -4520,10 +4666,8 @@ msgid ""
 "field tags. In other words, field text may be multiple lines in length, but "
 "the tools will join lines when processing the body of the field."
 msgstr ""
-"Les fichiers de B<%PKGCONFDIR%/origins> peuvent fournir des informations sur "
-"les différents distributeurs qui fournissent des paquets Debian. Ils "
-"contiennent un certain nombre de champs ou de commentaires pour les lignes "
-"commençant par un caractère « B<#> ». Chaque champ commence par une "
+"Ils contiennent un certain nombre de champs ou de commentaires pour les "
+"lignes commençant par un caractère « B<#> ». Chaque champ commence par une "
 "étiquette, telle que B<Vendor> ou B<Parent>, suivi du caractère « deux-"
 "points » et du contenu du champ. Les champs sont délimités par les "
 "étiquettes de champs. En d'autres termes, le contenu d'un champ peut "
@@ -4539,13 +4683,18 @@ msgid ""
 "the file can have the same casing as the value in B<Vendor> field, or it can "
 "be capitalized."
 msgstr ""
+"Le fichier sera nommé d'après le nom du distributeur. La convention "
+"habituelle est d'appeler le fichier distributeur avec le nom du distributeur "
+"tout en minuscules, mais des différences sont possibles. Notamment, les "
+"espaces sont remplacées par des tirets (« B<-> ») et le fichier peut avoir "
+"la même casse que la valeur du champ B<Vendor> ou il peut être mis en "
+"capitales."
 
 #. type: TP
 #: deb-origin.man
-#, fuzzy, no-wrap
-#| msgid "B<Vendor:>I< vendor-name>"
+#, no-wrap
 msgid "B<Vendor:> I<vendor-name> (required)"
-msgstr "B<Vendor:>I< distributeur>"
+msgstr "B<Vendor:>I< distributeur> (requis)"
 
 #. type: Plain text
 #: deb-origin.man
@@ -4648,8 +4797,8 @@ msgid ""
 "The override file has a simple whitespace-delimited format. Comments are "
 "allowed (denoted with a B<#>)."
 msgstr ""
-"Les éléments du fichier « override » sont séparés simplement par une espace. "
-"Les commentaires commencent par un caractère B<« # »>."
+"Les éléments du fichier « override » sont séparés simplement par des "
+"espaces. Les commentaires commencent par un caractère B<« # »>."
 
 #. type: Plain text
 #: deb-override.man
@@ -4668,18 +4817,14 @@ msgstr ""
 
 #. type: Plain text
 #: deb-override.man
-#, fuzzy
-#| msgid ""
-#| "I<priority> and I<section> correspond to the respective control fields "
-#| "available in the .deb. The allowed values are listed in the Debian policy."
 msgid ""
 "I<priority> and I<section> correspond to the respective control fields "
 "available in the .deb. The allowed values are specific to each distribution "
 "archive."
 msgstr ""
 "I<priority> et I<section> correspondent respectivement aux champs de "
-"contrôle présents dans le fichier .deb. Les valeurs autorisées sont définies "
-"dans la Charte Debian."
+"contrôle présents dans le fichier .deb. Les valeurs autorisées sont "
+"distinctes pour l'archive de chaque distribution."
 
 #. type: Plain text
 #: deb-override.man
@@ -4739,7 +4884,7 @@ msgid ""
 "are allowed (denoted with a B<#>)."
 msgstr ""
 "Les éléments du fichier « override » supplémentaire sont séparés simplement "
-"par une espace. Les commentaires commencent par un caractère B<« # »>."
+"par des espaces. Les commentaires commencent par un caractère B<« # »>."
 
 #. type: Plain text
 #: deb-extra-override.man
@@ -4758,9 +4903,9 @@ msgid ""
 "value to put in the field. It can contain spaces as the line is split in no "
 "more than 3 columns when it's parsed."
 msgstr ""
-"I<nom-champ> est le nom du champ qui est remplacé. I<valeur> est la valeur à "
-"mettre dans ce champ. Elle peut contenir des espaces car la ligne est "
-"découpée en 3 colonnes au plus quand elle est analysée."
+"I<nom-de-champ> est le nom du champ qui est remplacé. I<valeur> est la "
+"valeur à mettre dans ce champ. Elle peut contenir des espaces car la ligne "
+"est découpée en trois colonnes au plus quand elle est analysée."
 
 #. type: Plain text
 #: deb-extra-override.man
@@ -4796,7 +4941,7 @@ msgstr ""
 "Les fichiers B<shlibs> associent les noms et versions (I<sonames>) des "
 "bibliothèques partagées aux dépendances correspondantes dans les fichiers de "
 "contrôle des paquets. Il y a une entrée par ligne et les lignes vides ne "
-"sont B<pas> autorisées. Les lignes commencant par le caractère B<(« # »)> "
+"sont B<pas> autorisées. Les lignes commençant par le caractère B<(« # »)> "
 "sont considérées comme étant des commentaires et sont ignorées. Toutes les "
 "autres lignes doivent être au format"
 
@@ -4818,18 +4963,12 @@ msgstr ""
 
 #. type: Plain text
 #: deb-shlibs.man
-#, fuzzy
-#| msgid ""
-#| "The I<dependencies> field has the same syntax as the B<Depends> field in "
-#| "a binary control file, see B<deb-control>(5).  See also the Debian Policy "
-#| "Manual for further details."
 msgid ""
 "The I<dependencies> field has the same syntax as the B<Depends> field in a "
 "binary control file, see B<deb-control>(5)."
 msgstr ""
 "Le champ I<dépendances> utilise la même syntaxe que le champ B<Depends> d'un "
-"fichier de contrôle d'un paquet binaire, voir B<deb-control>(5). Voir aussi "
-"la Charte Debian pour plus de détails."
+"fichier de contrôle d'un paquet binaire, voir B<deb-control>(5)."
 
 #. type: Plain text
 #: deb-shlibs.man
@@ -4847,13 +4986,6 @@ msgstr "libcrunch 1 libcrunch1 (E<gt>= 1.2-1)"
 
 #. type: Plain text
 #: deb-shlibs.man
-#, fuzzy
-#| msgid ""
-#| "The I<dependencies> must mention the most recent version of the package "
-#| "that added new symbols to the library: in the above example, new symbols "
-#| "were added to version 1.2 of I<libcrunch>.  This is not the only reason "
-#| "the dependencies might need to be tightened; again, see the Debian Policy "
-#| "Manual for details."
 msgid ""
 "The I<dependencies> must mention the most recent version of the package that "
 "added new symbols to the library: in the above example, new symbols were "
@@ -4862,10 +4994,9 @@ msgid ""
 msgstr ""
 "Les I<dépendances> doivent indiquer la version la plus récente du paquet qui "
 "ajoute de nouveaux symboles à la bibliothèque : dans l'exemple précédent, de "
-"nouveaux symboles ont été ajoutés avec la version 1.2 de I<libcrunch>. Ce "
+"nouveaux symboles ont été ajoutés avec la version 1.2 de I<libcrunch>. Ce "
 "n'est pas la seule raison pour laquelle les dépendances doivent être suivies "
-"avec soin ; une fois de plus, veuillez vous reporter à la charte Debian pour "
-"plus de détails."
+"avec soin."
 
 #. type: Plain text
 #: deb-shlibs.man
@@ -4906,17 +5037,19 @@ msgstr ""
 #: deb-substvars.man
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 "Une substitution de variable est de la forme : B<${>I<nom-variable>B<}>. Les "
-"noms de variable consistent en caractères alphanumériques, traits d'union et "
-"« deux points » ; ils commencent par une lettre ou un chiffre. La "
-"substitution se fait répétitivement jusqu'à ce qu'il n'en reste aucune à "
-"faire ; le texte entier du champ après la substitution est réexaminé pour "
-"chercher d'autres substitutions."
+"noms de variable consistent en caractères alphanumériques (a-zA-Z0-9), "
+"traits d'union (-) et « deux points » (:) ; ils commencent par une lettre ou "
+"un chiffre et sont sensibles à la casse même si ils se réfèrent à d'autres "
+"entités qui préservent la casse. La substitution se fait répétitivement "
+"jusqu'à ce qu'il n'en reste aucune à faire ; le texte entier du champ après "
+"la substitution est réexaminé pour chercher d'autres substitutions."
 
 #. type: Plain text
 #: deb-substvars.man
@@ -4952,7 +5085,7 @@ msgid ""
 "set to \"foo is bar.${Newline}foo is great.\" and if you have the following "
 "field:"
 msgstr ""
-"La substitution de variables se fait dans le contexte des champs après leur "
+"La substitution de variables se fait dans le contenu des champs après leur "
 "analyse. En conséquence, si vous souhaitez qu'une variable soit remplacée "
 "sur plusieurs lignes, il n'est pas nécessaire de placer une espace après le "
 "retour à la ligne. Cela se fait implicitement quand le champ est affiché. "
@@ -5026,6 +5159,8 @@ msgid ""
 "The current host architecture (i.e. the architecture the package is being "
 "built for, the equivalent of B<DEB_HOST_ARCH>)."
 msgstr ""
+"L'architecture de l'hôte actuel (c'est-à-dire l'architecture pour laquelle "
+"le paquet est construit, équivalent de B<DEB_HOST_ARCH>)."
 
 #. type: TP
 #: deb-substvars.man dpkg-query.man
@@ -5035,10 +5170,8 @@ msgstr "B<source:Version>"
 
 #. type: Plain text
 #: deb-substvars.man
-#, fuzzy
-#| msgid "The package architecture (since dpkg 1.16.1)."
 msgid "The source package version (since dpkg 1.13.19)."
-msgstr "Architecture du paquet (depuis dpkg 1.16.1)"
+msgstr "Version du paquet source (depuis dpkg 1.13.19)."
 
 #. type: TP
 #: deb-substvars.man dpkg-query.man
@@ -5048,16 +5181,12 @@ msgstr "B<source:Upstream-Version>"
 
 #. type: Plain text
 #: deb-substvars.man
-#, fuzzy
-#| msgid ""
-#| "The upstream source package version, including the Debian version epoch "
-#| "if any."
 msgid ""
 "The upstream source package version, including the Debian version epoch if "
 "any (since dpkg 1.13.19)."
 msgstr ""
 "La version amont du paquet source, avec éventuellement l'« epoch » de la "
-"version debian."
+"version Debian (depuis dpkg 1.13.19)."
 
 #. type: TP
 #: deb-substvars.man
@@ -5067,16 +5196,12 @@ msgstr "B<binary:Version>"
 
 #. type: Plain text
 #: deb-substvars.man
-#, fuzzy
-#| msgid ""
-#| "The binary package version (which may differ from source:Version in a "
-#| "binNMU for example)."
 msgid ""
 "The binary package version (which may differ from B<source:Version> in a "
 "binNMU for example; since dpkg 1.13.19)."
 msgstr ""
-"La version du paquet binaire (qui peut être différente de source:Version "
-"dans un binNMU par exemple)."
+"La version du paquet binaire (qui peut être différente de B<source:Version> "
+"dans un binNMU par exemple ; depuis dpkg 1.13.19)."
 
 #. type: TP
 #: deb-substvars.man
@@ -5086,11 +5211,6 @@ msgstr "B<Source-Version>"
 
 #. type: Plain text
 #: deb-substvars.man
-#, fuzzy
-#| msgid ""
-#| "The source package version (from the changelog file). This variable is "
-#| "now B<deprecated> as its meaning is different from its function, please "
-#| "use the B<source:Version> or B<binary:Version> as appropriate."
 msgid ""
 "The source package version (from the changelog file). This variable is now "
 "B<obsolete> and emits an error when used as its meaning is different from "
@@ -5098,15 +5218,15 @@ msgid ""
 "appropriate."
 msgstr ""
 "La version du paquet source, selon le fichier changelog. Cette variable est "
-"maintenant B<déconseillée> car sa signification est distincte de sa "
-"fonction. Utilisez plutôt B<source:Version> ou B<binary:Version>."
+"maintenant B<obsolète> et produit une erreur lors de son utilisation car sa "
+"signification est distincte de sa fonction. Utilisez plutôt B<source:"
+"Version> ou B<binary:Version>."
 
 #. type: TP
 #: deb-substvars.man
-#, fuzzy, no-wrap
-#| msgid "B<source:Version>"
+#, no-wrap
 msgid "B<source:Synopsis>"
-msgstr "B<source:Version>"
+msgstr "B<source:Synopsis>"
 
 #. type: Plain text
 #: deb-substvars.man
@@ -5114,13 +5234,14 @@ msgid ""
 "The source package synopsis, extracted from the source stanza B<Description> "
 "field, if it exists (since dpkg 1.19.0)."
 msgstr ""
+"Le synopsis du paquet source, extrait du champ B<Description> du paragraphe "
+"source, s'il existe (depuis dpkg 1.19.0)."
 
 #. type: TP
 #: deb-substvars.man
-#, fuzzy, no-wrap
-#| msgid "B<source:Upstream-Version>"
+#, no-wrap
 msgid "B<source:Extended-Description>"
-msgstr "B<source:Upstream-Version>"
+msgstr "B<source:Extended-Description>"
 
 #. type: Plain text
 #: deb-substvars.man
@@ -5128,6 +5249,8 @@ msgid ""
 "The source package extended description, extracted from the source stanza "
 "B<Description> field, if it exists (since dpkg 1.19.0)."
 msgstr ""
+"La description étendue du paquet source, extraite du champ B<Description> du "
+"paragraphe source, s'il existe (depuis dpkg 1.19.0)."
 
 #. type: TP
 #: deb-substvars.man
@@ -5137,12 +5260,6 @@ msgstr "B<Installed-Size>"
 
 #. type: Plain text
 #: deb-substvars.man
-#, fuzzy
-#| msgid ""
-#| "The total size of the package's installed files. This value is copied "
-#| "into the corresponding control file field; setting it will modify the "
-#| "value of that field. If this variable isn't set B<dpkg-gencontrol> will "
-#| "use B<du -k debian/tmp> to find the default value."
 msgid ""
 "The approximate total size of the package's installed files. This value is "
 "copied into the corresponding control file field; setting it will modify the "
@@ -5151,11 +5268,13 @@ msgid ""
 "symlink rounded to 1 KiB used units, and a baseline of 1 KiB for any other "
 "filesystem object type."
 msgstr ""
-"La taille de tous les fichiers installés du paquet. Cette valeur est copiée "
-"dans le champ adéquat du fichier « control » ; quand on fixe cette variable, "
-"cela modifie la valeur de ce champ. Quand elle est indéterminée, B<dpkg-"
-"gencontrol> utilise la commande B<du -k debian/tmp> pour trouver une valeur "
-"par défaut."
+"La taille approximative de tous les fichiers installés du paquet. Cette "
+"valeur est copiée dans le champ adéquat du fichier « control » ; quand on "
+"fixe cette variable, cela modifie la valeur de ce champ. Quand elle est "
+"indéterminée, B<dpkg-gencontrol> calcule la valeur par défaut en "
+"additionnant la taille de chaque fichier ordinaire et lien symbolique "
+"arrondie en unité d'un kio utilisée et sur la base d'un kio pour n'importe "
+"quel type d'objet du système de fichiers."
 
 #. type: Plain text
 #: deb-substvars.man
@@ -5165,6 +5284,11 @@ msgid ""
 "filesystem used and its parameters, which might end up using either more or "
 "less space than the specified in this field."
 msgstr ""
+"B<Remarque> : Il faut tenir compte que cela ne peut jamais être qu'une "
+"approximation dans la mesure où la taille véritablement occupée sur un "
+"système installé dépend largement du système de fichiers utilisé et de ses "
+"paramètres, ce qui pourrait finir par l'utilisation de plus ou moins "
+"d'espace que ce qui est spécifié dans ce champ."
 
 #. type: TP
 #: deb-substvars.man
@@ -5183,38 +5307,34 @@ msgstr ""
 "L'espace disque supplémentaire utilisé pour l'installation du paquet. Quand "
 "on fixe cette variable, on ajoute sa valeur à la valeur de la variable "
 "B<Installed-Size> (qu'elle soit définie explicitement ou calculée par "
-"défaut) avant que la variable B<Installed-Size> ne soit copiée dans le champ "
-"du fichier « control »."
+"défaut) avant qu'elle soit copiée dans le champ B<Installed-Size> du fichier "
+"« control »."
 
 #. type: TP
 #: deb-substvars.man
-#, fuzzy, no-wrap
-#| msgid "B<F:>I<fieldname>"
+#, no-wrap
 msgid "B<S:>I<fieldname>"
-msgstr "B<F:>I<fieldname>"
+msgstr "B<S:>I<nom-de-champ>"
 
 #. type: Plain text
 #: deb-substvars.man
-#, fuzzy
-#| msgid ""
-#| "The value of the output field I<fieldname> (which must be given in the "
-#| "canonical capitalisation). Setting these variables has no effect other "
-#| "than on places where they are expanded explicitly."
 msgid ""
 "The value of the source stanza field I<fieldname> (which must be given in "
 "the canonical capitalisation; since dpkg 1.18.11).  Setting these variables "
 "has no effect other than on places where they are expanded explicitly.  "
 "These variables are only available when generating binary control files."
 msgstr ""
-"La valeur du champ I<fieldname> affiché en sortie et qui doit être "
-"classiquement en majuscules. Quand on fixe ces variables, cela ne prend "
-"effet que là où elles sont effectivement développées."
+"La valeur du champ I<nom-de-champ> du paragraphe source (qui doit être "
+"classiquement en majuscules, depuis dpkg 1.18.11). Quand on fixe ces "
+"variables, cela ne prend effet que là où elles sont explicitement "
+"développées. Ces variables ne sont disponibles que lors de la création des "
+"fichiers de contrôle binaires."
 
 #. type: TP
 #: deb-substvars.man
 #, no-wrap
 msgid "B<F:>I<fieldname>"
-msgstr "B<F:>I<fieldname>"
+msgstr "B<F:>I<nom-de-champ>"
 
 #. type: Plain text
 #: deb-substvars.man
@@ -5223,9 +5343,9 @@ msgid ""
 "canonical capitalisation). Setting these variables has no effect other than "
 "on places where they are expanded explicitly."
 msgstr ""
-"La valeur du champ I<fieldname> affiché en sortie et qui doit être "
-"classiquement en majuscules. Quand on fixe ces variables, cela ne prend "
-"effet que là où elles sont effectivement développées."
+"La valeur du champ I<nom-de-champ> affichée en sortie (qui doit être "
+"classiquement en majuscules). Quand on fixe ces variables, cela ne prend "
+"effet que là où elles sont explicitement développées."
 
 #. type: TP
 #: deb-substvars.man
@@ -5259,7 +5379,7 @@ msgstr "Ces variables contiennent chacune le caractère correspondant."
 #: deb-substvars.man
 #, no-wrap
 msgid "B<shlibs:>I<dependencyfield>"
-msgstr "B<shlibs:>I<dependencyfield>"
+msgstr "B<shlibs:>I<champ-dépendance>"
 
 #. type: Plain text
 #: deb-substvars.man
@@ -5277,10 +5397,8 @@ msgstr "B<dpkg:Upstream-Version>"
 
 #. type: Plain text
 #: deb-substvars.man
-#, fuzzy
-#| msgid "The upstream version of dpkg."
 msgid "The upstream version of dpkg (since dpkg 1.13.19)."
-msgstr "La version amont de dpkg."
+msgstr "La version amont de dpkg (depuis dpkg 1.13.19)."
 
 #. type: TP
 #: deb-substvars.man
@@ -5290,10 +5408,8 @@ msgstr "B<dpkg:Version>"
 
 #. type: Plain text
 #: deb-substvars.man
-#, fuzzy
-#| msgid "The full version of dpkg."
 msgid "The full version of dpkg (since dpkg 1.13.19)."
-msgstr "La version complète de dpkg."
+msgstr "La version complète de dpkg (depuis dpkg 1.13.19)."
 
 #. type: Plain text
 #: deb-substvars.man
@@ -5302,7 +5418,7 @@ msgid ""
 "empty value is assumed."
 msgstr ""
 "Quand une variable est référencée mais n'est pas définie, cela produit un "
-"avertissement et une valeur nulle est supposée."
+"avertissement et une valeur vide est supposée."
 
 #. type: TP
 #: deb-substvars.man
@@ -5348,6 +5464,9 @@ msgid ""
 "subset of the template symbol files used by B<dpkg-gensymbols>(1)  in Debian "
 "source packages."
 msgstr ""
+"Les fichiers de symboles sont fournis dans les paquets binaires de Debian et "
+"leur format est un sous-ensemble des fichiers modèles de symboles utilisés "
+"par B<dpkg-gensymbols>(1) dans les paquets source Debian."
 
 #. type: Plain text
 #: deb-symbols.man
@@ -5361,12 +5480,12 @@ msgstr ""
 #. type: Plain text
 #: deb-symbols.man
 msgid "I<library-soname main-dependency-template>"
-msgstr "I<modèle principal de dépendance de bibliothèque soname>"
+msgstr "I<soname-de-bibliothèque modèle-principal-de-dépendance>"
 
 #. type: Plain text
 #: deb-symbols.man
 msgid "[| I<alternative-dependency-template>]"
-msgstr "[| I<modèle alternatif de dépendance>]"
+msgstr "[| I<modèle-alternatif-de-dépendance>]"
 
 #. type: Plain text
 #: deb-symbols.man
@@ -5386,40 +5505,24 @@ msgid ""
 " I<symbol> I<minimal-version> [I<id-of-dependency-template>]\n"
 msgstr ""
 "[...]\n"
-" I<symbole> I<version minimum>[I<id du modèle de dépendance>]\n"
+" I<symbole> I<version-minimale>[I<id-du-modèle-de-dépendance>]\n"
 
 #. type: Plain text
 #: deb-symbols.man
-#, fuzzy
-#| msgid ""
-#| "The I<library-soname> is exactly the value of the SONAME field as "
-#| "exported by B<objdump>(1). A I<dependency-template> is a dependency where "
-#| "I<#MINVER#> is dynamically replaced either by a version check like "
-#| "\"(E<gt>= I<minimal-version>)\" or by nothing (if an unversioned "
-#| "dependency is deemed sufficient)."
 msgid ""
 "The I<library-soname> is exactly the value of the SONAME field as exported "
 "by B<objdump>(1). A I<dependency-template> is a dependency where I<#MINVER#> "
 "is dynamically replaced either by a version check like “(E<gt>= I<minimal-"
 "version>)” or by nothing (if an unversioned dependency is deemed sufficient)."
 msgstr ""
-"La variable I<soname de la bibliothèque> est exactement la valeur du champ "
-"SONAME telle que exportée par B<objdump>(1). Un I<modèle de dépendance> est "
+"La variable I<soname-de-bibliothèque> est exactement la valeur du champ "
+"SONAME telle qu'exportée par B<objdump>(1). Un I<modèle-de-dépendance> est "
 "une dépendance où I<#MINVER#> est dynamiquement remplacé soit par une "
-"version comme \"(E<gt>= I<version minimum>)\" soit par rien (si une "
+"version comme « (E<gt>= I<version-minimale>) » soit par rien (si une "
 "dépendance quelle que soit sa version est reconnue suffisante)."
 
 #. type: Plain text
 #: deb-symbols.man
-#, fuzzy
-#| msgid ""
-#| "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> "
-#| "being \"Base\" if the library is not versioned) is associated to a "
-#| "I<minimal-version> of its dependency template (the main dependency "
-#| "template is always used and will end up being combined with the "
-#| "dependency template referenced by I<id-of-dependency-template> if "
-#| "present). The first alternative dependency template is numbered 1, the "
-#| "second one 2, etc."
 msgid ""
 "Each exported I<symbol> (listed as I<name>@I<version>, with I<version> being "
 "“Base” if the library is not versioned) is associated to a I<minimal-"
@@ -5428,13 +5531,12 @@ msgid ""
 "by I<id-of-dependency-template> if present). The first alternative "
 "dependency template is numbered 1, the second one 2, etc."
 msgstr ""
-"Chaque I<symbole> exporté (noté I<nom>@I<version>, avec I<version> qui "
-"commence par \"Base\" si la bibliothèque n'a pas de version) est associé à "
-"une I<version minimale> dans son modèle de dépendance (le modèle principal "
-"de dépendance est toujours utilisé et se termine combiné avec le modèle de "
-"dépendance référencé par l'I<id du modèle de dépendance> est présent). La "
-"première alternative au modèle de dépendance est numérotée 1, la seconde 2, "
-"etc."
+"Chaque I<symbole> exporté (noté I<nom>@I<version>, avec I<version> réglé à "
+"« Base » si la bibliothèque n'a pas de version) est associé à une I<version-"
+"minimale> dans son modèle de dépendance (le modèle principal de dépendance "
+"est toujours utilisé et se termine combiné avec le modèle de dépendance "
+"référencé par l'I<id-du-modèle-de-dépendance> est présent). La première "
+"alternative au modèle de dépendance est numérotée 1, la seconde 2, etc."
 
 #. type: Plain text
 #: deb-symbols.man
@@ -5455,11 +5557,6 @@ msgstr "B<Build-Depends-Package>"
 
 #. type: Plain text
 #: deb-symbols.man
-#, fuzzy
-#| msgid ""
-#| "It indicates the name of the \"-dev\" package associated to the library "
-#| "and is used by B<dpkg-shlibdeps> to make sure that the dependency "
-#| "generated is at least as strict as the corresponding build dependency."
 msgid ""
 "It indicates the name of the “-dev” package associated to the library and is "
 "used by B<dpkg-shlibdeps> to make sure that the dependency generated is at "
@@ -5467,7 +5564,8 @@ msgid ""
 msgstr ""
 "Il indique le nom du paquet « -dev » associé à la bibliothèque et est "
 "utilisé par B<dpkg-shlibdeps> pour s'assurer que la dépendance produite est "
-"au moins aussi stricte que la dépendance de construction correspondante."
+"au moins aussi stricte que la dépendance de construction correspondante "
+"(depuis dpkg 1.14.13)."
 
 #. type: TP
 #: deb-symbols.man
@@ -5477,14 +5575,6 @@ msgstr "B<Ignore-Blacklist-Groups>"
 
 #. type: Plain text
 #: deb-symbols.man
-#, fuzzy
-#| msgid ""
-#| "It indicates what blacklist groups should be ignored, as a whitespace "
-#| "separated list, so that the symbols contained in those groups get "
-#| "included in the output file. This should only be necessary for toolchain "
-#| "packages providing those blacklisted symbols. The available groups are "
-#| "system dependent, for ELF and GNU-based systems these are B<aeabi> and "
-#| "B<gomp>."
 msgid ""
 "It indicates what blacklist groups should be ignored, as a whitespace "
 "separated list, so that the symbols contained in those groups get included "
@@ -5495,10 +5585,10 @@ msgid ""
 msgstr ""
 "Il indique que les groupes blacklistés seront ignorés, sous forme de liste "
 "séparée par des espaces, afin que les symboles contenus dans ces groupes "
-"soient inclus dans le fichier de sortie. Cela sera seulement nécessaire pour "
-"les paquets de chaîne d'outils qui fournissent ces symboles blacklistés. Les "
-"groupes disponibles dépendent des systèmes et, pour les systèmes basés sur "
-"ELF et GNU, ce sont B<aeabi> et B<gomp>."
+"soient inclus dans le fichier de sortie (depuis dpkg 1.17.6). Cela sera "
+"seulement nécessaire pour les paquets de chaîne d'outils qui fournissent ces "
+"symboles blacklistés. Les groupes disponibles dépendent des systèmes et, "
+"pour les systèmes basés sur ELF et GNU, ce sont B<aeabi> et B<gomp>."
 
 #. type: SS
 #: deb-symbols.man
@@ -5564,120 +5654,111 @@ msgstr "B<dpkg-shlibdeps>(1), B<dpkg-gensymbols>(1)."
 
 #. type: TH
 #: deb-postinst.man
-#, fuzzy, no-wrap
-#| msgid "I<postinst>"
+#, no-wrap
 msgid "deb-postinst"
-msgstr "I<postinst>"
+msgstr "deb-postinst"
 
 #. type: Plain text
 #: deb-postinst.man
 msgid "deb-postinst - package post-installation maintainer script"
 msgstr ""
+"deb-postinst - Script du responsable pour la fin d'installation du paquet"
 
 #. type: Plain text
 #: deb-postinst.man
-#, fuzzy
-#| msgid "I<postinst>"
 msgid "postinst"
-msgstr "I<postinst>"
+msgstr "postinst"
 
 #. type: Plain text
 #: deb-postinst.man
-#, fuzzy
-#| msgid ""
-#| "A package declares its relationship to some trigger(s) by including a "
-#| "I<triggers> file in its control archive (i.e. I<DEBIAN/triggers> during "
-#| "package creation)."
 msgid ""
 "A package can perform several post-installation actions via maintainer "
 "scripts, by including an executable I<postinst> file in its control archive "
 "(i.e. I<DEBIAN/postinst> during package creation)."
 msgstr ""
-"Un paquet déclare ses relations avec des actions différées en incluant un "
-"fichier I<triggers> dans son archive de contrôle (c'est-à-dire I<DEBIAN/"
-"triggers> au moment de la création du paquet)."
+"Un paquet peut réaliser plusieurs actions post-installation à l'aide de "
+"scripts du responsable, en incluant un fichier I<postinst> exécutable dans "
+"son archive de contrôle (c'est-à-dire I<DEBIAN/postinst> au moment de la "
+"création du paquet)."
 
 #. type: Plain text
 #: deb-postinst.man deb-postrm.man deb-preinst.man deb-prerm.man
 msgid "The script can be called in the following ways:"
-msgstr ""
+msgstr "Le script peut être appelé de diverses manières :"
 
 #. type: TP
 #: deb-postinst.man
 #, no-wrap
 msgid "I<postinst> B<configure> I<old-version>"
-msgstr ""
+msgstr "I<postinst> B<configure> I<version-ancienne>"
 
 #. type: Plain text
 #: deb-postinst.man
-#, fuzzy
-#| msgid "The package name."
 msgid "After the package was installed."
-msgstr "Nom du paquet"
+msgstr "Après l'installation paquet"
 
 #. type: TP
 #: deb-postinst.man
-#, fuzzy, no-wrap
-#| msgid "B<interest> I<trigger-name>"
+#, no-wrap
 msgid "I<postinst> B<triggered> I<trigger-name...>"
-msgstr "B<interest> I<nom-action-différée>"
+msgstr "I<postinst> B<triggered> I<nom-action-différée...>"
 
 #. type: Plain text
 #: deb-postinst.man
-#, fuzzy
-#| msgid "The package has been triggered."
 msgid "After the package was triggered."
-msgstr "Une action différée de ce paquet a été activée, il reste à l'exécuter."
+msgstr "Après activation d'une action différée de ce paquet."
 
 #. type: TP
 #: deb-postinst.man
 #, no-wrap
 msgid "I<old-postinst> B<abort-upgrade> I<new-version>"
-msgstr ""
+msgstr "I<ancien-postinst> B<abort-upgrade> I<nouvelle-version>"
 
 #. type: Plain text
 #: deb-postinst.man
 msgid "If I<prerm> fails during upgrade or fails on failed upgrade."
 msgstr ""
+"Si I<prerm> échoue durant la mise à niveau ou échoue après l'échec de la "
+"mise à niveau."
 
 #. type: TP
 #: deb-postinst.man
 #, no-wrap
 msgid "I<old-postinst> B<abort-remove>"
-msgstr ""
+msgstr "I<ancien-postinst> B<abort-remove>"
 
 #. type: Plain text
 #: deb-postinst.man
 msgid "If I<prerm> fails during removal."
-msgstr ""
+msgstr "Si I<prerm> échoue durant la suppression."
 
 #. type: TP
 #: deb-postinst.man
 #, no-wrap
 msgid "I<postinst> B<abort-deconfigure in-favour> I<new-package new-version>"
-msgstr ""
+msgstr "I<postinst> B<abort-deconfigure in-favour> I<nouveau-paquet nouvelle-version>"
 
 #. type: TQ
 #: deb-postinst.man
 #, no-wrap
 msgid "       [ B<removing> I<old-package old-version> ]"
-msgstr ""
+msgstr "       [ B<removing> I<ancien-paquet ancienne-version> ]"
 
 #. type: Plain text
 #: deb-postinst.man
 msgid "If I<prerm> fails during deconfiguration of a package."
-msgstr ""
+msgstr "Si I<prerm> échoue durant la déconfiguration d'un paquet."
 
 #. type: TP
 #: deb-postinst.man
 #, no-wrap
 msgid "I<postinst> B<abort-remove in-favour> I<new-package new-version>"
-msgstr ""
+msgstr "I<postinst> B<abort-remove in-favour> I<nouveau-paquet nouvelle-version>"
 
 #. type: Plain text
 #: deb-postinst.man
 msgid "If I<prerm> fails during replacement due to conflict."
-msgstr ""
+msgstr "Si I<prerm> échoue durant un remplacement à cause d'un conflit."
 
 #. type: Plain text
 #: deb-postinst.man deb-postrm.man deb-preinst.man deb-prerm.man dpkg.cfg.man
@@ -5687,322 +5768,285 @@ msgstr "B<dpkg>(1)."
 
 #. type: TH
 #: deb-postrm.man
-#, fuzzy, no-wrap
-#| msgid "deb-control"
+#, no-wrap
 msgid "deb-postrm"
-msgstr "deb-control"
+msgstr "deb-postrm"
 
 #. type: Plain text
 #: deb-postrm.man
 msgid "deb-postrm - package post-removal maintainer script"
-msgstr ""
+msgstr "deb-postrm - Script du responsable pour la fin du retrait du paquet"
 
 #. type: Plain text
 #: deb-postrm.man
-#, fuzzy
-#| msgid "I<postrm>"
 msgid "postrm"
-msgstr "I<postrm>"
+msgstr "postrm"
 
 #. type: Plain text
 #: deb-postrm.man
-#, fuzzy
-#| msgid ""
-#| "A package declares its relationship to some trigger(s) by including a "
-#| "I<triggers> file in its control archive (i.e. I<DEBIAN/triggers> during "
-#| "package creation)."
 msgid ""
 "A package can perform several post-removal actions via maintainer scripts, "
 "by including an executable I<postrm> file in its control archive (i.e. "
 "I<DEBIAN/postrm> during package creation)."
 msgstr ""
-"Un paquet déclare ses relations avec des actions différées en incluant un "
-"fichier I<triggers> dans son archive de contrôle (c'est-à-dire I<DEBIAN/"
-"triggers> au moment de la création du paquet)."
+"Un paquet peut réaliser plusieurs actions post-retrait à l'aide de scripts "
+"du responsable, en incluant un fichier I<postrm> exécutable dans son archive "
+"de contrôle (c'est-à-dire I<DEBIAN/postrm> au moment de la création du "
+"paquet)."
 
 #. type: TP
 #: deb-postrm.man
-#, fuzzy, no-wrap
-#| msgid "I<postrm>"
+#, no-wrap
 msgid "I<postrm> B<remove>"
-msgstr "I<postrm>"
+msgstr "I<postrm> B<remove>"
 
 #. type: Plain text
 #: deb-postrm.man
-#, fuzzy
-#| msgid "The package name."
 msgid "After the package was removed."
-msgstr "Nom du paquet"
+msgstr "Après le retrait du paquet"
 
 #. type: TP
 #: deb-postrm.man
-#, fuzzy, no-wrap
-#| msgid "I<postrm>"
+#, no-wrap
 msgid "I<postrm> B<purge>"
-msgstr "I<postrm>"
+msgstr "I<postrm> B<purge>"
 
 #. type: Plain text
 #: deb-postrm.man
-#, fuzzy
-#| msgid "The package has been triggered."
 msgid "After the package was purged."
-msgstr "Une action différée de ce paquet a été activée, il reste à l'exécuter."
+msgstr "Après la purge du paquet."
 
 #. type: TP
 #: deb-postrm.man
 #, no-wrap
 msgid "I<old-postrm> B<upgrade> I<new-version>"
-msgstr ""
+msgstr "I<ancien-postrm> B<upgrade> I<nouvelle-version>"
 
 #. type: Plain text
 #: deb-postrm.man
-#, fuzzy
-#| msgid "The package has been triggered."
 msgid "After the package was upgraded."
-msgstr "Une action différée de ce paquet a été activée, il reste à l'exécuter."
+msgstr "Après la mise à niveau du paquet."
 
 #. type: TP
 #: deb-postrm.man
 #, no-wrap
 msgid "I<new-postrm >B<failed-upgrade>I< old-version new-version>"
-msgstr ""
+msgstr "I<nouveau-postrm >B<failed-upgrade> I<ancienne-version nouvelle-version>"
 
 #. type: Plain text
 #: deb-postrm.man
 msgid "If the above B<upgrade> call fails."
-msgstr ""
+msgstr "Si l'appel B<upgrade> ci-dessus échoue."
 
 #. type: TP
 #: deb-postrm.man
 #, no-wrap
 msgid "I<postrm> B<disappear> I<overwriter-package> I<overwriter-version>"
-msgstr ""
+msgstr "I<postrm> B<disappear> I<paquet-de-remplacement> I<version-de-remplacement>"
 
 #. type: Plain text
 #: deb-postrm.man
 msgid "After all of the packages files have been replaced."
-msgstr ""
+msgstr "Après que l'ensemble des fichiers de paquets ont été remplacés"
 
 #. type: TP
 #: deb-postrm.man
 #, no-wrap
 msgid "I<new-postrm> B<abort-install>"
-msgstr ""
+msgstr "I<nouveau-postrm> B<abort-install>"
 
 #. type: Plain text
 #: deb-postrm.man
 msgid "If I<preinst> fails during install."
-msgstr ""
+msgstr "Si I<preinst> échoue lors de l'installation."
 
 #. type: TP
 #: deb-postrm.man
 #, no-wrap
 msgid "I<new-postrm> B<abort-install> I<old-version new-version>"
-msgstr ""
+msgstr "I<nouveau-postrm> B<abort-install> I<ancienne-version nouvelle-version>"
 
 #. type: Plain text
 #: deb-postrm.man
-#, fuzzy
-#| msgid "B<3.> Run I<preinst> script, if provided by the package."
 msgid "If I<preinst> fails during upgrade of removed package."
-msgstr "B<3.> Lancement du script I<preinst>, s'il est fourni par le paquet."
+msgstr "Si I<preinst> échoue lors de la mise à niveau d'un paquet supprimé."
 
 #. type: TP
 #: deb-postrm.man
 #, no-wrap
 msgid "I<new-postrm> B<abort-upgrade> I<old-version new-version>"
-msgstr ""
+msgstr "I<nouveau-postrm> B<abort-upgrade> I<ancienne-version nouvelle-version>"
 
 #. type: Plain text
 #: deb-postrm.man
 msgid "If I<preinst> fails during upgrade."
-msgstr ""
+msgstr "Si I<preinst> échoue lors d'une mise à niveau."
 
 #. type: TH
 #: deb-preinst.man
-#, fuzzy, no-wrap
-#| msgid "deb-split"
+#, no-wrap
 msgid "deb-preinst"
-msgstr "deb-split"
+msgstr "deb-preinst"
 
 #. type: Plain text
 #: deb-preinst.man
 msgid "deb-preinst - package pre-installation maintainer script"
-msgstr ""
+msgstr "deb-preinst - Script du responsable pour la pré-installation du paquet"
 
 #. type: Plain text
 #: deb-preinst.man
-#, fuzzy
-#| msgid "I<preinst>"
 msgid "preinst"
-msgstr "I<preinst>"
+msgstr "preinst"
 
 #. type: Plain text
 #: deb-preinst.man
-#, fuzzy
-#| msgid ""
-#| "A package declares its relationship to some trigger(s) by including a "
-#| "I<triggers> file in its control archive (i.e. I<DEBIAN/triggers> during "
-#| "package creation)."
 msgid ""
 "A package can perform several pre-installation actions via maintainer "
 "scripts, by including an executable I<preinst> file in its control archive "
 "(i.e. I<DEBIAN/preinst> during package creation)."
 msgstr ""
-"Un paquet déclare ses relations avec des actions différées en incluant un "
-"fichier I<triggers> dans son archive de contrôle (c'est-à-dire I<DEBIAN/"
-"triggers> au moment de la création du paquet)."
+"Un paquet peut réaliser plusieurs actions pré-installation à l'aide de "
+"scripts du responsable, en incluant un fichier I<preinst> exécutable dans "
+"son archive de contrôle (c'est-à-dire I<DEBIAN/preinst> au moment de la "
+"création du paquet)."
 
 #. type: TP
 #: deb-preinst.man
 #, no-wrap
 msgid "I<new-preinst> B<install>"
-msgstr ""
+msgstr "I<nouveau-preinst> B<install>"
 
 #. type: Plain text
 #: deb-preinst.man
-#, fuzzy
-#| msgid "The package is not installed on your system."
 msgid "Before the package is installed."
-msgstr "Le paquet n'est pas installé sur le système."
+msgstr "Avant que le paquet ne soit installé."
 
 #. type: TP
 #: deb-preinst.man
-#, fuzzy, no-wrap
-#| msgid "B<--until> I<version>, B<-u>I<version>"
+#, no-wrap
 msgid "I<new-preinst> B<install> I<old-version new-version>"
-msgstr "B<--until> I<version>, B<-u>I<version>"
+msgstr "I<nouveau-preinst> B<install> I<ancienne-version nouvelle-version>"
 
 #. type: Plain text
 #: deb-preinst.man
 msgid "Before removed package is upgraded."
-msgstr ""
+msgstr "Avant qu'un paquet supprimé ne soit mis à niveau."
 
 #. type: TP
 #: deb-preinst.man
 #, no-wrap
 msgid "I<new-preinst> B<upgrade> I<old-version new-version>"
-msgstr ""
+msgstr "I<nouveau-preinst> B<upgrade> I<ancienne-version nouvelle-version>"
 
 #. type: Plain text
 #: deb-preinst.man
-#, fuzzy
-#| msgid "The machine the package is built for."
 msgid "Before the package is upgraded."
-msgstr "Machine pour laquelle le paquet est construit."
+msgstr "Avant qu'un paquet ne soit mis à niveau."
 
 #. type: TP
 #: deb-preinst.man
 #, no-wrap
 msgid "I<old-preinst> B<abort-upgrade> I<new-version>"
-msgstr ""
+msgstr "I<ancien-preinst> B<abort-upgrade> I<nouvelle-version>"
 
 #. type: Plain text
 #: deb-preinst.man
 msgid "If I<postrm> fails during upgrade or fails on failed upgrade."
 msgstr ""
+"Si I<postrm> échoue lors de la mise à niveau ou échoue après l'échec de la "
+"mise à niveau."
 
 #. type: TH
 #: deb-prerm.man
-#, fuzzy, no-wrap
-#| msgid "deb-triggers"
+#, no-wrap
 msgid "deb-prerm"
-msgstr "deb-triggers"
+msgstr "deb-prerm"
 
 #. type: Plain text
 #: deb-prerm.man
 msgid "deb-prerm - package pre-removal maintainer script"
-msgstr ""
+msgstr "deb-prerm - Script du responsable pour le pré-retrait du paquet"
 
 #. type: Plain text
 #: deb-prerm.man
-#, fuzzy
-#| msgid "I<prerm>"
 msgid "prerm"
-msgstr "I<prerm>"
+msgstr "prerm"
 
 #. type: Plain text
 #: deb-prerm.man
-#, fuzzy
-#| msgid ""
-#| "A package declares its relationship to some trigger(s) by including a "
-#| "I<triggers> file in its control archive (i.e. I<DEBIAN/triggers> during "
-#| "package creation)."
 msgid ""
 "A package can perform several pre-removal actions via maintainer scripts, by "
 "including an executable I<prerm> file in its control archive (i.e. I<DEBIAN/"
 "prerm> during package creation)."
 msgstr ""
-"Un paquet déclare ses relations avec des actions différées en incluant un "
-"fichier I<triggers> dans son archive de contrôle (c'est-à-dire I<DEBIAN/"
-"triggers> au moment de la création du paquet)."
+"Un paquet peut réaliser plusieurs actions de pré-retrait à l'aide de scripts "
+"du responsable, en incluant un fichier I<prerm> exécutable dans son archive "
+"de contrôle (c'est-à-dire I<DEBIAN/prerm> au moment de la création du "
+"paquet)."
 
 #. type: TP
 #: deb-prerm.man
-#, fuzzy, no-wrap
-#| msgid "B<--remove>"
+#, no-wrap
 msgid "I<prerm> B<remove>"
-msgstr "B<--remove>"
+msgstr "I<prerm> B<remove>"
 
 #. type: Plain text
 #: deb-prerm.man
-#, fuzzy
-#| msgid "The machine the package is built on."
 msgid "Before the package is removed."
-msgstr "Machine sur laquelle le paquet est construit."
+msgstr "Avant le retrait du paquet"
 
 #. type: TP
 #: deb-prerm.man
 #, no-wrap
 msgid "I<old-prerm> B<upgrade> I<new-version>"
-msgstr ""
+msgstr "I<ancien-prerm> B<upgrade> I<nouvelle-version>"
 
 #. type: Plain text
 #: deb-prerm.man
 msgid "Before an upgrade."
-msgstr ""
+msgstr "Avant une mise à niveau."
 
 #. type: TP
 #: deb-prerm.man
 #, no-wrap
 msgid "I<new-prerm> B<failed-upgrade> I<old-version new-version>"
-msgstr ""
+msgstr "I<nouveau-prerm> B<failed-upgrade> I<ancienne-version nouvelle-version>"
 
 #. type: Plain text
 #: deb-prerm.man
 msgid "If the above B<upgrade> fails."
-msgstr ""
+msgstr "Si le B<upgrade> ci-dessus échoue."
 
 #. type: TP
 #: deb-prerm.man
 #, no-wrap
 msgid "I<prerm> B<deconfigure in-favour> I<new-package new-version>"
-msgstr ""
+msgstr "I<prerm> B<deconfigure in-favour> I<nouveau-paquet nouvelle-version>"
 
 #. type: TQ
 #: deb-prerm.man
 #, no-wrap
 msgid "    [ B<removing> I<old-package old-version> ]"
-msgstr ""
+msgstr "    [ B<removing> I<ancien-paquet ancienne-version> ]"
 
 #. type: Plain text
 #: deb-prerm.man
 msgid ""
 "Before package is deconfigured while dependency is replaced due to conflict."
 msgstr ""
+"Avant qu'un paquet soit déconfiguré pendant qu'une dépendance est remplacée "
+"du fait d'un conflit."
 
 #. type: TP
 #: deb-prerm.man
 #, no-wrap
 msgid "I<prerm> B<remove in-favour> I<new-package new-version>"
-msgstr ""
+msgstr "I<prerm> B<remove in-favour> I<nouveau-paquet nouvelle-version>"
 
 #. type: Plain text
 #: deb-prerm.man
-#, fuzzy
-#| msgid "The package is unpacked, but not configured."
 msgid "Before the package is replaced due to conflict."
-msgstr "Le paquet est dépaqueté mais n'est pas configuré."
+msgstr "Avant que le paquet soit remplacé du fait d'un conflit."
 
 #. type: TH
 #: deb-triggers.man
@@ -6013,7 +6057,7 @@ msgstr "deb-triggers"
 #. type: Plain text
 #: deb-triggers.man
 msgid "deb-triggers - package triggers"
-msgstr "deb-triggers - actions différées du paquet"
+msgstr "deb-triggers - Actions différées du paquet"
 
 #. type: Plain text
 #: deb-triggers.man
@@ -6038,9 +6082,9 @@ msgid ""
 "and everything after the first B<#> on any line will be trimmed, and empty "
 "lines will be ignored."
 msgstr ""
-"Ce fichier contient des directives, une par ligne. Les mises en page et "
-"autres espaces ainsi que ce qui suit le caractère B<« # »> sont sautés, et "
-"les lignes vides seront ignorées."
+"Ce fichier contient des directives, une par ligne. Les espaces de début et "
+"fin de ligne et tout ce qui suit le premier caractère B<« # »> sont "
+"supprimés, et les lignes vides seront ignorées."
 
 #. type: Plain text
 #: deb-triggers.man
@@ -6067,26 +6111,34 @@ msgstr "B<interest-noawait> I<nom-action-différée>"
 
 #. type: Plain text
 #: deb-triggers.man
-#, fuzzy
-#| msgid ""
-#| "Specifies that the package is interested in the named trigger. All "
-#| "triggers in which a package is interested must be listed using this "
-#| "directive in the triggers control file. The \"noawait\" variant does not "
-#| "put the triggering packages in triggers-awaited state. This should be "
-#| "used when the functionality provided by the trigger is not crucial."
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
-"functionality provided by the trigger is not crucial."
+"triggers control file."
 msgstr ""
 "Indique que le paquet est concerné par l'action différée indiquée. Toutes "
 "les actions différées associées au paquet doivent être listées en utilisant "
-"cette directive depuis le fichier de contrôle des actions différées. La "
-"variante « noawait » ne place toutefois pas les paquets qui provoquent cette "
-"action différée dans l'état « triggers-awaited » (actions différées "
-"attendues). Elle ne devrait être utilisée que lorsque la fonctionnalité "
+"cette directive depuis le fichier de contrôle des actions différées."
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
+"functionality provided by the trigger is not crucial."
+msgstr ""
+"Les variantes « await » placent le paquet qui provoque l'action différée "
+"dans l'état « triggers-awaited » (actions différées attendues) selon la "
+"manière dont l'action différée est activée. La variante « noawait » ne place "
+"pas les paquets qui provoquent cette action différée dans l'état « triggers-"
+"awaited » même si le paquet déclenchant a déclaré une activation "
+"« await » (par soit une directive B<activate-await> ou B<activate>, soit en "
+"utilisant l'option en ligne de commande B<dpkg-trigger> B<--no-await>. La "
+"variante « await » ne devrait être utilisée que lorsque la fonctionnalité "
 "fournie par l'action différée n'est pas critique."
 
 #. type: TP
@@ -6109,31 +6161,32 @@ msgstr "B<activate-noawait> I<nom-action-différée>"
 
 #. type: Plain text
 #: deb-triggers.man
-#, fuzzy
-#| msgid ""
-#| "Arranges that changes to this package's state will activate the specified "
-#| "trigger. The trigger will be activated at the start of the following "
-#| "operations: unpack, configure, remove (including for the benefit of a "
-#| "conflicting package), purge and deconfigure.  The \"noawait\" variant "
-#| "does not put the triggering packages in triggers-awaited state. This "
-#| "should be used when the functionality provided by the trigger is not "
-#| "crucial."
 msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
 msgstr ""
 "Cette directive permet que tout changement dans l'état de ce paquet active "
 "l'action différée spécifiée. L'action différée sera activée au début des "
 "opérations suivantes : dépaquetage, configuration, suppression (y compris en "
-"cas de remplacement par un paquet conflictuel), purge et déconfiguration. La "
-"variante « noawait » ne place toutefois pas les paquets qui provoquent cette "
-"action différée dans l'état « triggers-awaited » (actions différées "
-"attendues). Elle ne devrait être utilisée que lorsque la fonctionnalité "
-"fournie par l'action différée n'est pas critique."
+"cas de remplacement par un paquet conflictuel), purge et déconfiguration."
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
+msgstr ""
+"Les variantes « await » ne placent le paquet qui provoque cette action "
+"différée dans l'état « triggers-awaited » que si la directive concernée est "
+"aussi « await ». La variante « noawait » ne place jamais les paquets qui "
+"provoquent cette action différée dans l'état « triggers-awaited ». Elle ne "
+"devrait être utilisée que lorsque la fonctionnalité fournie par l'action "
+"différée n'est pas critique."
 
 #. type: Plain text
 #: deb-triggers.man
@@ -6163,14 +6216,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-triggers.man
-#, fuzzy
-#| msgid ""
-#| "The \"-noawait\" variants should always be favored when possible since "
-#| "triggering packages are not put in triggers-awaited state and can thus be "
-#| "immediately configured without requiring the processing of the trigger.  "
-#| "If the triggering packages are dependencies of other upgraded packages, "
-#| "it will avoid an early trigger processing run and make it possible to run "
-#| "the trigger only once as one of the last steps of the upgrade."
 msgid ""
 "The “-noawait” variants should always be favored when possible since "
 "triggering packages are not put in triggers-awaited state and can thus be "
@@ -6186,41 +6231,43 @@ msgstr ""
 "l'action différée. Si les paquets provoquant l'action différée sont des "
 "dépendances d'autres paquets mis à jour, cela évitera le lancement de "
 "l'action différée et rendra possible l'exécution de l'action différée une "
-"seule fois au cours des étapes finales de la mise à jour. "
+"seule fois au cours des étapes finales de la mise à jour."
 
 #. type: Plain text
 #: deb-triggers.man
-#, fuzzy
-#| msgid ""
-#| "The \"-noawait\" variants are only supported since dpkg 1.16.1, and will "
-#| "lead to errors if used with an older dpkg. It is thus recommended to add "
-#| "a \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" to any package that wish to use "
-#| "those directives."
 msgid ""
 "The “-noawait” variants are supported since dpkg 1.16.1, and will lead to "
 "errors if used with an older dpkg."
 msgstr ""
-"Les variantes « -noawait » ne sont gérées qu'à partir de dpkg 1.16.1 et "
-"provoqueront des erreurs avec les versions plus anciennes. Il est donc "
-"conseillé d'utiliser « Pre-Depends: dpkg(E<gt>= 1.16.1) » pour chaque paquet "
-"qui a besoin de se servir de telles directives."
+"Les variantes « -noawait » ne sont gérées qu'à partir de dpkg 1.16.1 et "
+"provoqueront des erreurs avec les versions plus anciennes."
 
 #. type: Plain text
 #: deb-triggers.man
-#, fuzzy
-#| msgid ""
-#| "The \"-await\" alias variants are only supported since dpkg 1.17.21, and "
-#| "will lead to errors if used with an older dpkg. It is thus recommended to "
-#| "add a \"Pre-Depends: dpkg (E<gt>= 1.17.21)\" to any package that wish to "
-#| "use those directives."
 msgid ""
 "The “-await” alias variants are supported since dpkg 1.17.21, and will lead "
 "to errors if used with an older dpkg."
 msgstr ""
-"Les alias de variantes « -await » ne sont gérés qu'à partir de dpkg 1.17.21 "
-"et provoqueront des erreurs avec les versions plus anciennes. Il est donc "
-"conseillé d'utiliser « Pre-Depends: dpkg(E<gt>= 1.17.21) » pour chaque "
-"paquet qui a besoin de se servir de telles directives."
+"Les alias de variantes « -await » ne sont gérés qu'à partir de dpkg 1.17.21 "
+"et provoqueront des erreurs avec les versions plus anciennes."
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+"Si un paquet fournit une directive B<interest-noawait>, toute activation "
+"mettra le paquet provoquant l'action différée en mode « noawait », "
+"indépendamment du mode d'attente demandé par l'activation (soit « await », "
+"soit « noawait »). Si un paquet fournit une directive B<interest> ou "
+"B<interest-await>, toute activation mettra le paquet provoquant l'action "
+"différée en mode « await » ou « noawait » selon la manière dont il a été "
+"activé."
 
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
@@ -6232,39 +6279,22 @@ msgstr ""
 
 #. type: TH
 #: dsc.man
-#, fuzzy, no-wrap
-#| msgid "dselect"
+#, no-wrap
 msgid "dsc"
-msgstr "dselect"
+msgstr "dsc"
 
 #. type: Plain text
 #: dsc.man
-#, fuzzy
-#| msgid "deb-src-control - Debian source packages' master control file format"
 msgid "dsc - Debian source packages' control file format"
-msgstr ""
-"deb-src-control - Format du fichier principal de contrôle dans les paquets "
-"source Debian"
+msgstr "dsc - Format du fichier de contrôle dans les paquets source Debian"
 
 #. type: Plain text
 #: dsc.man
-#, fuzzy
-#| msgid "I<filename>B<.deb>"
 msgid "I<filename>B<.dsc>"
-msgstr "I<nom-du-fichier>B<.deb>"
+msgstr "I<nom-du-fichier>B<.dsc>"
 
 #. type: Plain text
 #: dsc.man
-#, fuzzy
-#| msgid ""
-#| "Each Debian package contains the master `control' file, which contains a "
-#| "number of fields, or comments when the line starts with B<'#'>. Each "
-#| "field begins with a tag, such as B<Package> or B<Version> (case "
-#| "insensitive), followed by a colon, and the body of the field.  Fields are "
-#| "delimited only by field tags. In other words, field text may be multiple "
-#| "lines in length, but the installation tools will generally join lines "
-#| "when processing the body of the field (except in the case of the "
-#| "B<Description> field, see below)."
 msgid ""
 "Each Debian source package is composed of a .dsc control file, which "
 "contains a number of fields.  Each field begins with a tag, such as "
@@ -6275,15 +6305,15 @@ msgid ""
 "of the multiline fields B<Package-List>, B<Files>, B<Checksums-Sha1> and "
 "B<Checksums-Sha256>, see below)."
 msgstr ""
-"Chaque paquet Debian possède un fichier principal de contrôle qui contient "
-"un certain nombre de champs ou de commentaires pour les lignes commençant "
-"par un caractère « B<#> ». Chaque champ commence par une étiquette, telle "
-"que B<Package> ou B<Version> (la casse n'importe pas), suivie d'un « : », et "
-"du contenu du champ. Les champs sont séparés seulement par des étiquettes de "
+"Chaque paquet Debian possède un fichier de contrôle .dsc qui contient un "
+"certain nombre de champs. Chaque champ commence par une étiquette, telle que "
+"B<Source> ou B<Binary> (la casse n'importe pas), suivie d'un « : », et du "
+"contenu du champ. Les champs sont séparés seulement par des étiquettes de "
 "champ. En d'autres termes, le contenu d'un champ peut s'étendre sur "
 "plusieurs lignes, mais les outils d'installation joindront en général les "
-"lignes pendant le traitement du contenu du champ (sauf pour le champ "
-"B<Description>, voyez ci-dessous)."
+"lignes pendant le traitement du contenu du champ (sauf pour les champs à "
+"lignes multiples B<Package-List>, B<Files>, B<Checksums-Sha1> et B<Checksums-"
+"Sha256>, voir ci-dessous)."
 
 #. type: Plain text
 #: dsc.man
@@ -6291,32 +6321,45 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
-msgstr ""
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
+msgstr ""
+"La valeur de ce champ déclare la version du format du paquet source. La "
+"valeur du champ est utilisée par les programmes qui agissent sur un paquet "
+"source pour interpréter la liste des fichiers du paquet source et déterminer "
+"comment le dépaqueter. La syntaxe de la valeur du champ est un numéro de "
+"révision majeure (« 0-9 »), un point (« . »), un numéro de révision mineure, "
+"puis un sous-type facultatif après une espace («   ») qui, lorsqu'il est "
+"présent, est un mot en caractères alphanumériques (« a-z0-9 »), en "
+"minuscules entre parenthèses (« () ». Le sous-type est facultatif dans la "
+"syntaxe, mais peut être obligatoire pour certaines révisions particulières "
+"du format source."
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
+"Les formats source actuellement pris en charge par B<dpkg> sont B<1.0>, "
+"B<2.0>, B<3.0 (native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> et B<3.0 "
+"(custom)>. Voir B<dpkg-source>(1) pour leur description."
 
 #. type: TP
 #: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Source:> I<source-package-name> (required)"
+#, no-wrap
 msgid "B<Source:> I<source-name> (required)"
-msgstr "B<Source:> I<nom-du-paquet-source> (requis)"
+msgstr "B<Source:> I<nom-source> (requis)"
 
 #. type: TP
 #: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Breaks:>I< package-list>"
+#, no-wrap
 msgid "B<Binary:>I< binary-package-list>"
-msgstr "B<Breaks:>I< liste-de-paquets>"
+msgstr "B<Binary:> I<liste-de-paquets-binaires>"
 
 #. type: Plain text
 #: dsc.man
@@ -6324,6 +6367,8 @@ msgid ""
 "This folded field lists binary packages which this source package can "
 "produce, separated by commas."
 msgstr ""
+"Ce champ coupé liste des paquets binaires que ce paquet source peut produire "
+"séparés par des virgules."
 
 #. type: Plain text
 #: dsc.man
@@ -6332,13 +6377,16 @@ msgid ""
 "enough information about what binary packages are produced on which "
 "architecture, build-profile and other involved restrictions."
 msgstr ""
+"Ce champ a maintenant été remplacé par le champ B<Package-List> qui donne "
+"suffisamment d'informations sur quels paquets binaires sont produits sur "
+"quelle architecture, quel profil de construction et autres restrictions "
+"actives."
 
 #. type: TP
 #: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Architecture:> I<arch>|B<all>|B<any> (required)"
+#, no-wrap
 msgid "B<Architecture:> I<arch-list> (recommended)"
-msgstr "B<Architecture:> I<arch>|B<all>|B<any> (requis)"
+msgstr "B<Architecture:> I<liste-architectures> (recommandé)"
 
 #. type: Plain text
 #: dsc.man
@@ -6348,6 +6396,10 @@ msgid ""
 "architecture names and architecture wildcards are B<amd64>, B<armel>, "
 "B<i386>, B<linux-any>, B<any-amd64>, etc."
 msgstr ""
+"Une liste d'architectures et de jokers d'architecture séparés par des "
+"espaces qui précisent le type de matériel pour lequel ce paquet peut être "
+"compilé. Les noms et les jokers d'architecture courants sont B<amd64>, "
+"B<armel>, B<i386>, B<linux-any>, B<any-amd64>, etc."
 
 #. type: Plain text
 #: dsc.man
@@ -6358,6 +6410,11 @@ msgid ""
 "list contains the architecture wildcard B<any>, the only other value allowed "
 "in the list is B<all>."
 msgstr ""
+"Notez que la valeur B<all> est destinée aux paquets indépendants de "
+"l'architecture et B<any> à ceux qui sont dépendants d'une architecture. La "
+"liste peut comprendre (ou consister uniquement de) la valeur spéciale "
+"B<all>. Quand la liste comprend le joker d'architecture B<any>, la seule "
+"autre valeur permise dans la liste est B<all>."
 
 #. type: Plain text
 #: dsc.man
@@ -6365,33 +6422,29 @@ msgid ""
 "The field value is generally generated from B<Architecture> fields from in "
 "the I<debian/control> in the source package."
 msgstr ""
+"La valeur du champ est en général générée par les champs B<Architecture> du "
+"fichier I<debian/control> du paquet source."
 
 #. type: TP
 #: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Uploaders:>I< fullname-email>"
+#, no-wrap
 msgid "B<Uploaders:>I< fullname-email-list>"
-msgstr "B<Uploaders:>I< nom complet et adresse électronique>"
+msgstr "B<Uploaders:> I<liste-de-noms-complets-et-adresses-électroniques>"
 
 #. type: TP
 #: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Standards-Version:>I< version-string>"
+#, no-wrap
 msgid "B<Standards-Version:> I<version-string> (recommended)"
-msgstr "B<Standards-Version:>I< chaîne de version>"
+msgstr "B<Standards-Version:> I<chaîne-de-la-version> (recommandé)"
 
 #. type: Plain text
 #: dsc.man
-#, fuzzy
-#| msgid ""
-#| "The I<url> of a webinterface to browse the Version Control System "
-#| "repository."
 msgid ""
 "The I<url> of a web interface to browse the Version Control System "
 "repository."
 msgstr ""
 "Indique l'I<URL> de l'interface web permettant de parcourir le dépôt du "
-"système de gestion de version."
+"système de gestion de versions."
 
 #. type: Plain text
 #: dsc.man
@@ -6399,13 +6452,9 @@ msgid ""
 "These fields declare the I<url> of the Version Control System repository "
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
-
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<Suggests:>I< liste-de-paquets>"
+"Ces champs indiquent l'I<URL> du dépôt du système de gestion de versions "
+"utilisé pour la gestion du paquet. Voir B<deb-src-control>(5) pour plus de "
+"détails."
 
 #. type: Plain text
 #: dsc.man
@@ -6416,22 +6465,27 @@ msgid ""
 "present, if the file is present but not the value, then B<dpkg-source> will "
 "automatically add it, preserving previous values."
 msgstr ""
-
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<Suggests:>I< liste-de-paquets>"
+"Ce champ indique que le paquet source contient les suites de tests "
+"spécifiées. La valeur est une liste des suites de tests séparées par des "
+"virgules. Si la valeur B<autopkgtest> est présente, un fichier I<debian/"
+"tests/control> devrait être présent, et si la fichier est présent mais pas "
+"la valeur, alors B<dpkg-source> l'ajoutera automatiquement, en conservant "
+"les valeurs précédentes."
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
+"Ce champ indique l'union de toutes les dépendances de test, séparées par des "
+"virgules (champs B<Depends> du fichier I<debian/tests/control>), toutes "
+"restrictions supprimées, et les dépendances OR mises à plat (c'est-à-dire "
+"convertie en relations AND distinctes), sauf pour les binaires générés par "
+"ce paquet source et son équivalent de méta-dépendance B<@>."
 
 #. type: Plain text
 #: dsc.man
@@ -6439,33 +6493,30 @@ msgid ""
 "Rationale: this field is needed because otherwise to be able to get the test "
 "dependencies, each source package would need to be unpacked."
 msgstr ""
+"Raison : ce champ est nécessaire parce qu'autrement chaque paquet source "
+"devrait être dépaqueté pour pouvoir obtenir les dépendances de test."
 
 #. type: Plain text
 #: dsc.man
-#, fuzzy
-#| msgid ""
-#| "These fields declare relationships between packages. They are discussed "
-#| "in the B<deb-control>(5)  manpage and in the B<debian-policy> package."
 msgid ""
 "These fields declare relationships between the source package and packages "
 "used to build it.  They are discussed in the B<deb-src-control>(5) manpage."
 msgstr ""
-"Ces champs indiquent les relations entre les paquets. Ils sont détaillés "
-"dans la page de manuel B<deb-control>(5) et dans le paquet B<debian-policy>."
+"Ces champs indiquent les relations entre le paquet source et les paquets "
+"utilisés pour le construire. Ils sont détaillés dans la page de manuel B<deb-"
+"src-control>(5)."
 
 #. type: TP
 #: dsc.man
-#, fuzzy, no-wrap
-#| msgid "Package status:"
+#, no-wrap
 msgid "B<Package-List:>"
-msgstr "État du paquet :"
+msgstr "B<Package-List:>"
 
 #. type: TQ
 #: dsc.man
-#, fuzzy, no-wrap
-#| msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+#, no-wrap
 msgid " I<package> I<package-type> I<section> I<priority> I<key-value-list>"
-msgstr "I<paquet> I<priorité> I<section> [I<responsable>]"
+msgstr "I<paquet> I<type-de-paquet> I<section> I<priorité> I<liste-clés-valeurs>"
 
 #. type: Plain text
 #: dsc.man
@@ -6473,13 +6524,13 @@ msgid ""
 "This multiline field contains a list of binary packages generated by this "
 "source package."
 msgstr ""
+"Ce champ à lignes multiples contient une liste des paquets binaires générés "
+"par le paquet source."
 
 #. type: Plain text
 #: dsc.man
-#, fuzzy
-#| msgid "I<package> is the name of the binary/source package."
 msgid "The I<package> is the binary package name."
-msgstr "I<paquet> est le nom du paquet binaire/source."
+msgstr "Le I<paquet> est le nom du paquet binaire."
 
 #. type: Plain text
 #: dsc.man
@@ -6487,6 +6538,8 @@ msgid ""
 "The I<package-type> is the binary package type, usually B<deb>, another "
 "common value is B<udeb>."
 msgstr ""
+"Le I<type-de-paquet> est le type du paquet binaire, habituellement B<deb> ; "
+"une autre valeur commune est B<udeb>."
 
 #. type: Plain text
 #: dsc.man
@@ -6494,6 +6547,8 @@ msgid ""
 "The I<section> and I<priority> match the binary package fields of the same "
 "name."
 msgstr ""
+"La I<section> et la I<priorité> correspondent aux champs du même nom du "
+"paquet binaire."
 
 #. type: Plain text
 #: dsc.man
@@ -6501,13 +6556,14 @@ msgid ""
 "The I<key-value-list> is a space separated I<key>B<=>I<value> list, and the "
 "currently known optional keys are:"
 msgstr ""
+"La I<liste-clés-valeurs> est une liste de I<clés>B<=>I<valeurs> séparées par "
+"des valeurs et les clés optionnelles actuellement reconnues sont :"
 
 #. type: TP
 #: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Arch>"
+#, no-wrap
 msgid "B<arch>"
-msgstr "B<Arch>"
+msgstr "B<arch>"
 
 #. type: Plain text
 #: dsc.man
@@ -6515,13 +6571,14 @@ msgid ""
 "The architecture restriction from the binary package B<Architecture> field, "
 "with spaces converted to ‘,’."
 msgstr ""
+"Les restrictions d'architecture à partir du champ B<Architecture> du paquet "
+"binaire avec les espaces converties en « , »."
 
 #. type: TP
 #: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<config-files>"
+#, no-wrap
 msgid "B<profile>"
-msgstr "B<config-files>"
+msgstr "B<profile>"
 
 #. type: Plain text
 #: dsc.man
@@ -6529,12 +6586,15 @@ msgid ""
 "The normalized build-profile restriction formula from the binary package "
 "B<Build-Profile> field, with ORs converted to ‘+’ and ANDs to ‘,’."
 msgstr ""
+"La formule normalisée de restrictions de profil de construction à partir du "
+"champ B<Build-Profile> du paquet binaire avec les OR convertis en « + » et "
+"les « AND » en « , »."
 
 #. type: TP
 #: dsc.man
 #, no-wrap
 msgid "B<essential>"
-msgstr ""
+msgstr "B<essential>"
 
 #. type: Plain text
 #: dsc.man
@@ -6542,6 +6602,8 @@ msgid ""
 "If the binary package is essential, this key will contain the value of the "
 "B<Essential> field, that is a B<yes> value."
 msgstr ""
+"Si le paquet binaire est essentiel, cette clé contiendra la valeur du champ "
+"B<Essential>, qui est la valeur B<yes>."
 
 #. type: Plain text
 #: dsc.man
@@ -6551,6 +6613,11 @@ msgid ""
 "algorithm used: MD5 for B<Files>, SHA-1 for B<Checksums-Sha1> and SHA-256 "
 "for B<Checksums-Sha256>."
 msgstr ""
+"Ces champs à lignes multiples contiennent une liste de fichiers avec une "
+"somme de contrôle et une taille pour chacun. Ces champs ont la même syntaxe "
+"et diffèrent seulement par l'algorithme de somme de contrôle employé : MD5 "
+"pour B<Files>, SHA-1 pour B<Checksums-Sha1> et SHA-256 pour B<Checksums-"
+"Sha256>."
 
 #. type: Plain text
 #: dsc.man
@@ -6560,6 +6627,11 @@ msgid ""
 "expressed as continuation lines, one line per file.  Each line consists of "
 "the checksum, a space, the file size, a space, and the file name."
 msgstr ""
+"La première ligne de la valeur du champ (la partie sur la même ligne que le "
+"nom du champ suivi par deux-points) est toujours vide. Le contenu du champ "
+"est exprimé sous la forme de lignes de continuation, un ligne par fichier. "
+"Chaque ligne consiste en la somme de contrôle, une espace, la taille du "
+"fichier, une espace et le nom du fichier."
 
 #. type: Plain text
 #: dsc.man
@@ -6568,6 +6640,9 @@ msgid ""
 "files in these fields must match the list of files in the other related "
 "fields."
 msgstr ""
+"Ces champs listent tous les fichiers qui composent le paquet source. La "
+"liste de fichiers de ces champs doit correspondre à celle présente dans les "
+"autres champs relatifs."
 
 #. type: Plain text
 #: dsc.man
@@ -6575,13 +6650,13 @@ msgid ""
 "The B<Format> field conflates the format for the B<.dsc> file itself and the "
 "format of the extracted source package."
 msgstr ""
+"Le champ B<Format> combine le format pour le fichier B<.dsc> lui-même et le "
+"format du paquet source extrait."
 
 #. type: Plain text
 #: dsc.man
-#, fuzzy
-#| msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgid "B<deb-src-control>(5), B<deb-version>(7), B<dpkg-source>(1)."
-msgstr "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
+msgstr "B<deb-src-control>(5), B<deb-version>(7), B<dpkg-source>(1)."
 
 #. type: TH
 #: dpkg.man
@@ -6592,7 +6667,7 @@ msgstr "dpkg"
 #. type: Plain text
 #: dpkg.man
 msgid "dpkg - package manager for Debian"
-msgstr "dpkg - un gestionnaire de paquet pour Debian"
+msgstr "dpkg - Gestionnaire de paquet pour Debian"
 
 #. type: Plain text
 #: dpkg.man
@@ -6639,7 +6714,7 @@ msgid ""
 msgstr ""
 "B<dpkg> est un outil pour l'installation, la création, la suppression et la "
 "gestion des paquets Debian. B<aptitude>(1) est la principale interface à "
-"B<dpkg> et la plus agréable pour l'utilisateur.  B<dpkg> lui-même est "
+"B<dpkg> et la plus agréable pour l'utilisateur. B<dpkg> lui-même est "
 "entièrement contrôlé par des paramètres sur la ligne de commande. Une "
 "commande comporte exactement une action et zéro ou plusieurs options. Le "
 "paramètre « action » dit ce que B<dpkg> doit faire et les options modifient "
@@ -6675,7 +6750,7 @@ msgid ""
 "information is divided in three classes: B<states>, B<selection states> and "
 "B<flags>. These values are intended to be changed mainly with B<dselect>."
 msgstr ""
-"B<dpkg> conserve des renseignements utiles sur les paquets disponibles.  "
+"B<dpkg> conserve des renseignements utiles sur les paquets disponibles. "
 "Cette information est divisée en trois classes : les états, les états de la "
 "sélection et les drapeaux. La modification de ces valeurs est principalement "
 "dévolue à B<dselect>."
@@ -6844,9 +6919,26 @@ msgid ""
 "system directories, even configuration files)."
 msgstr ""
 "Le paquet est sélectionné pour être purgé (c'est-à-dire qu'on veut tout "
-"supprimer dans les répertoire du système, même les fichiers de "
+"supprimer dans les répertoires du système, même les fichiers de "
 "configuration)."
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr "B<unknown>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+"La sélection de paquets est inconnue. Un paquet qui est aussi dans un état "
+"B<not-installed> et avec un drapeau B<ok> sera oublié dans le prochain "
+"enregistrement de la base de données."
+
 #. type: SS
 #: dpkg.man
 #, no-wrap
@@ -6857,7 +6949,7 @@ msgstr "Drapeaux du paquet :"
 #: dpkg.man
 #, no-wrap
 msgid "B<ok>"
-msgstr ""
+msgstr "B<ok>"
 
 #. type: Plain text
 #: dpkg.man
@@ -6865,29 +6957,25 @@ msgid ""
 "A package marked B<ok> is in a known state, but might need further "
 "processing."
 msgstr ""
+"Un paquet marqué B<ok> est dans un état connu, mais pourrait nécessiter un "
+"traitement supplémentaire."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<reinst-required>"
+#, no-wrap
 msgid "B<reinstreq>"
-msgstr "B<reinst-required>"
+msgstr "B<reinstreq>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "A package marked B<reinst-required> is broken and requires "
-#| "reinstallation. These packages cannot be removed, unless forced with "
-#| "option B<--force-remove-reinstreq>."
 msgid ""
 "A package marked B<reinstreq> is broken and requires reinstallation. These "
 "packages cannot be removed, unless forced with option B<--force-remove-"
 "reinstreq>."
 msgstr ""
-"Un paquet marqué B<reinst-required> est défectueux et demande une "
-"réinstallation. B<dpkg> ne peut supprimer de tels paquets, à moins qu'il ne "
-"soit lancé avec l'option de forçage B<--force-remove-reinstreq>."
+"Un paquet marqué B<reinstreq> est défectueux et demande une réinstallation. "
+"B<dpkg> ne peut supprimer ces paquets, à moins qu'il ne soit lancé avec "
+"l'option de forçage B<--force-remove-reinstreq>."
 
 #. type: SH
 #: dpkg.man
@@ -6994,7 +7082,7 @@ msgid ""
 "a> or B<--pending> is given instead of I<package>, all unpacked but "
 "unconfigured packages are configured."
 msgstr ""
-"Reconfiguration d'un paquet dépaqueté mais non encore configuré. Si l'option "
+"Configuration d'un paquet dépaqueté mais non encore configuré. Si l'option "
 "B<-a> ou B<--pending> est utilisée au lieu de I<paquet>, tous les paquets "
 "dépaquetés mais non configurés sont configurés."
 
@@ -7035,14 +7123,6 @@ msgstr "B<--triggers-only> I<paquet> ...|B<-a> | B<--pending>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Processes only triggers. All pending triggers will be processed. If "
-#| "package names are supplied only those packages' triggers will be "
-#| "processed, exactly once each where necessary. Use of this option may "
-#| "leave packages in the improper B<triggers-awaited> and B<triggers-"
-#| "pending> states. This can be fixed later by running: B<dpkg --configure --"
-#| "pending>."
 msgid ""
 "Processes only triggers (since dpkg 1.14.17).  All pending triggers will be "
 "processed.  If package names are supplied only those packages' triggers will "
@@ -7050,37 +7130,41 @@ msgid ""
 "leave packages in the improper B<triggers-awaited> and B<triggers-pending> "
 "states. This can be fixed later by running: B<dpkg --configure --pending>."
 msgstr ""
-"N'exécute que les actions différées. Toutes les actions différées en attente "
-"seront traitées. Si des noms de paquets sont fournis, les actions différées "
-"de ces paquets seront traitées, une fois chacune lorsque nécessaire. "
-"L'utilisation de cette option peut laisser des paquets dans les états "
-"incorrects de B<triggers-awaited> et de B<triggers-pending>. Cela peut être "
-"corrigé plus tard en exécutant : B<dpkg --configure --pending>."
+"N'exécute que les actions différées (depuis dpkg 1.14.17). Toutes les "
+"actions différées en attente seront traitées. Si des noms de paquets sont "
+"fournis, les actions différées de ces paquets seront traitées, une fois "
+"chacune lorsque nécessaire. L'utilisation de cette option peut laisser des "
+"paquets dans les états incorrects de B<triggers-awaited> et de B<triggers-"
+"pending>. Cela peut être corrigé plus tard en exécutant : B<dpkg --configure "
+"--pending>."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<-r>, B<--remove> I<package>B<...|-a|--pending>"
+#, no-wrap
 msgid "B<-r>, B<--remove> I<package>...|B<-a>|B<--pending>"
-msgstr "B<-r>, B<--remove> I<paquet>B<...|-al--pending>"
+msgstr "B<-r>, B<--remove> I<paquet>...|B<-a>|B<--pending>"
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
-"Supprimer un paquet installé. Supprime tout à l'exception des fichiers de "
-"configuration, ce qui évite d'avoir à reconfigurer le paquet s'il était "
-"réinstallé par la suite (ces fichiers sont les fichiers de configuration "
-"listés dans le fichier de contrôle I<DEBIAN/conffiles>). Si B<-a> ou B<--"
-"pending> est indiqué à la place d'un nom de paquet, alors tous les paquets "
-"dépaquetés mais marqués pour suppression dans le fichier I<%ADMINDIR%/"
-"status> seront supprimés."
+"Supprimer un paquet installé. Cela supprime tout à l'exception des fichiers "
+"de configuration et les autres données nettoyées par le script I<postrm>, ce "
+"qui évite d'avoir à reconfigurer le paquet s'il était réinstallé par la "
+"suite (ces fichiers sont les fichiers de configuration listés dans le "
+"fichier de contrôle I<DEBIAN/conffiles>). S'il n'y a pas de fichier de "
+"contrôle I<DEBIAN/conffiles> ni script I<DEBIAN/postrm>, cette commande est, "
+"équivalente à l'appel de B<--purge>. Si B<-a> ou B<--pending> est indiqué à "
+"la place d'un nom de paquet, alors tous les paquets dépaquetés mais marqués "
+"pour suppression dans le fichier I<%ADMINDIR%/status> seront supprimés."
 
 #. type: Plain text
 #: dpkg.man
@@ -7100,28 +7184,28 @@ msgstr "B<2.> Suppression des fichiers installés"
 #. type: Plain text
 #: dpkg.man
 msgid "B<3.> Run I<postrm> script"
-msgstr "B<3.> lancement du script I<postrm>"
+msgstr "B<3.> Lancement du script I<postrm>"
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
+#, no-wrap
 msgid "B<-P>, B<--purge> I<package>...|B<-a>|B<--pending>"
-msgstr "B<-P>, B<--purge>I<paquet>...|B<-a>|B<--pending>"
+msgstr "B<-P>, B<--purge> I<paquet>...|B<-a>|B<--pending>"
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 "Purger un paquet installé ou déjà supprimé. L'action supprime tout, y "
-"compris les fichiers de configuration. Si B<-a> ou B<--pending> est indiqué "
-"à la place d'un nom de paquet, tous les paquets dépaquetés ou supprimés mais "
-"marqués dans le fichier I<%ADMINDIR%/status> comme devant être purgés seront "
-"purgés."
+"compris les fichiers de configuration et tout le reste nettoyé de I<postrm>. "
+"Si B<-a> ou B<--pending> est indiqué à la place d'un nom de paquet, tous les "
+"paquets dépaquetés ou supprimés mais marqués dans le fichier I<%ADMINDIR%/"
+"status> comme devant être purgés seront purgés."
 
 #. type: Plain text
 #: dpkg.man
@@ -7134,7 +7218,7 @@ msgid ""
 "not configuration files written to individual users' home directories."
 msgstr ""
 "Note : certains fichiers de configuration peuvent être inconnus de B<dpkg> "
-"car ils sont créés et gérés séparement par le biais de scripts de "
+"car ils sont créés et gérés séparément par le biais de scripts de "
 "configuration. En ce cas, B<dpkg> ne les supprimera pas lui-même et le "
 "script I<postrm> du paquet devra s'en charger durant l'opération de purge. "
 "Cela ne s'applique bien entendu qu'aux fichiers situés dans les répertoires "
@@ -7168,14 +7252,6 @@ msgstr "B<-V>, B<--verify> I<nom-du-paquet>..."
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Verifies the integrity of I<package-name> or all packages if omitted, by "
-#| "comparing information from the files installed by a package with the "
-#| "files metadata information stored in the B<dpkg> database. The origin of "
-#| "the files metadata information in the database is the binary packages "
-#| "themselves. That metadata gets collected at package unpack time during "
-#| "the installation process."
 msgid ""
 "Verifies the integrity of I<package-name> or all packages if omitted, by "
 "comparing information from the files installed by a package with the files "
@@ -7184,22 +7260,16 @@ msgid ""
 "packages themselves. That metadata gets collected at package unpack time "
 "during the installation process."
 msgstr ""
-"Vérifie l'intégrité du I<nom-du-paquet> ou tous les paquets, si omis, en "
+"Vérifie l'intégrité du I<nom-du-paquet> ou de tous les paquets, si omis, en "
 "comparant l'information des fichiers installés par un paquet avec "
 "l'information des métadonnées des fichiers stockée dans la base de données "
-"de B<dpkg>. L'origine de l'information des métadonnées des fichiers dans la "
-"base de données, ce sont les paquets binaires eux-mêmes. Ces métadonnées "
-"sont collectées au moment du dépaquetage des paquets durant le processus "
-"d'installation."
+"de B<dpkg> (depuis dpkg 1.17.2). L'origine de l'information des métadonnées "
+"des fichiers dans la base de données, ce sont les paquets binaires eux-"
+"mêmes. Ces métadonnées sont collectées au moment du dépaquetage des paquets "
+"durant le processus d'installation."
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Currently the only functional check performed is an md5sum verification "
-#| "against the stored value in the files database. It will only get checked "
-#| "if the database contains the file md5sum. To check for any missing "
-#| "metadata in the database, the B<--audit> command can be used."
 msgid ""
 "Currently the only functional check performed is an md5sum verification of "
 "the file contents against the stored value in the files database.  It will "
@@ -7207,11 +7277,11 @@ msgid ""
 "missing metadata in the database, the B<--audit> command can be used."
 msgstr ""
 "Actuellement la seule vérification fonctionnelle effectuée est une "
-"comparaison des sommes de contrôle MD5 des fichiers par rapport aux valeurs "
-"stockées dans la base de données des fichiers. La vérification n'a lieu que "
-"si la base de données contient les informations nécessaires. Pour vérifier "
-"si des méta-données manquent dans la base de données, la commande B<--audit> "
-"peut être employée."
+"comparaison des sommes de contrôle MD5 du contenu des fichier par rapport "
+"aux valeurs stockées dans la base de données des fichiers. La vérification "
+"n'a lieu que si la base de données contient les informations nécessaires. "
+"Pour vérifier si des métadonnées manquent dans la base de données, la "
+"commande B<--audit> peut être employée."
 
 #. type: Plain text
 #: dpkg.man
@@ -7230,17 +7300,10 @@ msgstr ""
 #: dpkg.man
 #, no-wrap
 msgid "B<-C>, B<--audit> [I<package-name>...]"
-msgstr "B<-C>, B<--audit> I<nom-paquet>..."
+msgstr "B<-C>, B<--audit> I<nom-du-paquet>..."
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Performs database sanity and consistency checks for I<package-name> or "
-#| "all packages if omitted.  For example, searches for packages that have "
-#| "been installed only partially on your system or that have missing, wrong "
-#| "or obsolete control data or files. B<dpkg> will suggest what to do with "
-#| "them to get them fixed."
 msgid ""
 "Performs database sanity and consistency checks for I<package-name> or all "
 "packages if omitted (per package checks since dpkg 1.17.10).  For example, "
@@ -7248,38 +7311,27 @@ msgid ""
 "or that have missing, wrong or obsolete control data or files. B<dpkg> will "
 "suggest what to do with them to get them fixed."
 msgstr ""
-"Effectue une vérification de et de consistance sur le I<nom-paquet> ou sur "
-"tous les paquets si omis. Par exemple, recherche les paquets qui n'ont été "
-"que partiellement installés sur le système ou qui ont des données de "
-"contrôle ou des fichiers manquants, incorrects ou obsolètes. B<dpkg> suggère "
-"une manière de les faire fonctionner."
+"Effectue une vérification du bon état et de consistance de la base de "
+"données sur le I<nom-du-paquet> ou sur tous les paquets si omis "
+"(vérification par paquet depuis dpkg 1.17.10). Par exemple, recherche les "
+"paquets qui n'ont été que partiellement installés sur le système ou qui ont "
+"des données de contrôle ou des fichiers manquants, incorrects ou obsolètes. "
+"B<dpkg> suggère une manière de les corriger."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<--update-avail>, B<--merge-avail> [I<Packages-file>]"
+#, no-wrap
 msgid "B<--update-avail> [I<Packages-file>]"
-msgstr "B<--update-avail>, B<--merge-avail> [I<fichier-Paquets>]"
+msgstr "B<--update-avail> [I<fichier-Paquets>]"
 
 #. type: TQ
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<--update-avail>, B<--merge-avail> [I<Packages-file>]"
+#, no-wrap
 msgid "B<--merge-avail> [I<Packages-file>]"
-msgstr "B<--update-avail>, B<--merge-avail> [I<fichier-Paquets>]"
+msgstr "B<--merge-avail> [I<fichier-Paquets>]"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Update B<dpkg>'s and B<dselect>'s idea of which packages are available. "
-#| "With action B<--merge-avail>, old information is combined with "
-#| "information from I<Packages-file>. With action B<--update-avail>, old "
-#| "information is replaced with the information in the I<Packages-file>. The "
-#| "I<Packages-file> distributed with Debian is simply named I<Packages>. If "
-#| "the I<Packages-file> argument is missing or named B<-> then it will be "
-#| "read from standard input (since dpkg 1.17.7). B<dpkg> keeps its record of "
-#| "available packages in I<%ADMINDIR%/available>."
 msgid ""
 "Update B<dpkg>'s and B<dselect>'s idea of which packages are available. With "
 "action B<--merge-avail>, old information is combined with information from "
@@ -7295,9 +7347,9 @@ msgstr ""
 "avec celles qui proviennent du fichier I<fichier-Packages>. L'action B<--"
 "update-avail> remplace les informations anciennes par celles qui proviennent "
 "du fichier I<fichier-Packages>. Le fichier I<fichier-Packages> distribué "
-"avec Debian est appelé simplement I<Packages>. Si le paramètre I<fichier- "
-"Packages> est manquant ou est nommé B<->, alors, il sera lu à partir de "
-"l'entrée standard (depuis dpkg 1.17.7). B<dpkg> garde son propre "
+"avec Debian est appelé simplement « I<Packages> ». Si le paramètre I<fichier-"
+"Packages> est manquant ou est nommé « B<-> », alors, il sera lu à partir de "
+"l'entrée standard (depuis dpkg 1.17.7). B<dpkg> garde son propre "
 "enregistrement des paquets disponibles dans I<%ADMINDIR%/available>."
 
 #. type: Plain text
@@ -7318,7 +7370,7 @@ msgstr ""
 #: dpkg.man
 #, no-wrap
 msgid "B<-A>, B<--record-avail> I<package-file>..."
-msgstr "B<-A>, B<--record-avail> I<fichier_paquet>..."
+msgstr "B<-A>, B<--record-avail> I<fichier-paquet>..."
 
 #. type: Plain text
 #: dpkg.man
@@ -7340,17 +7392,15 @@ msgstr "B<--forget-old-unavail>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Now B<obsolete> and a no-op as B<dpkg> will automatically forget "
-#| "uninstalled unavailable packages."
 msgid ""
 "Now B<obsolete> and a no-op as B<dpkg> will automatically forget uninstalled "
 "unavailable packages (since dpkg 1.15.4), but only those that do not contain "
 "user information such as package selections."
 msgstr ""
 "Désormais B<obsolète> et sans effet car B<dpkg> oublie automatiquement les "
-"paquets désinstallés qui ne sont pas disponibles."
+"paquets désinstallés qui ne sont pas disponibles depuis (dpkg 1.15.4), mais "
+"seulement ceux qui ne contiennent pas d'informations pour l'utilisateur "
+"comme les sélections de paquets."
 
 #. type: TP
 #: dpkg.man
@@ -7376,7 +7426,7 @@ msgid ""
 "non-installed packages (i.e. those which have been previously purged) will "
 "not be shown."
 msgstr ""
-"Obtenir la liste des sélections de paquets et l'envoie sur la sortie "
+"Obtient la liste des sélections de paquets et l'envoie sur la sortie "
 "standard. Sans un motif, les paquets non installés (c'est-à-dire ceux qui "
 "ont été précédemment purgés) ne seront pas affichés."
 
@@ -7388,12 +7438,6 @@ msgstr "B<--set-selections>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Set package selections using file read from stdin. This file should be in "
-#| "the format 'I<package> I<state>', where state is one of B<install>, "
-#| "B<hold>, B<deinstall> or B<purge>. Blank lines and comment lines "
-#| "beginning with '#' are also permitted."
 msgid ""
 "Set package selections using file read from stdin. This file should be in "
 "the format “I<package> I<state>”, where state is one of B<install>, B<hold>, "
@@ -7403,7 +7447,7 @@ msgstr ""
 "Modifie la liste des sélections des paquets en lisant un fichier sur "
 "l'entrée standard. Le format de ce fichier doit être de la forme « I<paquet> "
 "I<état> », où état vaut B<install>, B<hold>, B<deinstall> ou B<purge>. Les "
-"lignes vides ou les lignes de commentaires débutant par « # » sont "
+"lignes vides ou les lignes de commentaires débutant par « B<#> » sont "
 "autorisées."
 
 #. type: Plain text
@@ -7415,7 +7459,7 @@ msgid ""
 msgstr ""
 "Le fichier I<available> doit être à jour pour que cette commande soit utile, "
 "autrement des paquets inconnus seront ignorés avec un avertissement. "
-"Veuillez consultez les commandes B<--update-avail> and B<--merge-avail> pour "
+"Veuillez consultez les commandes B<--update-avail> et B<--merge-avail> pour "
 "plus d'informations."
 
 #. type: TP
@@ -7426,20 +7470,16 @@ msgstr "B<--clear-selections>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Set the requested state of every non-essential package to deinstall.  "
-#| "This is intended to be used immediately before B<--set-selections>, to "
-#| "deinstall any packages not in list given to B<--set-selections>."
 msgid ""
 "Set the requested state of every non-essential package to deinstall (since "
 "dpkg 1.13.18).  This is intended to be used immediately before B<--set-"
 "selections>, to deinstall any packages not in list given to B<--set-"
 "selections>."
 msgstr ""
-"Met l'état de chaque paquet non essentiel à « deinstall ». Il faut utiliser "
-"cette option juste avant B<--set-selections>, pour désinstaller les paquets "
-"qui ne sont pas affichés par B<--set-selections>."
+"Met l'état de chaque paquet non essentiel à « deinstall » (depuis "
+"dpkg 1.13.18). Il faut utiliser cette option juste avant B<--set-"
+"selections>, pour désinstaller les paquets qui ne sont pas affichés par B<--"
+"set-selections>."
 
 #. type: TP
 #: dpkg.man
@@ -7456,12 +7496,20 @@ msgstr ""
 "Recherche les paquets qui ont été sélectionnés pour l'installation, mais "
 "qui, pour une raison quelconque, ne sont pas encore installés."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+"Note : cette commande utilise à la fois le fichier disponible et les "
+"sélections de paquets."
+
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<-p>I<package>"
+#, no-wrap
 msgid "B<--predep-package>"
-msgstr "B<-p>I<paquet>"
+msgstr "B<--predep-package>"
 
 #. type: Plain text
 #: dpkg.man
@@ -7469,6 +7517,9 @@ msgid ""
 "Print a single package which is the target of one or more relevant pre-"
 "dependencies and has itself no unsatisfied pre-dependencies."
 msgstr ""
+"Affiche un fichier unique qui est la cible d'une ou plusieurs pré-"
+"dépendances correspondantes et n'a lui-même pas de pré-dépendances "
+"insatisfaites."
 
 #. type: Plain text
 #: dpkg.man
@@ -7476,6 +7527,8 @@ msgid ""
 "If such a package is present, output it as a Packages file entry, which can "
 "be massaged as appropriate."
 msgstr ""
+"Si un tel paquet est présent, l'affiche comme entrée du fichier Packages, et "
+"il peut être manipulé comme il se doit."
 
 #. type: Plain text
 #: dpkg.man
@@ -7483,6 +7536,8 @@ msgid ""
 "Returns 0 when a package is printed, 1 when no suitable package is available "
 "and 2 on error."
 msgstr ""
+"Renvoie B<0> si un paquet est affiché, B<1> quand il n'y a pas de paquet "
+"adéquat disponible et B<2> en cas d'erreur."
 
 #. type: TP
 #: dpkg.man
@@ -7492,12 +7547,6 @@ msgstr "B<--add-architecture >I<architecture>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Add I<architecture> to the list of architectures for which packages can "
-#| "be installed without using B<--force-architecture>. The architecture "
-#| "B<dpkg> is built for (i.e. the output of B<--print-architecture>)  is "
-#| "always part of that list."
 msgid ""
 "Add I<architecture> to the list of architectures for which packages can be "
 "installed without using B<--force-architecture> (since dpkg 1.16.2).  The "
@@ -7505,9 +7554,9 @@ msgid ""
 "architecture>)  is always part of that list."
 msgstr ""
 "Ajoute I<architecture> à la liste d'architectures pour lesquelles les "
-"paquets peuvent être installés sans utiliser B<--force-architecture>. "
-"L'architecture pour laquelle B<dpkg> est compilé (c'est-à-dire ce qu'affiche "
-"B<--print-architecture>) est toujours incluse dans cette liste."
+"paquets peuvent être installés sans utiliser B<--force-architecture> (depuis "
+"dpkg 1.16.2). L'architecture pour laquelle B<dpkg> est compilé (c'est-à-dire "
+"ce qu'affiche B<--print-architecture>) est toujours incluse dans cette liste."
 
 #. type: TP
 #: dpkg.man
@@ -7517,14 +7566,6 @@ msgstr "B<--remove-architecture >I<architecture>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Remove I<architecture> from the list of architectures for which packages "
-#| "can be installed without using B<--force-architecture>. If the "
-#| "architecture is currently in use in the database then the operation will "
-#| "be refused, except if B<--force-architecture> is specified. The "
-#| "architecture B<dpkg> is built for (i.e. the output of B<--print-"
-#| "architecture>) can never be removed from that list."
 msgid ""
 "Remove I<architecture> from the list of architectures for which packages can "
 "be installed without using B<--force-architecture> (since dpkg 1.16.2). If "
@@ -7534,11 +7575,12 @@ msgid ""
 "be removed from that list."
 msgstr ""
 "Retire I<architecture> de la liste d'architectures pour lesquelles les "
-"paquets peuvent être installés sans utiliser B<--force-architecture>. Si "
-"cette architecture est actuellement utilisée dans la base de données, cette "
-"opération sera rejetée, sauf si B<--force-architecture> est utilisé. "
-"L'architecture pour laquelle B<dpkg> est compilé (c'est-à-dire ce qu'affiche "
-"B<--print-architecture>) ne peut jamais être retirée de cette liste."
+"paquets peuvent être installés sans utiliser B<--force-architecture> (depuis "
+"dpkg 1.16.2). Si cette architecture est actuellement utilisée dans la base "
+"de données, cette opération sera rejetée, sauf si B<--force-architecture> "
+"est utilisé. L'architecture pour laquelle B<dpkg> est compilé (c'est-à-dire "
+"ce qu'affiche B<--print-architecture>) ne peut jamais être retirée de cette "
+"liste."
 
 #. type: TP
 #: dpkg.man
@@ -7548,9 +7590,6 @@ msgstr "B<--print-architecture>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Print architecture of packages B<dpkg> installs (for example, \"i386\")."
 msgid "Print architecture of packages B<dpkg> installs (for example, “i386”)."
 msgstr "Affiche l'architecture des paquets installés (par exemple, « i386 »)."
 
@@ -7562,23 +7601,19 @@ msgstr "B<--print-foreign-architectures>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Print a newline-separated list of the extra architectures B<dpkg> is "
-#| "configured to allow packages to be installed for."
 msgid ""
 "Print a newline-separated list of the extra architectures B<dpkg> is "
 "configured to allow packages to be installed for (since dpkg 1.16.2)."
 msgstr ""
-"Affiche la liste, à raison d'une par ligne, des architectures pour "
-"lesquelles B<dpkg> est autorisé à installer des paquets."
+"Affiche la liste, à raison d'une par ligne, des architectures "
+"supplémentaires pour lesquelles B<dpkg> est autorisé à installer des paquets "
+"(depuis dpkg 1.16.2)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<--export=>I<format>"
+#, no-wrap
 msgid "B<--assert->I<feature>"
-msgstr "B<--export=>I<format>"
+msgstr "B<--assert=>I<fonction>"
 
 #. type: Plain text
 #: dpkg.man
@@ -7588,85 +7623,85 @@ msgid ""
 "provide support for it yet, and 2 if the feature is unknown.  The current "
 "list of assertable features is:"
 msgstr ""
+"Déclare que B<dpkg> prend en charge la fonction requise. Renvoie B<0> si la "
+"fonction est complètement prise en charge, B<1> si la fonction est reconnue "
+"mais que B<dpkg> ne peut pas encore fournir sa prise en charge, et B<2> si "
+"la fonction est inconnue. La liste actuelle des fonctions déclarables est :"
 
 #. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<support-predepends>"
-msgstr ""
+msgstr "B<support-predepends>"
 
 #. type: Plain text
 #: dpkg.man
 msgid "Supports the B<Pre-Depends> field (since dpkg 1.1.0)."
-msgstr ""
+msgstr "Gère le champ B<Pre-Depends> (depuis dpkg 1.1.0)."
 
 #. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<working-epoch>"
-msgstr ""
+msgstr "B<working-epoch>"
 
 #. type: Plain text
 #: dpkg.man
 msgid "Supports epochs in version strings (since dpkg 1.4.0.7)."
-msgstr ""
+msgstr "Gère les « epochs » dans les chaînes de version (depuis dpkg 1.4.0.7)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<--log=>I<filename>"
+#, no-wrap
 msgid "B<long-filenames>"
-msgstr "B<--log=>I<fichier>"
+msgstr "B<longs-noms-de-fichier>"
 
 #. type: Plain text
 #: dpkg.man
 msgid "Supports long filenames in B<deb>(5) archives (since dpkg 1.4.1.17)."
 msgstr ""
+"Gère les longs noms de fichier dans les archives B<deb>(5) (depuis "
+"dpkg 1.4.1.17)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<half-configured>"
+#, no-wrap
 msgid "B<multi-conrep>"
-msgstr "B<half-configured>"
+msgstr "B<multi-conrep>"
 
 #. type: Plain text
 #: dpkg.man
 msgid "Supports multiple B<Conflicts> and B<Replaces> (since dpkg 1.4.1.19)."
-msgstr ""
+msgstr "Gère plusieurs B<Conflicts> et B<Replaces> (depuis dpkg 1.4.1.19)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<-a>I<arch>"
+#, no-wrap
 msgid "B<multi-arch>"
-msgstr "B<-a>I<arch>"
+msgstr "B<multi-arch>"
 
 #. type: Plain text
 #: dpkg.man
 msgid "Supports multi-arch fields and semantics (since dpkg 1.16.2)."
 msgstr ""
+"Gère les champs et les sémantiques multi-architectures (depuis dpkg 1.16.2)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<--version>"
+#, no-wrap
 msgid "B<versioned-provides>"
-msgstr "B<--version>"
+msgstr "B<versioned-provides>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "Cancels a previous B<--no-triggers>."
 msgid "Supports versioned B<Provides> (since dpkg 1.17.11)."
-msgstr "Annule un précédent B<--no-triggers>."
+msgstr "Gère les B<Provides> versionnés (depuis dpkg 1.17.11)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<--force-sign>"
+#, no-wrap
 msgid "B<--validate->I<thing string>"
-msgstr "B<--force-sign>"
+msgstr "B<--validate->I<chaîne-quelque-chose>"
 
 #. type: Plain text
 #: dpkg.man
@@ -7676,62 +7711,55 @@ msgid ""
 "invalid but might be accepted in lax contexts, and 2 if the I<string> is "
 "invalid.  The current list of validatable I<thing>s is:"
 msgstr ""
+"Valide que la I<chaîne> I<quelque-chose> a une syntaxe correcte (depuis "
+"dpkg 1.18.16). Renvoie B<0> si la I<chaîne> est valable, B<1> si la "
+"I<chaîne> n'est pas valable mais pourrait être accepté dans des contextes "
+"tolérants, et B<2> si la chaîne n'est pas valable. La liste actuelle des "
+"I<quelque-chose>s acceptables est :"
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<pkgstate>"
+#, no-wrap
 msgid "B<pkgname>"
-msgstr "B<pkgstate>"
+msgstr "B<pkgname>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "The package architecture (since dpkg 1.16.1)."
 msgid "Validates the given package name (since dpkg 1.18.16)."
-msgstr "Architecture du paquet (depuis dpkg 1.16.1)"
+msgstr "Valide le nom de paquet donné (depuis dpkg 1.18.16)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<--rename>"
+#, no-wrap
 msgid "B<trigname>"
-msgstr "B<--rename>"
+msgstr "B<trigname>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "The Debian cpu name of the target machine (since dpkg 1.17.14)."
 msgid "Validates the given trigger name (since dpkg 1.18.16)."
-msgstr "Nom du processeur Debian de la machine cible (depuis dpkg 1.17.14)."
+msgstr "Valide le nom d'action différée donné (depuis dpkg 1.18.16)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<Arch>"
+#, no-wrap
 msgid "B<archname>"
-msgstr "B<Arch>"
+msgstr "B<archname>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "The package architecture (since dpkg 1.16.1)."
 msgid "Validates the given architecture name (since dpkg 1.18.16)."
-msgstr "Architecture du paquet (depuis dpkg 1.16.1)"
+msgstr "Valide le nom d'architecture donné (depuis dpkg 1.18.16)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<--version>"
+#, no-wrap
 msgid "B<version>"
-msgstr "B<--version>"
+msgstr "B<version>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "The package architecture (since dpkg 1.16.1)."
 msgid "Validates the given version (since dpkg 1.18.16)."
-msgstr "Architecture du paquet (depuis dpkg 1.16.1)"
+msgstr "Valide la version donnée (depuis dpkg 1.18.16)."
 
 #. type: TP
 #: dpkg.man
@@ -7746,16 +7774,6 @@ msgstr "B<--compare-versions >I<ver1 op ver2>"
 #.  are not reset for subsequent commands executed during the same run.
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Compare version numbers, where I<op> is a binary operator. B<dpkg> "
-#| "returns success (zero result) if the specified condition is satisfied, "
-#| "and failure (nonzero result) otherwise. There are two groups of "
-#| "operators, which differ in how they treat an empty I<ver1> or I<ver2>. "
-#| "These treat an empty version as earlier than any version: B<lt le eq ne "
-#| "ge gt>. These treat an empty version as later than any version: B<lt-nl "
-#| "le-nl ge-nl gt-nl>. These are provided only for compatibility with "
-#| "control file syntax: B<E<lt> E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>>."
 msgid ""
 "Compare version numbers, where I<op> is a binary operator. B<dpkg> returns "
 "true (B<0>) if the specified condition is satisfied, and false (B<1>) "
@@ -7769,15 +7787,17 @@ msgid ""
 "E<lt> 0.1> evaluates to true."
 msgstr ""
 "Compare des numéros de version, où I<op> est un opérateur binaire. B<dpkg> "
-"retourne un zéro si la condition spécifiée est vérifiée, et retourne un "
-"nombre différent de zéro dans le cas contraire. Il y a deux groupes "
-"d'opérateurs ; ils diffèrent par leur façon de traiter l'absence de I<ver1> "
-"ou de I<ver2>. Pour les opérateurs suivants, B<lt le eq ne ge gt>, l'absence "
-"d'une version est considérée comme inférieure à toute version ; pour les "
-"opérateurs B<lt-nl le-nl ge-nl gt-nl>, l'absence d'une version est "
-"considérée comme supérieure à toute version. Les opérateurs B<E<lt> "
-"E<lt>E<lt> E<lt>= = E<gt>= E<gt>E<gt> E<gt>> ne sont fournis que pour la "
-"compatibilité avec la syntaxe du fichier de contrôle."
+"renvoie « true » (B<0>) si la condition spécifiée est vérifiée, et renvoie "
+"« false » (B<1>) dans le cas contraire. Il y a deux groupes d'opérateurs ; "
+"ils diffèrent par leur façon de traiter l'absence de I<ver1> ou de I<ver2>. "
+"Pour les opérateurs suivants, B<lt le eq ne ge gt>, l'absence d'une version "
+"est considérée comme inférieure à toute version ; pour les opérateurs B<lt-"
+"nl le-nl ge-nl gt-nl>, l'absence d'une version est considérée comme "
+"supérieure à toute version. Les opérateurs B<E<lt> E<lt>E<lt> E<lt>= = "
+"E<gt>= E<gt>E<gt> E<gt>> ne sont fournis que pour la compatibilité avec la "
+"syntaxe du fichier de contrôle. Les opérateurs B<E<lt>> et B<E<gt>> sont "
+"obsolètes et ne devraient B<pas> être utilisés du fait d'une sémantique pas "
+"claire. Comme illustration, B<0.1E<lt> 0.1> est évaluée à vrai."
 
 #. type: TP
 #: dpkg.man dpkg-architecture.man dpkg-buildpackage.man dpkg-genbuildinfo.man
@@ -7796,7 +7816,7 @@ msgid "Display a brief help message."
 msgstr "Affiche un court message d'aide."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
@@ -7849,26 +7869,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid ""
-#| "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
-#| "    Build a deb package.\n"
-#| "B<-c>, B<--contents> I<archive>\n"
-#| "    List contents of a deb package.\n"
-#| "B<-e>, B<--control> I<filename> [I<directory>]\n"
-#| "    Extract control-information from a package.\n"
-#| "B<-x>, B<--extract> I<archive directory>\n"
-#| "    Extract the files contained by package.\n"
-#| "B<-X>, B<--vextract> I<archive directory>\n"
-#| "    Extract and display the filenames contained by a\n"
-#| "    package.\n"
-#| "B<-f>, B<--field>  I<archive> [I<control-field>...]\n"
-#| "    Display control field(s) of a package.\n"
-#| "B<--fsys-tarfile> I<archive>\n"
-#| "    Display the filesystem tar-file contained by a\n"
-#| "    Debian package.\n"
-#| "B<-I>, B<--info> I<archive> [I<control-file>...]\n"
-#| "    Show information about a package.\n"
+#, no-wrap
 msgid ""
 "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]\n"
 "    Build a deb package.\n"
@@ -7894,15 +7895,21 @@ msgstr ""
 "    Construit un paquet deb.\n"
 "B<-c>, B<--contents> I<archive>\n"
 "    Liste le contenu d'un paquet deb.\n"
-"B<-e>, B<--control> I<nom-de-fichier> [I<répertoire>]\n"
+"B<-e>, B<--control> I<archive> [I<répertoire>]\n"
 "    Extrait les informations de contrôle d'un paquet.\n"
-"B<-x>, B<--extract> I<répertoire de l'archive>\n"
+"B<-x>, B<--extract> I<archive répertoire>\n"
 "    Extrait et affiche les fichiers contenus dans un paquet.\n"
-"B<-f>, B<--field> I<nom-de-fichier> [I<champ de contrôle>] ...\n"
+"B<-X>, B<--vextract> I<archive répertoire>\n"
+"    Extrait et affiche les noms de fichiers contenus dans un\n"
+"    paquet.\n"
+"B<-f>, B<--field> I<archive> [I<champ de contrôle>] ...\n"
 "    Affiche le(s) champ(s) de contrôle d'un paquet.\n"
+"B<--ctrl-tarfile> I<archive>\n"
+"    Produit le contenu du fichier tar de contrôle d'un paquet Debian.\n"
 "B<--fsys-tarfile> I<archive>\n"
-"    Affiche le contenu du fichier tar d'un paquet Debian.\n"
-"B<-I>, B<--info> I<nom-de-fichier> [I<fichier de contrôle>]\n"
+"    Produit le contenu du fichier tar du système de fichiers d'un\n"
+"    paquet Debian.\n"
+"B<-I>, B<--info> I<archive> [I<fichier de contrôle>]\n"
 "    Affiche des renseignements sur un paquet.\n"
 
 #. type: TP
@@ -7963,14 +7970,6 @@ msgstr "OPTIONS"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "All options can be specified both on the command line and in the B<dpkg> "
-#| "configuration file I<%PKGCONFDIR%/dpkg.cfg> or fragment files (with names "
-#| "matching this shell pattern '[0-9a-zA-Z_-]*') on the configuration "
-#| "directory I<%PKGCONFDIR%/dpkg.cfg.d/>. Each line in the configuration "
-#| "file is either an option (exactly the same as the command line option but "
-#| "without leading hyphens) or a comment (if it starts with a B<#>)."
 msgid ""
 "All options can be specified both on the command line and in the B<dpkg> "
 "configuration file I<%PKGCONFDIR%/dpkg.cfg> or fragment files (with names "
@@ -7982,10 +7981,10 @@ msgstr ""
 "On peut spécifier toutes les options à la fois sur la ligne de commande, "
 "dans le fichier de configuration de B<dpkg>, I<%PKGCONFDIR%/dpkg.cfg> ou "
 "dans les fragments de fichiers du répertoire de configuration I<%PKGCONFDIR%/"
-"dpkg.cfg.d/> (avec un nom qui respecte le motif '[0-9a-zA-Z_-]*')). Chaque "
+"dpkg.cfg.d/> (avec un nom qui respecte le motif « [0-9a-zA-Z_-]* »). Chaque "
 "ligne de ce fichier est soit une option (identique à une option en ligne de "
 "commande mais sans tirets initiaux), soit un commentaire, commençant par "
-"B<#>."
+"« B<#> »."
 
 #. type: TP
 #: dpkg.man
@@ -8071,23 +8070,21 @@ msgstr ""
 "10000   Sortie sur l'activation et le traitement des actions différées\n"
 "20000   De nombreuses sorties sur les actions différées\n"
 "40000   Quantité stupide de sorties sur les actions différées\n"
-" 1000   Beaucoup de radotage à propos du répertoire\n"
+" 1000   Beaucoup de radotage à propos, par exemple, du répertoire\n"
 "        dpkg/info \n"
 " 2000   Quantité stupide de radotage\n"
 
 #. type: TP
-#: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<--force-sign>"
+#: dpkg.man dpkg-statoverride.man
+#, no-wrap
 msgid "B<--force->I<things>"
-msgstr "B<--force-sign>"
+msgstr "B<--force->I<quelque-chose>"
 
 #. type: TQ
-#: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
+#: dpkg.man dpkg-statoverride.man
+#, no-wrap
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
-msgstr "B<--force->I<quelque-chose>, B<--no-force->I<quelque-chose>, B<--refuse->I<quelque-chose>"
+msgstr "B<--no-force->I<quelque-chose>, B<--refuse->I<quelque-chose>"
 
 #. type: Plain text
 #: dpkg.man
@@ -8114,7 +8111,7 @@ msgstr ""
 "système entier.>"
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all> : Met en œuvre (ou pas) toutes les options de forçage."
 
@@ -8149,15 +8146,13 @@ msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
 msgstr ""
-"B<configure-any> : Configure aussi les paquets dépaquetés mais non "
+"B<configure-any> : configurer aussi les paquets dépaquetés mais non "
 "configurés dont dépend le paquet en question."
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "B<hold>: Process packages even when marked \"hold\"."
 msgid "B<hold>: Process packages even when marked “hold”."
-msgstr "B<hold> : Traite même les paquets marqués « à garder » (« hold »)."
+msgstr "B<hold> : traiter même les paquets marqués « à garder » (« hold »)."
 
 #. type: Plain text
 #: dpkg.man
@@ -8166,7 +8161,7 @@ msgid ""
 "require reinstallation. This may, for example, cause parts of the package to "
 "remain on the system, which will then be forgotten by B<dpkg>."
 msgstr ""
-"B<remove-reinstreq> : Supprime un paquet, même défectueux et marqué comme "
+"B<remove-reinstreq> : supprimer un paquet, même défectueux et marqué comme "
 "demandant une réinstallation. Il se peut, dès lors, que des éléments du "
 "paquet restent dans le système et soient oubliés par B<dpkg>."
 
@@ -8177,62 +8172,59 @@ msgid ""
 "Essential packages contain mostly very basic Unix commands. Removing them "
 "might cause the whole system to stop working, so use with caution."
 msgstr ""
-"B<remove-essential> : supprime un paquet même s'il est considéré comme "
+"B<remove-essential> : supprimer un paquet même s'il est considéré comme "
 "indispensable. Les paquets « Essential » comportent les commandes Unix les "
 "plus fondamentales et les enlever peut casser le système entier. Il faut "
 "utiliser cette option avec prudence."
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr ""
-"B<depends> : Change tous les problèmes de dépendance en avertissements."
+"B<depends> : changer tous les problèmes de dépendance en avertissements. "
+"Cela affecte les champs B<Pre-Depends> et B<Depends>."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
-"B<depends-version> : Ignore les versions dans les questions de dépendance."
+"B<depends-version> : ignorer les versions dans les questions de dépendance."
+"Cela affecte les champs B<Pre-Depends> et B<Depends>."
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "B<breaks>: Install, even if this would break another package."
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr ""
-"B<breaks> : Force l'installation, même si cela risque de casser un autre "
-"paquet."
+"B<breaks> : forcer l'installation, même si cela risque de casser un autre "
+"paquet (depuis dpkg 1.14.6). Cela affecte le champ B<Breaks>."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
-"B<conflicts> : Installe un paquet, même s'il est en conflit avec un autre "
+"B<conflicts> : installer un paquet, même s'il est en conflit avec un autre "
 "paquet. C'est dangereux car habituellement cela produit le remplacement de "
-"certains fichiers."
+"certains fichiers. Cela affecte le champ B<Conflicts>."
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "B<confmiss>: If a conffile is missing and the version in the package did "
-#| "change, always install the missing conffile without prompting. This is "
-#| "dangerous, since it means not preserving a change (removing) made to the "
-#| "file."
 msgid ""
 "B<confmiss>: Always install the missing conffile without prompting. This is "
 "dangerous, since it means not preserving a change (removing) made to the "
 "file."
 msgstr ""
-"B<confmiss> : si un fichier de configuration est manquant et que la version "
-"du paquet change, toujours l'installer. Cette opération est dangereuse, "
-"puisque les changements apportés au fichier ne seront pas préservés "
-"(suppression)."
+"B<confmiss> : toujours installer le fichier de configuration manquant sans "
+"rien demander. Cette opération est dangereuse, puisque les changements "
+"apportés au fichier ne seront pas préservés (suppression)."
 
 #. type: Plain text
 #: dpkg.man
@@ -8243,8 +8235,8 @@ msgid ""
 "preferred."
 msgstr ""
 "B<confnew> : quand un fichier de configuration a été modifié et que la "
-"version dans le paquet a changé, toujours installer la nouvelle version et "
-"ne rien demander, sauf si l'option B<--force-confdef> est aussi présente, "
+"version dans le paquet a changé, toujours installer la nouvelle version sans "
+"rien demander, sauf si l'option B<--force-confdef> est aussi présente, "
 "auquel cas l'action par défaut est choisie."
 
 #. type: Plain text
@@ -8256,7 +8248,7 @@ msgid ""
 "preferred."
 msgstr ""
 "B<confold> : quand un fichier de configuration a été modifié et que la "
-"version du paquet a changé, garder l'ancienne version et ne rien demander, "
+"version du paquet a changé, garder l'ancienne version sans rien demander, "
 "sauf si l'option B<--force-confdef> est aussi présente, auquel cas l'action "
 "par défaut est choisie."
 
@@ -8278,13 +8270,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "B<confask>: If a conffile has been modified always offer to replace it "
-#| "with the version in the package, even if the version in the package did "
-#| "not change. If any of B<--force-confmiss>, B<--force-confnew>, B<--force-"
-#| "confold>, or B<--force-confdef> is also given, it will be used to decide "
-#| "the final action."
 msgid ""
 "B<confask>: If a conffile has been modified always offer to replace it with "
 "the version in the package, even if the version in the package did not "
@@ -8292,46 +8277,65 @@ msgid ""
 "confold>, or B<--force-confdef> is also given, it will be used to decide the "
 "final action."
 msgstr ""
-"B<confask> : Si un fichier de configuration a été modifié, propose de le "
-"remplacer avec la version du paquet, même si celle-ci n'a pas changé. Si "
-"l'une des options B<--force-confmiss>, B<--force-confnew>, B<--force-"
-"confold>, ou B<--force-confdef> est également mentionnée, elle déterminera "
-"l'action finalement utilisée."
+"B<confask> : si un fichier de configuration a été modifié, propose de le "
+"remplacer avec la version du paquet, même si celle-ci n'a pas changé (depuis "
+"dpkg 1.15.8). Si l'une des options B<--force-confmiss>, B<--force-confnew>, "
+"B<--force-confold>, ou B<--force-confdef> est également mentionnée, elle "
+"déterminera l'action finalement utilisée."
 
 #. type: Plain text
 #: dpkg.man
 msgid "B<overwrite>: Overwrite one package's file with another's file."
-msgstr "B<overwrite> : Remplace un fichier par un fichier d'un autre paquet."
+msgstr "B<overwrite> : remplacer un fichier par un fichier d'un autre paquet."
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "B<overwrite-dir> Overwrite one package's directory with another's file."
 msgid ""
 "B<overwrite-dir>: Overwrite one package's directory with another's file."
 msgstr ""
-"B<overwrite-dir> : Remplace un répertoire par un répertoire d'un autre "
-"paquet."
+"B<overwrite-dir> : remplacer un répertoire d'un paquet par le fichier d'un "
+"autre paquet."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
-"B<overwrite-diverted> : Remplace un fichier détourné avec une version non "
+"B<overwrite-diverted> : remplacer un fichier détourné avec une version non "
 "détournée."
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+"B<statoverride-add> : remplacer une dérogation d'état existante lors de son "
+"ajout (depuis dpkg 1.19.5)"
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+"B<statoverride-remove> : ignorer l'absence de dérogation d'état lors de sa "
+"suppression (depuis dpkg 1.19.5)."
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+"B<security-mac>(*) : utiliser une sécurité basée sur le contrôle d'accès "
+"obligatoire (Mandatory Access Controls – MAC) spécifique à la plateforme "
+"lors de l'installation de fichiers dans le systèmes de fichiers (depuis "
+"dpkg 1.19.5). Sur les systèmes Linux, la mise en œuvre utilise SELinux."
+
+#. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "B<unsafe-io>: Do not perform safe I/O operations when unpacking. "
-#| "Currently this implies not performing file system syncs before file "
-#| "renames, which is known to cause substantial performance degradation on "
-#| "some file systems, unfortunately the ones that require the safe I/O on "
-#| "the first place due to their unreliable behaviour causing zero-length "
-#| "files on abrupt system crashes."
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking (since dpkg "
 "1.15.8.6).  Currently this implies not performing file system syncs before "
@@ -8340,12 +8344,12 @@ msgid ""
 "first place due to their unreliable behaviour causing zero-length files on "
 "abrupt system crashes."
 msgstr ""
-"B<unsafe-io> : Ne pas effectuer d'action d'entrée/sortie non sûre lors de la "
-"décompression. Cela implique actuellement de ne pas synchroniser le système "
-"de fichiers avant le renommage de fichiers, ce qui est une cause connue de "
-"dégradation des performances sur certains systèmes, en général ceux qui, peu "
-"fiables, ont besoin d'actions sûres pour éviter de terminer avec des "
-"fichiers de taille vide en cas d'interruption inopinée."
+"B<unsafe-io> : ne pas effectuer d'action d'entrée/sortie non sûre lors de la "
+"décompression (depuis dpkg 1.15.8.6). Cela implique actuellement de ne pas "
+"synchroniser le système de fichiers avant le renommage de fichiers, ce qui "
+"est une cause connue de dégradation des performances sur certains systèmes, "
+"en général ceux qui, peu fiables, ont besoin d'actions sûres pour éviter de "
+"terminer avec des fichiers de taille vide en cas d'interruption inopinée."
 
 #. type: Plain text
 #: dpkg.man
@@ -8356,12 +8360,12 @@ msgid ""
 "zero-length files on abrupt system crashes with any software not doing syncs "
 "before atomic renames."
 msgstr ""
-"I<Note>: Pour ext4, le principal concerné, il est suggéré de plutôt utiliser "
-"l'option de montage B<nodelalloc>, qui corrigera à la fois la dégradation "
-"des performances et les problèmes de sécurité des données. Elle permet "
-"notamment d'éviter de terminer avec des fichiers vides lors des arrêts "
-"brutaux pour tout logiciel qui ne synchronise pas le système de fichiers "
-"avant chaque renommage."
+"I<Note> : pour ext4, le principal concerné, il est suggéré de plutôt "
+"utiliser l'option de montage B<nodelalloc>, qui corrigera à la fois la "
+"dégradation des performances et les problèmes de sécurité des données. Elle "
+"permet notamment d'éviter de terminer avec des fichiers vides lors des "
+"arrêts brutaux pour tout logiciel qui ne synchronise pas le système de "
+"fichiers avant chaque renommage."
 
 #. type: Plain text
 #: dpkg.man
@@ -8369,58 +8373,62 @@ msgid ""
 "I<Warning: Using this option might improve performance at the cost of losing "
 "data, use with care.>"
 msgstr ""
-"I<Avertissement : L'utilisation de cette option peut améliorer la "
+"I<Avertissement : l'utilisation de cette option peut améliorer la "
 "performance mais augmente le risque de perte de données. Elle est donc à "
 "utiliser avec précautions.>"
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
+"B<script-chrootless> : exécuter les scripts du responsable sans créer de "
+"B<chroot>(2) dans B<instdir> même si le paquet ne gère pas ce mode "
+"d'opération (depuis dpkg 1.18.5)."
 
 #. type: Plain text
 #: dpkg.man
 msgid "I<Warning: This can destroy your host system, use with extreme care.>"
 msgstr ""
+"I<Avertissement : cela peut détruire le système hôte, utilisez avec des "
+"précautions extrêmes.>"
 
 #. type: Plain text
 #: dpkg.man
 msgid "B<architecture>: Process even packages with wrong or no architecture."
 msgstr ""
-"B<architecture> : Traite même les paquets sans architecture ou avec une "
+"B<architecture> : traiter même les paquets sans architecture ou avec une "
 "architecture incorrecte."
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "B<bad-version>: Process even packages with wrong versions."
 msgid ""
 "B<bad-version>: Process even packages with wrong versions (since dpkg "
 "1.16.1)."
 msgstr ""
-"B<bad-version> : Traite même les paquets dont la version est incorrecte"
+"B<bad-version> : traiter même les paquets dont la version est incorrecte "
+"(depuis dpkg 1.16.1)."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<bad-path>: B<PATH> is missing important programs, so problems are likely."
 msgstr ""
-"B<bad-path> : Programmes importants non visibles par la variable B<PATH>, ce "
+"B<bad-path> : programmes importants non visibles par la variable B<PATH>, ce "
 "qui va poser des problèmes."
 
 #. type: Plain text
 #: dpkg.man
 msgid "B<not-root>: Try to (de)install things even when not root."
-msgstr "B<not-root> : Tente de (dés)installer même sans être root."
+msgstr "B<not-root> : tenter de (dés)installer même sans être root."
 
 #. type: Plain text
 #: dpkg.man
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
-"B<bad-verify> : Installe un paquet même si la vérification de son "
+"B<bad-verify> : installer un paquet même si la vérification de son "
 "authenticité a échoué."
 
 #. type: TP
@@ -8433,11 +8441,13 @@ msgstr "B<--ignore-depends>=I<paquet>,..."
 #: dpkg.man
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "Ne tient pas compte de la vérification des dépendances pour les paquets "
 "spécifiés (en fait, la vérification est faite mais on ne donne rien d'autre "
-"que des avertissements)."
+"que des avertissements). Cela affecte les champs B<Pre-Depends>, B<Depends> "
+"et B<Breaks>."
 
 #. type: TP
 #: dpkg.man
@@ -8477,11 +8487,6 @@ msgstr "B<-R>, B<--recursive>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Recursively handle all regular files matching pattern B<*.deb> found at "
-#| "specified directories and all of its subdirectories. This can be used "
-#| "with B<-i>, B<-A>, B<--install>, B<--unpack> and B<--avail> actions."
 msgid ""
 "Recursively handle all regular files matching pattern B<*.deb> found at "
 "specified directories and all of its subdirectories. This can be used with "
@@ -8490,7 +8495,7 @@ msgstr ""
 "Traite récursivement tous les simples fichiers qui correspondent au motif "
 "B<*.deb> et qui se trouvent dans les répertoires et sous-répertoires "
 "spécifiés. On peut utiliser cette option avec les actions B<-i>, B<-A>, B<--"
-"install>, B<--unpack> et B<--avail>."
+"install>, B<--unpack> et B<--record-avail>."
 
 #. type: TP
 #: dpkg.man dpkg-buildpackage.man dpkg-genchanges.man
@@ -8512,49 +8517,38 @@ msgstr ""
 #: dpkg-query.man dpkg-shlibdeps.man dpkg-trigger.man
 #, no-wrap
 msgid "B<--admindir=>I<dir>"
-msgstr "B<--admindir>=I<dir>"
+msgstr "B<--admindir>=I<répertoire>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Change default administrative directory, which contains many files that "
-#| "give information about status of installed or uninstalled packages, etc.  "
-#| "(Defaults to I<%ADMINDIR%>)"
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
-"Modifie le répertoire d'administration par défaut, qui contient de nombreux "
-"fichiers donnant des informations au sujet de l'état des paquets installés "
-"ou non, etc. (Le répertoire par défaut étant I<%ADMINDIR%>)"
+"Fixe le répertoire d'administration à I<répertoire>. Ce répertoire contient "
+"de nombreux fichiers donnant des informations au sujet de l'état des paquets "
+"installés ou non, etc. (Le répertoire par défaut est I<%ADMINDIR%>)"
 
 #. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--instdir=>I<dir>"
-msgstr "B<--instdir=>I<repertoire>"
+msgstr "B<--instdir=>I<répertoire>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Change default installation directory which refers to the directory where "
-#| "packages are to be installed. B<instdir> is also the directory passed to "
-#| "B<chroot>(2) before running package's installation scripts, which means "
-#| "that the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
-"Change le répertoire d'installation par défaut qui indique où les paquets "
-"vont être installés. B<instdir> est aussi le nom du répertoire indiqué à "
-"B<chroot>(2) avant que ne soient lancés les scripts d'installation, ce qui "
-"signifie que ces scripts voient B<instdir> comme répertoire racine. (Le "
-"répertoire par défaut est I</>)."
+"Fixe le répertoire d'installation qui indique où les paquets vont être "
+"installés. B<instdir> est aussi le nom du répertoire indiqué à B<chroot>(2) "
+"avant que ne soient lancés les scripts d'installation, ce qui signifie que "
+"ces scripts voient B<instdir> comme répertoire racine. Le répertoire par "
+"défaut est « I</> »."
 
 #. type: TP
 #: dpkg.man
@@ -8564,16 +8558,14 @@ msgstr "B<--root=>I<répertoire>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
-#| "var/lib/dpkg>."
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
-"Modifier B<root> change B<instdir> par I<répertoire> et B<admindir> par "
-"I<dir>B<%ADMINDIR%>."
+"Fixe le répertoire racine à I<répertoire> ce qui fixe le répertoire "
+"d'installation à « I<répertoire> » et le répertoire d'administration à "
+"« I<répertoire>B<%ADMINDIR%> »."
 
 #. type: TP
 #: dpkg.man
@@ -8622,17 +8614,6 @@ msgstr "B<--post-invoke=>I<commande>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
-#| "B<dpkg> run for the I<unpack>, I<configure>, I<install>, I<triggers-"
-#| "only>, I<remove>, I<purge>, I<add-architecture> and I<remove-"
-#| "architecture> B<dpkg> actions. This option can be specified multiple "
-#| "times. The order the options are specified is preserved, with the ones "
-#| "from the configuration files taking precedence.  The environment variable "
-#| "B<DPKG_HOOK_ACTION> is set for the hooks to the current B<dpkg> action. "
-#| "Note: front-ends might call B<dpkg> several times per invocation, which "
-#| "might run the hooks more times than expected."
 msgid ""
 "Set an invoke hook I<command> to be run via ``sh -c'' before or after the "
 "B<dpkg> run for the I<unpack>, I<configure>, I<install>, I<triggers-only>, "
@@ -8648,13 +8629,15 @@ msgstr ""
 "Programme l'exécution de I<commande> à l'aide « sh -c » avant ou après "
 "l'exécution de B<dpkg> pour les actions I<unpack>, I<configure>, I<install>, "
 "I<triggers-only>, I<remove>, I<purge>, I<add-architecture> et I<remove-"
-"architecture>. Cette option peut être utilisée plusieurs fois. L'ordre dans "
-"lequel les options multiples sont indiquées sera préservé et celles "
-"indiquées dans le fichier de configuration auront la priorité. La variable "
-"d'environnement B<DPKG_HOOK_ACTION> est utilisée pour indiquer aux scripts "
-"utilisés quelle est l'action actuelle de B<dpkg>. Note : les interfaces de "
-"B<dpkg> peuvent l'appeler plusieurs fois à chaque invocation, ce qui peut "
-"provoquer l'exécution des « hooks » plus souvent que prévu."
+"architecture> (depuis dpkg 1.15.4 ; les actions I<add-architecture> et "
+"I<remove-architecture> depuis dpkg 1.17.19). Cette option peut être utilisée "
+"plusieurs fois. L'ordre dans lequel les options multiples sont indiquées "
+"sera préservé et celles indiquées dans le fichier de configuration auront la "
+"priorité. La variable d'environnement B<DPKG_HOOK_ACTION> est utilisée pour "
+"indiquer aux scripts utilisés quelle est l'action actuelle de B<dpkg>. "
+"Note : les interfaces de B<dpkg> peuvent l'appeler plusieurs fois à chaque "
+"invocation, ce qui peut provoquer l'exécution des « hooks » plus souvent que "
+"prévu."
 
 #. type: TP
 #: dpkg.man
@@ -8670,10 +8653,6 @@ msgstr "B<--path-include=>I<motif-global>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Set I<glob-pattern> as a path filter, either by excluding or re-including "
-#| "previously excluded paths matching the specified patterns during install."
 msgid ""
 "Set I<glob-pattern> as a path filter, either by excluding or re-including "
 "previously excluded paths matching the specified patterns during install "
@@ -8681,7 +8660,7 @@ msgid ""
 msgstr ""
 "Utilise I<motif-global> comme filtre de chemins, soit en excluant, soit en "
 "ré-incluant des chemins précédemment exclus, correspondant au motif indiqué, "
-"pendant l'installation."
+"pendant l'installation (depuis dpkg 1.15.8)."
 
 #. type: Plain text
 #: dpkg.man
@@ -8694,17 +8673,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "The glob patterns use the same wildcards used in the shell, were '*' "
-#| "matches any sequence of characters, including the empty string and also "
-#| "'/'. For example, I<'/usr/*/READ*'> matches I<'/usr/share/doc/package/"
-#| "README'>.  As usual, '?' matches any single character (again, including "
-#| "'/'). And '[' starts a character class, which can contain a list of "
-#| "characters, ranges and complementations. See B<glob>(7) for detailed "
-#| "information about globbing. Note: the current implementation might re-"
-#| "include more directories and symlinks than needed, to be on the safe side "
-#| "and avoid possible unpack failures, future work might fix this."
 msgid ""
 "The glob patterns use the same wildcards used in the shell, were ‘*’ matches "
 "any sequence of characters, including the empty string and also ‘/’.  For "
@@ -8718,8 +8686,8 @@ msgid ""
 msgstr ""
 "Les motifs globaux utilisent les mêmes caractères joker que le "
 "shell où « * » correspond à une séquence quelconque de caractères, y compris "
-"une chaîne vide ou le caractère « / ». Ainsi, I<'/usr/*/READ*'> comportera "
-"I<'/usr/share/doc/package/README'>. Comme toujours, le caractère « ? » "
+"une chaîne vide ou le caractère « / ». Ainsi, « I</usr/*/READ*> » comportera "
+"« I</usr/share/doc/package/README> ». Comme toujours, le caractère « ? » "
 "correspond à un caractère quelconque (y compris « / »). Le caractère « [ » "
 "marque le début d'une classe de caractères, qui contient une liste de "
 "caractères, séries de caractères ou compléments de séries. Veuillez "
@@ -8780,11 +8748,22 @@ msgid ""
 "code sees the need).  Any subsequent files contained within that directory "
 "will fail to unpack."
 msgstr ""
+"Les filtres sont appliqués lors du dépaquetage des paquets binaires et, en "
+"tant que tel, ont seulement connaissance du type des objets qui sont en "
+"cours de filtrage (par exemple un fichier ordinaire ou un répertoire) et "
+"n'ont pas de visibilité des objets à venir. Comme ces filtres ont des effets "
+"secondaires (à la différence des filtres de B<find>(1)), l'exclusion d'un "
+"chemin précis qui se trouve être un objet répertoire, comme I</usr/share/"
+"doc>, n'aura pas le résultat désiré, et seul ce chemin sera exclu (et qui "
+"pourrait être réintégré automatiquement si le code en voit la nécessité).Le "
+"dépaquetage de tous les fichiers suivants renfermés par ce répertoire "
+"échouera."
 
 #. type: Plain text
 #: dpkg.man
 msgid "Hint: make sure the globs are not expanded by your shell."
 msgstr ""
+"Astuce : Assurez-vous que les « globs » ne sont pas développés par le shell."
 
 #. type: TP
 #: dpkg.man
@@ -8794,24 +8773,12 @@ msgstr "B<--verify-format>I< nom-de-format>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "Sets the output format for the B<--verify> command."
 msgid "Sets the output format for the B<--verify> command (since dpkg 1.17.2)."
-msgstr "Définit le format de sortie de la commande B<--verify>."
+msgstr ""
+"Définit le format de sortie de la commande B<--verify> (depuis dpkg 1.17.2)."
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "The only currently supported output format is B<rpm>, which consists of a "
-#| "line for every path that failed any check. The lines start with 9 "
-#| "characters to report each specific check result, a 'B<?>' implies the "
-#| "check could not be done (lack of support, file permissions, etc), 'B<.>' "
-#| "implies the check passed, and an alphanumeric character implies a "
-#| "specific check failed; the md5sum verification is denoted with a 'B<5>' "
-#| "on the third character. The line is followed by a space and an attribute "
-#| "character (currently 'B<c>' for conffiles), another space and the "
-#| "pathname."
 msgid ""
 "The only currently supported output format is B<rpm>, which consists of a "
 "line for every path that failed any check.  The lines start with 9 "
@@ -8824,15 +8791,15 @@ msgid ""
 "space and the pathname."
 msgstr ""
 "Le seul format de sortie géré actuellement est B<rpm>, qui consiste en une "
-"ligne par chemin dont la vérification a échoué. Les lignes débutent par 9 "
-"caractères pour signaler les résultats d'une vérification spécifique, un "
+"ligne par chemin dont la vérification a échoué. Les lignes débutent par "
+"9 caractères pour signaler les résultats d'une vérification spécifique, un "
 "« B<?> » implique que la vérification ne peut être réalisée (absence de "
 "prise en charge, droit d'accès de fichier, etc), « B<.> » implique que la "
 "vérification est passée et un caractère alphanumérique implique qu'une "
-"vérification spécifique a échoué ; la vérification md5sum est identifiée par "
-"un « B<5> » en troisième caractère. La ligne continue par une espace et un "
-"caractère d'attribut (comme « B<c> » pour conffiles - fichiers de "
-"configuration), une autre espace et le nom de chemin."
+"vérification spécifique a échoué ; l'échec de vérification md5sum est "
+"identifiée par un « B<5> » en troisième caractère. La ligne continue par une "
+"espace et un caractère d'attribut (comme « B<c> » pour conffiles – fichiers "
+"de configuration), une autre espace et le nom de chemin."
 
 #. type: TP
 #: dpkg.man
@@ -8848,7 +8815,7 @@ msgid ""
 "information is generally one record per line, in one of the following forms:"
 msgstr ""
 "Envoie un état du paquet compréhensible par la machine et met à jour cette "
-"information dans le fichier de description I<n>. Cette option peut être "
+"information dans le descripteur de fichier I<n>. Cette option peut être "
 "spécifiée plusieurs fois. L'information est généralement constituée d'un "
 "enregistrement par ligne, dans l'une des formes suivantes :"
 
@@ -8856,20 +8823,20 @@ msgstr ""
 #: dpkg.man
 #, no-wrap
 msgid "B<status: >I<package>B<: >I<status>"
-msgstr "B<status: >I<paquet>B<: >I<status>"
+msgstr "B<status: >I<paquet>B<: >I<état>"
 
 #. type: Plain text
 #: dpkg.man
 msgid "Package status changed; I<status> is as in the status file."
 msgstr ""
-"L'état du paquet a changé ; le I<status> est tel que dans le fichier d'état "
+"L'état du paquet a changé ; l'I<état> est tel que dans le fichier d'état "
 "( «status file »)."
 
 #. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<status: >I<package>B< : error : >I<extended-error-message>"
-msgstr "B<status: >I<paquet>B< : error : >I<message-d'erreur-complet>"
+msgstr "B<status: >I<paquet>B< : error : >I<message-d'erreur-complet>"
 
 #. type: Plain text
 #: dpkg.man
@@ -8878,13 +8845,14 @@ msgid ""
 "be converted to spaces before output."
 msgstr ""
 "Une erreur s'est produite. Toutes les lignes supplémentaires éventuelles "
-"dans I<extended-error-message> seront converties en espaces avant affichage."
+"dans I<message-d'erreur-complet> seront converties en espaces avant "
+"affichage."
 
 #. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<status: >I<file>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
-msgstr "B<status: >I<fichier>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
+msgstr "B<status: >I<fichier>B< : conffile-prompt : '>I<real-old>B<' '>I<real-new>B<' >I<useredited>B< >I<distedited>"
 
 #. type: Plain text
 #: dpkg.man
@@ -8896,7 +8864,7 @@ msgstr ""
 #: dpkg.man
 #, no-wrap
 msgid "B<processing: >I<stage>B<: >I<package>"
-msgstr "B<processing: >I<stage>B<: >I<paquet>"
+msgstr "B<processing: >I<phase>B<: >I<paquet>"
 
 #. type: Plain text
 #: dpkg.man
@@ -8905,7 +8873,7 @@ msgid ""
 "B<install> (both sent before unpacking), B<configure>, B<trigproc>, "
 "B<disappear>, B<remove>, B<purge>."
 msgstr ""
-"Envoyé juste avant le début du traitement d'un stage. Les I<stages> sont "
+"Envoyé juste avant le début du traitement d'une phase. Les I<phases> sont "
 "B<upgrade>, B<install> (les deux sont envoyés avant le dépaquetage), "
 "B<configure>, B<trigproc>, B<disappear>, B<remove>, B<purge>."
 
@@ -8917,11 +8885,6 @@ msgstr "B<--status-logger>=I<commande>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Send machine-readable package status and progress information to the "
-#| "shell I<command>'s standard input. This option can be specified multiple "
-#| "times. The output format used is the same as in B<--status-fd.>"
 msgid ""
 "Send machine-readable package status and progress information to the shell "
 "I<command>'s standard input, to be run via ``sh -c'' (since dpkg 1.16.0).  "
@@ -8930,8 +8893,9 @@ msgid ""
 msgstr ""
 "Envoie un état du paquet compréhensible par la machine et met à jour "
 "l'information de progression sur l'entrée standard du processeur de "
-"commandes I<command>. Cette option peut être spécifiée plusieurs fois. Le "
-"format d'affichage utilisé est le même que celui de B<--status-fd.>"
+"commandes I<command>, à exécuter avec « sh -c » (depuis dpkg 1.16.0). Cette "
+"option peut être spécifiée plusieurs fois. Le format d'affichage utilisé est "
+"le même que celui de B<--status-fd.>"
 
 #. type: TP
 #: dpkg.man
@@ -8946,12 +8910,16 @@ msgid ""
 "I<%LOGDIR%/dpkg.log>. If this option is given multiple times, the last "
 "filename is used. Log messages are of the form:"
 msgstr ""
+"Enregistre les mises à jour et actions des changements d'état dans "
+"I<fichier> plutôt que dans le I<%LOGDIR%/dpkg.log> par défaut. Si l'option "
+"est passée plusieurs fois, le dernier nom de fichier est utilisé. Les "
+"messages du journal ont cette forme :"
 
 #. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "YYYY-MM-DD HH:MM:SS B<startup> I<type> I<command>"
-msgstr ""
+msgstr "AAAA-MM-JJ HH:MM:SS B<startup> I<type> I<commande>"
 
 #. type: Plain text
 #: dpkg.man
@@ -8960,49 +8928,62 @@ msgid ""
 "B<unpack> or B<install>) or B<packages> (with a I<command> of B<configure>, "
 "B<triggers-only>, B<remove> or B<purge>)."
 msgstr ""
+"Pour chaque invocation de dpkg où I<type> est B<archives> (avec une "
+"I<commande> B<unpack> ou B<install>) ou B<packages> (avec une I<commande> "
+"B<configure>, B<triggers-only>, B<remove> ou B<purge>)."
 
 #. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "YYYY-MM-DD HH:MM:SS B<status> I<state> I<pkg> I<installed-version>"
-msgstr ""
+msgstr "AAAA-MM-JJ HH:MM:SS B<status> I<état> I<paquet> I<version-installée>"
 
 #. type: Plain text
 #: dpkg.man
 msgid "For status change updates."
-msgstr ""
+msgstr "Pour les mises à jour des changements d'état."
 
 #. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "YYYY-MM-DD HH:MM:SS I<action> I<pkg> I<installed-version> I<available-version>"
-msgstr ""
+msgstr "AAAA-MM-JJ HH:MM:SS B<action> I<paquet> I<version-installée> I<version-disponible>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Sent just before a processing stage starts. I<stage> is one of "
-#| "B<upgrade>, B<install> (both sent before unpacking), B<configure>, "
-#| "B<trigproc>, B<disappear>, B<remove>, B<purge>."
 msgid ""
 "For actions where I<action> is one of B<install>, B<upgrade>, B<configure>, "
 "B<trigproc>, B<disappear>, B<remove> or B<purge>."
 msgstr ""
-"Envoyé juste avant le début du traitement d'un stage. Les I<stages> sont "
-"B<upgrade>, B<install> (les deux sont envoyés avant le dépaquetage), "
-"B<configure>, B<trigproc>, B<disappear>, B<remove>, B<purge>."
+"Pour les actions où I<action> est B<install>, B<upgrade>, B<configure>, "
+"B<trigproc>, B<disappear>, B<remove> ou B<purge>."
 
 #. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "YYYY-MM-DD HH:MM:SS B<conffile> I<filename> I<decision>"
-msgstr ""
+msgstr "AAAA-MM-JJ HH:MM:SS B<conffile> I<fichier> I<décision>"
 
 #. type: Plain text
 #: dpkg.man
 msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
+"Pour les changements du fichier de configuration où I<décision> est "
+"B<install> ou B<keep>."
+
+#. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<--no-pager>"
+msgstr "B<--no-pager>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr ""
+"Désactive l'utilisation d'un afficheur pour montrer les informations (depuis "
+"dpkg 1.19.2)."
 
 #. type: TP
 #: dpkg.man
@@ -9023,14 +9004,6 @@ msgstr "B<--no-triggers>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Do not run any triggers in this run (activations will still be "
-#| "recorded).  If used with B<--configure> I<package> or B<--triggers-only> "
-#| "I<package> then the named package postinst will still be run even if only "
-#| "a triggers run is needed. Use of this option may leave packages in the "
-#| "improper B<triggers-awaited> and B<triggers-pending> states. This can be "
-#| "fixed later by running: B<dpkg --configure --pending>."
 msgid ""
 "Do not run any triggers in this run (since dpkg 1.14.17), but activations "
 "will still be recorded.  If used with B<--configure> I<package> or B<--"
@@ -9039,13 +9012,14 @@ msgid ""
 "in the improper B<triggers-awaited> and B<triggers-pending> states. This can "
 "be fixed later by running: B<dpkg --configure --pending>."
 msgstr ""
-"Durant ce traitement, ne pas lancer d'actions différées (les activations "
-"seront toujours enregistrées). S'il est utilisé avec B<--configure> "
-"I<paquet> ou B<--triggers-only> I<paquet> alors le postinst du paquet sera "
-"toujours exécuté même si seule l'exécution d'une action différée est "
-"nécessaire. L'utilisation de cette option peut laisser des paquets dans les "
-"mauvais états B<triggers-awaited> et B<triggers-pending>. Cela peut être "
-"corrigé plus tard en exécutant B<dpkg --configure --pending>."
+"Durant ce traitement, ne pas lancer d'actions différées (depuis "
+"dpkg 1.14.17), mais les activations seront toujours enregistrées. S'il est "
+"utilisé avec B<--configure> I<paquet> ou B<--triggers-only> I<paquet> alors "
+"le postinst du paquet sera toujours exécuté même si seule l'exécution d'une "
+"action différée est nécessaire. L'utilisation de cette option peut laisser "
+"des paquets dans les mauvais états B<triggers-awaited> et B<triggers-"
+"pending>. Cela peut être corrigé plus tard en exécutant B<dpkg --configure --"
+"pending>."
 
 #. type: TP
 #: dpkg.man
@@ -9055,10 +9029,8 @@ msgstr "B<--triggers>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "Cancels a previous B<--no-triggers>."
 msgid "Cancels a previous B<--no-triggers> (since dpkg 1.14.17)."
-msgstr "Annule un précédent B<--no-triggers>."
+msgstr "Annule un précédent B<--no-triggers> (depuis dpkg 1.14.17)."
 
 #. type: SH
 #: dpkg.man dpkg-deb.man dpkg-divert.man dpkg-query.man dpkg-split.man
@@ -9078,12 +9050,12 @@ msgstr "B<0>"
 
 #. type: Plain text
 #: dpkg.man dpkg-trigger.man
-#, fuzzy
-#| msgid "The requested action was successfully performed."
 msgid ""
 "The requested action was successfully performed.  Or a check or assertion "
 "command returned true."
-msgstr "L'action demandée s'est correctement déroulée."
+msgstr ""
+"L'action demandée s'est correctement déroulée. Ou bien une commande de "
+"vérification ou de déclaration renvoie « true »."
 
 #. type: TP
 #: dpkg.man dpkg-query.man dpkg-split.man dpkg-statoverride.man
@@ -9095,7 +9067,7 @@ msgstr "B<1>"
 #. type: Plain text
 #: dpkg.man dpkg-trigger.man
 msgid "A check or assertion command returned false."
-msgstr ""
+msgstr "Une commande de vérification ou de déclaration renvoie « false »."
 
 #. type: TP
 #: dpkg.man dpkg-deb.man dpkg-divert.man dpkg-query.man dpkg-split.man
@@ -9113,11 +9085,17 @@ msgid ""
 "interactions with the system, such as accesses to the database, memory "
 "allocations, etc."
 msgstr ""
+"Erreur fatale ou irrécupérable due à l'utilisation d'une ligne de commande "
+"non valable, ou interactions avec le système, telles que des accès à la base "
+"de données, des allocations de mémoire, etc."
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, no-wrap
@@ -9125,17 +9103,16 @@ msgid "ENVIRONMENT"
 msgstr "ENVIRONNEMENT"
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
-msgstr ""
+msgstr "Environnement externe"
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<PAGER>"
+#, no-wrap
 msgid "B<PATH>"
-msgstr "B<PAGER>"
+msgstr "B<PATH>"
 
 #. type: Plain text
 #: dpkg.man
@@ -9144,6 +9121,10 @@ msgid ""
 "system paths where several required programs are to be found. If it's not "
 "set or the programs are not found, B<dpkg> will abort."
 msgstr ""
+"Cette variable devrait être définie dans l'environnement et pointer vers les "
+"chemins du système où plusieurs programmes requis devraient se trouver. Si "
+"la variable n'est pas définie ou si les programmes ne sont pas trouvés, "
+"B<dpkg> s'arrête."
 
 #. type: TP
 #: dpkg.man dselect.man
@@ -9173,81 +9154,141 @@ msgid ""
 "files and directories."
 msgstr ""
 "Si cette option est utilisée, B<dpkg> utilisera le répertoire indiqué pour "
-"créer les fichiers et répertoire temporaires."
+"créer les fichiers et répertoires temporaires."
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
+msgstr ""
+"Le programme exécuté par B<dpkg> quand il lance un nouvel interpréteur de "
+"commandes interactif ou lance une commande avec le shell."
+
+#. type: TP
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<PAGER>"
 msgstr "B<PAGER>"
 
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<DPKG_PAGER>"
+msgstr "B<DPKG_PAGER>"
+
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+msgid ""
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
-"Cette option indique le programme exécuté par B<dpkg> quand il affiche les "
-"fichiers de configuration."
+"Le programme exécuté par B<dpkg> quand il utilise un afficheur, par exemple "
+"lorsqu'il affiche des différences de fichiers de configuration. Si B<SHELL> "
+"n'est pas défini, B<sh> sera utilisé à la place. Le B<DPKG_PAGER> se "
+"substitue à la variable d'environnement B<PAGER> (depuis dpkg 1.19.2)."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+msgid "B<DPKG_COLORS>"
+msgstr "B<DPKG_COLORS>"
 
 #. type: Plain text
-#: dpkg.man
-#, fuzzy
-#| msgid "The program B<dpkg> will execute when starting a new shell."
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
+msgid ""
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 msgstr ""
-"Le programme exécuté par B<dpkg> quand il lance un nouvel interpréteur de "
-"commandes."
+"Définit le mode de couleur (depuis dpkg 1.18.5). Les valeurs actuellement "
+"acceptées sont B<auto> (par défaut), B<always> et B<never>."
 
 #. type: TP
-#: dpkg.man dpkg-query.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_FORCE>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
 msgstr ""
-"Fixe le nombre de colonnes utilisées par B<dpkg> lorsqu'il affiche un texte "
-"formaté. Seule l'action B<-l> se sert actuellement de cette variable."
+"Définit les drapeaux de forçage (depuis dpkg 1.19.5). Quand cette variable "
+"est présente, aucune des options internes de forçage par défaut ne sera "
+"appliquée. Si la variable est présente mais vide, tous les drapeaux de "
+"forçage seront désactivés."
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<DPKG_CONFFILE_OLD>"
-msgid "B<DPKG_COLORS>"
-msgstr "B<DPKG_CONFFILE_OLD>"
+#: dpkg.man
+#, no-wrap
+msgid "B<DPKG_FRONTEND_LOCKED>"
+msgstr "B<DPKG_FRONTEND_LOCKED>"
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man
 msgid ""
-"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
-"B<auto> (default), B<always> and B<never>."
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
 msgstr ""
+"Définie par une interface de gestion de paquets pour notifier à dpkg qu'il "
+"ne devrait pas obtenir le verrou d'interface (dpkg 1.19.1)."
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
-msgstr ""
+msgstr "Environnement interne"
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr "B<LESS>"
+
+#. type: Plain text
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<DPKG_NO_TSTP>"
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+"Définie par B<dpkg> à « B<-FRSXMQ> », si ce n'est pas déjà configuré, lors "
+"du lancement d'un afficheur (depuis dpkg 1.19.2). Pour modifier le "
+"comportement par défaut, cette variable peut être configurée à une autre "
+"valeur y compris une chaîne vide ; alternativement, les variables B<PAGER> "
+"ou B<DPKG_PAGER> peuvent être réglées pour désactiver des options "
+"particulières avec «B<-+>», par exemple B<DPKG_PAGER=\"less -+F\">."
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
+#, no-wrap
 msgid "B<DPKG_ROOT>"
-msgstr "B<DPKG_NO_TSTP>"
+msgstr "B<DPKG_ROOT>"
 
 #. type: Plain text
 #: dpkg.man
@@ -9261,6 +9302,15 @@ msgid ""
 "chrootless> is specified then the B<chroot>(2) call is skipped and "
 "B<instdir> is non-empty."
 msgstr ""
+"Définie par B<dpkg> dans l'environnement du script du responsable pour "
+"indiquer quelle installation activer (depuis dpkg 1.18.5). La valeur est "
+"destinée à être ajoutée avant n'importe quel chemin sur lequel les scripts "
+"du responsable agissent. Pendant une opération normale, cette variable est "
+"vide. Lors de l'installation de paquets dans un B<instdir> différent, "
+"B<dpkg> invoque normalement les scripts du responsable avec B<chroot>(2) et "
+"laisse cette variable vide, mais si B<--force-script-chrootless> est "
+"indiqué, alors, l'appel de B<chroot>(2) est ignoré et B<instdir> n'est pas "
+"vide."
 
 #. type: TP
 #: dpkg.man dpkg-divert.man dpkg-query.man dpkg-statoverride.man
@@ -9271,17 +9321,24 @@ msgstr "B<DPKG_ADMINDIR>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the maintainer script environment to the private "
-#| "library directory of the currently running B<dpkg> instance."
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to indicate the "
 "B<dpkg> administrative directory to use (since dpkg 1.16.0).  This variable "
 "is always set to the current B<--admindir> value."
 msgstr ""
-"Définie par B<dpkg> dans l'environnement du script du responsable, cette "
-"variable contient la version de l'instance de B<dpkg> en cours d'exécution."
+"Définie par B<dpkg> dans l'environnement du script du responsable, pour "
+"indiquer le répertoire d'administration à utiliser (depuis dpkg 1.16.0). "
+"Cette variable est toujours fixée à la valeur actuelle de B<--admindir>."
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+"Définie par B<dpkg> dans l'environnement du sous-processus pour tous les "
+"noms d'options de forçage actuellement activées séparés par des virgules "
+"(depuis dpkg 1.19.5)."
 
 #. type: TP
 #: dpkg.man
@@ -9291,17 +9348,14 @@ msgstr "B<DPKG_SHELL_REASON>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
-#| "the situation. Current valid value: B<conffile-prompt>."
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation (since dpkg 1.15.6).  Current valid value: B<conffile-prompt>."
 msgstr ""
-"Cette variable définit l'invite du shell lancé par B<dpkg> lorsqu'il lui est "
-"demandé d'« examiner la situation » lors du traitement des fichiers de "
-"configuration. La valeur actuellement valable est : B<conffile-prompt>/"
+"Cette variable est définie pour le shell lancé par B<dpkg> lorsqu'il lui est "
+"demandé d'analyser la situation lors du traitement des fichiers de "
+"configuration (depuis dpkg 1.15.6). La valeur actuellement valable est : "
+"B<conffile-prompt>."
 
 #. type: TP
 #: dpkg.man
@@ -9311,17 +9365,14 @@ msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
-#| "the situation. Contains the path to the old conffile."
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation (since dpkg 1.15.6).  Contains the path to the old conffile."
 msgstr ""
 "Cette variable est définie pour le shell lancé par B<dpkg> lorsqu'il lui est "
-"demandé d'«  examiner la situation » lors du traitement des fichiers de "
-"configuration. Elle contient le nom de l'ancien fichier de configuration."
+"demandé d'analyser la situation lors du traitement des fichiers de "
+"configuration (depuis dpkg 1.15.6). Elle contient le nom de l'ancien fichier "
+"de configuration."
 
 #. type: TP
 #: dpkg.man
@@ -9331,38 +9382,30 @@ msgstr "B<DPKG_CONFFILE_NEW>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
-#| "the situation. Contains the path to the new conffile."
 msgid ""
 "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
 "the situation (since dpkg 1.15.6).  Contains the path to the new conffile."
 msgstr ""
 "Cette variable est définie pour le shell lancé par B<dpkg> lorsqu'il lui est "
-"demandé d'« examiner la situation » lors du traitement des fichiers de "
-"configuration. Elle contient le nom du nouveau fichier de configuration."
+"demandé d'analyser la situation lors du traitement des fichiers de "
+"configuration (depuis dpkg 1.15.6). Elle contient le nom du nouveau fichier "
+"de configuration."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<DPKG_SHELL_REASON>"
+#, no-wrap
 msgid "B<DPKG_HOOK_ACTION>"
-msgstr "B<DPKG_SHELL_REASON>"
+msgstr "B<DPKG_HOOK_ACTION>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the shell spawned on the conffile prompt to examine "
-#| "the situation. Contains the path to the old conffile."
 msgid ""
 "Defined by B<dpkg> on the shell spawned when executing a hook action (since "
 "dpkg 1.15.4).  Contains the current B<dpkg> action."
 msgstr ""
-"Cette variable est définie pour le shell lancé par B<dpkg> lorsqu'il lui est "
-"demandé d'«  examiner la situation » lors du traitement des fichiers de "
-"configuration. Elle contient le nom de l'ancien fichier de configuration."
+"Cette variable est définie par B<dpkg> pour le shell lancé lors de "
+"l'exécution d'une action de point d'entrée (depuis dpkg 1.15.4). Elle "
+"contient l'action actuelle de B<dpkg>."
 
 #. type: TP
 #: dpkg.man
@@ -9372,17 +9415,13 @@ msgstr "B<DPKG_RUNNING_VERSION>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the maintainer script environment to the version of "
-#| "the currently running B<dpkg> instance."
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the version of "
 "the currently running B<dpkg> instance (since dpkg 1.14.17)."
 msgstr ""
 "Cette variable est définie par B<dpkg> dans l'environnement du script du "
 "responsable. Elle contient la version de l'instance de B<dpkg> en cours "
-"d'exécution."
+"d'exécution (depuis dpkg 1.14.17)."
 
 #. type: TP
 #: dpkg.man dpkg-divert.man
@@ -9392,17 +9431,13 @@ msgstr "B<DPKG_MAINTSCRIPT_PACKAGE>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the maintainer script environment to the (non-arch-"
-#| "qualified) package name being handled."
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the (non-arch-"
 "qualified) package name being handled (since dpkg 1.14.17)."
 msgstr ""
 "Définie par B<dpkg> dans l'environnement du script du responsable, cette "
 "variable contient le nom du paquet (sans qualification d'architecture) en "
-"cours de traitement."
+"cours de traitement (depuis dpkg 1.14.17)."
 
 #. type: TP
 #: dpkg.man
@@ -9412,11 +9447,6 @@ msgstr "B<DPKG_MAINTSCRIPT_PACKAGE_REFCOUNT>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the maintainer script environment to the package "
-#| "reference count, i.e. the number of package instances with a state "
-#| "greater than B<not-installed>. Since dpkg 1.17.2."
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the package "
 "reference count, i.e. the number of package instances with a state greater "
@@ -9424,8 +9454,8 @@ msgid ""
 msgstr ""
 "Définie par B<dpkg> dans l'environnement du script du responsable, cette "
 "variable contient le compte de référence du paquet, c'est-à-dire le nombre "
-"d'instances de paquet avec un état plus élevé que B<not-installed>. Géré à "
-"partir de dpkg 1.17.2."
+"d'instances de paquet avec un état plus élevé que B<not-installed> (depuis "
+"dpkg 1.17.2)."
 
 #. type: TP
 #: dpkg.man
@@ -9435,16 +9465,13 @@ msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the maintainer script environment to the "
-#| "architecture the package got built for."
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the architecture "
 "the package got built for (since dpkg 1.15.4)."
 msgstr ""
 "Définie par B<dpkg> dans l'environnement du script du responsable, cette "
-"variable contient l'architecture pour laquelle le paquet a été construit."
+"variable contient l'architecture pour laquelle le paquet a été construit "
+"(depuis dpkg 1.15.4)."
 
 #. type: TP
 #: dpkg.man
@@ -9454,40 +9481,32 @@ msgstr "B<DPKG_MAINTSCRIPT_NAME>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the maintainer script environment to the name of "
-#| "the script running (preinst, postinst, prerm, postrm)."
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to the name of the "
 "script running, one of B<preinst>, B<postinst>, B<prerm> or B<postrm> (since "
 "dpkg 1.15.7)."
 msgstr ""
 "Définie par B<dpkg> dans l'environnement du script du responsable, cette "
-"variable contient le nom du script en cours d'exécution (preinst, postinst, "
-"prerm, postrm)."
+"variable contient le nom du script en cours d'exécution, B<preinst>, "
+"B<postinst>, B<prerm> ou B<postrm> (depuis dpkg 1.15.7)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<DPKG_MAINTSCRIPT_NAME>"
+#, no-wrap
 msgid "B<DPKG_MAINTSCRIPT_DEBUG>"
-msgstr "B<DPKG_MAINTSCRIPT_NAME>"
+msgstr "B<DPKG_MAINTSCRIPT_DEBUG>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Defined by B<dpkg> on the maintainer script environment to the version of "
-#| "the currently running B<dpkg> instance."
 msgid ""
 "Defined by B<dpkg> on the maintainer script environment to a value (‘B<0>’ "
 "or ‘B<1>’) noting whether debugging has been requested (with the B<--debug> "
 "option) for the maintainer scripts (since dpkg 1.18.4)."
 msgstr ""
 "Cette variable est définie par B<dpkg> dans l'environnement du script du "
-"responsable. Elle contient la version de l'instance de B<dpkg> en cours "
-"d'exécution."
+"responsable à une valeur (« B<0> » ou « B<1> » notant si le débogage a été "
+"demandé (avec l'option B<--debug>) pour les scripts du responsable (depuis "
+"dpkg 1.18.4)."
 
 #. type: Plain text
 #: dpkg.man dpkg.cfg.man
@@ -9497,10 +9516,8 @@ msgstr "I<%PKGCONFDIR%/dpkg.cfg.d/[0-9a-zA-Z_-]*>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid "Configuration fragment files."
 msgid "Configuration fragment files (since dpkg 1.15.4)."
-msgstr "Fragments de fichiers de configuration."
+msgstr "Fragments de fichiers de configuration (depuis dpkg 1.15.4)."
 
 #. type: Plain text
 #: dpkg.man dpkg.cfg.man
@@ -9521,12 +9538,9 @@ msgstr "I<%LOGDIR%/dpkg.log>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Default log file (see I<%PKGCONFDIR%/dpkg.cfg>(5) and option B<--log>)."
 msgid "Default log file (see I<%PKGCONFDIR%/dpkg.cfg> and option B<--log>)."
 msgstr ""
-"Fichier journal standard. Voyez I<%PKGCONFDIR%/dpkg.cfg>(5) et l'option  B<--"
+"Fichier journal standard. Voyez I<%PKGCONFDIR%/dpkg.cfg> et l'option  B<--"
 "log>."
 
 #. type: Plain text
@@ -9565,7 +9579,7 @@ msgid ""
 msgstr ""
 "États des paquets disponibles. Ce fichier contient des informations qui "
 "permettent de savoir si un paquet est marqué comme devant être supprimé ou "
-"pas, devant être installé ou pas, etc. Voyez la section B<RENSEIGNEMENTS SUR "
+"pas, devant être installé ou pas, etc. Voyez la section B<RENSEIGNEMENTS SUR "
 "LES PAQUETS> pour des informations supplémentaires."
 
 #. type: Plain text
@@ -9575,13 +9589,14 @@ msgid ""
 "it's lost or corrupted due to filesystems troubles."
 msgstr ""
 "Le fichier d'état est sauvegardé quotidiennement dans I</var/backups>. Cela "
-"peut être utile en cas de perte ou de corruption dûe à des problèmes de "
+"peut être utile en cas de perte ou de corruption due à des problèmes de "
 "système de fichiers."
 
 #. type: Plain text
 #: dpkg.man
 msgid "The format and contents of a binary package are described in B<deb>(5)."
 msgstr ""
+"Le format et le contenu d'un paquet binaire sont décrits dans B<deb>(5)."
 
 #. type: Plain text
 #: dpkg.man
@@ -9641,18 +9656,13 @@ msgstr "    B<dpkg -r elvis>\n"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "To install a package, you first need to find it in an archive or CDROM. "
-#| "The I<available> file shows that the vim package is in section \"editors"
-#| "\":"
 msgid ""
 "To install a package, you first need to find it in an archive or CDROM. The "
 "I<available> file shows that the vim package is in section B<editors>:"
 msgstr ""
 "Pour installer un paquet, vous devez d'abord le trouver dans une archive ou "
 "sur un CD. Le fichier I<available> montre que le paquet vim se trouve dans "
-"la section « editors » :"
+"la section « B<editors> » :"
 
 #. type: Plain text
 #: dpkg.man
@@ -9673,7 +9683,7 @@ msgstr "Pour faire une copie locale des états de sélection des paquets :"
 #: dpkg.man
 #, no-wrap
 msgid "     B<dpkg --get-selections E<gt>myselections>\n"
-msgstr "    B<dpkg --get-selections E<gt>myselections>\n"
+msgstr "    B<dpkg --get-selections E<gt>mes-sélections>\n"
 
 #. type: Plain text
 #: dpkg.man
@@ -9696,7 +9706,7 @@ msgstr "     B<apt-cache dumpavail | dpkg --merge-avail>\n"
 #. type: Plain text
 #: dpkg.man
 msgid "or with dpkg 1.17.6 and earlier:"
-msgstr "ou avec dpkg 1.17.6 et les versions antérieures :"
+msgstr "ou avec dpkg 1.17.6 et les versions antérieures :"
 
 #. type: Plain text
 #: dpkg.man
@@ -9725,7 +9735,7 @@ msgid ""
 "     B<dpkg --set-selections E<lt>myselections>\n"
 msgstr ""
 "    B<dpkg --clear-selections>\n"
-"    B<dpkg --set-selections E<lt>myselections>\n"
+"    B<dpkg --set-selections E<lt>mes-sélections>\n"
 
 #. type: Plain text
 #: dpkg.man
@@ -9738,7 +9748,7 @@ msgstr ""
 "On remarquera que cela n'installe ou ne supprime rien du tout ; cela ne fait "
 "qu'enregistrer l'état souhaité des paquets. Vous aurez besoin d'autres "
 "applications pour récupérer et installer réellement les paquets requis. Par "
-"exemple, exécutez B<apt-get dselect-upgrade>."
+"exemple, exécuter B<apt-get dselect-upgrade>."
 
 #. type: Plain text
 #: dpkg.man
@@ -9884,11 +9894,11 @@ msgid ""
 "wildcards.  Command finishes with an exit status of 0 if matched, 1 if not "
 "matched."
 msgstr ""
-"Vérifie l'égalité d'architectures (depuis dpkg 1.13.13). Cela compare "
+"Vérifie l'égalité d'architectures (depuis dpkg 1.13.13). Cela compare "
 "l'architecture Debian en cours (ou celle spécifiée) à I<architecture> afin "
 "de vérifier leur égalité. Cette action ne gère pas les architectures joker. "
-"La commande quitte avec un code de retour de 0 si l'architecture correspond "
-"et de 1 dans le cas contraire."
+"La commande quitte avec un code de retour de B<0> si l'architecture "
+"correspond et de B<1> dans le cas contraire."
 
 #. type: TP
 #: dpkg-architecture.man
@@ -9905,11 +9915,11 @@ msgid ""
 "they match.  Command finishes with an exit status of 0 if matched, 1 if not "
 "matched."
 msgstr ""
-"Vérifie l'identité des architectures (depuis dpkg 1.13.13). Cela compare "
+"Vérifie l'identité des architectures (depuis dpkg 1.13.13). Cela compare "
 "l'architecture Debian en cours (ou celle spécifiée) à I<architecture-joker> "
 "(après expansion de celle-ci) afin de vérifier leur correspondance. La "
-"commande quitte avec un code de retour de 0 si l'architecture correspond et "
-"de 1 dans le cas contraire."
+"commande quitte avec un code de retour de B<0> si l'architecture correspond "
+"et de B<1> dans le cas contraire."
 
 #. type: TP
 #: dpkg-architecture.man
@@ -9952,23 +9962,18 @@ msgstr ""
 
 #. type: TP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "B<-c>, B<--command> I<command>"
+#, no-wrap
 msgid "B<-c>, B<--command> I<command-string>"
-msgstr "B<-c>, B<--command> I<commande>"
+msgstr "B<-c>, B<--command> I<chaîne-de-commande>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid ""
-#| "Execute a I<command> in an environment which has all variables set to the "
-#| "determined value."
 msgid ""
 "Execute a I<command-string> in an environment which has all variables set to "
 "the determined value."
 msgstr ""
-"Exécute une I<commande> dans un environnement où toutes les variables sont "
-"positionnées aux valeurs spécifiées."
+"Exécute une I<chaîne-de-commande> dans un environnement où toutes les "
+"variables sont positionnées aux valeurs spécifiées."
 
 #. type: TP
 #: dpkg-architecture.man
@@ -9985,7 +9990,7 @@ msgid ""
 msgstr ""
 "Affiche une liste des architectures valables. Elle peut être restreinte par "
 "une ou plusieurs des options correspondantes B<--match-wildcard>, B<--match-"
-"bits> ou B<--match-endian> (depuis dpkg 1.17.14)."
+"bits> ou B<--match-endian> (depuis dpkg 1.17.14)."
 
 #. type: Plain text
 #: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -10040,10 +10045,8 @@ msgstr "B<-A>, B<--target-arch> I<architecture>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "Set the target GNU system type."
 msgid "Set the target Debian architecture (since dpkg 1.17.14)."
-msgstr "Définit le type de système GNU de la cible."
+msgstr "Définit l'architecture Debian de la cible (depuis dpkg 1.17.14)."
 
 #. type: TP
 #: dpkg-architecture.man
@@ -10053,10 +10056,8 @@ msgstr "B<-T>, B<--target-type> I<type-de-système-gnu>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "Set the target GNU system type."
 msgid "Set the target GNU system type (since dpkg 1.17.14)."
-msgstr "Définit le type de système GNU de la cible."
+msgstr "Définit le type de système GNU de la cible (depuis dpkg 1.17.14)."
 
 #. type: TP
 #: dpkg-architecture.man
@@ -10071,7 +10072,7 @@ msgid ""
 "specified architecture wildcard (since dpkg 1.17.14)."
 msgstr ""
 "Restreindre les architectures listées par B<--list-known> à celles "
-"correspondant à l'architecture-joker (depuis dpkg 1.17.14)."
+"correspondant à l'architecture-joker (depuis dpkg 1.17.14)."
 
 #. type: TP
 #: dpkg-architecture.man
@@ -10086,8 +10087,8 @@ msgid ""
 "specified CPU bits (since dpkg 1.17.14). Either B<32> or B<64>."
 msgstr ""
 "Restreindre les architectures listées par B<--list-known> à celles employant "
-"un CPU disposant du nombre de bits indiqués (depuis dpkg 1.17.14). Soit "
-"B<32>, soit B<64>."
+"un CPU disposant du nombre de bits indiqués (depuis dpkg 1.17.14). Soit "
+"B<32>, soit B<64>."
 
 #. type: TP
 #: dpkg-architecture.man
@@ -10102,7 +10103,7 @@ msgid ""
 "specified endianness (since dpkg 1.17.14). Either B<little> or B<big>."
 msgstr ""
 "Restreindre les architectures listées par B<--list-known> à celles "
-"correspondant au boutisme spécifié (depuis dpkg 1.17.14). Soit B<little>, "
+"correspondant au boutisme spécifié (depuis dpkg 1.17.14). Soit B<little>, "
 "soit B<big>."
 
 #. type: TP
@@ -10122,7 +10123,7 @@ msgid ""
 msgstr ""
 "Les valeurs positionnées par les variables d'environnement ayant le même nom "
 "que celles utilisées par les scripts sont prises en compte (c'est-à-dire "
-"utilisée par B<dpkg-architecture>), sauf si cette option est présente. Cela "
+"utilisées par B<dpkg-architecture>), sauf si cette option est présente. Cela "
 "permet à un utilisateur de surcharger une valeur même lorsque l'appel à "
 "B<dpkg-architecture> est inclus dans un autre script (par exemple B<dpkg-"
 "buildpackage>(1))."
@@ -10163,21 +10164,16 @@ msgstr "Machine cible"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid ""
-#| "Set the target Debian architecture. This is only needed when building a "
-#| "cross-toolchain, one that will be built on the build architecture, to be "
-#| "run on the host architecture, and to build code for the target "
-#| "architecture."
 msgid ""
 "The machine the compiler is building for.  This is only needed when building "
 "a cross-toolchain, one that will be built on the build architecture, to be "
 "run on the host architecture, and to build code for the target architecture."
 msgstr ""
-"Définit l'architecture Debian cible. Cela est nécessaire uniquement lors de "
-"la construction d'une chaîne d'outils de compilation croisée qui sera "
-"construite sur l'architecture de construction, pour être exécutée sur "
-"l'architecture hôte, afin de construire du code pour l'architecture cible."
+"La machine pour laquelle le compilateur construit. Cela est nécessaire "
+"uniquement lors de la construction d'une chaîne d'outils de compilation "
+"croisée qui sera construite sur l'architecture de construction, pour être "
+"exécutée sur l'architecture hôte, afin de construire du code pour "
+"l'architecture cible."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10196,10 +10192,9 @@ msgstr ""
 
 #. type: IP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "Debian architecture"
+#, no-wrap
 msgid "Debian architecture tuple"
-msgstr "Architecture Debian"
+msgstr "N-uplet d'architecture Debian"
 
 #. type: Plain text
 #: dpkg-architecture.man
@@ -10210,21 +10205,20 @@ msgid ""
 "the form I<abi>-I<libc>-I<os>-I<cpu>.  Examples: base-gnu-linux-amd64, "
 "eabihf-musl-linux-arm."
 msgstr ""
+"Un n-uplet d'architecture Debian est l'architecture pleinement qualifiée "
+"avec tous ses composants énoncés. C'est différent des architectures Debian "
+"en ce que le composant I<processeur> n'intègre pas l'I<ABI>. Le n-uplet "
+"actuel a la forme I<ABI>-I<libc>-I<os>-I<processeur>. Exemples : base-gnu-"
+"linux-amd64, eabihf-musl-linux-arm."
 
 #. type: IP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "architecture wildcard"
+#, no-wrap
 msgid "Debian architecture wildcard"
-msgstr "Architecture joker"
+msgstr "Architecture Debian joker"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid ""
-#| "An architecture wildcard is a special architecture string that will match "
-#| "any real architecture being part of it. The general form is "
-#| "E<lt>kernelE<gt>-E<lt>cpuE<gt>.  Examples: linux-any, any-i386, hurd-any."
 msgid ""
 "A Debian architecture wildcard is a special architecture string that will "
 "match any real architecture being part of it.  The general form is a Debian "
@@ -10232,10 +10226,12 @@ msgid ""
 "being B<any>.  Missing elements of the tuple are prefixed implicitly as "
 "B<any>, and thus the following pairs are equivalent:"
 msgstr ""
-"Une architecture joker est une architecture spéciale qui correspond à toutes "
-"les architectures réelles qui en font partie. Il est en général de la forme "
-"E<lt>noyauE<gt>-E<lt>processeurE<gt>. Par exemple : linux-any, any-i386, "
-"hurd-any."
+"Une architecture Debian joker est une architecture spéciale qui correspond à "
+"toutes les architectures réelles qui en font partie. Il est en général de la "
+"forme d'un n-uplet d'architecture Debian avec quatre éléments ou moins dont "
+"au moins l'un deux est B<any>. Les éléments manquants du n-uplet sont "
+"préfixés implicitement par B<any>, et donc les paires suivantes sont "
+"équivalentes."
 
 #. type: Plain text
 #: dpkg-architecture.man
@@ -10245,12 +10241,16 @@ msgid ""
 "    B<any>-B<any>-I<os>-B<any> = I<os>-B<any>\n"
 "    B<any>-I<libc>-B<any>-B<any> = I<libc>-B<any>-B<any>\n"
 msgstr ""
+"    B<any>-B<any>-B<any>-B<any> = B<any>\n"
+"    B<any>-B<any>-I<os>-B<any> = I<os>-B<any>\n"
+"    B<any>-I<libc>-B<any>-B<any> = I<libc>-B<any>-B<any>\n"
 
 #. type: Plain text
 #: dpkg-architecture.man
 msgid ""
 "Examples: linux-any, any-i386, hurd-any, eabi-any-any-arm, musl-any-any."
 msgstr ""
+"Exemples : linux-any, any-i386, hurd-any, eabi-any-any-arm, musl-any-any."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10260,25 +10260,20 @@ msgstr "Type de système GNU"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid ""
-#| "An architecture specification string consisting of two parts separated by "
-#| "a hyphen: cpu and system. Examples: i386-linux-gnu, sparc-linux-gnu, i386-"
-#| "gnu, x86_64-netbsd."
 msgid ""
 "An architecture specification string consisting of two parts separated by a "
 "hyphen: cpu and system.  Examples: i586-linux-gnu, sparc-linux-gnu, i686-"
 "gnu, x86_64-netbsd."
 msgstr ""
 "Chaîne de caractères définissant l'architecture et constituée de deux "
-"parties séparées par un tiret : processeur et système. Par exemple : i386-"
+"parties séparées par un tiret : processeur et système. Par exemple : i586-"
 "linux-gnu, sparc-linux-gnu, i386-gnu, x86_64-netbsd."
 
 #. type: IP
 #: dpkg-architecture.man
 #, no-wrap
 msgid "multiarch triplet"
-msgstr ""
+msgstr "n-uplet multiarchitecture"
 
 #. type: Plain text
 #: dpkg-architecture.man
@@ -10290,6 +10285,13 @@ msgid ""
 "i386-linux-gnu, x86_64-linux-gnu.  Example paths: /lib/powerpc64le-linux-"
 "gnu/, /usr/lib/i386-kfreebsd-gnu/."
 msgstr ""
+"Type en clair de système GNU, utilisé pour les chemins du système de "
+"fichiers. Ce n-uplet ne change pas même quand l'ISA de base est incrémentée, "
+"de sorte que les chemins résultants sont stables dans la durée. La seule "
+"différence actuelle avec le type du système GNU est que la partie processeur "
+"pour les systèmes basés sur l'i386 est toujours i386. Exemples : i386-linux-"
+"gnu, x86_64-linux-gnu. Exemple de chemins : /lib/powerpc64le-linux-gnu/, /"
+"usr/lib/i386-kfreebsd-gnu/."
 
 #. type: SH
 #: dpkg-architecture.man
@@ -10299,8 +10301,12 @@ msgstr "VARIABLES D'ENVIRONNEMENT"
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
-msgstr "Les variables suivantes sont positionnées par B<dpkg-architecture> :"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
+msgstr ""
+"Les variables suivantes sont positionnées par B<dpkg-architecture> (voir la "
+"section B<TERMS> pour une description du schéma de nommage) :"
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10315,33 +10321,27 @@ msgstr "Architecture Debian de la machine de construction."
 
 #. type: IP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "B<DEB_BUILD_ARCH_BITS>"
+#, no-wrap
 msgid "B<DEB_BUILD_ARCH_ABI>"
-msgstr "B<DEB_BUILD_ARCH_BITS>"
+msgstr "B<DEB_BUILD_ARCH_ABI>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "The Debian cpu name of the build machine (since dpkg 1.13.2)."
 msgid "The Debian abi name of the build machine (since dpkg 1.18.11)."
 msgstr ""
-"Nom de processeur Debian de la machine de construction (depuis dpkg 1.13.2)."
+"Nom de l'ABI Debian de la machine de construction (depuis dpkg 1.18.11)."
 
 #. type: IP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "B<DEB_BUILD_ARCH_CPU>"
+#, no-wrap
 msgid "B<DEB_BUILD_ARCH_LIBC>"
-msgstr "B<DEB_BUILD_ARCH_CPU>"
+msgstr "B<DEB_BUILD_ARCH_LIBC>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "The Debian cpu name of the build machine (since dpkg 1.13.2)."
 msgid "The Debian libc name of the build machine (since dpkg 1.18.11)."
 msgstr ""
-"Nom de processeur Debian de la machine de construction (depuis dpkg 1.13.2)."
+"Nom de la libc Debian de la machine de construction (depuis dpkg 1.18.11)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10353,7 +10353,7 @@ msgstr "B<DEB_BUILD_ARCH_OS>"
 #: dpkg-architecture.man
 msgid "The Debian system name of the build machine (since dpkg 1.13.2)."
 msgstr ""
-"Nom du système Debian de la machine de construction (depuis dpkg 1.13.2)."
+"Nom du système Debian de la machine de construction (depuis dpkg 1.13.2)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10365,7 +10365,7 @@ msgstr "B<DEB_BUILD_ARCH_CPU>"
 #: dpkg-architecture.man
 msgid "The Debian cpu name of the build machine (since dpkg 1.13.2)."
 msgstr ""
-"Nom de processeur Debian de la machine de construction (depuis dpkg 1.13.2)."
+"Nom de processeur Debian de la machine de construction (depuis dpkg 1.13.2)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10377,8 +10377,8 @@ msgstr "B<DEB_BUILD_ARCH_BITS>"
 #: dpkg-architecture.man
 msgid "The pointer size of the build machine (in bits; since dpkg 1.15.4)."
 msgstr ""
-"Taille de pointeur de la machine de construction (en bits, depuis dpkg "
-"1.15.4)."
+"Taille de pointeur de la machine de construction (en bits, depuis "
+"dpkg 1.15.4)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10390,7 +10390,7 @@ msgstr "B<DEB_BUILD_ARCH_ENDIAN>"
 #: dpkg-architecture.man
 msgid "The endianness of the build machine (little / big; since dpkg 1.15.4)."
 msgstr ""
-"Boutisme de la machine de construction (petit ou gros, depuis dpkg 1.15.4)."
+"Boutisme de la machine de construction (petit ou gros, depuis dpkg 1.15.4)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10438,7 +10438,7 @@ msgid ""
 "paths (since dpkg 1.16.0)."
 msgstr ""
 "Le type en clair de système GNU de la machine de construction, utilisé pour "
-"les chemins du système de fichiers (depuis dpkg 1.16.0)."
+"les chemins du système de fichiers (depuis dpkg 1.16.0)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10453,31 +10453,25 @@ msgstr "Architecture Debian de la machine hôte."
 
 #. type: IP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "B<DEB_HOST_ARCH_BITS>"
+#, no-wrap
 msgid "B<DEB_HOST_ARCH_ABI>"
-msgstr "B<DEB_HOST_ARCH_BITS>"
+msgstr "B<DEB_HOST_ARCH_ABI>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "The Debian cpu name of the host machine (since dpkg 1.13.2)."
 msgid "The Debian abi name of the host machine (since dpkg 1.18.11)."
-msgstr "Nom du processeur Debian de la machine hôte (depuis dpkg 1.13.2)."
+msgstr "Nom de l'ABI Debian de la machine hôte (depuis dpkg 1.18.11)."
 
 #. type: IP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "B<DEB_HOST_ARCH_CPU>"
+#, no-wrap
 msgid "B<DEB_HOST_ARCH_LIBC>"
-msgstr "B<DEB_HOST_ARCH_CPU>"
+msgstr "B<DEB_HOST_ARCH_LIBC>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "The Debian cpu name of the host machine (since dpkg 1.13.2)."
 msgid "The Debian libc name of the host machine (since dpkg 1.18.11)."
-msgstr "Nom du processeur Debian de la machine hôte (depuis dpkg 1.13.2)."
+msgstr "Nom de la libc Debian de la machine hôte (depuis dpkg 1.18.11)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10488,7 +10482,7 @@ msgstr "B<DEB_HOST_ARCH_OS>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The Debian system name of the host machine (since dpkg 1.13.2)."
-msgstr "Nom du système Debian de la machine hôte (depuis dpkg 1.13.2)."
+msgstr "Nom du système Debian de la machine hôte (depuis dpkg 1.13.2)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10499,7 +10493,7 @@ msgstr "B<DEB_HOST_ARCH_CPU>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The Debian cpu name of the host machine (since dpkg 1.13.2)."
-msgstr "Nom du processeur Debian de la machine hôte (depuis dpkg 1.13.2)."
+msgstr "Nom du processeur Debian de la machine hôte (depuis dpkg 1.13.2)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10510,7 +10504,7 @@ msgstr "B<DEB_HOST_ARCH_BITS>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The pointer size of the host machine (in bits; since dpkg 1.15.4)."
-msgstr "Taille de pointeur de la machine hôte (en bits, depuis dpkg 1.15.4)."
+msgstr "Taille de pointeur de la machine hôte (en bits, depuis dpkg 1.15.4)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10521,7 +10515,7 @@ msgstr "B<DEB_HOST_ARCH_ENDIAN>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The endianness of the host machine (little / big; since dpkg 1.15.4)."
-msgstr "Boutisme de la machine hôte (petit ou gros, depuis dpkg 1.15.4)."
+msgstr "Boutisme de la machine hôte (petit ou gros, depuis dpkg 1.15.4)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10569,7 +10563,7 @@ msgid ""
 "(since dpkg 1.16.0)."
 msgstr ""
 "Le type en clair de système GNU de la machine hôte, utilisé pour les chemins "
-"du système de fichiers (depuis dpkg 1.16.0)."
+"du système de fichiers (depuis dpkg 1.16.0)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10580,35 +10574,29 @@ msgstr "B<DEB_TARGET_ARCH>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The Debian architecture of the target machine (since dpkg 1.17.14)."
-msgstr "L'architecture Debian de la machine cible (depuis dpkg 1.17.14)."
+msgstr "L'architecture Debian de la machine cible (depuis dpkg 1.17.14)."
 
 #. type: IP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "B<DEB_TARGET_ARCH_BITS>"
+#, no-wrap
 msgid "B<DEB_TARGET_ARCH_ABI>"
-msgstr "B<DEB_TARGET_ARCH_BITS>"
+msgstr "B<DEB_TARGET_ARCH_ABI>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "The Debian cpu name of the target machine (since dpkg 1.17.14)."
 msgid "The Debian abi name of the target machine (since dpkg 1.18.11)."
-msgstr "Nom du processeur Debian de la machine cible (depuis dpkg 1.17.14)."
+msgstr "Nom de l'ABI Debian de la machine cible (depuis dpkg 1.18.11)."
 
 #. type: IP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "B<DEB_TARGET_ARCH_CPU>"
+#, no-wrap
 msgid "B<DEB_TARGET_ARCH_LIBC>"
-msgstr "B<DEB_TARGET_ARCH_CPU>"
+msgstr "B<DEB_TARGET_ARCH_LIBC>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "The Debian cpu name of the target machine (since dpkg 1.17.14)."
 msgid "The Debian libc name of the target machine (since dpkg 1.18.11)."
-msgstr "Nom du processeur Debian de la machine cible (depuis dpkg 1.17.14)."
+msgstr "Nom de la libc Debian de la machine cible (depuis dpkg 1.18.11)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10619,7 +10607,7 @@ msgstr "B<DEB_TARGET_ARCH_OS>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The Debian system name of the target machine (since dpkg 1.17.14)."
-msgstr "Nom du système Debian de la machine cible (depuis dpkg 1.17.14)."
+msgstr "Nom du système Debian de la machine cible (depuis dpkg 1.17.14)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10630,7 +10618,7 @@ msgstr "B<DEB_TARGET_ARCH_CPU>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The Debian cpu name of the target machine (since dpkg 1.17.14)."
-msgstr "Nom du processeur Debian de la machine cible (depuis dpkg 1.17.14)."
+msgstr "Nom du processeur Debian de la machine cible (depuis dpkg 1.17.14)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10641,7 +10629,7 @@ msgstr "B<DEB_TARGET_ARCH_BITS>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The pointer size of the target machine (in bits; since dpkg 1.17.14)."
-msgstr "Taille de pointeur de la machine cible (en bits, depuis dpkg 1.17.14)."
+msgstr "Taille de pointeur de la machine cible (en bits, depuis dpkg 1.17.14)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10653,7 +10641,7 @@ msgstr "B<DEB_TARGET_ARCH_ENDIAN>"
 #: dpkg-architecture.man
 msgid ""
 "The endianness of the target machine (little / big; since dpkg 1.17.14)."
-msgstr "Boutisme de la machine cible (petit ou gros, depuis dpkg 1.17.14)."
+msgstr "Boutisme de la machine cible (petit ou gros, depuis dpkg 1.17.14)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10664,7 +10652,7 @@ msgstr "B<DEB_TARGET_GNU_CPU>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The CPU part of B<DEB_TARGET_GNU_TYPE> (since dpkg 1.17.14)."
-msgstr "Partie « processeur » de B<DEB_TARGET_GNU_TYPE> (depuis dpkg 1.17.14)."
+msgstr "Partie « processeur » de B<DEB_TARGET_GNU_TYPE> (depuis dpkg 1.17.14)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10675,7 +10663,7 @@ msgstr "B<DEB_TARGET_GNU_SYSTEM>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The System part of B<DEB_TARGET_GNU_TYPE> (since dpkg 1.17.14)."
-msgstr "Partie « système » de B<DEB_TARGET_GNU_TYPE> (depuis dpkg 1.17.14)."
+msgstr "Partie « système » de B<DEB_TARGET_GNU_TYPE> (depuis dpkg 1.17.14)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10686,7 +10674,7 @@ msgstr "B<DEB_TARGET_GNU_TYPE>"
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "The GNU system type of the target machine (since dpkg 1.17.14)."
-msgstr "Type du système GNU de la machine cible (depuis dpkg 1.17.14)."
+msgstr "Type du système GNU de la machine cible (depuis dpkg 1.17.14)."
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10700,8 +10688,8 @@ msgid ""
 "The clarified GNU system type of the target machine, used for filesystem "
 "paths (since dpkg 1.17.14)."
 msgstr ""
-"Le type de système clarifié GNU de la machine cible, utilisé pour les "
-"chemins du système de fichiers (depuis dpkg 1.17.14)."
+"Le type en clair du système GNU de la machine cible, utilisé pour les "
+"chemins du système de fichiers (depuis dpkg 1.17.14)."
 
 #. type: SS
 #: dpkg-architecture.man
@@ -10711,11 +10699,6 @@ msgstr "Tables d'architectures"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid ""
-#| "All these files have to be present for B<dpkg-architecture> to work. "
-#| "Their location can be overridden at runtime with the environment variable "
-#| "B<DPKG_DATADIR>."
 msgid ""
 "All these files have to be present for B<dpkg-architecture> to work. Their "
 "location can be overridden at runtime with the environment variable "
@@ -10724,76 +10707,71 @@ msgid ""
 "understand it, such as \"# Version=1.0\"."
 msgstr ""
 "Tous ces fichiers sont nécessaires afin que B<dpkg-architecture> puisse "
-"fonctionner. Leurs emplacements peuvent être modifiés lors du traitement via "
-"la variable d'environnement B<DPKG_DATADIR>."
+"fonctionner. Leurs emplacements peuvent être modifiés lors du traitement à "
+"l'aide de la variable d'environnement B<DPKG_DATADIR>. Ces tables "
+"contiennent en première ligne un pseudo-champ de B<Version> de format pour "
+"indiquer leur format de sorte que les analyseurs peuvent vérifier s'ils les "
+"comprennent, tel que « # Version=1.0 »."
 
 #. type: TP
 #: dpkg-architecture.man
 #, no-wrap
 msgid "I<%PKGDATADIR%/cputable>"
-msgstr "I<%PKGDATADIR%/cputable>"
+msgstr "I<%PKGDATADIR%/table-processeur>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "Table of known CPU names and mapping to their GNU name."
 msgid ""
 "Table of known CPU names and mapping to their GNU name.  Format version 1.0 "
 "(since dpkg 1.13.2)."
-msgstr "Table des noms de processeurs connus et liaison avec leur nom GNU."
+msgstr ""
+"Table des noms de processeurs connus et liaison avec leur nom GNU. "
+"Version 1.0 de format (depuis dpkg 1.13.2)."
 
 #. type: TP
 #: dpkg-architecture.man
 #, no-wrap
 msgid "I<%PKGDATADIR%/ostable>"
-msgstr "I<%PKGDATADIR%/ostable>"
+msgstr "I<%PKGDATADIR%/table-système-exploitation>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "Table of known operating system names and mapping to their GNU name."
 msgid ""
 "Table of known operating system names and mapping to their GNU name.  Format "
 "version 2.0 (since dpkg 1.18.11)."
 msgstr ""
 "Table des noms des systèmes d'exploitation connus et liaison avec leurs noms "
-"GNU."
+"GNU. Version 2.0 de format (depuis dpkg 1.18.11)."
 
 #. type: TP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "I<%PKGDATADIR%/triplettable>"
+#, no-wrap
 msgid "I<%PKGDATADIR%/tupletable>"
-msgstr "I<%PKGDATADIR%/triplettable>"
+msgstr "I<%PKGDATADIR%/table-n-uplet>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid ""
-#| "Mapping between Debian architecture triplets and Debian architecture "
-#| "names."
 msgid ""
 "Mapping between Debian architecture tuples and Debian architecture names.  "
 "Format version 1.0 (since dpkg 1.18.11)."
 msgstr ""
-"Correspondances entre les triplets de l'architecture Debian et les noms des "
-"architectures Debian."
+"Correspondances entre les n-uplets de l'architecture Debian et les noms des "
+"architectures Debian. Format version 1.0 (depuis dpkg 1.18.11)."
 
 #. type: TP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "I<%PKGDATADIR%/ostable>"
+#, no-wrap
 msgid "I<%PKGDATADIR%/abitable>"
-msgstr "I<%PKGDATADIR%/ostable>"
+msgstr "I<%PKGDATADIR%/table-ABI>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "The Debian architecture of the host machine."
 msgid ""
 "Table of Debian architecture ABI attribute overrides.  Format version 2.0 "
 "(since dpkg 1.18.11)."
-msgstr "Architecture Debian de la machine hôte."
+msgstr ""
+"Table des substituts d'attributs d'ABI d'architecture Debian. Format "
+"version 2.0 (depuis dpkg 1.18.11)."
 
 #. type: SS
 #: dpkg-architecture.man dpkg-buildflags.man
@@ -10814,7 +10792,7 @@ msgid ""
 "B<dpkg-architecture> outputs (since dpkg 1.16.1)."
 msgstr ""
 "Un fragment de fichier Makefile qui définit correctement et exporte toutes "
-"les variables que B<dpkg-architecture> peut fournir (depuis dpkg 1.16.1)."
+"les variables que B<dpkg-architecture> peut fournir (depuis dpkg 1.16.1)."
 
 #. type: Plain text
 #: dpkg-architecture.man
@@ -10988,10 +10966,9 @@ msgstr ""
 
 #. type: TP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "B<DPKG_ADMINDIR>"
+#, no-wrap
 msgid "B<DPKG_DATADIR>"
-msgstr "B<DPKG_ADMINDIR>"
+msgstr "B<DPKG_DATADIR>"
 
 #. type: Plain text
 #: dpkg-architecture.man
@@ -11000,20 +10977,49 @@ msgid ""
 "architecture tables are located (since dpkg 1.14.17).  Defaults to "
 "«%PKGDATADIR%»."
 msgstr ""
+"Si cette variable est définie, elle sera utilisée comme répertoire de "
+"données de B<dpkg> où sont placées les tables d'architecture (depuis "
+"dpkg 1.14.17). Par défaut «%PKGDATADIR%»."
+
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, no-wrap
+msgid "B<DPKG_NLS>"
+msgstr "B<DPKG_NLS>"
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+"Si cette variable est définie, elle sera utilisée pour décider l'activation "
+"de la prise en charge des langues (NLS – Native Language Support), connu "
+"aussi comme la gestion de l'internationalisation (ou i18n) (depuis "
+"dpkg 1.19.0). Les valeurs permises sont : B<0> et B<1> (par défaut)."
 
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
 msgstr ""
 "Tous les noms de commandes et d'options longs ne sont disponibles qu'à "
-"partir de dpkg 1.17.17."
+"partir de dpkg 1.17.17."
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "dpkg-buildpackage"
 msgid "B<dpkg-buildpackage>(1)."
-msgstr "dpkg-buildpackage"
+msgstr "B<dpkg-buildpackage>(1)."
 
 #. type: TH
 #: dpkg.cfg.man
@@ -11024,17 +11030,10 @@ msgstr "dpkg.cfg"
 #. type: Plain text
 #: dpkg.cfg.man
 msgid "dpkg.cfg - dpkg configuration file"
-msgstr "dpkg.cfg - fichier de configuration de dpkg"
+msgstr "dpkg.cfg - Fichier de configuration de dpkg"
 
 #. type: Plain text
 #: dpkg.cfg.man
-#, fuzzy
-#| msgid ""
-#| "This file contains default options for dpkg. Each line contains a single "
-#| "option which is exactly the same as a normal command line option for dpkg "
-#| "except for the leading hyphens which are not used here. Quotes "
-#| "surrounding option values are stripped. Comments are allowed by starting "
-#| "a line with a hash sign (\"B<#>\")."
 msgid ""
 "This file contains default options for dpkg. Each line contains a single "
 "option which is exactly the same as a normal command line option for dpkg "
@@ -11063,7 +11062,7 @@ msgstr "dpkg-buildflags"
 #: dpkg-buildflags.man
 msgid "dpkg-buildflags - returns build flags to use during package build"
 msgstr ""
-"dpkg-buildflags - retourne les options de compilation à utiliser pour la "
+"dpkg-buildflags - Renvoie les options de compilation à utiliser pour la "
 "construction du paquet"
 
 #. type: Plain text
@@ -11086,8 +11085,8 @@ msgid ""
 "The default flags are defined by the vendor but they can be extended/"
 "overridden in several ways:"
 msgstr ""
-"Les drapeaux par défaut sont définis par le fournisseur de la distribution "
-"mais peuvent être étendus ou remplacés de plusieurs façons :"
+"Les drapeaux par défaut sont définis par le distributeur mais peuvent être "
+"étendus ou remplacés de plusieurs façons :"
 
 #. type: IP
 #: dpkg-buildflags.man
@@ -11098,7 +11097,7 @@ msgstr "1."
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "system-wide with B<%PKGCONFDIR%/buildflags.conf>;"
-msgstr "pour tout le système avec B<%PKGCONFDIR%/buildflags.conf>;"
+msgstr "pour tout le système avec B<%PKGCONFDIR%/buildflags.conf> ;"
 
 #. type: IP
 #: dpkg-buildflags.man
@@ -11113,7 +11112,7 @@ msgid ""
 "$XDG_CONFIG_HOME> defaults to B<$HOME/.config>;"
 msgstr ""
 "pour l'utilisateur courant avec B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> où "
-"la valeur par défaut de B<$XDG_CONFIG_HOME> est B<$HOME/.config>;"
+"la valeur par défaut de B<$XDG_CONFIG_HOME> est B<$HOME/.config> ;"
 
 #. type: IP
 #: dpkg-buildflags.man
@@ -11128,7 +11127,7 @@ msgid ""
 "B<ENVIRONMENT>);"
 msgstr ""
 "temporairement par l'utilisateur avec des variables d'environnement (voir "
-"B<VARIABLES D'ENVIRONNEMENT>)."
+"B<VARIABLES D'ENVIRONNEMENT>) ;"
 
 #. type: IP
 #: dpkg-buildflags.man
@@ -11143,15 +11142,14 @@ msgid ""
 "B<debian/rules> (see section B<ENVIRONMENT>)."
 msgstr ""
 "dynamiquement par le responsable du paquet avec des variables "
-"d'environnement via B<debian/rules> (voir B<VARIABLES D'ENVIRONNEMENT>)."
+"d'environnement à l'aide de B<debian/rules> (voir B<VARIABLES "
+"D'ENVIRONNEMENT>)."
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid "The configuration files can contain two types of directives:"
 msgid "The configuration files can contain four types of directives:"
 msgstr ""
-"Les fichiers de configuration peuvent contenir deux types de directives :"
+"Les fichiers de configuration peuvent contenir quatre types de directives :"
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11168,7 +11166,7 @@ msgstr "Remplace le drapeau I<drapeau> par la valeur I<valeur>."
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "B<STRIP>I< flag value>"
-msgstr "B<STRIP>I< valeur drapeau>"
+msgstr "B<STRIP>I< drapeau valeur>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11199,7 +11197,7 @@ msgstr ""
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "B<PREPEND>I< flag value>"
-msgstr "B<PREPEND>I< valeur drapeau>"
+msgstr "B<PREPEND>I< drapeau valeur>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11229,11 +11227,6 @@ msgstr "B<--dump>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Print to standard output all compilation flags and their values. It "
-#| "prints one flag per line separated from its value by an equal sign "
-#| "(\"I<flag>=I<value>\"). This is the default action."
 msgid ""
 "Print to standard output all compilation flags and their values. It prints "
 "one flag per line separated from its value by an equal sign "
@@ -11256,8 +11249,9 @@ msgid ""
 "Print the list of flags supported by the current vendor (one per line). See "
 "the B<SUPPORTED FLAGS> section for more information about them."
 msgstr ""
-"Affiche la liste des drapeaux gérés par l'éditeur actuel (un par ligne). "
-"Voir la section B<DRAPEAUX GÉRÉS> pour plus d'informations sur chacun d'eux."
+"Affiche la liste des drapeaux gérés par le distributeur actuel (un par "
+"ligne). Voir la section B<DRAPEAUX GÉRÉS> pour plus d'informations sur "
+"chacun d'eux."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11267,12 +11261,6 @@ msgstr "B<--status>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Display any information that can be useful to explain the behaviour of "
-#| "B<dpkg-buildflags>: relevant environment variables, current vendor, state "
-#| "of all feature flags. Also print the resulting compiler flags with their "
-#| "origin."
 msgid ""
 "Display any information that can be useful to explain the behaviour of "
 "B<dpkg-buildflags> (since dpkg 1.16.5): relevant environment variables, "
@@ -11280,9 +11268,9 @@ msgid ""
 "compiler flags with their origin."
 msgstr ""
 "Affiche toute information utile pour expliquer le comportement de B<dpkg-"
-"buildflags> : variables  d'environnement, éditeur actuel, état de tous les "
-"drapeaux de fonctionnalités. Affiche également les drapeaux de compilation "
-"résultants ainsi que leur origine."
+"buildflags> (depuis dpkg 1.16.5) : variables d'environnement, distributeur "
+"actuel, état de tous les drapeaux de fonctionnalités. Affiche également les "
+"drapeaux de compilation résultants ainsi que leur origine."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11348,7 +11336,7 @@ msgid ""
 "syntax."
 msgstr ""
 "Arguments à passer à la ligne de commande d'un programme de construction "
-"pour utiliser tous les drapeaux de compilation (depuis dpkg 1.17.0). Les "
+"pour utiliser tous les drapeaux de compilation (depuis dpkg 1.17.0). Les "
 "valeurs drapeau sont protégées dans la syntaxe du shell."
 
 #. type: TP
@@ -11372,12 +11360,12 @@ msgstr "B<make>"
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 "Directives de make pour définir et exporter tous les drapeaux de compilation "
 "dans l'environnement. La sortie peut être écrite dans un fragment de "
-"makefile et évaluée en utilisant une directive B<include>."
+"Makefile et évaluée en utilisant une directive B<include>."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11392,7 +11380,7 @@ msgid ""
 "known otherwise exits with 1."
 msgstr ""
 "Affiche la valeur de ce drapeau sur la sortie standard. Retourne un code de "
-"sortie 0 si le drapeau est connu et 1 s'il est inconnu."
+"sortie B<0> si le drapeau est connu et B<1> s'il est inconnu."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11408,8 +11396,8 @@ msgid ""
 "following values:"
 msgstr ""
 "Affiche l'origine de la valeur renvoyée par B<--get>. Retourne un code de "
-"sortie 0 si le drapeau est connu et 1 s'il est inconnu. L'origine est une "
-"des valeurs suivantes :"
+"sortie B<0> si le drapeau est connu et B<1> s'il est inconnu. L'origine est "
+"une des valeurs suivantes :"
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11420,7 +11408,7 @@ msgstr "B<vendor>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "the original flag set by the vendor is returned;"
-msgstr "le drapeau défini à l'origine par l'éditeur est renvoyé ;"
+msgstr "le drapeau défini à l'origine par le distributeur est renvoyé ;"
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11461,36 +11449,28 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "B<query>"
+#, no-wrap
 msgid "B<--query>"
-msgstr "B<query>"
+msgstr "B<--query>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Display any information that can be useful to explain the behaviour of "
-#| "B<dpkg-buildflags>: relevant environment variables, current vendor, state "
-#| "of all feature flags. Also print the resulting compiler flags with their "
-#| "origin."
 msgid ""
 "Print any information that can be useful to explain the behaviour of the "
 "program: current vendor, relevant environment variables, feature areas, "
 "state of all feature flags, and the compiler flags with their origin (since "
 "dpkg 1.19.0)."
 msgstr ""
-"Affiche toute information utile pour expliquer le comportement de B<dpkg-"
-"buildflags> : variables  d'environnement, éditeur actuel, état de tous les "
-"drapeaux de fonctionnalités. Affiche également les drapeaux de compilation "
-"résultants ainsi que leur origine."
+"Affiche toute information utile pour expliquer le comportement du "
+"programme : distributeur actuel, variables d'environnement, domaines des "
+"fonctionnalités, état de tous les drapeaux de fonctionnalités. Affiche "
+"également les drapeaux de compilation résultants ainsi que leur origine "
+"(depuis dpkg 1.19.0)."
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid "B<Example>"
 msgid "For example:"
-msgstr "B<Exemple>"
+msgstr "Par exemple :"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11500,6 +11480,9 @@ msgid ""
 "  Environment:\n"
 "   DEB_CFLAGS_SET=-O0 -Wall\n"
 msgstr ""
+"  Vendor: Debian\n"
+"  Environment:\n"
+"   DEB_CFLAGS_SET=-O0 -Wall\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11510,6 +11493,10 @@ msgid ""
 "   bug=no\n"
 "   canary=no\n"
 msgstr ""
+"  Area: qa\n"
+"  Features:\n"
+"   bug=no\n"
+"   canary=no\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11519,6 +11506,9 @@ msgid ""
 "  Features:\n"
 "   timeless=no\n"
 msgstr ""
+"  Area: reproducible\n"
+"  Features:\n"
+"   timeless=no\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11528,6 +11518,9 @@ msgid ""
 "  Value: -O0 -Wall\n"
 "  Origin: env\n"
 msgstr ""
+"  Flag: CFLAGS\n"
+"  Value: -O0 -Wall\n"
+"  Origin: env\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11537,6 +11530,9 @@ msgid ""
 "  Value: -D_FORTIFY_SOURCE=2\n"
 "  Origin: vendor\n"
 msgstr ""
+"  Flag: CPPFLAGS\n"
+"  Value: -D_FORTIFY_SOURCE=2\n"
+"  Origin: vendor\n"
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11546,12 +11542,6 @@ msgstr "B<--query-features>I< domaine>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Print the features enabled for a given area. The only currently "
-#| "recognized areas are B<qa>, B<reproducible> and B<hardening>, see the "
-#| "B<FEATURE AREAS> section for more details.  Exits with 0 if the area is "
-#| "known otherwise exits with 1."
 msgid ""
 "Print the features enabled for a given area (since dpkg 1.16.2).  The only "
 "currently recognized areas on Debian and derivatives are B<future>, B<qa>, "
@@ -11559,10 +11549,11 @@ msgid ""
 "section for more details.  Exits with 0 if the area is known otherwise exits "
 "with 1."
 msgstr ""
-"Affiche les fonctionnalités activées pour un domaine donné. Les seuls "
-"domaines reconnus actuellement sont B<qa>, B<reproducible> et B<hardening>, "
+"Affiche les fonctionnalités activées pour un domaine donné (depuis "
+"dpkg 1.16.2). Les seuls domaines reconnus actuellement sur Debian et ses "
+"dérivés sont B<future>, B<qa>, B<reproducible>, B<sanitize> et B<hardening>, "
 "voir la section B<ZONES D'OPTION> pour plus de détails. Retourne un code de "
-"sortie 0 si le domaine est connu et 1 s'il est inconnu."
+"sortie B<0> si le domaine est connu et B<1> s'il est inconnu."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11574,16 +11565,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid ""
-#| "  Feature: pie\n"
-#| "  Enabled: no\n"
+#, no-wrap
 msgid ""
 "  Feature: pie\n"
 "  Enabled: yes\n"
 msgstr ""
 "  Feature: pie\n"
-"  Enabled: no\n"
+"  Enabled: yes\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11621,7 +11609,7 @@ msgid ""
 "g> and the default optimization level (B<-O2> usually, or B<-O0> if the "
 "B<DEB_BUILD_OPTIONS> environment variable defines I<noopt>)."
 msgstr ""
-"Options du compilateur C. La valeur par défaut définie par l'éditeur "
+"Options du compilateur C. La valeur par défaut définie par le distributeur "
 "comporte B<-g> et le niveau d'optimisation par défaut (B<-O2> en général, ou "
 "B<-O0> si la variable d'environnement B<DEB_BUILD_OPTIONS> contient "
 "I<noopt>)."
@@ -11635,7 +11623,7 @@ msgstr "B<CPPFLAGS>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "Options for the C preprocessor. Default value: empty."
-msgstr "Options du préprocesseur C. Valeur par défaut : aucune."
+msgstr "Options du préprocesseur C. Valeur par défaut : aucune."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11646,7 +11634,7 @@ msgstr "B<CXXFLAGS>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "Options for the C++ compiler. Same as B<CFLAGS>."
-msgstr "Options du compilateur C++. Analogue à B<CFLAGS>."
+msgstr "Options du compilateur C++. Analogue à B<CFLAGS>."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11657,7 +11645,7 @@ msgstr "B<OBJCFLAGS>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "Options for the Objective C compiler. Same as B<CFLAGS>."
-msgstr "Options du compilateur Objective C. Analogue à B<CFLAGS>."
+msgstr "Options du compilateur Objective C. Analogue à B<CFLAGS>."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11668,7 +11656,7 @@ msgstr "B<OBJCXXFLAGS>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "Options for the Objective C++ compiler. Same as B<CXXFLAGS>."
-msgstr "Options du compilateur Objective C++. Analogue à B<CXXFLAGS>."
+msgstr "Options du compilateur Objective C++. Analogue à B<CXXFLAGS>."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11690,7 +11678,7 @@ msgstr "B<FFLAGS>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "Options for the Fortran 77 compiler. A subset of B<CFLAGS>."
-msgstr "Options du compilateur Fortran 77. Un sous-ensemble de B<CFLAGS>."
+msgstr "Options du compilateur Fortran 77. Un sous-ensemble de B<CFLAGS>."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11701,7 +11689,7 @@ msgstr "B<FCFLAGS>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "Options for the Fortran 9x compiler. Same as B<FFLAGS>."
-msgstr "Options du compilateur Fortran 9x. Analogue à B<FFLAGS>."
+msgstr "Options du compilateur Fortran 9x. Analogue à B<FFLAGS>."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11737,24 +11725,17 @@ msgstr "ZONES D'OPTION"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Each area feature can be enabled and disabled in the B<DEB_BUILD_OPTIONS> "
-#| "and B<DEB_BUILD_MAINT_OPTIONS> environment variable's area value with the "
-#| "\"+\" and \"-\" modifier.  For example, to enable the B<hardening> \"pie"
-#| "\" feature and disable the \"fortify\" feature you can do this in "
-#| "B<debian/rules>:"
 msgid ""
 "Each area feature can be enabled and disabled in the B<DEB_BUILD_OPTIONS> "
 "and B<DEB_BUILD_MAINT_OPTIONS> environment variable's area value with the ‘B<"
 "+>’ and ‘B<->’ modifier.  For example, to enable the B<hardening> “pie” "
 "feature and disable the “fortify” feature you can do this in B<debian/rules>:"
 msgstr ""
-"Chaque zone d'options peut être activée ou désactivée avec les valeurs "
+"Chaque option de zone peut être activée ou désactivée avec les valeurs "
 "B<DEB_BUILD_OPTIONS> et B<DEB_BUIL_MAINT_OPTIONS> de l'espace de variables "
-"d'environnement graĉe aux modificateurs « + » et « - ». Par exemple, pour "
-"activer l'option B<hardening> « pie » et désactiver l'option « fortify », il "
-"est possible d'indiquer ceci dans B<debian/rules> :"
+"d'environnement grâce aux modificateurs « B<+> » et « B<-> ». Par exemple, "
+"pour activer l'option B<hardening> « pie » et désactiver l'option "
+"« fortify », il est possible d'indiquer cela dans B<debian/rules> :"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11764,21 +11745,15 @@ msgstr "  export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,-fortify\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "The special feature B<all> (valid in any area) can be used to enable or "
-#| "disable all area features at the same time.  Thus disabling everything in "
-#| "the B<hardening> area and enabling only \"format\" and \"fortify\" can be "
-#| "achieved with:"
 msgid ""
 "The special feature B<all> (valid in any area) can be used to enable or "
 "disable all area features at the same time.  Thus disabling everything in "
 "the B<hardening> area and enabling only “format” and “fortify” can be "
 "achieved with:"
 msgstr ""
-"L'option spéciale B<all> (valable dans tous les espaces) peut être utilisée "
-"pour activer ou désactiver toutes les options de l'espace à la fois. Ainsi, "
-"tout désactiver dans l'espace B<hardening> en n'activant que « format » et "
+"L'option spéciale B<all> (valable dans toutes les zones) peut être utilisée "
+"pour activer ou désactiver toutes les options de la zone à la fois. Ainsi, "
+"tout désactiver dans la zone B<hardening> en n'activant que « format » et "
 "« fortify » peut être réalisé avec :"
 
 #. type: Plain text
@@ -11791,42 +11766,43 @@ msgstr "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "future"
-msgstr ""
+msgstr "future"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Several compile-time options (detailed below) can be used to help detect "
-#| "problems in the source code or build system."
 msgid ""
 "Several compile-time options (detailed below) can be used to enable features "
 "that should be enabled by default, but cannot due to backwards compatibility "
 "reasons."
 msgstr ""
 "Plusieurs options de compilation (détaillées ci-dessous) peuvent être "
-"utilisées pour détecter des problèmes dans le code source ou dans le système "
-"de construction."
+"utilisées pour activer des fonctionnalités qui devraient être activées par "
+"défaut, mais ne peuvent pas l'être pour des raisons de compatibilité avec "
+"les versions précédentes."
 
 #. type: TP
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "B<lfs>"
-msgstr ""
+msgstr "B<lfs>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
+"Ce paramètre (désactivé par défaut) active la prise en charge des gros "
+"fichiers (LFS) sur les architectures 32 bits où l'ABI n'inclut pas LFS par "
+"défaut, en ajoutant B<-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> à "
+"B<CPPFLAGS>."
 
 #. type: SS
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "qa"
-msgstr ""
+msgstr "qa"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11853,6 +11829,12 @@ msgid ""
 "Werror=array-bounds>, B<-Werror=clobbered>, B<-Werror=implicit-function-"
 "declaration> and B<-Werror=volatile-register-var>."
 msgstr ""
+"Ce paramètre (désactivé par défaut) ajoute toutes les options "
+"d'avertissement détectant de façon fiable du code source problématique. Les "
+"avertissements sont fatals. Les seuls drapeaux actuellement gérés sont "
+"B<CFLAGS> et B<CXXFLAGS> avec des drapeaux définis à B<-Werror=array-"
+"bounds>, B<-Werror=clobbered>, B<-Werror=implicit-function-declaration> et "
+"B<-Werror=volatile-register-var>."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11874,27 +11856,20 @@ msgstr ""
 "Ce paramètre (désactivé par défaut) ajoute des options détectrices "
 "« canary » factices aux drapeaux de construction de telle sorte que les "
 "rapports de compilation permettront de vérifier la façon dont ces drapeaux "
-"se propagent et de repérer toute ommission des paramètres de drapeaux "
+"se propagent et de repérer toute omission des paramètres de drapeaux "
 "habituels. Les drapeaux actuellement pris en charge sont B<CPPFLAGS>, "
-"B<CFLAGS>, B<OBJCFLAGS>,\n"
-" B<CXXFLAGS> ainsi que B<OBJCXXFLAGS>, avec les drapeaux définis à B<-"
-"D__DEB_CANARY_>I<flag>_I<random-id>B<__>, et B<LDFLAGS> paramétré à B<-Wl,-z,"
-"deb-canary->I<random-id>."
+"B<CFLAGS>, B<OBJCFLAGS>, B<CXXFLAGS> ainsi que B<OBJCXXFLAGS>, avec les "
+"drapeaux définis à B<-D__DEB_CANARY_>I<flag>_I<random-id>B<__>, et "
+"B<LDFLAGS> paramétré à B<-Wl,-z,deb-canary->I<random-id>."
 
 #. type: SS
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "sanitize"
-msgstr ""
+msgstr "sanitize"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Several compile-time options (detailed below) can be used to help harden "
-#| "a resulting binary against memory corruption attacks, or provide "
-#| "additional warning messages during compilation.  Except as noted below, "
-#| "these are enabled by default for architectures that support them."
 msgid ""
 "Several compile-time options (detailed below) can be used to help sanitize a "
 "resulting binary against memory corruptions, memory leaks, use after free, "
@@ -11903,17 +11878,18 @@ msgid ""
 "for conformant code, reduce security or even functionality."
 msgstr ""
 "Plusieurs options de compilation (détaillées ci-dessous) peuvent être "
-"utilisées pour accroître la résistance du binaire compilé face aux attaques "
-"par corruption de la mémoire ou fournir des messages d'avertissement "
-"supplémentaires lors de la compilation. Sauf mention contraire (voir ci-"
-"dessous), ces options sont activées par défaut pour les architectures qui "
-"les gèrent."
+"utilisées pour aider à nettoyer le binaire compilé face aux corruptions de "
+"la mémoire, aux fuites de mémoire, à l'utilisation de mémoire après "
+"libération et à des bogues au comportement indéfini. B<Note> : ces options "
+"ne devraient pas être utilisées pour des constructions en production car "
+"elles peuvent réduire la fiabilité du code, réduire la sécurité ou même les "
+"fonctionnalités."
 
 #. type: TP
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "B<address>"
-msgstr ""
+msgstr "B<address>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11922,13 +11898,15 @@ msgid ""
 "and B<-fsanitize=address -fno-omit-frame-pointer> to B<CFLAGS> and "
 "B<CXXFLAGS>."
 msgstr ""
+"Ce paramètre (désactivé par défaut) ajoute B<-fsanitize=address> à "
+"B<LDFLAGS> et B<-fsanitize=address -fno-omit-frame-pointer> à B<CFLAGS> et "
+"B<CXXFLAGS>."
 
 #. type: TP
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "B<listhead>"
+#, no-wrap
 msgid "B<thread>"
-msgstr "B<listhead>"
+msgstr "B<thread>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11936,12 +11914,14 @@ msgid ""
 "This setting (disabled by default) adds B<-fsanitize=thread> to B<CFLAGS>, "
 "B<CXXFLAGS> and B<LDFLAGS>."
 msgstr ""
+"Ce paramètre (désactivé par défaut) ajoute B<-fsanitize=thread> à B<CFLAGS>, "
+"B<CXXFLAGS> et B<LDFLAGS>."
 
 #. type: TP
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "B<leak>"
-msgstr ""
+msgstr "B<leak>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11950,13 +11930,15 @@ msgid ""
 "gets automatically disabled if either the B<address> or the B<thread> "
 "features are enabled, as they imply it."
 msgstr ""
+"Ce paramètre (désactivé par défaut) ajoute B<-fsanitize=leak> à B<LDFLAGS>. "
+"Il est automatiquement désactivé si les fonctions B<address> ou B<thread> "
+"sont activées, parce qu'elles l'impliquent."
 
 #. type: TP
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "B<unpacked>"
+#, no-wrap
 msgid "B<undefined>"
-msgstr "B<unpacked>"
+msgstr "B<undefined>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11964,13 +11946,14 @@ msgid ""
 "This setting (disabled by default) adds B<-fsanitize=undefined> to "
 "B<CFLAGS>, B<CXXFLAGS> and B<LDFLAGS>."
 msgstr ""
+"Ce paramètre (désactivé par défaut) ajoute B<-fsanitize=undefined> à "
+"B<CFLAGS>, B<CXXFLAGS> et B<LDFLAGS>."
 
 #. type: SS
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "Hardening"
+#, no-wrap
 msgid "hardening"
-msgstr "Compilation renforcée"
+msgstr "compilation renforcée"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11995,17 +11978,6 @@ msgstr "B<format>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "This setting (enabled by default) adds B<-Wformat -Werror=format-"
-#| "security> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS> and B<OBJCXXFLAGS>.  "
-#| "This will warn about improper format string uses, and will fail when "
-#| "format functions are used in a way that represent possible security "
-#| "problems. At present, this warns about calls to B<printf> and B<scanf> "
-#| "functions where the format string is not a string literal and there are "
-#| "no format arguments, as in B<printf(foo);> instead of B<printf(\"%s\", "
-#| "foo);> This may be a security hole if the format string came from "
-#| "untrusted input and contains \"%n\"."
 msgid ""
 "This setting (enabled by default) adds B<-Wformat -Werror=format-security> "
 "to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS> and B<OBJCXXFLAGS>.  This will warn "
@@ -12035,16 +12007,6 @@ msgstr "B<fortify>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
-#| "B<CPPFLAGS>. During code generation the compiler knows a great deal of "
-#| "information about buffer sizes (where possible), and attempts to replace "
-#| "insecure unlimited length buffer function calls with length-limited ones. "
-#| "This is especially useful for old, crufty code.  Additionally, format "
-#| "strings in writable memory that contain '%n' are blocked. If an "
-#| "application depends on such a format string, it will need to be worked "
-#| "around."
 msgid ""
 "This setting (enabled by default) adds B<-D_FORTIFY_SOURCE=2> to "
 "B<CPPFLAGS>. During code generation the compiler knows a great deal of "
@@ -12054,16 +12016,15 @@ msgid ""
 "strings in writable memory that contain ‘%n’ are blocked. If an application "
 "depends on such a format string, it will need to be worked around."
 msgstr ""
-"Ce réglage, activé par défaut, ajoute B<-D_FORTIFY_SOURCE=2> à B<CFLAGS> et "
-"B<CPPFLAGS>. Lors de la création du code, le compilateur connaît un nombre "
-"important d'informations relatives aux tailles de tampons (quand c'est "
-"possible) et tente alors de remplacer des appels de fonctions avec une "
-"taille illimitée de tampons, peu sûrs, par des appels avec des tampons de "
-"taille limitée. Cette fonctionnalité est particulièrement utile pour du code "
-"ancien et mal écrit. De plus, les chaînes de formatage dans la mémoire "
-"accessible en écriture qui contiennent « %n » sont bloquées. Si une "
-"application dépend de telles chaînes de formatage, un contournement devra "
-"être mis en place."
+"Ce réglage, activé par défaut, ajoute B<-D_FORTIFY_SOURCE=2> à B<CPPFLAGS>. "
+"Lors de la création du code, le compilateur connaît un nombre important "
+"d'informations relatives aux tailles de tampons (quand c'est possible) et "
+"tente alors de remplacer des appels de fonctions avec une taille illimitée "
+"de tampons, peu sûrs, par des appels avec des tampons de taille limitée. "
+"Cette fonctionnalité est particulièrement utile pour du code ancien et mal "
+"écrit. De plus, les chaînes de formatage dans la mémoire accessible en "
+"écriture qui contiennent « %n » sont bloquées. Si une application dépend de "
+"telles chaînes de formatage, un contournement devra être mis en place."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -12076,8 +12037,8 @@ msgstr ""
 "Veuillez noter que pour que cette option fasse effet, la source devra aussi "
 "être compilée avec B<-O1> ou plus. Si la variable d'environnement "
 "B<DEB_BUILD_OPTIONS> contient I<noopt>, la prise en charge de B<fortify> "
-"sera désactivée du fait des nouveaux avertissements émis par glibc version "
-"2.16 et ultérieure."
+"sera désactivée du fait des nouveaux avertissements émis par glibc "
+"version 2.16 et ultérieure."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -12133,7 +12094,7 @@ msgid ""
 msgstr ""
 "Ce réglage, activé par défaut, ajoute B<-fstack-protector-strong> à "
 "B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> "
-"et B<FCFLAGS>. Il s'agit d'une version renforcée de B<stackprotector>qui "
+"et B<FCFLAGS>. Il s'agit d'une version renforcée de B<stackprotector> qui "
 "n'affecte pas les performances de manière importante."
 
 #. type: Plain text
@@ -12148,7 +12109,7 @@ msgid ""
 "also requires gcc 4.9 and later."
 msgstr ""
 "Cette fonctionnalité a les même exigences que B<stackprotector>, en plus de "
-"nécessiter gcc 4.9 ou plus récent."
+"nécessiter gcc 4.9 ou plus récent."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -12190,9 +12151,9 @@ msgid ""
 msgstr ""
 "Ce réglage, désactivé par défaut, ajoute B<-Wl,-z,now> à B<LDFLAGS>. Lors du "
 "chargement du programme, tous les symboles dynamiques sont résolus, ce qui "
-"permet au « PLT » entier (NdT : jargon détecté !) d'être en lecture seule "
-"(du fait du réglage B<relro> ci-dessus). Cette option ne peut être activée "
-"si B<relro> ne l'est pas."
+"permet au PLT (Procedure Linkage Table) entier d'être en lecture seule (du "
+"fait du réglage B<relro> ci-dessus). Cette option ne peut être activée si "
+"B<relro> ne l'est pas."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -12203,33 +12164,44 @@ msgstr "B<pie>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
-msgstr ""
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
+msgstr ""
+"Ce réglage (sans option globale par défaut depuis dpkg 1.18.23, parce qu'il "
+"est maintenant activé par défaut par gcc dans les architectures Debian "
+"amd64, arm64, armel, armhf, hurd-i386, i386, kfreebsd-amd64, kfreebsd-i386, "
+"mips, mipsel, mips64el, powerpc, ppc64, ppc64el, riscv64, s390x, sparc et "
+"sparc64) ajoute les options requises pour activer ou désactiver PIE "
+"(exécutable indépendant de l'emplacement) au moyen des fichiers de "
+"spécifications de gcc, si nécessaire, selon que gcc injecte sur cette "
+"architecture les drapeaux par lui-même ou non. Si le réglage est activé et "
+"que gcc injecte les drapeaux, il n'ajoute rien. Si le réglage est activé et "
+"que gcc n'injecte pas les drapeaux, il ajoute B<-fPIE> (au moyen de I<"
+"%PKGDATADIR%/pie-compiler.specs>) à B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, "
+"B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> et B<FCFLAGS>, et B<-fPIE -pie> (au "
+"moyen de I<%PKGDATADIR%/pie-link.specs>) à B<LDFLAGS>. Si le réglage est "
+"désactivé et que gcc injecte les drapeaux, il ajoute B<-fno-PIE> (au moyen "
+"de I<%PKGDATADIR%/no-pie-compile.specs>) à B<CFLAGS>, B<CXXFLAGS>, "
+"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> et B<FCFLAGS>, et B<-"
+"fno-PIE -no-pie> (au moyen de I<%PKGDATADIR%/no-pie-link.specs>) à "
+"B<LDFLAGS>."
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "This setting (disabled by default) adds B<-fPIE> to B<CFLAGS>, "
-#| "B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
-#| "B<FCFLAGS>, and B<-fPIE -pie> to B<LDFLAGS>. Position Independent "
-#| "Executable are needed to take advantage of Address Space Layout "
-#| "Randomization, supported by some kernel versions. While ASLR can already "
-#| "be enforced for data areas in the stack and heap (brk and mmap), the code "
-#| "areas must be compiled as position-independent. Shared libraries already "
-#| "do this (-fPIC), so they gain ASLR automatically, but binary .text "
-#| "regions need to be build PIE to gain ASLR. When this happens, ROP (Return "
-#| "Oriented Programming) attacks are much harder since there are no static "
-#| "locations to bounce off of during a memory corruption attack."
 msgid ""
 "Position Independent Executable are needed to take advantage of Address "
 "Space Layout Randomization, supported by some kernel versions. While ASLR "
@@ -12240,20 +12212,18 @@ msgid ""
 "(Return Oriented Programming) attacks are much harder since there are no "
 "static locations to bounce off of during a memory corruption attack."
 msgstr ""
-"Ce réglage, désactivé par défaut, ajoute B<-fPIE> à B<CFLAGS>, B<CXXFLAGS> "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> et B<FCFLAGS>,ainsi que "
-"B<-fPIE -pie> à B<LDFLAGS>. Les exécutables à position indépendante "
-"(« Position Independent Executable ») permettent d'utiliser la randomisation "
-"de l'organisation de l'espace d'adressage (ASLR : « Address Space Layout "
-"Randomization »), qui est gérée par certaines versions du noyau. Bien que "
-"ASLR puisse déjà être mise en œuvre pour les zones de données dans la pile "
-"et le tampon (brk et mmap), les zones de codes doivent être compilées comme "
-"indépendantes de la position. Les bibliothèques partagées font déjà cela (-"
-"fPIC) ce qui permet automatiquement d'utiliser ASLR. Par contre les régions ."
-"text binaires doivent être construites en mode PIE pour mettre en œuvre "
-"ASLR. Une fois cela réalisé, les attaques ROP (« Return Oriented "
-"Programming ») deviennent plus difficiles car il n'existe pas d'emplacement "
-"statique d'où rebondir sur une attaque par corruption de la mémoire."
+"Les exécutables à position indépendante (« Position Independent "
+"Executable ») permettent d'utiliser la randomisation de l'organisation de "
+"l'espace d'adressage (ASLR : « Address Space Layout Randomization »), qui "
+"est gérée par certaines versions du noyau. Bien que ASLR puisse déjà être "
+"mise en œuvre pour les zones de données dans la pile et le tampon (brk et "
+"mmap), les zones de codes doivent être compilées comme indépendantes de la "
+"position. Les bibliothèques partagées font déjà cela (B<-fPIC>) ce qui "
+"permet automatiquement d'utiliser ASLR. Par contre les régions .text "
+"binaires doivent être construites en mode PIE pour mettre en œuvre ASLR. Une "
+"fois cela réalisé, les attaques ROP (« Return Oriented Programming ») "
+"deviennent plus difficiles car il n'existe pas d'emplacement statique d'où "
+"rebondir pendant une attaque par corruption de la mémoire."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -12263,6 +12233,11 @@ msgid ""
 "gcc specs files, it should always be safe to unconditionally set them "
 "regardless of the object type being compiled or linked."
 msgstr ""
+"PIE n'est pas compatible avec B<fPIC>, aussi, en général, des précautions "
+"doivent être prises lors de la construction d'objets partagés. Mais comme "
+"les drapeaux PIE émis sont injectés par des fichiers de spécifications de "
+"gcc, il devrait toujours être sûr de les définir sans condition "
+"indépendamment du type d'objet en train d'être compilé ou lié."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -12271,41 +12246,46 @@ msgid ""
 "Depending on the flags used to compile all the objects within a static "
 "library, these libraries will be usable by different sets of objects:"
 msgstr ""
+"Les bibliothèques statiques peuvent être utilisées par des programmes ou "
+"d'autres bibliothèques partagées. Selon les drapeaux utilisés pour compiler "
+"tous les objets d'une bibliothèque statique, ces bibliothèques seront "
+"utilisables par divers ensembles d'objets :"
 
 #. type: TP
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "none"
-msgstr ""
+msgstr "B<none>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "Cannot be linked into a PIE program, nor a shared library."
 msgstr ""
+"Ne peut être lié ni à un programme PIE, ni à une bibliothèque partagée."
 
 #. type: TP
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "B<-f>"
+#, no-wrap
 msgid "B<-fPIE>"
-msgstr "B<-f>"
+msgstr "B<-fPIE>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "Can be linked into any program, but not a shared library (recommended)."
 msgstr ""
+"Peut être lié à tout programme, mais pas à une bibliothèque partagée "
+"(recommandé)."
 
 #. type: TP
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "B<-f>"
+#, no-wrap
 msgid "B<-fPIC>"
-msgstr "B<-f>"
+msgstr "B<-fPIC>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid "Can be linked into any program and shared library."
-msgstr ""
+msgstr "Peut être lié à tout programme et toute bibliothèque partagée."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -12322,16 +12302,22 @@ msgid ""
 "B<LDFLAGS>. B<Note:> This should not be needed with the default gcc specs "
 "machinery."
 msgstr ""
+"S'il est nécessaire de régler ces drapeaux manuellement, en contournant "
+"l'injonction des spécifications de gcc, il y a plusieurs choses à prendre en "
+"compte. Le passage sans condition et de façon explicite de B<-fPIE>, B<-"
+"fpie> ou B<-pie> à un système de construction en utilisant libtool est sûr "
+"dans la mesure où ces drapeaux seront retirés lors de la construction de "
+"bibliothèques partagées. Sinon, sur les projets qui construisent à la fois "
+"des programmes et des bibliothèques partagées, il faudrait s'assurer que, "
+"lors de la construction des bibliothèques partagées, B<-fPIC> soit toujours "
+"passé en dernier aux drapeaux de compilation tels que B<CFLAGS> (de sorte "
+"qu'il remplace tout B<-PIE> antérieur), et que B<-shared> soit passé en "
+"dernier aux drapeaux de création de lien tels que B<LDFLAGS> (de sorte qu'il "
+"remplace tout B<-pie> antérieur). B<Note> : Cela ne devrait pas être "
+"nécessaire avec les mécanismes de spécification de gcc par défaut."
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Additionally, since PIE is implemented via a general register, some "
-#| "architectures (most notably i386) can see performance losses of up to 15% "
-#| "in very text-segment-heavy application workloads; most workloads see less "
-#| "than 1%. Architectures with more general registers (e.g. amd64)  do not "
-#| "see as high a worst-case penalty."
 msgid ""
 "Additionally, since PIE is implemented via a general register, some register "
 "starved architectures (but not including i386 anymore since optimizations "
@@ -12340,20 +12326,20 @@ msgid ""
 "Architectures with more general registers (e.g. amd64)  do not see as high a "
 "worst-case penalty."
 msgstr ""
-"De plus, comme la protection PIE est mise en œuvre à l'aide dun registre "
-"global, certaines architectures (notamment i386) peuvent souffrir de pertes "
-"de performances allant jusqu'à 15 % sur des charges d'applications utilisant "
-"largement les segments de texte ; le plus souvent, cette perte de "
-"performances n'excèdera pas 1 %. Pour des architectures offrant plus de "
+"De plus, comme la protection PIE est mise en œuvre à l'aide d'un registre "
+"global, certaines architectures privées de registre (mais plus i386 depuis "
+"les optimisations mises en œuvre dans gcc E<gt>= 5) peuvent souffrir de "
+"pertes de performances allant jusqu'à 15 % sur des charges d'applications "
+"utilisant largement les segments de texte ; le plus souvent, cette perte de "
+"performances n’excédera pas 1 %. Pour des architectures offrant plus de "
 "registres globaux (par exemple amd64), cette pénalisation n'existe "
 "pratiquement pas."
 
 #. type: SS
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "Reproducibility"
+#, no-wrap
 msgid "reproducible"
-msgstr "Reproductibilité"
+msgstr "reproductible"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -12377,35 +12363,53 @@ msgstr "B<timeless>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "This setting (disabled by default) adds B<-Wdate-time> to B<CPPFLAGS>.  "
-#| "This will cause warnings when the B<__TIME__>, B<__DATE__> and "
-#| "B<__TIMESTAMP__> macros are used."
 msgid ""
 "This setting (enabled by default) adds B<-Wdate-time> to B<CPPFLAGS>.  This "
 "will cause warnings when the B<__TIME__>, B<__DATE__> and B<__TIMESTAMP__> "
 "macros are used."
 msgstr ""
-"Ce paramètre (désactivé par défaut) ajoute B<-Wdate-time> à B<CPPFLAGS>. "
-"Cela provoquera des avertissements quand les macros B<__TIME__>, B<__DATE__> "
-"et B<__TIMESTAMP__> sont utilisées. "
+"Ce paramètre, activé par défaut, ajoute B<-Wdate-time> à B<CPPFLAGS>. Cela "
+"provoquera des avertissements quand les macros B<__TIME__>, B<__DATE__> et "
+"B<__TIMESTAMP__> sont utilisées. "
 
 #. type: TP
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "B<--debug>"
+#, no-wrap
+msgid "B<fixfilepath>"
+msgstr "B<fixfilepath>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+"Ce paramètre, désactivé par défaut, ajoute B<-ffile-prefix-"
+"map=>I<BUILDPATH>B<=.> à B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, "
+"B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> et B<FCFLAGS> où B<BUILDPATH> est "
+"fixé sur le répertoire de plus haut niveau du paquet en construction. Cela a "
+"pour effet de retirer le chemin de construction de tout fichier généré."
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+"Si à la fois B<fixdebugpath> et B<fixfilepath> sont définis, cette option a "
+"la priorité parce c'est un sur-ensemble du premier."
+
+#. type: TP
+#: dpkg-buildflags.man
+#, no-wrap
 msgid "B<fixdebugpath>"
-msgstr "B<--debug>"
+msgstr "B<fixdebugpath>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "This setting (enabled by default) adds B<-fstack-protector-strong> to "
-#| "B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-#| "B<FFLAGS> and B<FCFLAGS>.  This is a stronger variant of "
-#| "B<stackprotector>, but without significant performance penalties."
 msgid ""
 "This setting (enabled by default) adds B<-fdebug-prefix-map=>I<BUILDPATH>B<=."
 "> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
@@ -12413,10 +12417,11 @@ msgid ""
 "directory of the package being built.  This has the effect of removing the "
 "build path from any generated debug symbols."
 msgstr ""
-"Ce réglage, activé par défaut, ajoute B<-fstack-protector-strong> à "
-"B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> "
-"et B<FCFLAGS>. Il s'agit d'une version renforcée de B<stackprotector>qui "
-"n'affecte pas les performances de manière importante."
+"Ce réglage, activé par défaut, ajoute B<-fdebug-prefix-map=>I<BUILDPATH>B<=."
+"> à B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> et B<FCFLAGS> où B<BUILDPATH> est fixé sur le répertoire de plus "
+"haut niveau du paquet en construction. Cela a pour effet de retirer le "
+"chemin de construction de tous les symboles de débogage générés."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -12555,10 +12560,6 @@ msgstr "B<DEB_VENDOR>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "This setting defines the current vendor. If not set, it will discover the "
-#| "current vendor by reading B<%PKGCONFDIR%/origins/default>."
 msgid ""
 "This setting defines the current vendor.  If not set, it will discover the "
 "current vendor by reading B<%PKGCONFDIR%/origins/default>."
@@ -12568,10 +12569,9 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "B<DEB_BUILD_ARCH>"
+#, no-wrap
 msgid "B<DEB_BUILD_PATH>"
-msgstr "B<DEB_BUILD_ARCH>"
+msgstr "B<DEB_BUILD_PATH>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -12580,6 +12580,10 @@ msgid ""
 "such as B<fixdebugpath> so that they can be controlled by the caller.  This "
 "variable is currently Debian and derivatives-specific."
 msgstr ""
+"Cette variable configure le chemin de construction (depuis dpkg 1.18.8) à "
+"utiliser avec des fonctions telles que B<fixdebugpath> de telle sorte "
+"qu'elles soient contrôlées par l'appelant. Cette variable est actuellement "
+"spécifique à Debian et à ses dérivés."
 
 #. type: SS
 #: dpkg-buildflags.man
@@ -12600,17 +12604,15 @@ msgstr "Fichier de configuration pour l'ensemble du système."
 
 #. type: TP
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
+#, no-wrap
 msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or "
-msgstr "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> ou B<$HOME/.config/dpkg/buildflags.conf>"
+msgstr "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> ou "
 
 #. type: TQ
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "B<%PKGCONFDIR%/buildflags.conf>"
+#, no-wrap
 msgid "B<$HOME/.config/dpkg/buildflags.conf>"
-msgstr "B<%PKGCONFDIR%/buildflags.conf>"
+msgstr "B<$HOME/.config/dpkg/buildflags.conf>"
 
 #. type: Plain text
 #: dpkg-buildflags.man dpkg-buildpackage.man
@@ -12630,12 +12632,12 @@ msgid ""
 "by B<dpkg-buildflags> into variables (since dpkg 1.16.1)."
 msgstr ""
 "Fragment de fichier Makefile qui chargera (et facultativement exportera) "
-"dans les variables (depuis dpkg 1.16.1) tous les drapeaux pris en charge par "
+"dans les variables (depuis dpkg 1.16.1) tous les drapeaux pris en charge par "
 "B<dpkg-buildflags>."
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr ""
 "Pour passer des drapeaux de compilation à une commande de compilation dans "
 "un Makefile :"
@@ -12654,16 +12656,12 @@ msgstr "\\&./configure $(shell dpkg-buildflags --export=cmdline)\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "To set build flags in a shell script or shell fragment, \"eval\" can be "
-#| "used to interpret the output and to export the flags in the environment:"
 msgid ""
 "To set build flags in a shell script or shell fragment, B<eval> can be used "
 "to interpret the output and to export the flags in the environment:"
 msgstr ""
 "Pour définir les drapeaux de compilation dans un script shell ou un fragment "
-"de shell, on peut utiliser « eval » pour interpréter la sortie et exporter "
+"de shell, on peut utiliser B<eval> pour interpréter la sortie et exporter "
 "les drapeaux dans l'environnement :"
 
 #. type: Plain text
@@ -12699,7 +12697,7 @@ msgstr ""
 "Il faut appeler B<dpkg-buildflags> ou inclure B<buildflags.mk> à partir du "
 "fichier B<debian/rules> pour obtenir les drapeaux de compilation nécessaires "
 "à passer au système de construction. Veuillez noter que les anciennes "
-"versions de B<dpkg-buildpackage> (antérieures à dpkg 1.16.1) exportaient ces "
+"versions de B<dpkg-buildpackage> (antérieures à dpkg 1.16.1) exportaient ces "
 "drapeaux automatiquement. Néanmoins, il est déconseillé de dépendre de ce "
 "comportement parce qu'il casse l'appel manuel de B<debian/rules>."
 
@@ -12721,7 +12719,7 @@ msgid ""
 "B<buildflags.mk> instead, which takes care of calling B<dpkg-buildflags> and "
 "storing the build flags in make variables."
 msgstr ""
-"Pour d'autres système de construction ou si on souhaite un contrôle "
+"Pour d'autres systèmes de construction ou si on souhaite un contrôle "
 "extrêmement précis sur le choix et la position où sont passés les drapeaux, "
 "B<--get> peut être utilisé. Autrement, il est possible d'inclure "
 "B<buildflags.mk> qui s'occupe de l'appel de B<dpkg-buildflags> et du "
@@ -12837,16 +12835,12 @@ msgstr "B<2.>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "It checks that the build-dependencies and build-conflicts are satisfied "
-#| "(unless B<-d> is specified)."
 msgid ""
 "It checks that the build-dependencies and build-conflicts are satisfied "
 "(unless B<-d> or B<--no-check-builddeps> is specified)."
 msgstr ""
-"Contrôle des dépendances de constructions et des conflits de construction "
-"(non effectué si B<-d> est utilisé)."
+"Contrôle des dépendances de construction et des conflits de construction "
+"(non effectué si B<-d> ou B<--no-check-builddeps> sont utilisés)."
 
 #. type: IP
 #: dpkg-buildpackage.man
@@ -12856,22 +12850,17 @@ msgstr "B<3.>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "If a specific target has been selected with the B<-T> or B<--target> "
-#| "option, it calls that target and stops here. Otherwise it runs the "
-#| "B<preclean> hook and calls B<fakeroot debian/rules clean> to clean the "
-#| "build-tree (unless B<-nc> is specified)."
 msgid ""
 "If one or more specific targets have been selected with the B<-T> or B<--"
 "target> option, it calls those targets and stops here. Otherwise it runs the "
 "B<preclean> hook and calls B<fakeroot debian/rules clean> to clean the build-"
 "tree (unless B<-nc> or B<--no-pre-clean> is specified)."
 msgstr ""
-"Si une cible particulière a été indiquée avec les options B<-T> ou B<--"
-"target>, appel de cette cible et arrêt. Dans le cas contraire, exécution du "
-"point d'entrée B<preclean> et appel de B<fakeroot debian/rules clean> pour "
-"nettoyage de l'arborescence source (sauf si B<-nc> a été utilisé)."
+"Si une ou plusieurs cibles particulières ont été indiquées avec les options "
+"B<-T> ou B<--target>, appel de ces cibles et arrêt. Dans le cas contraire, "
+"exécution du point d'entrée B<preclean> et appel de B<fakeroot debian/rules "
+"clean> pour nettoyage de l'arborescence source (sauf si B<-nc> ou B<--no-pre-"
+"clean> ont été utilisés)."
 
 #. type: IP
 #: dpkg-buildpackage.man
@@ -12881,19 +12870,14 @@ msgstr "B<4.>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "It runs the B<source> hook and calls B<dpkg-source -b> to generate the "
-#| "source package (unless a binary-only build has been requested with B<-b>, "
-#| "B<-B> or B<-A>)."
 msgid ""
 "It runs the B<source> hook and calls B<dpkg-source -b> to generate the "
 "source package (if a B<source> build has been requested with B<--build> or "
 "equivalent options)."
 msgstr ""
 "Exécution du point d'entrée B<source> et appel de B<dpkg-source -b> pour "
-"créer le paquet source (sauf si une construction binaire seule a été "
-"demandée avec B<-b>, B<-B> ou B<-A>)."
+"créer le paquet source (si une construction B<source> a été demandée avec "
+"B<--build> ou des options équivalentes)."
 
 #. type: IP
 #: dpkg-buildpackage.man
@@ -12903,15 +12887,6 @@ msgstr "B<5.>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "It runs the B<build> hook and calls B<debian/rules> I<build-target>, then "
-#| "runs the B<binary> hook followed by B<fakeroot debian/rules> I<binary-"
-#| "target> (unless a source-only build has been requested with B<-S>). Note "
-#| "that I<build-target> and I<binary-target> are either B<build> and "
-#| "B<binary> (default case, or if B<-b> is specified), or B<build-arch> and "
-#| "B<binary-arch> (if B<-B> or B<-G> are specified), or B<build-indep> and "
-#| "B<binary-indep> (if B<-A> or B<-g> are specified)."
 msgid ""
 "It runs the B<build> hook and calls B<debian/rules> I<build-target>, then "
 "runs the B<binary> hook followed by B<fakeroot debian/rules> I<binary-"
@@ -12927,10 +12902,14 @@ msgstr ""
 "Exécution du point d'entrée B<build> et appel de B<debian/rules> I<build-"
 "target>, puis exécution du point d'entrée B<binary> suivie de B<fakeroot "
 "debian/rules> I<binary-target> (sauf si une construction source seule a été "
-"demandée avec B<-S>). Noter que I<build-target> et I<binary-target> sont "
-"soit B<build> et B<binary> (cas par défaut, ou avec utilisation de B<-b>) "
-"soit B<build-arch> et B<binary-arch> (si B<-B> ou B<-G> est utilisé) soit "
-"B<build-indep> et B<binary-indep> (si B<-A> ou B<-g> est utilisé)."
+"demandée avec B<--build=source> ou des options équivalentes). Noter que "
+"I<build-target> et I<binary-target> sont soit B<build> et B<binary> (cas par "
+"défaut, ou si une construction B<any> et B<all> a été demandée avec B<--"
+"build> ou des options équivalentes), soit B<build-arch> et B<binary-arch> "
+"(si une construction B<any> et pas B<all> a été demandée avec B<--build> ou "
+"des options équivalentes), soit B<build-indep> et B<binary-indep> (si une "
+"construction B<all> et pas B<any> a été demandée avec B<--build> ou des "
+"options équivalentes)."
 
 #. type: IP
 #: dpkg-buildpackage.man
@@ -12940,19 +12919,14 @@ msgstr "B<6.>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "It runs the B<changes> hook and calls B<dpkg-genchanges> to generate a B<."
-#| "changes> file.  Many B<dpkg-buildpackage> options are forwarded to B<dpkg-"
-#| "genchanges>."
 msgid ""
 "It runs the B<buildinfo> hook and calls B<dpkg-genbuildinfo> to generate a "
 "B<.buildinfo> file.  Several B<dpkg-buildpackage> options are forwarded to "
 "B<dpkg-genbuildinfo>."
 msgstr ""
-"Exécution du point d'entrée B<changes> et appel de B<dpkg-genchanges> pour "
-"créer un fichier B<.changes>. De nombreuses options de B<dpkg-buildpackage> "
-"sont passées à B<dpkg-genchanges>."
+"Exécution du point d'entrée B<buildinfo> et appel de B<dpkg-genbuildinfo> "
+"pour créer un fichier B<.buildinfo>. De nombreuses options de B<dpkg-"
+"buildpackage> sont passées à B<dpkg-genbuildinfo>."
 
 #. type: IP
 #: dpkg-buildpackage.man
@@ -12973,6 +12947,15 @@ msgid ""
 "I<source-name>B<_>I<source-version>B<_>B<source.changes>.  Many B<dpkg-"
 "buildpackage> options are forwarded to B<dpkg-genchanges>."
 msgstr ""
+"Exécution du point d'entrée B<changes> et appel de B<dpkg-genchanges> pour "
+"créer un fichier B<.changes>. Le nom du fichier B<.changes> dépendra du type "
+"de construction et sera aussi spécifique que nécessaire mais pas plus ; pour "
+"une construction qui inclut B<any>, le nom sera I<nom-de-"
+"source>B<_>I<version-binaire>B<_>I<architecture>B<.changes>, ou pour une "
+"construction qui inclut B<all>, le nom sera I<nom-de-source>B<_>I<version-"
+"binaire>B<_>B<all.changes>, ou pour une construction qui inclut B<source>, "
+"le nom sera I<nom-de-source>B<_>I<version-source>B<_>B<sources.changes>. De "
+"nombreuses options de B<dpkg-buildpackage> sont passées à B<dpkg-genchanges>."
 
 #. type: IP
 #: dpkg-buildpackage.man
@@ -12982,16 +12965,12 @@ msgstr "B<8.>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "It runs the B<postclean> hook and if B<-tc> is specified, it will call "
-#| "B<fakeroot debian/rules clean> again."
 msgid ""
 "It runs the B<postclean> hook and if B<-tc> or B<--post-clean> is specified, "
 "it will call B<fakeroot debian/rules clean> again."
 msgstr ""
-"Exécution du point d'entrée B<postclean> et si B<-tc> est utilisé, appel de "
-"B<fakeroot debian/rules clean> à nouveau."
+"Exécution du point d'entrée B<postclean> et si B<-tc> ou B<--post-clean> "
+"sont utilisés, appel de B<fakeroot debian/rules clean> à nouveau."
 
 #. type: IP
 #: dpkg-buildpackage.man
@@ -13002,7 +12981,7 @@ msgstr "B<9.>"
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid "It calls B<dpkg-source --after-build>."
-msgstr "Enfin, appel de B<dpkg-source --after-build>."
+msgstr "Appel de B<dpkg-source --after-build>."
 
 #. type: IP
 #: dpkg-buildpackage.man
@@ -13029,11 +13008,6 @@ msgstr "B<11.>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "It runs the B<sign> hook and calls B<gpg2> or B<gpg> to sign the B<.dsc> "
-#| "file (if any, unless B<-us> is specified or on UNRELEASED builds), and "
-#| "the B<.changes> file (unless B<-uc> is specified or on UNRELEASED builds)."
 msgid ""
 "It runs the B<sign> hook and calls B<gpg2> or B<gpg> (as long as it is not "
 "an UNRELEASED build, or B<--no-sign> is specified) to sign the B<.dsc> file "
@@ -13042,32 +13016,26 @@ msgid ""
 "unsigned-changes> is specified) and the B<.changes> file (unless B<-uc> or "
 "B<--unsigned-changes> is specified)."
 msgstr ""
-"Exécution du point d'entrée B<sign> et appel de B<gpg2> ou de B<gpg> pour "
-"signature des fichiers B<.dsc> (sauf si B<-us> est utilisé ou pour des "
-"constructions UNRELEASED) et B<.changes> (sauf si B<-uc> est utilisé ou pour "
-"des constructions UNRELEASED)."
+"Exécution du point d'entrée B<sign> et appel de B<gpg2> ou de B<gpg> (à "
+"condition que ce ne soit pas une construction pour UNRELEASED, ou si B<--no-"
+"sign> est spécifié), pour signature des fichiers B<.dsc> (sauf si B<-us> ou "
+"si B<--unsigned-source> sont spécifiés), B<.buildinfo> (sauf si B<-ui>, B<--"
+"unsigned-buildinfo>, B<-uc> ou B<--unsigned-changes> sont spécifiés) et B<."
+"changes> (sauf si B<-uc> ou B<--unsigned-changes> sont spécifiés)."
 
 #. type: IP
 #: dpkg-buildpackage.man
 #, no-wrap
 msgid "B<12.>"
-msgstr ""
+msgstr "B<12.>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid "It runs the B<done> hook."
-msgstr "Il exécute le point d'entrée B<done>."
+msgstr "Exécution du point d'entrée B<done>."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "All options can be specified both on the command line and in the "
-#| "B<dselect> configuration file I<%PKGCONFDIR%/dselect.cfg> or the files on "
-#| "the configuration directory I<%PKGCONFDIR%/dselect.cfg.d/>. Each line in "
-#| "the configuration file is either an option (exactly the same as the "
-#| "command line option but without leading hyphens) or a comment (if it "
-#| "starts with a B<#>)."
 msgid ""
 "All long options can be specified both on the command line and in the B<dpkg-"
 "buildpackage> system and user configuration files.  Each line in the "
@@ -13075,82 +13043,75 @@ msgid ""
 "option but without leading hyphens) or a comment (if it starts with a "
 "‘B<#>’)."
 msgstr ""
-"On peut spécifier une option à la fois sur la ligne de commande et dans le "
-"fichier de configuration de B<dselect>, I<%PKGCONFDIR%/dselect.cfg> ou dans "
-"les fichiers du répertoire de configuration I<%PKGCONFDIR%/dselect.cfg.d/>. "
-"Chaque ligne de ce fichier est soit une option (identique à une option en "
-"ligne de commande mais sans tiret), soit un commentaire (si il commence par "
-"B<#>)."
+"Toutes les options longues peuvent être spécifiées  à la fois sur la ligne "
+"de commande et dans les fichiers de configuration utilisateur et de système "
+"B<dpkg-buildpackage>. Chaque ligne du fichier de configuration est soit une "
+"option (identique à une option en ligne de commande mais sans tiret), soit "
+"un commentaire (si elle commence par « B<#> »)."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genbuildinfo.man dpkg-genchanges.man
-#, fuzzy, no-wrap
-#| msgid "B<-t>I<type>"
+#, no-wrap
 msgid "B<--build=>I<type>"
-msgstr "B<-t>I<type>"
+msgstr "B<--build=>I<type>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Specifies a build limited to source and architecture specific packages.  "
-#| "Passed to B<dpkg-genchanges>."
 msgid ""
 "Specifies the build I<type> from a comma-separated list of components (since "
 "dpkg 1.18.5).  Passed to B<dpkg-genchanges>."
 msgstr ""
-"Indique une construction limitée aux paquets source et binaires dépendants "
-"de l'architecture. Passé à B<dpkg-genchanges>."
+"Indique le I<type> de construction à partir d'une liste de composants "
+"séparés par des virgules (depuis dpkg 1.18.5). Passé à B<dpkg-genchanges>."
 
 #. type: Plain text
 #: dpkg-buildpackage.man dpkg-genbuildinfo.man dpkg-genchanges.man
 msgid "The allowed values are:"
-msgstr ""
+msgstr "Les valeurs autorisées sont :"
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genbuildinfo.man dpkg-genchanges.man
-#, fuzzy, no-wrap
-#| msgid "B<--force>"
+#, no-wrap
 msgid "B<source>"
-msgstr "B<--force>"
+msgstr "B<source>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
+"Construit le paquet source. Note : quand cette valeur est utilisée toute "
+"seule et si ce que vous voulez est seulement (re)construire le paquet source "
+"à partir d'une arborescence des sources propre, l'utilisation directe de "
+"B<dpkg-source> est toujours une meilleure option dans la mesure où cela ne "
+"demande pas l'installation de dépendances de construction qui sont sinon "
+"nécessaires pour pouvoir appeler la cible B<clean>."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genbuildinfo.man dpkg-genchanges.man
 #, no-wrap
 msgid "B<any>"
-msgstr ""
+msgstr "B<any>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid "Builds the architecture specific binary packages."
-msgstr ""
+msgstr "Construit les paquets binaires spécifiques à l'architecture."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genbuildinfo.man dpkg-genchanges.man
-#, fuzzy, no-wrap
-#| msgid "B<--all>"
+#, no-wrap
 msgid "B<all>"
-msgstr "B<--all>"
+msgstr "B<all>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Same as B<Build-Conflicts>, but only when building the architecture "
-#| "independent packages."
 msgid "Builds the architecture independent binary packages."
-msgstr ""
-"liste analogue à B<Build-Conflicts> mais restreinte à la construction des "
-"paquets indépendants de l'architecture."
+msgstr "Construit les paquets binaires indépendants de l'architecture."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -13158,25 +13119,23 @@ msgid ""
 "Builds the architecture specific and independent binary packages.  This is "
 "an alias for B<any,all>."
 msgstr ""
+"Construit les paquets binaires particuliers et indépendants de "
+"l'architecture. C'est un alias de B<any,all>."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genbuildinfo.man dpkg-genchanges.man
 #, no-wrap
 msgid "B<full>"
-msgstr ""
+msgstr "B<full>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Specifies a normal full build, binary and source packages will be built.  "
-#| "This is the same as the default case when no build option is specified."
 msgid ""
 "Builds everything.  This is an alias for B<source,any,all>, and the same as "
 "the default case when no build option is specified."
 msgstr ""
-"Construction complète où les paquets sources et binaires sont construits. "
-"Identique au cas par défaut où aucune option de construction n'est indiquée."
+"Construction complète. C'est un alias de B<source,any,all>, et il est "
+"identique au cas par défaut où aucune option de construction n'est indiquée."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genchanges.man
@@ -13186,17 +13145,13 @@ msgstr "B<-g>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man dpkg-genchanges.man
-#, fuzzy
-#| msgid "Cancels a previous B<--no-triggers>."
 msgid "Equivalent to B<--build=source,all> (since dpkg 1.17.11)."
-msgstr "Annule un précédent B<--no-triggers>."
+msgstr "Équivalent de B<--build=source,all> (depuis dpkg 1.17.11)."
 
 #. type: Plain text
 #: dpkg-buildpackage.man dpkg-genchanges.man
-#, fuzzy
-#| msgid "Cancels a previous B<--no-triggers>."
 msgid "Equivalent to B<--build=source,any> (since dpkg 1.17.11)."
-msgstr "Annule un précédent B<--no-triggers>."
+msgstr "Équivalent de B<--build=source,any> (depuis dpkg 1.17.11)."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genchanges.man
@@ -13207,7 +13162,7 @@ msgstr "B<-b>"
 #. type: Plain text
 #: dpkg-buildpackage.man dpkg-genchanges.man
 msgid "Equivalent to B<--build=binary> or B<--build=any,all>."
-msgstr ""
+msgstr "Équivalent de B<--build=binary> ou B<--build=any,all>."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-checkbuilddeps.man dpkg-genchanges.man
@@ -13218,7 +13173,7 @@ msgstr "B<-B>"
 #. type: Plain text
 #: dpkg-buildpackage.man dpkg-genchanges.man
 msgid "Equivalent to B<--build=any>."
-msgstr ""
+msgstr "Équivalent de B<--build=any>"
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-checkbuilddeps.man dpkg-genchanges.man
@@ -13229,7 +13184,7 @@ msgstr "B<-A>"
 #. type: Plain text
 #: dpkg-buildpackage.man dpkg-genchanges.man
 msgid "Equivalent to B<--build=all>."
-msgstr ""
+msgstr "Équivalent de B<--build=all>."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genchanges.man
@@ -13240,7 +13195,7 @@ msgstr "B<-S>"
 #. type: Plain text
 #: dpkg-buildpackage.man dpkg-genchanges.man
 msgid "Equivalent to B<--build=source>."
-msgstr ""
+msgstr "Équivalent à B<--build=source>."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13250,43 +13205,33 @@ msgstr "B<-F>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid "Cancels a previous B<--no-triggers>."
 msgid ""
 "Equivalent to B<--build=full>, B<--build=source,binary> or B<--build=source,"
 "any,all> (since dpkg 1.15.8)."
-msgstr "Annule un précédent B<--no-triggers>."
+msgstr ""
+"Équivalent de B<--build=full>, B<--build=source,binary> ou B<--build=source,"
+"any,all> (depuis dpkg 1.15.8)."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<--target=>I<target>"
+#, no-wrap
 msgid "B<--target=>I<target>[,...]"
-msgstr "B<--target=>I<cible>"
+msgstr "B<--target=>I<cible>[,...]"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<--target >I<target>"
+#, no-wrap
 msgid "B<--target >I<target>[,...]"
-msgstr "B<--target >I<cible>"
+msgstr "B<--target >I<cible>[,...]"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<--target=>I<target>"
+#, no-wrap
 msgid "B<-T>, B<--rules-target=>I<target>[,...]"
-msgstr "B<--target=>I<cible>"
+msgstr "B<-T>, B<--rules-target=>I<cible>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Calls B<debian/rules> I<target> after having setup the build environment "
-#| "and stops the package build process here. If B<--as-root> is also given, "
-#| "then the command is executed as root (see B<-r>). Note that official "
-#| "targets that are required to be run as root by the Debian policy do not "
-#| "need this option."
 msgid ""
 "Calls B<debian/rules> I<target> once per target specified, after having "
 "setup the build environment (except for calling B<dpkg-source --before-"
@@ -13297,11 +13242,15 @@ msgid ""
 "not need this option (i.e. the B<clean>, B<binary>, B<binary-arch> and "
 "B<binary-indep> targets)."
 msgstr ""
-"Appelle B<debian/rules> I<cible> après avoir mis en place l'environnement de "
-"construction, puis interrompt le processus de construction. Si B<--as-root> "
-"est également utilisé, la commande sera exécutée avec les privilèges du "
-"superutilisateur (voir B<-r>). Noter que les cibles dont l'exécution par "
-"root est imposée par la Charte Debian n'ont pas besoin de cette option."
+"Appelle B<debian/rules> I<cible> une fois par cible spécifiée, après avoir "
+"mis en place l'environnement de construction (sauf pour appeler B<dpkg-"
+"source --before-build>), puis interrompt le processus de construction "
+"(depuis dpkg 1.15.0, option longue depuis dpkg 1.18.8, pris en charge de "
+"multiples cibles depuis dpkg 1.18.16). Si B<--as-root> est également "
+"utilisé, la commande sera exécutée avec les privilèges du superutilisateur "
+"(voir B<--root-command>). Noter que les cibles connues dont l'exécution par "
+"root est imposée n'ont pas besoin de cette option (c'est-à-dire les cibles "
+"B<clean>, B<binary>, B<binary-arch> et B<binary-indep>)."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13311,16 +13260,12 @@ msgstr "B<--as-root>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Only meaningful together with B<--target>. Requires that the target be "
-#| "run with root rights."
 msgid ""
 "Only meaningful together with B<--target> (since dpkg 1.15.0).  Requires "
 "that the target be run with root rights."
 msgstr ""
-"N'est utile qu'avec B<--target>. Impose d'exécuter la cible avec les "
-"privilèges du superutilisateur."
+"N'est utile qu'avec B<--target> (depuis dpkg 1.15.0). Impose d'exécuter la "
+"cible avec les privilèges du superutilisateur."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genchanges.man
@@ -13355,17 +13300,15 @@ msgstr "B<-C>I<description-des-changements>"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-m>I<maintainer-address>"
+#, no-wrap
 msgid "B<-m>, B<--release-by=>I<maintainer-address>"
-msgstr "B<-m>I<adresse-du-responsable>"
+msgstr "B<-m>, B<--release-by=>I<adresse-du-responsable>"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-e>I<maintainer-address>"
+#, no-wrap
 msgid "B<-e>, B<--build-by=>I<maintainer-address>"
-msgstr "B<-e>I<adresse-du-responsable>"
+msgstr "B<-e>, B<--build-by=>I<adresse-du-responsable>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -13374,35 +13317,27 @@ msgstr "Passé tel quel à B<dpkg-genchanges>. Voir sa page de manuel."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Specify the Debian architecture we build for. The architecture of the "
-#| "machine we build on is determined automatically, and is also the default "
-#| "for the host machine."
 msgid ""
 "Specify the Debian architecture we build for (long option since dpkg "
 "1.17.17).  The architecture of the machine we build on is determined "
 "automatically, and is also the default for the host machine."
 msgstr ""
-"Précise l'architecture Debian pour laquelle on construit. L'architecture de "
-"la machine sur laquelle on construit est automatiquement déterminée ; c'est "
-"aussi l'architecture par défaut de la machine hôte."
+"Précise l'architecture Debian pour laquelle on construit (option longue "
+"depuis dpkg 1.17.17). L'architecture de la machine sur laquelle on construit "
+"est automatiquement déterminée ; c'est aussi l'architecture par défaut de la "
+"machine hôte."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Specify the GNU system type we build for. It can be used in place of --"
-#| "host-arch or as a complement to override the default GNU system type of "
-#| "the host Debian architecture."
 msgid ""
 "Specify the GNU system type we build for (long option since dpkg 1.17.17).  "
 "It can be used in place of B<--host-arch> or as a complement to override the "
 "default GNU system type of the host Debian architecture."
 msgstr ""
-"Précise le type de système GNU pour lequel construire. Il peut être utilisé "
-"à la place de B<--host-arch> ou en tant que complément afin de remplacer le "
-"type de système GNU par défaut de l'architecture Debian cible."
+"Précise le type de système GNU pour lequel construire (option longue depuis "
+"dpkg 1.17.17). Il peut être utilisé à la place de B<--host-arch> ou en tant "
+"que complément afin de remplacer le type de système GNU par défaut de "
+"l'architecture Debian hôte."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13412,16 +13347,13 @@ msgstr "B<--target-arch> I<architecture>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Specify the Debian architecture the binaries built will build for.  The "
-#| "default value is the host machine."
 msgid ""
 "Specify the Debian architecture the binaries built will build for (since "
 "dpkg 1.17.17).  The default value is the host machine."
 msgstr ""
 "Précise l'architecture Debian pour laquelle les binaires compilés vont "
-"construire. La valeur par défaut est l'architecture de la machine hôte."
+"construire (depuis dpkg 1.17.17). La valeur par défaut est l'architecture de "
+"la machine hôte."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13431,37 +13363,24 @@ msgstr "B<--target-type> I<type-de-système-gnu>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Specify the GNU system type the binaries built will build for. It can be "
-#| "used in place of --target-arch or as a complement to override the default "
-#| "GNU system type of the target Debian architecture."
 msgid ""
 "Specify the GNU system type the binaries built will build for (since dpkg "
 "1.17.17).  It can be used in place of B<--target-arch> or as a complement to "
 "override the default GNU system type of the target Debian architecture."
 msgstr ""
 "Précise le type de système GNU pour lequel les binaires compilés vont "
-"construire. Il peut être utilisé à la place de B<--target-arch> ou en tant "
-"que complément afin de remplacer le type de système GNU par défaut de "
-"l'architecture Debian cible."
+"construire (depuis dpkg 1.17.17). Il peut être utilisé à la place de B<--"
+"target-arch> ou en tant que complément afin de remplacer le type de système "
+"GNU par défaut de l'architecture Debian cible."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-P >I<profile>[B<,>...]"
+#, no-wrap
 msgid "B<-P>, B<--build-profiles=>I<profile>[B<,>...]"
-msgstr "B<-P >I<profil>[B<,>...]"
+msgstr "B<-P>, B<--build-profiles=>I<profil>[B<,>...]"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Specify the profile(s) we build, as a comma-separated list. The default "
-#| "behavior is to build for no specific profile. Also sets them (as a space "
-#| "separated list) as the B<DEB_BUILD_PROFILES> environment variable which "
-#| "allows, for example, B<debian/rules> files to use this information for "
-#| "conditional builds."
 msgid ""
 "Specify the profile(s) we build, as a comma-separated list (since dpkg "
 "1.17.2, long option since dpkg 1.18.8).  The default behavior is to build "
@@ -13470,37 +13389,21 @@ msgid ""
 "B<debian/rules> files to use this information for conditional builds."
 msgstr ""
 "Précise le ou les profils que l'on construit, sous forme d'une liste séparée "
-"par des virgules. Le comportement par défaut est de construire pour un "
-"profil non spécifique. Cela les définit également (sous la forme d'une liste "
-"séparée par des espaces) en tant que variable d'environnement "
-"B<DEB_BUILD_PROFILES>, ce qui permet, par exemple, au fichiers B<debian/"
-"rules> d'utiliser cette information pour des constructions conditionnelles."
+"par des virgules (depuis dpkg 1.17.2, option longue depuis dpkg 1.18.8). Le "
+"comportement par défaut est de construire pour un profil non spécifique. "
+"Cela les définit également (sous la forme d'une liste séparée par des "
+"espaces) en tant que variable d'environnement B<DEB_BUILD_PROFILES>, ce qui "
+"permet, par exemple, au fichiers B<debian/rules> d'utiliser cette "
+"information pour des constructions conditionnelles."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-j>[I<jobs>|B<auto>]"
+#, no-wrap
 msgid "B<-j>, B<--jobs>[=I<jobs>|B<auto>]"
-msgstr "B<-j>[I<jobs>|B<auto>]"
+msgstr "B<-j>, B<--jobs>[I<jobs>|B<auto>]"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Number of jobs allowed to be run simultaneously, number of jobs matching "
-#| "the number of online processors if B<auto> is specified, or unlimited "
-#| "number if I<jobs> is not specified, equivalent to the B<make>(1)  option "
-#| "of the same name. Will add itself to the B<MAKEFLAGS> environment "
-#| "variable, which should cause all subsequent make invocations to inherit "
-#| "the option. Also adds B<parallel=>I<jobs> or B<parallel=> to the "
-#| "B<DEB_BUILD_OPTIONS> environment variable which allows debian/rules files "
-#| "to use this information for their own purposes.  The B<parallel=>I<jobs> "
-#| "or B<parallel=> option in B<DEB_BUILD_OPTIONS> environment variable will "
-#| "override the B<-j> value if this option is given.  Note that the B<auto> "
-#| "value will get replaced by the actual number of currently active "
-#| "processors, and as such will not get propagated to any child process. If "
-#| "the number of online processors cannot be inferred then the code will "
-#| "fallback to using an unlimited number."
 msgid ""
 "Number of jobs allowed to be run simultaneously, number of jobs matching the "
 "number of online processors if B<auto> is specified (since dpkg 1.17.10), or "
@@ -13523,25 +13426,29 @@ msgid ""
 msgstr ""
 "Nombre de processus simultanés qui peuvent être exécutés, nombre de "
 "processus correspondant au nombre de processeurs en ligne si B<auto> est "
-"indiquée, ou un nombre illimité si I<jobs> n'est pas indiqué, équivalent à "
-"l'option B<make>(1) du même nom. S'ajoutera tout seul à la variable "
-"d'environnement MAKEFLAGS, afin que les appels suivants de make en héritent. "
-"Ajoute aussi B<parallel=>I<jobs> ou B<parallel=> à la variable "
-"d'environnement B<DEB_BUILD_OPTIONS> ce qui permet aux fichiers debian/rules "
-"d'utiliser cette information pour leurs propres besoins. La présence de "
-"B<parallel=>I<jobs> ou B<parallel=> dans la variable d'environnement "
-"DEB_BUILD_OPTIONS remplace la valeur de l'option B<-j> si elle est précisée. "
-"Notez que la valeur B<auto> sera remplacée par le nombre réel de processeurs "
-"actuellement actifs, et par conséquent ne sera pas transmis à aucun "
-"processus fils. Si le nombre de processeur en ligne ne peut pas être déduit, "
-"alors le code utilisera par défaut un nombre illimité."
+"indiquée (depuis dpkg 1.17.10), ou un nombre illimité si I<jobs> n'est pas "
+"indiqué, équivalent à l'option B<make>(1) du même nom (depuis dpkg 1.14.7, "
+"option longue depuis dpkg 1.18.8). S'ajoutera tout seul à la variable "
+"d'environnement MAKEFLAGS, afin que les appels suivants de make en héritent, "
+"forçant donc le paramètre parallèle sur l'empaquetage (et éventuellement le "
+"système de construction amont s'il utilise make) indépendamment de leur "
+"prise en charge des constructions parallèle, ce qui pourrait provoquer des "
+"échecs de construction. Ajoute aussi B<parallel=>I<jobs> ou B<parallel> à la "
+"variable d'environnement B<DEB_BUILD_OPTIONS> ce qui permet aux fichiers "
+"debian/rules d'utiliser cette information pour leurs propres besoins. La "
+"valeur de B<j> remplacera les options B<parallel=>I<jobs> ou B<parallel> "
+"dans la variable d'environnement B<DEB_BUILD_OPTIONS>. Notez que la valeur "
+"B<auto> sera remplacée par le nombre réel de processeurs actuellement "
+"actifs, et par conséquent ne sera pas transmise à aucun processus fils. Si "
+"le nombre de processeurs en ligne ne peut pas être déduit, alors le code "
+"utilisera par défaut une exécution sérielle (depuis dpkg 1.18.15), même si "
+"cela ne devrait arriver que sur des systèmes exotiques et non pris en charge."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-j>[I<jobs>|B<auto>]"
+#, no-wrap
 msgid "B<-J>, B<--jobs-try>[=I<jobs>|B<auto>]"
-msgstr "B<-j>[I<jobs>|B<auto>]"
+msgstr "B<-J>, B<--jobs-try>[=I<tâches>|B<auto>]"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -13551,58 +13458,57 @@ msgid ""
 "variable, and as such it is safer to use with any package including those "
 "that are not parallel-build safe."
 msgstr ""
+"Cette option (depuis dpkg 1.18.2, option longue depuis dpkg 1.18.8) est "
+"équivalente à l'option B<-j> sauf qu'elle ne configure pas la variable "
+"d'environnement B<MAKEFLAGS> et, à ce titre, il est plus sûr de l'utiliser "
+"avec tous les paquets y compris ceux qui ne sont pas sécurisés pour une "
+"construction parallèle."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid "The full version of dpkg."
 msgid ""
 "B<auto> is the default behavior (since dpkg 1.18.11). Setting the number of "
 "jobs to 1 will restore a serial behavior."
-msgstr "La version complète de dpkg."
+msgstr ""
+"Le comportement par défaut est B<auto> (depuis dpkg 1.18.11). Fixer le "
+"nombre de tâches à 1 rétablira un comportement sériel."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-?>, B<--help>"
+#, no-wrap
 msgid "B<-D>, B<--check-builddeps>"
-msgstr "B<-?>, B<--help>"
+msgstr "B<-D>, B<--check-builddeps>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Check build dependencies and conflicts; abort if unsatisfied. This is the "
-#| "default behavior."
 msgid ""
 "Check build dependencies and conflicts; abort if unsatisfied (long option "
 "since dpkg 1.18.8).  This is the default behavior."
 msgstr ""
-"Vérification les dépendances de constructions et les conflits ; se termine "
-"en cas de problèmes. Ceci est le comportement par défaut."
+"Vérification des dépendances de constructions et des conflits ; se termine "
+"en cas de problèmes (option longue depuis dpkg 1.18.8). C'est le "
+"comportement par défaut."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-a>, B<--no-architecture>"
+#, no-wrap
 msgid "B<-d>, B<--no-check-builddeps>"
-msgstr "B<-a>, B<--no-architecture>"
+msgstr "B<-d>, B<--no-check-builddeps>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid "Do not check build dependencies and conflicts."
 msgid ""
 "Do not check build dependencies and conflicts (long option since dpkg "
 "1.18.8)."
-msgstr "Pas de vérification des dépendances de constructions et des conflits."
+msgstr ""
+"Pas de vérification des dépendances de constructions et des conflits (option "
+"longue depuis dpkg 1.18.8)."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<--ignore-missing-info>"
+#, no-wrap
 msgid "B<--ignore-builtin-builddeps>"
-msgstr "B<--ignore-missing-info>"
+msgstr "B<--ignore-builtin-builddeps>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -13611,88 +13517,100 @@ msgid ""
 "These are the distribution specific implicit build dependencies usually "
 "required in a build environment, the so called Build-Essential package set."
 msgstr ""
+"Pas de vérification des dépendances de constructions internes et des "
+"conflits (depuis dpkg 1.18.2). Il s'agit des dépendances de construction "
+"implicites spécifiques à la distribution habituellement requises dans un "
+"environnement de construction, c'est l'ensemble de paquets appelé Build-"
+"Essentiel."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<--rules-requires-root>"
+msgstr "B<--rules-requires-root>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+"Pas de prise en compte du champ B<Rules-Requires-Root>, retour à l'ancienne "
+"valeur par défaut (depuis dpkg 1.19.1)."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-C>, B<--no-close>"
+#, no-wrap
 msgid "B<-nc>, B<--no-pre-clean>"
-msgstr "B<-C>, B<--no-close>"
+msgstr "B<-nc>, B<--no-pre-clean>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Do not clean the source tree (implies B<-b> if nothing else has been "
-#| "selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or B<-S>)."
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
-"Pas de nettoyage de l'arborescence des sources (implique B<-b> si aucune des "
-"options B<-F>, B<-g>, B<-G>, B<-B>, B<-A> ou B<-S> n'est utilisée)."
+"Pas de nettoyage de l'arborescence des sources avant la construction (option "
+"longue depuis dpkg 1.18.8). Implique B<-b> si aucune des options B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> ou B<-S> n'est utilisée). Implique B<-d> avec B<-S> "
+"(depuis dpkg 1.18.0)."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-p>I<package>"
+#, no-wrap
 msgid "B<--pre-clean>"
-msgstr "B<-p>I<paquet>"
+msgstr "B<--pre-clean>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "It contains the source package name for this binary package (since dpkg "
-#| "1.16.2)."
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr ""
-"Il contient le nom du paquet source de ce paquet binaire (depuis dpkg "
-"1.16.2)."
+"Nettoyage de l'arborescence des sources avant la construction (depuis "
+"dpkg 1.18.8). C'est le comportement par défaut."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-C>, B<--no-close>"
+#, no-wrap
 msgid "B<-tc>, B<--post-clean>"
-msgstr "B<-C>, B<--no-close>"
+msgstr "B<-tc>, B<--post-clean>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
-#| "after the package has been built."
 msgid ""
 "Clean the source tree (using I<gain-root-command> B<debian/rules clean>)  "
 "after the package has been built (long option since dpkg 1.18.8)."
 msgstr ""
-"Nettoyage de l'arborescence (en utilisant I<commande-pour-obtenir-privilèges-"
-"de-root> B<debian/rules clean>) après la construction du paquet."
+"Nettoyage de l'arborescence des sources (en utilisant I<commande-pour-"
+"obtenir-privilèges-de-root> B<debian/rules clean>) après la construction du "
+"paquet (option longue depuis dpkg 1.18.8)."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<--no-post-clean>"
+msgstr "B<--no-post-clean>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+"Pas de nettoyage de l'arborescence des sources après la construction du "
+"paquet (depuis dpkg 1.19.1). C'est le comportement par défaut."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-c>, B<--command> I<command>"
+#, no-wrap
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
-msgstr "B<-c>, B<--command> I<commande>"
+msgstr "B<-r>, B<--root-command=>I<commande-pour-obtenir-privilèges-de-root>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "When B<dpkg-buildpackage> needs to execute part of the build process as "
-#| "root, it prefixes the command it executes with I<gain-root-command> if "
-#| "one has been specified. Otherwise, if none has been specified, "
-#| "B<fakeroot> will be used by default, if the command is present.  I<gain-"
-#| "root-command> should start with the name of a program on the B<PATH> and "
-#| "will get as arguments the name of the real command to run and the "
-#| "arguments it should take.  I<gain-root-command> can include parameters "
-#| "(they must be space-separated) but no shell metacharacters.  I<gain-root-"
-#| "command> might typically be B<fakeroot>, B<sudo>, B<super> or B<really>.  "
-#| "B<su> is not suitable, since it can only invoke the user's shell with B<-"
-#| "c> instead of passing arguments individually to the command to be run."
 msgid ""
 "When B<dpkg-buildpackage> needs to execute part of the build process as "
 "root, it prefixes the command it executes with I<gain-root-command> if one "
@@ -13709,36 +13627,27 @@ msgid ""
 msgstr ""
 "Quand B<dpkg-buildpackage> doit exécuter une partie du processus de "
 "construction en tant que root, il préfixe la commande exécutée par "
-"I<commande-pour-obtenir-privilèges-de-root>, si une a été spécifiée. Si ce "
-"n'est pas le cas alors B<fakeroot> est utilisé par défaut. I<commande-pour-"
-"obtenir-privilèges-de-root> doit débuter par le nom d'un programme "
-"accessible depuis B<PATH> et avoir comme arguments le nom de la commande "
-"réelle avec les arguments qu'elle doit prendre. I<commande-pour-obtenir-"
-"privilèges-de-root> peut recevoir des paramètres (ils doivent être séparés "
-"par des espaces) mais aucun « métacaractère » de l'interpréteur de "
-"commandes. Classiquement I<commande-pour-obtenir-privilèges-de-root> devrait "
-"être B<fakeroot>, B<sudo>, B<super> ou B<really>. B<su> ne va pas, puisque "
-"ce programme peut uniquement utiliser l'interpréteur de commandes de "
-"l'utilisateur avec l'option B<-c> au lieu de passer directement les "
-"arguments à la commande qui doit être exécutée."
+"I<commande-pour-obtenir-privilèges-de-root>, si une a été spécifiée (option "
+"longue depuis dpkg 1.18.8). Si ce n'est pas le cas alors B<fakeroot> est "
+"utilisé par défaut. I<commande-pour-obtenir-privilèges-de-root> doit débuter "
+"par le nom d'un programme accessible depuis B<PATH> et avoir comme arguments "
+"le nom de la commande réelle avec les arguments qu'elle doit prendre. "
+"I<commande-pour-obtenir-privilèges-de-root> peut recevoir des paramètres "
+"(ils doivent être séparés par des espaces) mais aucun métacaractère de "
+"l'interpréteur de commandes. Classiquement I<commande-pour-obtenir-"
+"privilèges-de-root> devrait être B<fakeroot>, B<sudo>, B<super> ou "
+"B<really>. B<su> ne va pas, puisque ce programme peut uniquement utiliser "
+"l'interpréteur de commandes de l'utilisateur avec l'option B<-c> au lieu de "
+"passer directement les arguments à la commande qui doit être exécutée."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-l>, B<--label> I<file>"
+#, no-wrap
 msgid "B<-R>, B<--rules-file=>I<rules-file>"
-msgstr "B<-l>, B<--label> I<fichier>"
+msgstr "B<-R>, B<--rules-file=>I<fichier-rules>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Building a Debian package usually involves invoking B<debian/rules> as a "
-#| "command with several standard parameters. With this option it's possible "
-#| "to use another program invocation to build the package (it can include "
-#| "space separated parameters).  Alternatively it can be used to execute the "
-#| "standard rules file with another make program (for example by using B</"
-#| "usr/local/bin/make -f debian/rules> as I<rules-file>)."
 msgid ""
 "Building a Debian package usually involves invoking B<debian/rules> as a "
 "command with several standard parameters (since dpkg 1.14.17, long option "
@@ -13749,12 +13658,13 @@ msgid ""
 "f debian/rules> as I<rules-file>)."
 msgstr ""
 "Construire un paquet Debian implique généralement l'invocation de B<debian/"
-"rules> comme une commande avec de nombreux paramètres standards. Avec cette "
-"option, il est possible d'utiliser un autre programme à utiliser pour la "
-"construction de paquet (ainsi que ses paramètres séparés par des espaces). "
-"Une autre utilisation possible est d'exécuter le fichier rules standard avec "
-"un autre programme de construction (par exemple en utilisant B</usr/local/"
-"bin/make -f debian/rules> comme I<fichier-rules>)."
+"rules> comme une commande avec de nombreux paramètres standard (depuis "
+"dpkg 1.14.17, option longue depuis dpkg 1.18.8). Avec cette option, il est "
+"possible d'utiliser un autre programme à utiliser pour la construction de "
+"paquet (ainsi que ses paramètres séparés par des espaces). Une autre "
+"utilisation possible est d'exécuter le fichier rules standard avec un autre "
+"programme make (par exemple en utilisant B</usr/local/bin/make -f debian/"
+"rules> comme I<fichier-rules>)."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13764,20 +13674,15 @@ msgstr "B<--check-command=>I<commande-contrôleur>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Command used to check the B<.changes> file itself and any artifact built "
-#| "referenced in the file. The command should take the B<.changes> pathname "
-#| "as an argument. This command will usually be B<lintian>."
 msgid ""
 "Command used to check the B<.changes> file itself and any artifact built "
 "referenced in the file (since dpkg 1.17.6).  The command should take the B<."
 "changes> pathname as an argument. This command will usually be B<lintian>."
 msgstr ""
-"Commande utiliser pour vérifier le fichier B<.changes> lui-même et tout "
-"objet construit référencé dans le fichier. La commande peut recevoir comme "
-"argument le nom de chemin de B<.changes>. Cette commandement est en général "
-"B<lintian>."
+"Commande utilisée pour vérifier le fichier B<.changes> lui-même et tout "
+"objet construit référencé dans le fichier (depuis dpkg 1.17.6). La commande "
+"peut recevoir comme argument le nom de chemin de B<.changes>. Cette commande "
+"est en général B<lintian>."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13787,18 +13692,14 @@ msgstr "B<--check-option=>I<opt>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Pass option I<opt> to the I<check-command> specified with "
-#| "B<DEB_CHECK_COMMAND> or B<--check-command>.  Can be used multiple times."
 msgid ""
 "Pass option I<opt> to the I<check-command> specified with "
 "B<DEB_CHECK_COMMAND> or B<--check-command> (since dpkg 1.17.6).  Can be used "
 "multiple times."
 msgstr ""
-"Passe l'option I<opt> à I<commande-contrôleur> indiquée par "
-"B<DEB_CHECK_COMMAND> ou B<--check-command>.  Peut être utilisé plusieurs "
-"fois."
+"Passer l'option I<opt> à I<commande-contrôleur> indiquée par "
+"B<DEB_CHECK_COMMAND> ou B<--check-command> (depuis dpkg 1.17.6). Peut être "
+"utilisé plusieurs fois."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13808,12 +13709,6 @@ msgstr "B<--hook->I<nom-de-point-d'entrée>B<=>I<commande-de-point-d'entrée>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Set the specified shell code I<hook-command> as the hook I<hook-name>, "
-#| "which will run at the times specified in the run steps. The hooks will "
-#| "always be executed even if the following action is not performed (except "
-#| "for the B<binary> hook)."
 msgid ""
 "Set the specified shell code I<hook-command> as the hook I<hook-name>, which "
 "will run at the times specified in the run steps (since dpkg 1.17.6).  The "
@@ -13821,11 +13716,12 @@ msgid ""
 "(except for the B<binary> hook).  All the hooks will run in the unpacked "
 "source directory."
 msgstr ""
-"Définit le code spécifié de l'interpréteur de commandes I<commande-de-point-"
-"d'entrée> comme point d'entrée I<nom-de-point-d'entré> qui sera éxécuté aux "
-"moments spécifiés par les étapes d'exécution. Les points d'entrée seront "
-"toujours exécutés même si l'action suivante n'est pas effectuée (sauf pour "
-"le point d'entrée B<binary>)."
+"Définir le code spécifié de l'interpréteur de commandes I<commande-de-point-"
+"d'entrée> comme point d'entrée I<nom-de-point-d'entré> qui sera exécuté aux "
+"moments spécifiés par les étapes d'exécution (depuis dpkg 1.17.6). Les "
+"points d'entrée seront toujours exécutés même si l'action suivante n'est pas "
+"effectuée (sauf pour le point d'entrée B<binary>). Tous les points d'entrée "
+"seront exécutés dans le répertoire source dépaqueté."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -13834,7 +13730,7 @@ msgid ""
 "commands fail, so watch out for unintended consequences."
 msgstr ""
 "Note : Les points d'entrée sont susceptibles d'affecter le processus de "
-"construction et provoquer des  échecs de construction si leurs commandes "
+"construction et provoquer des échecs de construction si leurs commandes "
 "échouent, donc attention aux conséquences inattendues."
 
 #. type: Plain text
@@ -13844,13 +13740,12 @@ msgstr "Les I<nom-de-point-d'entrée> actuellement pris en charge sont :"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "B<init preclean source build binary changes postclean check sign done>"
 msgid ""
 "B<init preclean source build binary buildinfo changes postclean check sign "
 "done>"
-msgstr "B<init preclean source build binary changes postclean check sign done>"
+msgstr ""
+"B<init preclean source build binary buildinfo changes postclean check sign "
+"done>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -13870,7 +13765,7 @@ msgstr "B<%%>"
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid "A single % character."
-msgstr "Un caractère % seul"
+msgstr "Un caractère % seul."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13884,7 +13779,7 @@ msgid ""
 "A boolean value (0 or 1), representing whether the following action is being "
 "performed."
 msgstr ""
-"Une valeur booléenne (0 ou 1) qui indique si l'action suivante est effectuée."
+"Une valeur booléenne (0 ou 1) qui indique si l'action suivante est effectuée."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13895,7 +13790,7 @@ msgstr "B<%p>"
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid "The source package name."
-msgstr "Nom du paquet source"
+msgstr "Nom du paquet source."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13932,39 +13827,27 @@ msgstr "La version amont."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<--source-option=>I<opt>"
+#, no-wrap
 msgid "B<--buildinfo-option=>I<opt>"
-msgstr "B<--source-option=>I<opt>"
+msgstr "B<--buildinfo-option=>I<opt>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Pass option I<opt> to B<dpkg-genchanges>.  Can be used multiple times."
 msgid ""
 "Pass option I<opt> to B<dpkg-genbuildinfo> (since dpkg 1.18.11).  Can be "
 "used multiple times."
 msgstr ""
-"Passe l'option I<opt> à B<dpkg-genchanges>. Peut être utilisé plusieurs fois."
+"Passer l'option I<opt> à B<dpkg-genbuildinfo> (depuis dpkg 1.18.11). Peut "
+"être utilisé plusieurs fois."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-c>, B<--command> I<command>"
+#, no-wrap
 msgid "B<-p>, B<--sign-command=>I<sign-command>"
-msgstr "B<-c>, B<--command> I<commande>"
+msgstr "B<-p>, B<--sign-command=>I<commande-de-signature>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "When B<dpkg-buildpackage> needs to execute GPG to sign a source control "
-#| "(B<.dsc>) file or a B<.changes> file it will run I<sign-command> "
-#| "(searching the B<PATH> if necessary) instead of B<gpg2> or B<gpg>. I<sign-"
-#| "command> will get all the arguments that B<gpg2> or B<gpg> would have "
-#| "gotten. I<sign-command> should not contain spaces or any other shell "
-#| "metacharacters."
 msgid ""
 "When B<dpkg-buildpackage> needs to execute GPG to sign a source control (B<."
 "dsc>) file or a B<.changes> file it will run I<sign-command> (searching the "
@@ -13976,76 +13859,68 @@ msgstr ""
 "Quand B<dpkg-buildpackage> doit exécuter GPG pour signer un fichier source "
 "de contrôle (B<.dsc>) ou un fichier B<.changes>, il exécute I<commande-de-"
 "signature> (recherchée dans B<PATH> si nécessaire) au lieu de B<gpg2> ou "
-"B<pgp>. I<commande-de-signature> reçoit tous les paramètres qu'auraient reçu "
-"B<gpg2> ou B<pgp>. I<commande-de-signature> ne devra pas contenir d'espace "
-"ni aucun « métacaractère » de l'interpréteur de commandes."
+"B<gpg> (option longue depuis dpkg 1.18.1). I<commande-de-signature> reçoit "
+"tous les paramètres qu'auraient reçu B<gpg2> ou B<gpg>. I<commande-de-"
+"signature> ne devra pas contenir d'espace ni aucun métacaractère de "
+"l'interpréteur de commandes."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-s>, B<--signal> I<signal>"
+#, no-wrap
 msgid "B<-k>, B<--sign-key=>I<key-id>"
-msgstr "B<-s>, B<--signal> I<signal>"
+msgstr "B<-k>, B<--sign-key=>I<identifiant-clé>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid "Specify a key-ID to use when signing packages."
 msgid ""
 "Specify a key-ID to use when signing packages (long option since dpkg "
 "1.18.8)."
-msgstr "Précise une clé pour la signature des paquets."
+msgstr ""
+"Préciser une clé pour la signature des paquets (option longue depuis "
+"dpkg 1.18.8)."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-s>, B<--print-set>"
+#, no-wrap
 msgid "B<-us>, B<--unsigned-source>"
-msgstr "B<-s>, B<--print-set>"
+msgstr "B<-us>, B<--unsigned-source>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid "It contains the package short description (since dpkg 1.16.2)."
 msgid "Do not sign the source package (long option since dpkg 1.18.8)."
-msgstr "Il contient la description courte du paquet (depuis dpkg 1.16.2)."
+msgstr "Ne pas signer le paquet source (option longue depuis dpkg 1.18.8)."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-s>, B<--print-set>"
+#, no-wrap
 msgid "B<-ui>, B<--unsigned-buildinfo>"
-msgstr "B<-s>, B<--print-set>"
+msgstr "B<-ui>, B<--unsigned-buildinfo>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid "Do not sign the B<.changes> file."
 msgid "Do not sign the B<.buildinfo> file (since dpkg 1.18.19)."
-msgstr "Ne pas signer le fichier B<.changes>."
+msgstr "Ne pas signer le fichier B<.buildinfo> (depuis dpkg 1.18.19)."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-u>, B<--print-unset>"
+#, no-wrap
 msgid "B<-uc>, B<--unsigned-changes>"
-msgstr "B<-u>, B<--print-unset>"
+msgstr "B<-uc>, B<--unsigned-changes>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid "Do not sign the B<.changes> file."
 msgid ""
 "Do not sign the B<.buildinfo> and B<.changes> files (long option since dpkg "
 "1.18.8)."
-msgstr "Ne pas signer le fichier B<.changes>."
+msgstr ""
+"Ne signer ni le fichier B<.buildinfo>, ni le fichier B<.changes> (option "
+"longue depuis dpkg 1.18.8)."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<--no-debsig>"
+#, no-wrap
 msgid "B<--no-sign>"
-msgstr "B<--no-debsig>"
+msgstr "B<--no-sign>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -14053,6 +13928,8 @@ msgid ""
 "Do not sign any file, this includes the source package, the B<.buildinfo> "
 "file and the B<.changes> file (since dpkg 1.18.20)."
 msgstr ""
+"Aucune signature de fichier, y compris du paquet source, du fichier B<."
+"buildinfo> et du fichier B<.changes> (depuis dpkg 1.18.20)."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -14062,17 +13939,14 @@ msgstr "B<--force-sign>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Force the signing of the resulting files (since dpkg 1.17.0), regardless "
-#| "of B<-us> or B<-uc> or other internal heuristics."
 msgid ""
 "Force the signing of the resulting files (since dpkg 1.17.0), regardless of "
 "B<-us>, B<--unsigned-source>, B<-ui>, B<--unsigned-buildinfo>, B<-uc>, B<--"
 "unsigned-changes> or other internal heuristics."
 msgstr ""
-"Force la signature des fichiers produits (depuis dpkg 1.17.0) indépendamment "
-"de B<-us>, B<-uc> ou d'autres heuristiques internes."
+"Forcer la signature des fichiers produits (depuis dpkg 1.17.0) "
+"indépendamment de B<-us>, B<--unsigned-source>, B<-ui>, B<--unsigned-"
+"buildinfo>, B<-uc>, B<--unsigned-changes> ou d'autres heuristiques internes."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-source.man
@@ -14088,10 +13962,9 @@ msgstr "B<-ss>"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-s>"
+#, no-wrap
 msgid "B<-sA>"
-msgstr "B<-s>"
+msgstr "B<-sA>"
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-source.man
@@ -14113,52 +13986,45 @@ msgstr "B<-sr>"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-s>"
+#, no-wrap
 msgid "B<-sK>"
-msgstr "B<-s>"
+msgstr "B<-sK>"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-s>"
+#, no-wrap
 msgid "B<-sU>"
-msgstr "B<-s>"
+msgstr "B<-sU>"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-s>"
+#, no-wrap
 msgid "B<-sR>"
-msgstr "B<-s>"
+msgstr "B<-sR>"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-i>[I<regex>], B<--diff-ignore>[=I<regex>]"
+#, no-wrap
 msgid "B<-i>, B<--diff-ignore>[=I<regex>]"
-msgstr "B<-i>[I<expr. rat.>], B<--diff-ignore>[=I<expr. rat.>]"
+msgstr "B<-i>, B<--diff-ignore>[=I<expression-rationnelle>]"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-I>[I<file-pattern>], B<--tar-ignore>[=I<file-pattern>]"
+#, no-wrap
 msgid "B<-I>, B<--tar-ignore>[=I<pattern>]"
-msgstr "B<-I>[I<motif-fichier>], B<--tar-ignore>[=I<motif-fichier>]"
+msgstr "B<-I>, B<--tar-ignore>[=I<motif>]"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-z>I<level>, B<--compression-level>=I<level>"
+#, no-wrap
 msgid "B<-z>, B<--compression-level=>I<level>"
-msgstr "B<-z>I<niveau>, B<--compression-level>=I<niveau>"
+msgstr "B<-z>, B<--compression-level>=I<niveau>"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<-Z>I<compression>, B<--compression>=I<compression>"
+#, no-wrap
 msgid "B<-Z>, B<--compression=>I<compressor>"
-msgstr "B<-Z>I<compression>, B<--compression>=I<compression>"
+msgstr "B<-Z>, B<--compression>=I<compression>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -14175,13 +14041,12 @@ msgstr "B<--source-option=>I<opt>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid "Pass option I<opt> to B<dpkg-source>.  Can be used multiple times."
 msgid ""
 "Pass option I<opt> to B<dpkg-source> (since dpkg 1.15.6).  Can be used "
 "multiple times."
 msgstr ""
-"Passe l'option I<opt> à B<dpkg-source>. Peut être utilisé plusieurs fois."
+"Passer l'option I<opt> à B<dpkg-source> (depuis dpkg 1.15.6). Peut être "
+"utilisé plusieurs fois."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -14191,14 +14056,12 @@ msgstr "B<--changes-option=>I<opt>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Pass option I<opt> to B<dpkg-genchanges>.  Can be used multiple times."
 msgid ""
 "Pass option I<opt> to B<dpkg-genchanges> (since dpkg 1.15.6).  Can be used "
 "multiple times."
 msgstr ""
-"Passe l'option I<opt> à B<dpkg-genchanges>. Peut être utilisé plusieurs fois."
+"Passer l'option I<opt> à B<dpkg-genchanges> (depuis dpkg 1.15.6). Peut être "
+"utilisé plusieurs fois."
 
 #. type: TQ
 #: dpkg-buildpackage.man
@@ -14208,16 +14071,12 @@ msgstr "B<--admindir >I<rép>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man dpkg-checkbuilddeps.man dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "Change the location of the B<dpkg> database. The default location is I</"
-#| "var/lib/dpkg>."
 msgid ""
 "Change the location of the B<dpkg> database (since dpkg 1.14.0).  The "
 "default location is I<%ADMINDIR%>."
 msgstr ""
-"Change l'endroit où se trouve la base de données de B<dpkg>. Par défaut, "
-"c'est I<%ADMINDIR%>."
+"Changer l'endroit où se trouve la base de données de B<dpkg> (depuis "
+"dpkg 1.14.0). Par défaut, c'est I<%ADMINDIR%>."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -14227,16 +14086,13 @@ msgstr "B<DEB_CHECK_COMMAND>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "If set, it will be used as the command to check the B<.changes> file.  "
-#| "Overridden by the B<--check-command> option."
 msgid ""
 "If set, it will be used as the command to check the B<.changes> file (since "
 "dpkg 1.17.6).  Overridden by the B<--check-command> option."
 msgstr ""
 "Si cette option est utilisée, elle le sera comme commande pour contrôler le "
-"fichier B<.changes>. Remplacée par l'option B<--check-command>."
+"fichier B<.changes> (depuis dpkg 1.17.6). Remplacée par l'option B<--check-"
+"command>."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -14246,16 +14102,13 @@ msgstr "B<DEB_SIGN_KEYID>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "If set, it will be used to sign the B<.changes> and B<.dsc> files.  "
-#| "Overridden by the B<-k> option."
 msgid ""
 "If set, it will be used to sign the B<.changes> and B<.dsc> files (since "
 "dpkg 1.17.2).  Overridden by the B<--sign-key> option."
 msgstr ""
 "Si cette option est utilisée, elle le sera pour la signature des fichiers B<."
-"changes> et B<.dsc>. Remplacée par l'option B<-k>."
+"changes> et B<.dsc> (depuis dpkg 1.17.2). Remplacée par l'option B<--sign-"
+"key>."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -14263,6 +14116,9 @@ msgid ""
 "If set, it will contain a space-separated list of options that might affect "
 "the build process in I<debian/rules>, and the behavior of some dpkg commands."
 msgstr ""
+"Si cette option est utilisée, elle contiendra une liste séparée par des "
+"espaces d'options qui pourraient affecter le processus de construction dans "
+"I<debian/rules> et le comportement de certaines commandes de dpkg."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -14271,6 +14127,9 @@ msgid ""
 "B<parallel=>I<N> the parallel jobs will be set to I<N>, overridden by the "
 "B<--jobs-try> option."
 msgstr ""
+"La variable B<DEB_CHECK_COMMAND> sera ignorée avec B<nocheck>. Avec "
+"B<parallel=>I<N> les tâches parallèles seront fixées à I<N>, remplacée par "
+"l'option B<--jobs-try>."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-checkbuilddeps.man
@@ -14280,28 +14139,18 @@ msgstr "B<DEB_BUILD_PROFILES>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "If set, it will be used as the active build profile(s) for the package "
-#| "being built. It is a space separated list of profile names. Overridden by "
-#| "the B<-P> option."
 msgid ""
 "If set, it will be used as the active build profile(s) for the package being "
 "built (since dpkg 1.17.2).  It is a space separated list of profile names.  "
 "Overridden by the B<-P> option."
 msgstr ""
 "Si cette option est utilisée, elle sera utilisée comme profil(s) de "
-"construction actif(s) pour le paquet à construire. C'est une liste séparée "
-"par des espaces de noms de profil. Cette option est outrepassée par l'option "
-"B<-P>."
+"construction actif(s) pour le paquet à construire (depuis dpkg 1.17.2). "
+"C'est une liste séparée par des espaces de noms de profil. Cette option est "
+"outrepassée par l'option B<-P>."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> "
-#| "should not rely on their presence and should instead use the respective "
-#| "interface to retrieve the needed values."
 msgid ""
 "Even if B<dpkg-buildpackage> exports some variables, B<debian/rules> should "
 "not rely on their presence and should instead use the respective interface "
@@ -14310,28 +14159,27 @@ msgid ""
 msgstr ""
 "Même si B<dpkg-buildpackage> exporte certaines variables, B<debian/rules> ne "
 "doit pas dépendre de leur présence, mais doit préférablement utiliser "
-"l'interface correspondante pour retrouver les valeurs nécessaires."
+"l'interface correspondante pour retrouver les valeurs nécessaires, parce que "
+"ce fichier est le point d'entrée principal pour la construction des paquets "
+"et son exécution autonome devrait être prise en charge."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<DEB_BUILD_ARCH>"
+#, no-wrap
 msgid "B<DEB_BUILD_*>"
-msgstr "B<DEB_BUILD_ARCH>"
+msgstr "B<DEB_BUILD_*>"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<DEB_HOST_ARCH>"
+#, no-wrap
 msgid "B<DEB_HOST_*>"
-msgstr "B<DEB_HOST_ARCH>"
+msgstr "B<DEB_HOST_*>"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<DEB_TARGET_ARCH>"
+#, no-wrap
 msgid "B<DEB_TARGET_*>"
-msgstr "B<DEB_TARGET_ARCH>"
+msgstr "B<DEB_TARGET_*>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -14340,16 +14188,35 @@ msgid ""
 "forwarded. Any variable that is output by its B<-s> option is integrated in "
 "the build environment."
 msgstr ""
-"B<dpkg-architecture> est lancé avec les paramètres de B<-a> and B<-t>. Toute "
+"B<dpkg-architecture> est lancé avec les paramètres de B<-a> et B<-t>. Toute "
 "variable retournée par l'option B<-s> est intégrée dans l'environnement de "
 "construction."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<DPKG_NO_TSTP>"
-msgid "B<DPKG_GAIN_ROOT_CMD>"
-msgstr "B<DPKG_NO_TSTP>"
+#, no-wrap
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr "B<DEB_RULES_REQUIRES_ROOT>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+"Cette variable est fixée à la valeur obtenue du champ B<Rules-Requires-Root> "
+"ou de la ligne de commande. Lorsqu'elle est configurée, ce sera une valeur "
+"valable pour le champ B<Rules-Requires-Root>. Elle est utilisée pour "
+"indiquer à B<debian/rules> si la spécification B<rootless-builds.txt> est "
+"prise en charge."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_GAIN_ROOT_CMD>"
+msgstr "B<DEB_GAIN_ROOT_CMD>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -14357,12 +14224,15 @@ msgid ""
 "This variable is set to I<gain-root-command> when the field B<Rules-Requires-"
 "Root> is set to a value different to B<no> and B<binary-targets>."
 msgstr ""
+"Cette valeur est fixée à I<commande-pour-obtenir-privilèges-de-root> si le "
+"champ B<Rules-Requires-Root> est fixé à une valeur différente de B<no> ou "
+"B<binary-targets>."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-source.man dpkg-split.man
 #, no-wrap
 msgid "B<SOURCE_DATE_EPOCH>"
-msgstr ""
+msgstr "B<SOURCE_DATE_EPOCH>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -14370,34 +14240,31 @@ msgid ""
 "This variable is set to the Unix timestamp since the epoch of the latest "
 "entry in I<debian/changelog>, if it is not already defined."
 msgstr ""
+"Cette valeur est fixée à l'horodatage d'Unix depuis « l'epoch » de la "
+"dernière entrée de I<debian/changelog>, si elle n'a pas déjà été définie."
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<%PKGCONFDIR%/buildflags.conf>"
+#, no-wrap
 msgid "I<%PKGCONFDIR%/buildpackage.conf>"
-msgstr "B<%PKGCONFDIR%/buildflags.conf>"
+msgstr "I<%PKGCONFDIR%/buildpackage.conf>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid "System wide configuration file."
 msgid "System wide configuration file"
-msgstr "Fichier de configuration pour l'ensemble du système."
+msgstr "Fichier de configuration pour l'ensemble du système"
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> or B<$HOME/.config/dpkg/buildflags.conf>"
+#, no-wrap
 msgid "I<$XDG_CONFIG_HOME/dpkg/buildpackage.conf> or"
-msgstr "B<$XDG_CONFIG_HOME/dpkg/buildflags.conf> ou B<$HOME/.config/dpkg/buildflags.conf>"
+msgstr "I<$XDG_CONFIG_HOME/dpkg/buildpackage.conf> ou"
 
 #. type: TQ
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<%PKGCONFDIR%/buildflags.conf>"
+#, no-wrap
 msgid "I<$HOME/.config/dpkg/buildpackage.conf>"
-msgstr "B<%PKGCONFDIR%/buildflags.conf>"
+msgstr "I<$HOME/.config/dpkg/buildpackage.conf>"
 
 #. type: SS
 #: dpkg-buildpackage.man
@@ -14412,7 +14279,7 @@ msgid ""
 "flags (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS>) with "
 "values as returned by B<dpkg-buildflags>. This is no longer the case."
 msgstr ""
-"Entre les versions 1.14.17 et 1.16.1, B<dpkg-buildpackage> exportait les "
+"Entre les versions 1.14.17 et 1.16.1, B<dpkg-buildpackage> exportait les "
 "drapeaux de compilation (B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> et "
 "B<LDFLAGS>) avec les valeurs que renvoyait B<dpkg-buildflags>. Cela n'est "
 "plus le cas."
@@ -14425,13 +14292,6 @@ msgstr "Cibles construites par défaut"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "B<dpkg-buildpackage> is using the B<build-arch> and B<build-indep> "
-#| "targets since dpkg 1.16.2. Those targets are thus mandatory. But to avoid "
-#| "breakages of existing packages, and ease the transition, it will fallback "
-#| "to using the B<build> target if B<make -f debian/rules -qn> I<build-"
-#| "target> returns 2 as exit code."
 msgid ""
 "B<dpkg-buildpackage> is using the B<build-arch> and B<build-indep> targets "
 "since dpkg 1.16.2. Those targets are thus mandatory. But to avoid breakages "
@@ -14441,10 +14301,12 @@ msgid ""
 "rules -qn> I<build-target> returns 2 as exit code."
 msgstr ""
 "B<dpkg-buildpackage> utilise les cibles B<build-arch> et B<build-indep> "
-"depuis dpkg 1.16.2. Ces cibles sont donc obligatoires. Cependant, pour "
-"éviter de casser les paquets existants et faciliter la transition, la cible "
-"B<build> sera utilisée par défaut si B<make -f debian/rules -qn> I<build-"
-"target> renvoie 2 comme code de retour."
+"depuis dpkg 1.16.2. Ces cibles sont donc obligatoires. Cependant, pour "
+"éviter de casser les paquets existants et faciliter la transition, si le "
+"paquet source ne construit pas à la fois les paquets binaires indépendants "
+"et dépendants de l'architecture (depuis dpkg 1.18.8), la cible B<build> sera "
+"utilisée par défaut si B<make -f debian/rules -qn> I<build-target> renvoie "
+"B<2> comme code de retour."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -14458,72 +14320,55 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
-#| "genchanges>(1), B<fakeroot>(1), B<lintian>(1), B<gpg2>(1), B<gpg>(1)."
 msgid ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
 "genbuildinfo>(1), B<dpkg-genchanges>(1), B<fakeroot>(1), B<lintian>(1), "
 "B<gpg2>(1), B<gpg>(1)."
 msgstr ""
 "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
-"genchanges>(1), B<fakeroot>(1), B<lintian>(1), B<gpg2>(1), B<gpg>(1)."
+"genbuildinfo>(1), B<dpkg-genchanges>(1), B<fakeroot>(1), B<lintian>(1), "
+"B<gpg2>(1), B<gpg>(1)."
 
 #. type: TH
 #: dpkg-genbuildinfo.man
-#, fuzzy, no-wrap
-#| msgid "dpkg-buildflags"
+#, no-wrap
 msgid "dpkg-genbuildinfo"
-msgstr "dpkg-buildflags"
+msgstr "dpkg-genbuildinfo"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid "dpkg-gencontrol - generate Debian control files"
 msgid "dpkg-genbuildinfo - generate Debian .buildinfo files"
-msgstr "dpkg-gencontrol - Créer des fichiers de contrôle Debian."
+msgstr "dpkg-genbuildinfo - Créer des fichiers .buildinfo Debian."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid "B<dpkg-gencontrol> [I<option>...]"
 msgid "B<dpkg-genbuildinfo> [I<option>...]"
-msgstr "B<dpkg-gencontrol> [I<option>...]"
+msgstr "B<dpkg-genbuildinfo> [I<option>...]"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "B<dpkg-genchanges> reads information from an unpacked and built Debian "
-#| "source tree and from the files it has generated and generates a Debian "
-#| "upload control file (B<.changes> file)."
 msgid ""
 "B<dpkg-genbuildinfo> reads information from an unpacked and built Debian "
 "source tree and from the files it has generated and generates a Debian "
 "control file describing the build environment and the build artifacts (B<."
 "buildinfo> file)."
 msgstr ""
-"B<dpkg-genchanges> lit les informations à la fois dans une arborescence "
+"B<dpkg-genbuildinfo> lit les informations à la fois dans une arborescence "
 "debian dépaquetée et déjà construite et sur les fichiers qui ont été créés ; "
-"puis il crée un fichier de contrôle pour la mise en place dans l'archive "
-"Debian (c'est le fichier B<.changes>)."
+"puis il crée un fichier de contrôle décrivant l'environnement et les objets "
+"de construction (c'est le fichier B<.buildinfo>)."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
 msgid "This command was introduced in dpkg 1.18.11."
-msgstr ""
+msgstr "Cette commande a été introduite dans dpkg 1.18.11."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "Specifies a build limited to source and architecture specific packages.  "
-#| "Passed to B<dpkg-genchanges>."
 msgid "Specifies the build I<type> from a comma-separated list of components."
 msgstr ""
-"Indique une construction limitée aux paquets source et binaires dépendants "
-"de l'architecture. Passé à B<dpkg-genchanges>."
+"Indique un I<type> de construction à partir d'une liste séparée par des "
+"virgules de composants."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
@@ -14532,6 +14377,9 @@ msgid ""
 "Depends>) and architecture specific build dependencies (B<Build-Depends-"
 "Arch>)."
 msgstr ""
+"Génère les informations de construction comprenant les dépendances de "
+"construction non qualifiées (B<Build-Depends>) et les dépendances de "
+"construction spécifiques à l'architecture (B<Build-Depends-Arch>)."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
@@ -14540,6 +14388,9 @@ msgid ""
 "Depends>) and architecture independent build dependencies (B<Build-Depends-"
 "Indep>)."
 msgstr ""
+"Génère les informations de construction comprenant les dépendances de "
+"construction non qualifiées (B<Build-Depends>) et les dépendances de "
+"construction indépendantes de l'architecture (B<Build-Depends-Indep>)."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
@@ -14547,6 +14398,8 @@ msgid ""
 "Effectively ignored; generate build information with just the unqualified "
 "build dependencies (B<Build-Depends>)."
 msgstr ""
+"Effectivement ignoré : génère les informations de construction avec "
+"seulement les dépendances de construction non qualifiées (B<Build-Depends>)."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
@@ -14554,20 +14407,19 @@ msgid ""
 "Generate build information with all three types of build dependencies.  This "
 "is an alias for B<any,all>."
 msgstr ""
+"Génère les informations de construction avec les trois types de dépendances "
+"de construction. C'est un alias de B<any,all>."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "Specifies a normal full build, binary and source packages will be built.  "
-#| "This is the same as the default case when no build option is specified."
 msgid ""
 "Generate build information with all three types of build dependencies.  This "
 "is an alias for B<any,all,source>, and the same as the default case when no "
 "build option is specified."
 msgstr ""
-"Construction complète où les paquets sources et binaires sont construits. "
-"Identique au cas par défaut où aucune option de construction n'est indiquée."
+"Génère les informations de construction avec les trois types de dépendances "
+"de construction. C'est un alias de B<any,all,source>. Identique au cas par "
+"défaut où aucune option de construction n'est indiquée."
 
 #. type: TP
 #: dpkg-genbuildinfo.man dpkg-genchanges.man
@@ -14609,23 +14461,19 @@ msgstr "B<-f>I<fichier/liste-des-fichiers>"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "Read or write the list of files to be uploaded here, rather than using "
-#| "B<debian/files>."
 msgid ""
 "Specifies where is the list of files that have been produced by the build, "
 "rather than using B<debian/files>."
 msgstr ""
-"Lit ou écrit la liste des fichiers qui doivent être envoyés vers l'archive "
-"dans ce fichier plutôt que dans le fichier B<debian/files>."
+"Indique où est la liste des fichiers qui ont été produits par la "
+"construction, au lieu d'utiliser le fichier B<debian/files>."
 
 #. type: TP
 #: dpkg-genbuildinfo.man dpkg-genchanges.man dpkg-gencontrol.man
 #: dpkg-source.man
 #, no-wrap
 msgid "B<-F>I<changelog-format>"
-msgstr "B<-F>I<format-du-fichiers-des-changements>"
+msgstr "B<-F>I<format-du-fichier-des-changements>"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man dpkg-genchanges.man dpkg-gencontrol.man
@@ -14646,20 +14494,17 @@ msgstr "B<-O>[I<nom-de-fichier>]"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "Print the control file to standard output (or I<filename> if specified), "
-#| "rather than to B<debian/tmp/DEBIAN/control> (or I<package-build-dir>B</"
-#| "DEBIAN/control> if B<-P> was used)."
 msgid ""
 "Print the buildinfo file to standard output (or I<filename> if specified)  "
 "rather than to I<dir>B</>I<source-name>B<_>I<binary-version>B<_>I<arch>B<."
 "buildinfo> (where I<dir> is B<..> by default or I<upload-files-dir> if B<-u> "
 "was used)."
 msgstr ""
-"Affiche le fichier « control » sur la sortie standard (ou I<nom-de-fichier>) "
-"au lieu de B<debian/tmp/DEBIAN/control> (ou I<rep-de-construction-du-"
-"paquet>B</DEBIAN/control> si l'option B<-P> a été utilisée)."
+"Affiche le fichier buildinfo sur la sortie standard (ou I<nom-de-fichier> si "
+"précisé) au lieu de I<répertoire>B</>I<nom-source>B<_>I<version-"
+"binaire>B<_>I<architecture>B<.buildinfo> (où I<répertoire> est B<..> par "
+"défaut ou I<répertoire-des-fichiers-à-installer> si l'option B<-u> a été "
+"utilisée)."
 
 #. type: TP
 #: dpkg-genbuildinfo.man dpkg-genchanges.man
@@ -14669,32 +14514,26 @@ msgstr "B<-u>I<répertoire-des-fichiers-à-installer>"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "Look for the files to be uploaded in I<upload-files-dir> rather than B<.."
-#| "> (B<dpkg-genchanges> needs to find these files so that it can include "
-#| "their sizes and checksums in the B<.changes> file)."
 msgid ""
 "Look for the files to be uploaded in I<upload-files-dir> rather than B<..> "
 "(B<dpkg-genbuildinfo> needs to find these files so that it can include their "
 "sizes and checksums in the B<.buildinfo> file)."
 msgstr ""
 "Cherche les fichiers à installer dans I<répertoire-des-fichiers-à-installer> "
-"plutôt que dans B<..> (B<dpkg-genchanges> doit trouver ces fichiers de "
+"plutôt que dans B<..>. (B<dpkg-genbuildinfo> doit trouver ces fichiers de "
 "manière à mettre leurs tailles et leurs sommes de contrôle dans le fichier "
-"B<.changes>)."
+"B<.buildinfo>)."
 
 #. type: TP
 #: dpkg-genbuildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<--single-debian-patch>"
+#, no-wrap
 msgid "B<--always-include-kernel>"
-msgstr "B<--single-debian-patch>"
+msgstr "B<--always-include-kernel>"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
 msgid "By default, the B<Build-Kernel-Version> field will not be written out."
-msgstr ""
+msgstr "Par défaut le champ B<Build-Kernel-Version> ne sera pas écrit."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
@@ -14702,13 +14541,14 @@ msgid ""
 "Specify this option (since dpkg 1.19.0) to always write a B<Build-Kernel-"
 "Version> field when generating the B<.buildinfo>."
 msgstr ""
+"Il faut préciser cette option (depuis dpkg 1.19.0) pour toujours remplir un "
+"champ B<Build-Kernel-Version> lors de la création de B<.buildinfo>."
 
 #. type: TP
 #: dpkg-genbuildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<--single-debian-patch>"
+#, no-wrap
 msgid "B<--always-include-path>"
-msgstr "B<--single-debian-patch>"
+msgstr "B<--always-include-path>"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
@@ -14716,6 +14556,8 @@ msgid ""
 "By default, the B<Build-Path> field will only be written if the current "
 "directory starts with a whitelisted pattern."
 msgstr ""
+"Par défaut, le champ B<Build-Path> ne sera rempli que si le répertoire "
+"courant débute par un motif inscrit en liste blanche."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
@@ -14723,6 +14565,8 @@ msgid ""
 "On Debian and derivatives the pattern matches on B</build/> at the start of "
 "the pathname."
 msgstr ""
+"Dans Debian et ses dérivés, le motif correspond à B</build/> au début du nom "
+"de chemin."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
@@ -14730,6 +14574,8 @@ msgid ""
 "Specify this option to always write a B<Build-Path> field when generating "
 "the B<.buildinfo>."
 msgstr ""
+"Il faut préciser cette option pour toujours remplir un champ B<Build-Path> "
+"lors de la création de B<.buildinfo>."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
@@ -14738,7 +14584,7 @@ msgid ""
 "lib/dpkg>."
 msgstr ""
 "Change l'endroit où se trouve la base de données de B<dpkg>. Par défaut, "
-"c'est I<%ADMINDIR%>."
+"c'est I</var/lib/dpkg>."
 
 #. type: TP
 #: dpkg-genbuildinfo.man dpkg-genchanges.man dpkg-gensymbols.man
@@ -14748,18 +14594,12 @@ msgstr "B<-q>"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "Usually B<dpkg-genchanges> will produce informative messages on standard "
-#| "error, for example about how many of the package's source files are being "
-#| "uploaded.  B<-q> suppresses these messages."
 msgid ""
 "B<dpkg-genbuildinfo> might produce informative messages on standard error.  "
 "B<-q> suppresses these messages."
 msgstr ""
-"B<dpkg-genchanges> affiche habituellement des messages d'information sur la "
-"sortie d'erreur standard ; par exemple, combien de fichiers source du paquet "
-"sont en cours d'installation. B<-q> supprime ces messages."
+"B<dpkg-genbuildinfo> devrait afficher des messages d'information sur la "
+"sortie d'erreur standard. B<-q> supprime ces messages."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
@@ -14772,6 +14612,14 @@ msgid ""
 "or disable all other features.  The feature “B<path>” controls whether to "
 "unconditionally include the B<Build-Path> field."
 msgstr ""
+"Cette variable peut être utilisée pour activer ou désactiver diverses "
+"fonctions qui affectent les informations comprises dans le fichier ."
+"buildinfo au moyen de l'option B<buildinfo> (depuis dpkg 1.18.19). Cette "
+"option fournit une liste, séparée par des virgules, de fonctionnalités, "
+"préfixées par les modificateurs « B<+> » ou « B<-> » pour indiquer s'il faut "
+"les activer ou les désactiver. La fonction spéciale « B<all> » peut être "
+"utilisée pour activer ou désactiver toutes les autres fonctions. La fonction "
+"« B<path> » contrôle l'inclusion sans condition du champ B<Build-Path>."
 
 #. type: TP
 #: dpkg-genbuildinfo.man dpkg-distaddfile.man dpkg-genchanges.man
@@ -14782,24 +14630,17 @@ msgstr "B<debian/files>"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "The list of generated files which are part of the upload being prepared.  "
-#| "B<dpkg-genchanges> reads the data here when producing a B<.changes> file."
 msgid ""
 "The list of generated files.  B<dpkg-genbuildinfo> reads the data here when "
 "producing a B<.buildinfo> file."
 msgstr ""
-"La liste des fichiers créés qui seront envoyés sur le serveur. B<dpkg-"
-"genchanges> lit dans ce fichier les données nécessaires à la création du "
-"fichier B<.changes>."
+"La liste des fichiers créés. B<dpkg-genbuildinfo> lit dans ce fichier les "
+"données nécessaires à la création du fichier B<.buildinfo>."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid "B<deb-origin>(5)."
 msgid "B<deb-buildinfo>(5)."
-msgstr "B<deb-origin>(5)."
+msgstr "B<deb-buildinfo>(5)."
 
 #. type: TH
 #: dpkg-checkbuilddeps.man
@@ -14811,7 +14652,7 @@ msgstr "dpkg-checkbuilddeps"
 #: dpkg-checkbuilddeps.man
 msgid "dpkg-checkbuilddeps - check build dependencies and conflicts"
 msgstr ""
-"dpkg-checkbuilddeps - vérifier les dépendances et les conflits de "
+"dpkg-checkbuilddeps - Vérifier les dépendances et les conflits de "
 "construction"
 
 #. type: Plain text
@@ -14829,7 +14670,7 @@ msgstr ""
 "Ce programme vérifie si les dépendances et les conflits de construction "
 "listés dans le fichier control existent dans les paquets installés sur le "
 "système. S'il en existe, il les affiche et se termine avec un code de retour "
-"différent de 0."
+"différent de B<0>."
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.man
@@ -14842,19 +14683,15 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.man
-#, fuzzy
-#| msgid ""
-#| "Ignore B<Build-Depends-Arch> and B<Build-Conflicts-Arch> lines. Use when "
-#| "only arch-indep packages will be built, or combine with B<-B> when only a "
-#| "source package is to be built."
 msgid ""
 "Ignore B<Build-Depends-Arch> and B<Build-Conflicts-Arch> lines (since dpkg "
 "1.16.4).  Use when only arch-indep packages will be built, or combine with "
 "B<-B> when only a source package is to be built."
 msgstr ""
-"Ignore les lignes B<Build-Depends-Arch> et B<Build-Conflicts-Arch>. À "
-"utiliser lorsque seuls des paquets indépendants d'une architecture seront "
-"construits ou à combiner avec B<-B> si seul un paquet source est construit."
+"Ignore les lignes B<Build-Depends-Arch> et B<Build-Conflicts-Arch> (depuis "
+"dpkg 1.16.4). À utiliser lorsque seuls des paquets indépendants d'une "
+"architecture seront construits ou à combiner avec B<-B> si seul un paquet "
+"source est construit."
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.man
@@ -14871,7 +14708,7 @@ msgstr ""
 #: dpkg-checkbuilddeps.man
 #, no-wrap
 msgid "B<-I>"
-msgstr ""
+msgstr "B<-I>"
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.man
@@ -14880,6 +14717,10 @@ msgid ""
 "implicit dependencies that are usually required on a specific distribution, "
 "the so called Build-Essential package set."
 msgstr ""
+"Ignore les dépendances et les conflits de construction internes (depuis "
+"dpkg 1.18.2). Ce sont les dépendances implicites qui sont habituellement "
+"demandées sur une distribution particulière, c'est l'ensemble de paquets "
+"appelé Build-Essentiel."
 
 #. type: TP
 #: dpkg-checkbuilddeps.man
@@ -14895,16 +14736,12 @@ msgstr "B<-c >I<chaîne-des-conflits-de-construction>"
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.man
-#, fuzzy
-#| msgid ""
-#| "Use the given build dependencies/conflicts instead of those contained in "
-#| "the I<debian/control> file."
 msgid ""
 "Use the given build dependencies/conflicts instead of those contained in the "
 "I<debian/control> file (since dpkg 1.14.17)."
 msgstr ""
 "Utilise les dépendances et conflits de construction donnés au lieu de ceux "
-"indiqués dans le fichier I<debian/control>."
+"indiqués dans le fichier I<debian/control> (depuis dpkg 1.14.17)."
 
 #. type: TP
 #: dpkg-checkbuilddeps.man
@@ -14914,11 +14751,6 @@ msgstr "B<-a >I<arch>"
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.man
-#, fuzzy
-#| msgid ""
-#| "Check build dependencies/conflicts assuming that the package described in "
-#| "the control file is to be built for the given host architecture instead "
-#| "of the architecture of the current system."
 msgid ""
 "Check build dependencies/conflicts assuming that the package described in "
 "the control file is to be built for the given host architecture instead of "
@@ -14926,7 +14758,8 @@ msgid ""
 msgstr ""
 "Vérifie les dépendances et conflits de construction en supposant que le "
 "paquet décrit dans le fichier de contrôle doit être construit pour "
-"l'architecture indiquée au lieu de celle du système."
+"l'architecture hôte indiquée au lieu de celle du système (depuis "
+"dpkg 1.16.2)."
 
 #. type: TP
 #: dpkg-checkbuilddeps.man
@@ -14936,11 +14769,6 @@ msgstr "B<-P >I<profil>[B<,>...]"
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.man
-#, fuzzy
-#| msgid ""
-#| "Check build dependencies/conflicts assuming that the package described in "
-#| "the control file is to be built for the given build profile(s). The "
-#| "argument is a comma-separated list of profile names."
 msgid ""
 "Check build dependencies/conflicts assuming that the package described in "
 "the control file is to be built for the given build profile(s)  (since dpkg "
@@ -14948,8 +14776,8 @@ msgid ""
 msgstr ""
 "Vérifie les dépendances et conflits de construction en supposant que le "
 "paquet décrit dans le fichier de contrôle doit être construit pour le ou les "
-"profils donnés. L'argument est une liste séparée par des virgules des noms "
-"de profil."
+"profils donnés (depuis dpkg 1.17.2). L'argument est une liste séparée par "
+"des virgules des noms de profil."
 
 #. type: Plain text
 #: dpkg-checkbuilddeps.man
@@ -15025,10 +14853,8 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-distaddfile.man
-#, fuzzy
-#| msgid "B<deb-origin>(5)."
 msgid "B<deb-src-files>(5)."
-msgstr "B<deb-origin>(5)."
+msgstr "B<deb-src-files>(5)."
 
 #. type: TH
 #: dpkg-deb.man
@@ -15040,7 +14866,7 @@ msgstr "dpkg-deb"
 #: dpkg-deb.man
 msgid "dpkg-deb - Debian package archive (.deb) manipulation tool"
 msgstr ""
-"dpkg-deb - outil pour la manipulation des archives (.deb) des paquets Debian"
+"dpkg-deb - Outil pour la manipulation des archives (.deb) des paquets Debian"
 
 #. type: Plain text
 #: dpkg-deb.man
@@ -15078,24 +14904,20 @@ msgid ""
 "(«B<->»); otherwise lack of support will be documented in their respective "
 "command description."
 msgstr ""
+"Pour la plupart des commandes recevant un argument d'entrée d'archive, "
+"l'archive peut être lue à partir de l'entrée standard si le nom d'archive "
+"est donné sous la forme d'un caractère moins («B<->») unique ; sinon, "
+"l'absence de prise en charge sera documentée dans leurs descriptions de "
+"commande respectives."
 
 #. type: TP
 #: dpkg-deb.man
-#, fuzzy, no-wrap
-#| msgid "B<-b>, B<--build> I<directory> [I<archive>|I<directory>]"
+#, no-wrap
 msgid "B<-b>, B<--build> I<binary-directory> [I<archive>|I<directory>]"
-msgstr "B<-b>, B<--build> I<répertoire> [I<archive>|I<répertoire>]"
+msgstr "B<-b>, B<--build> I<répertoire-binaire> [I<archive>|I<répertoire>]"
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "Creates a debian archive from the filesystem tree stored in I<directory>. "
-#| "I<directory> must have a B<DEBIAN> subdirectory, which contains the "
-#| "control information files such as the control file itself. This directory "
-#| "will I<not> appear in the binary package's filesystem archive, but "
-#| "instead the files in it will be put in the binary package's control "
-#| "information area."
 msgid ""
 "Creates a debian archive from the filesystem tree stored in I<binary-"
 "directory>. I<binary-directory> must have a B<DEBIAN> subdirectory, which "
@@ -15104,22 +14926,15 @@ msgid ""
 "instead the files in it will be put in the binary package's control "
 "information area."
 msgstr ""
-"Crée une archive Debian avec l'arborescence contenue dans I<répertoire>. "
-"I<répertoire> doit posséder un sous-répertoire B<DEBIAN> qui contient les "
-"fichiers de contrôle tels que le fichier « control » lui-même. Ce répertoire "
-"I<n'apparaît pas> dans l'archive de l'arborescence du paquet binaire ; mais "
-"les fichiers qu'il contient sont mis dans la zone de contrôle du paquet "
-"binaire."
+"Crée une archive Debian avec l'arborescence contenue dans I<répertoire-"
+"binaire>. I<répertoire-binaire> doit posséder un sous-répertoire B<DEBIAN> "
+"qui contient les fichiers de contrôle tels que le fichier « control » lui-"
+"même. Ce répertoire I<n'apparaît pas> dans l'archive de l'arborescence du "
+"paquet binaire ; mais les fichiers qu'il contient sont mis dans la zone de "
+"contrôle du paquet binaire."
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> "
-#| "and parse it. It will check it for syntax errors and other problems, and "
-#| "display the name of the binary package being built.  B<dpkg-deb> will "
-#| "also check the permissions of the maintainer scripts and other files "
-#| "found in the B<DEBIAN> control information directory."
 msgid ""
 "Unless you specify B<--nocheck>, B<dpkg-deb> will read B<DEBIAN/control> and "
 "parse it. It will check the file for syntax errors and other problems, and "
@@ -15128,23 +14943,20 @@ msgid ""
 "B<DEBIAN> control information directory."
 msgstr ""
 "À moins de préciser B<--nocheck>, B<dpkg-deb> lit B<DEBIAN/control> et "
-"l'analyse. Il cherche les erreurs de syntaxe et d'autres problèmes "
-"existants ; puis il affiche le nom du paquet binaire qu'il construit. B<dpkg-"
-"deb> vérifie aussi les permissions des scripts du responsable et des autres "
-"fichiers qu'il trouve dans le répertoire de contrôle B<DEBIAN>."
+"l'analyse. Il cherche dans le fichier les erreurs de syntaxe et d'autres "
+"problèmes existants ; puis il affiche le nom du paquet binaire qu'il "
+"construit. B<dpkg-deb> vérifie aussi les permissions des scripts du "
+"responsable et des autres fichiers qu'il trouve dans le répertoire de "
+"contrôle B<DEBIAN>."
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "If no I<archive> is specified then B<dpkg-deb> will write the package "
-#| "into the file I<directory>B<.deb>."
 msgid ""
 "If no I<archive> is specified then B<dpkg-deb> will write the package into "
 "the file I<binary-directory>B<.deb>."
 msgstr ""
-"Quand aucune I<archive> n'est donnée, B<dpkg-deb> appelle le paquet "
-"I<répertoire>B<.deb>."
+"Quand aucune I<archive> n'est donnée, B<dpkg-deb> écrit le paquet "
+"dansI<répertoire-binaire>B<.deb>."
 
 #. type: Plain text
 #: dpkg-deb.man
@@ -15153,15 +14965,6 @@ msgstr "Si l'archive qui doit être créée existe déjà, elle est remplacée."
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "If the second argument is a directory then B<dpkg-deb> will write to the "
-#| "file I<package>B<_>I<version>B<_>I<arch>B<.deb>, or "
-#| "I<package>B<_>I<version>B<.deb> if no B<Architecture> field is present in "
-#| "the package control file. When a target directory is specified, rather "
-#| "than a file, the B<--nocheck> option may not be used (since B<dpkg-deb> "
-#| "needs to read and parse the package control file to determine which "
-#| "filename to use)."
 msgid ""
 "If the second argument is a directory then B<dpkg-deb> will write to the "
 "file I<directory>B</>I<package>B<_>I<version>B<_>I<arch>B<.deb.> When a "
@@ -15169,13 +14972,12 @@ msgid ""
 "may not be used (since B<dpkg-deb> needs to read and parse the package "
 "control file to determine which filename to use)."
 msgstr ""
-"Quand le second argument est un répertoire, B<dpkg-deb> appelle le paquet "
-"I<paquet>B<_>I<version>B<_>I<arch>B<.deb>, ou bien I<paquet>B<_>I<version>B<."
-"deb> si aucun champ B<Architecture> n'est présent dans le fichier de "
-"contrôle du paquet. Quand un répertoire cible est précisé à la place d'un "
-"fichier, l'option B<--nocheck> ne doit pas être utilisée (puisque B<dpkg-"
-"deb> a besoin de lire et d'analyser le fichier de contrôle du paquet pour "
-"connaître le nom de fichier à utiliser)."
+"Quand le second argument est un répertoire, B<dpkg-deb> écrira dans le "
+"fichier I<répertoire>B</>I<paquet>B<_>I<version>B<_>I<arch>B<.deb>. Quand un "
+"répertoire cible est précisé à la place d'un fichier, l'option B<--nocheck> "
+"ne doit pas être utilisée (puisque B<dpkg-deb> a besoin de lire et "
+"d'analyser le fichier de contrôle du paquet pour connaître le nom de fichier "
+"à utiliser)."
 
 #. type: TP
 #: dpkg-deb.man
@@ -15208,7 +15010,7 @@ msgstr ""
 "Quand un argument I<fichier-control> est précisé, B<dpkg-deb> affiche les "
 "éléments dans l'ordre d'apparition ; quand l'un des éléments n'est pas "
 "présent, il affiche un message d'erreur sur « stderr » et quitte avec un "
-"code égal à 2."
+"code égal à B<2>."
 
 #. type: TP
 #: dpkg-deb.man
@@ -15243,25 +15045,15 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "If no B<control-file-field>s are specified then it will print the whole "
-#| "control file."
 msgid ""
 "If no I<control-field-name>s are specified then it will print the whole "
 "control file."
 msgstr ""
-"Quand aucun argument B<control-fichier-champ> n'est précisé, le fichier "
-"« control » est affiché en entier."
+"Quand aucun I<nom-du-champ-de-control> n'est précisé, le fichier « control » "
+"est affiché en entier."
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "If any are specified then B<dpkg-deb> will print their contents, in the "
-#| "order in which they appear in the control file. If more than one "
-#| "B<control-file-field> is specified then B<dpkg-deb> will precede each "
-#| "with its field name (and a colon and space)."
 msgid ""
 "If any are specified then B<dpkg-deb> will print their contents, in the "
 "order in which they appear in the control file. If more than one I<control-"
@@ -15270,7 +15062,7 @@ msgid ""
 msgstr ""
 "Quand il y en a un, B<dpkg-deb> affiche ses éléments en suivant leur ordre "
 "d'apparition dans le fichier « control ». Quand il y a plus d'un argument "
-"B<control-fichier-field,> B<dpkg-deb> fait précéder chacun par le nom de son "
+"I<nom-champ-control>, B<dpkg-deb> fait précéder chacun par le nom de son "
 "champ (puis par un « deux-points » et une espace)."
 
 #. type: Plain text
@@ -15291,9 +15083,8 @@ msgid ""
 "archive. It is currently produced in the format generated by B<tar>'s "
 "verbose listing."
 msgstr ""
-"Liste seulement l'arborescence des fichiers d'une archive de paquet. C'est "
-"en fait le résultat produit par la commande B<tar> et une option "
-"d'énumération verbeuse."
+"Liste la partie arborescence des fichiers d'une archive de paquet. Elle est "
+"actuellement produite dans le format généré par un listing verbeux de B<tar>."
 
 #. type: TP
 #: dpkg-deb.man
@@ -15352,11 +15143,6 @@ msgstr "B<-R>, B<--raw-extract> I<archive répertoire>"
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "Extracts the filesystem tree from a package archive into a specified "
-#| "directory, and the control information files into a DEBIAN subdirectory "
-#| "of the specified directory."
 msgid ""
 "Extracts the filesystem tree from a package archive into a specified "
 "directory, and the control information files into a B<DEBIAN> subdirectory "
@@ -15364,7 +15150,7 @@ msgid ""
 msgstr ""
 "Extrait l'arborescence des fichiers d'un paquet archive dans le répertoire "
 "spécifié et les fichiers d'information de contrôle dans un sous-répertoire "
-"nommé DEBIAN de ce répertoire."
+"nommé B<DEBIAN> de ce répertoire (depuis dpkg 1.16.1)."
 
 #. type: Plain text
 #: dpkg-deb.man
@@ -15380,6 +15166,9 @@ msgid ""
 "The input archive is not (currently) processed sequentially, so reading it "
 "from standard input («B<->») is B<not> supported."
 msgstr ""
+"L'archive d'entrée n'est pas actuellement traitée de façon séquentielle, "
+"aussi, sa lecture à partir de l'entrée standard (« B<-> ») n'est B<pas> "
+"prise en charge."
 
 #. type: TP
 #: dpkg-deb.man
@@ -15396,8 +15185,8 @@ msgid ""
 "The input archive will always be processed sequentially."
 msgstr ""
 "Extrait les données de contrôle d'un paquet binaire et les envoie sur la "
-"sortie standard dans le format propre à la commande B<tar> (depuis dpkg "
-"1.17.14). En combinant cette option avec la commande B<tar>(1), on peut "
+"sortie standard dans le format propre à la commande B<tar> (depuis "
+"dpkg 1.17.14). En combinant cette option avec la commande B<tar>(1), on peut "
 "ainsi extraire un fichier de contrôle précis d'une archive de paquet. "
 "L'archive d'entrée sera toujours traitée séquentiellement."
 
@@ -15452,7 +15241,7 @@ msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -15462,13 +15251,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "The string may reference any status field using the \"${I<field-name>}\" "
-#| "form, a list of the valid fields can be easily produced using B<-I> on "
-#| "the same package. A complete explanation of the formatting options "
-#| "(including escape sequences and field tabbing) can be found in the "
-#| "explanation of the B<--showformat> option in B<dpkg-query>(1)."
 msgid ""
 "The string may reference any status field using the “${I<field-name>}” form, "
 "a list of the valid fields can be easily produced using B<-I> on the same "
@@ -15477,7 +15259,7 @@ msgid ""
 "showformat> option in B<dpkg-query>(1)."
 msgstr ""
 "Cet argument est une chaîne qui peut référencer tout champ avec la forme "
-"${I<field-name>} ; une liste des champs valables peut être facilement "
+"« ${I<field-name>} » ; une liste des champs valables peut être facilement "
 "produite avec l'option B<-I> sur le même paquet. Une explication complète "
 "des options de formatage (avec les séquences d'échappement et les espaces "
 "entre les champs) se trouve dans la page B<dpkg-query>(1), option B<--"
@@ -15485,10 +15267,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid "The default for this field is \"${Package}\\et${Version}\\en\"."
 msgid "The default for this field is “${Package}\\et${Version}\\en”."
-msgstr "Par défaut, la valeur de ce champ est ${Package}\\et${Version}\\en."
+msgstr ""
+"Par défaut, la valeur de ce champ est « ${Package}\\et${Version}\\en »."
 
 #. type: TP
 #: dpkg-deb.man
@@ -15498,13 +15279,6 @@ msgstr "B<-z>I<niveau_compression>"
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "Specify which compression level to use on the compressor backend, when "
-#| "building a package (default is 9 for gzip and bzip2, 6 for xz and lzma).  "
-#| "The accepted values are 0-9 with: 0 being mapped to compressor none for "
-#| "gzip and 0 mapped to 1 for bzip2. Before dpkg 1.16.2 level 0 was "
-#| "equivalent to compressor none for all compressors."
 msgid ""
 "Specify which compression level to use on the compressor backend, when "
 "building a package (default is 9 for gzip, 6 for xz).  The accepted values "
@@ -15512,11 +15286,11 @@ msgid ""
 "1.16.2 level 0 was equivalent to compressor none for all compressors."
 msgstr ""
 "Indique le niveau de compression à fournir au logiciel de compression appelé "
-"en sous-main lors de la compression du paquet. La valeur par défaut est 9 "
-"pour gzip et bzip, 6 pour xz et lzma. Les valeurs possibles sont les entiers "
-"compris entre 0 et 9 : 0 correspond à aucune compression pour gzip et au "
-"niveau 1 pour bzip2. Avant la version 1.16.2, la valeur 0 correspondait à "
-"« aucune compression » pour tous les logiciels de compression."
+"en sous-main lors de la compression du paquet. La valeur par défaut est 9 "
+"pour gzip et 6 pour xz. Les valeurs possibles sont les entiers compris "
+"entre 0 et 9 : 0 correspond à aucune compression pour gzip. Avant la "
+"version 1.16.2, la valeur 0 correspondait à « aucune compression » pour tous "
+"les logiciels de compression."
 
 #. type: TP
 #: dpkg-deb.man
@@ -15526,12 +15300,6 @@ msgstr "B<-S>I<stratégie-compression>"
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "Specify which compression strategy to use on the compressor backend, when "
-#| "building a package (since dpkg 1.16.2). Allowed values are I<none> (since "
-#| "dpkg 1.16.4), I<filtered>, I<huffman>, I<rle> and I<fixed> for gzip "
-#| "(since dpkg 1.17.0) and I<extreme> for xz."
 msgid ""
 "Specify which compression strategy to use on the compressor backend, when "
 "building a package (since dpkg 1.16.2). Allowed values are B<none> (since "
@@ -15539,9 +15307,9 @@ msgid ""
 "dpkg 1.17.0) and B<extreme> for xz."
 msgstr ""
 "Indique la stratégie de compression à fournir au logiciel de compression "
-"appelé en sous-main lors de la construction du paquet (depuis dpkg 1.16.2). "
-"Les valeurs autorisées sont I<none> (depuis dpkg 1.16.4), I<filtered>, "
-"I<huffman>, I<rle> et I<fixed> pour gzip (since dpkg 1.17.0) et I<extreme> "
+"appelé en sous-main lors de la construction du paquet (depuis dpkg 1.16.2). "
+"Les valeurs autorisées sont B<none> (depuis dpkg 1.16.4), B<filtered>, "
+"B<huffman>, B<rle> et B<fixed> pour gzip (depuis dpkg 1.17.0) et B<extreme> "
 "pour xz."
 
 #. type: TP
@@ -15552,36 +15320,23 @@ msgstr "B<-Z>I<type_compression>"
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "Specify which compression type to use when building a package. Allowed "
-#| "values are I<gzip>, I<xz>, I<bzip2> (deprecated), I<lzma> (deprecated), "
-#| "and I<none> (default is I<xz>)."
 msgid ""
 "Specify which compression type to use when building a package.  Allowed "
 "values are B<gzip>, B<xz> (since dpkg 1.15.6), and B<none> (default is "
 "B<xz>)."
 msgstr ""
 "Indique le type de compression à utiliser lors de la construction d'un "
-"paquet. Les valeurs autorisées sont I<gzip>, I<xz>, I<bzip2> (déconseillée), "
-"I<lzma> (déconseillée) et I<none> (I<xz> est la valeur par défaut)."
+"paquet. Les valeurs autorisées sont B<gzip>, B<xz> (depuis dpkg 1.15.6) et "
+"B<none> (B<xz> est la valeur par défaut)."
 
 #. type: TP
 #: dpkg-deb.man
-#, fuzzy, no-wrap
-#| msgid "B<--uniform-compression>"
+#, no-wrap
 msgid "B<--[no-]uniform-compression>"
-msgstr "B<--uniform-compression>"
+msgstr "B<--[no-]uniform-compression>"
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "Specify that the same compression parameters should be used for all "
-#| "archive members (i.e. B<control.tar> and B<data.tar>). Otherwise only the "
-#| "B<data.tar> member will use those parameters. The only supported "
-#| "compression types allowed to be uniformly used are I<none>, I<gzip> and "
-#| "I<xz>."
 msgid ""
 "Specify that the same compression parameters should be used for all archive "
 "members (i.e. B<control.tar> and B<data.tar>; since dpkg 1.17.6).  Otherwise "
@@ -15591,16 +15346,17 @@ msgid ""
 "(since dpkg 1.19.0).  Uniform compression is the default (since dpkg 1.19.0)."
 msgstr ""
 "Indique que les mêmes paramètres de compression doivent être utilisés pour "
-"tous les membres de l'archive (c'est-à-dire B<control.tar> et B<data.tar>). "
-"Sinon, seul le membre B<data.tar> utilisera ces paramètres. I<none>, I<gzip> "
-"et I<xz> sont les seuls types de compression pris en charge pour cette "
-"option d'uniformité."
+"tous les membres de l'archive (c'est-à-dire B<control.tar> et B<data.tar> ; "
+"depuis dpkg 1.17.6). Sinon, seul le membre B<data.tar> utilisera ces "
+"paramètres. B<none>, B<gzip> et B<xz> sont les seuls types de compression "
+"pris en charge pour cette option d'uniformité (depuis dpkg 1.19.0). La "
+"compression uniforme est l'option par défaut (depuis dpkg 1.19.0)."
 
 #. type: TP
 #: dpkg-deb.man
 #, no-wrap
 msgid "B<--root-owner-group>"
-msgstr ""
+msgstr "B<--root-owner-group>"
 
 #. type: Plain text
 #: dpkg-deb.man
@@ -15608,6 +15364,9 @@ msgid ""
 "Set the owner and group for each entry in the filesystem tree data to root "
 "with id 0 (since dpkg 1.19.0)."
 msgstr ""
+"Fixe le propriétaire et le groupe de chaque entrée dans les données de "
+"l'arborescence du système de fichiers à root avec l'identité 0 (depuis "
+"dpkg 1.19.0)."
 
 #. type: Plain text
 #: dpkg-deb.man
@@ -15617,6 +15376,10 @@ msgid ""
 "group that is not root.  Support for these will be added later in the form "
 "of a meta manifest."
 msgstr ""
+"B<Note> : cette option peut être utile pour les constructions sans root "
+"(voir I<rootless-builds.txt>) mais ne devrait B<pas> être utilisée si les "
+"entrées ont un propriétaire ou un groupe qui n'est pas root. Leur prise en "
+"charge sera ajoutée plus tard sous la forme d'un méta-manifeste."
 
 #. type: TP
 #: dpkg-deb.man
@@ -15626,19 +15389,14 @@ msgstr "B<--deb-format=>I<format>"
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "Set the archive format version used when building (since dpkg 1.17.0).  "
-#| "Allowed values are I<2.0> for the new format, and I<0.939000> for the old "
-#| "one (default is I<2.0>)."
 msgid ""
 "Set the archive format version used when building (since dpkg 1.17.0).  "
 "Allowed values are B<2.0> for the new format, and B<0.939000> for the old "
 "one (default is B<2.0>)."
 msgstr ""
-"Indique la version du format d'archive utilisé lors de la construction. Les "
-"valeurs autorisées sont I<2.0> pour le nouveau format et I<0.939000> pour "
-"l'ancien (la valeur par défaut est I<2.0>)."
+"Indique la version du format d'archive utilisé lors de la construction "
+"(depuis dpkg 1.17.0). Les valeurs autorisées sont B<2.0> pour le nouveau "
+"format et B<0.939000> pour l'ancien (la valeur par défaut est B<2.0>)."
 
 #. type: Plain text
 #: dpkg-deb.man
@@ -15651,7 +15409,7 @@ msgstr ""
 "L'ancien format d'archive, moins facilement compris par les outils non-"
 "Debian, est maintenant dépassé. On l'utilise seulement quand on construit "
 "des paquets qui doivent être analysés par des versions de dpkg plus "
-"anciennes que la version 0.93.76 (septembre 1995), qui fut produite "
+"anciennes que la version 0.93.76 (septembre 1995), qui fut produite "
 "uniquement pour le format « i386 a.out »."
 
 #. type: TP
@@ -15678,16 +15436,12 @@ msgstr "B<-v>, B<--verbose>"
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "Enables verbose output. This currently only affects B<--extract> making "
-#| "it behave like B<--vextract>."
 msgid ""
 "Enables verbose output (since dpkg 1.16.1).  This currently only affects B<--"
 "extract> making it behave like B<--vextract>."
 msgstr ""
-"Active l'affichage bavard. Cela n'affecte actuellement que B<--extract> et "
-"le rend analogue à B<--vextract>."
+"Active l'affichage bavard (depuis dpkg 1.16.1). Cela n'affecte actuellement "
+"que B<--extract> et le rend analogue à B<--vextract>."
 
 #. type: TP
 #: dpkg-deb.man
@@ -15711,7 +15465,7 @@ msgid ""
 "If set, B<dpkg-deb> will use it as the directory in which to create "
 "temporary files and directories."
 msgstr ""
-"Si cette option est utilisée, B<dpkg> l'utilisera comme répertoire pour "
+"Si cette option est utilisée, B<dpkg-deb> l'utilisera comme répertoire pour "
 "créer les fichiers et répertoires temporaires."
 
 #. type: Plain text
@@ -15721,6 +15475,9 @@ msgid ""
 "B<deb>(5)'s B<ar>(5) container and used to clamp the mtime in the B<tar>(5) "
 "file entries."
 msgstr ""
+"Si cette option est utilisée, elle sera utilisée comme horodatage (en "
+"seconde à partir de « l'epoch ») dans le conteneur B<ar>(5) de B<deb>(5), et "
+"pour fixer le « mtime » dans les entrées du fichier B<tar>(5)."
 
 #. type: Plain text
 #: dpkg-deb.man
@@ -15753,7 +15510,7 @@ msgstr ""
 "pas de système de somme de contrôle immédiat. Les outils de haut niveau "
 "comme APT gèrent l'authentification des paquets B<.deb> récupérés depuis un "
 "dépôt donné et la plupart des paquets fournissent désormais une somme de "
-"contrôle MD5 créée par debian/rules. Cependant, ceci n'est pas directement "
+"contrôle MD5 créée par debian/rules. Cependant, cela n'est pas directement "
 "géré par les outils de plus bas niveau."
 
 #. type: Plain text
@@ -15771,7 +15528,7 @@ msgstr "dpkg-divert"
 #: dpkg-divert.man
 msgid "dpkg-divert - override a package's version of a file"
 msgstr ""
-"dpkg-divert - remplacer la version d'un fichier contenu dans un paquet."
+"dpkg-divert - Remplacer la version d'un fichier contenu dans un paquet."
 
 #. type: Plain text
 #: dpkg-divert.man
@@ -15788,15 +15545,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-divert.man
-#, fuzzy
-#| msgid ""
-#| "File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
-#| "into its location, but to a I<diverted> location. Diversions can be used "
-#| "through the Debian package scripts to move a file away when it causes a "
-#| "conflict. System administrators can also use it to override some "
-#| "package's configuration file, or whenever some files (which aren't marked "
-#| "as 'conffiles') need to be preserved by B<dpkg>, when installing a newer "
-#| "version of a package which contains those files."
 msgid ""
 "File I<diversions> are a way of forcing B<dpkg>(1)  not to install a file "
 "into its location, but to a I<diverted> location. Diversions can be used "
@@ -15806,12 +15554,12 @@ msgid ""
 "“conffiles”) need to be preserved by B<dpkg>, when installing a newer "
 "version of a package which contains those files."
 msgstr ""
-"Le « détournement » de fichier est un moyen d'obliger B<dpkg>(1) à installer "
+"Le I<détournement> de fichier est un moyen d'obliger B<dpkg>(1) à installer "
 "un fichier non pas dans l'emplacement prévu mais dans un autre. Les scripts "
-"des paquets Debian se servent de la déviation pour déplacer les fichiers qui "
+"des paquets Debian se servent du détournement pour déplacer les fichiers qui "
 "créent des conflits. Les administrateurs s'en servent, lors de "
 "l'installation d'une version plus récente d'un paquet, pour remplacer les "
-"fichiers de configuration de certains paquets, ou bien à chaque fois que des "
+"fichiers de configuration de certains paquets ou bien à chaque fois que des "
 "fichiers (qui ne sont pas des « conffiles ») doivent être préservés par "
 "B<dpkg>."
 
@@ -15823,8 +15571,12 @@ msgstr "[B<--add>] I<fichier>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
-msgstr "Ajoute un détournement pour le I<fichier>."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
+"Ajoute un détournement pour I<fichier>. Le fichier n'est pas renommé "
+"actuellement, voir B<--rename>."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15834,8 +15586,12 @@ msgstr "B<--remove>I< fichier>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
-msgstr "Supprime un détournement pour le I<fichier>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
+"Supprime un détournement pour I<fichier>. Le fichier n'est pas renommé "
+"actuellement, voir B<--rename>."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15856,18 +15612,14 @@ msgstr "B<--listpackage>I< fichier>"
 
 #. type: Plain text
 #: dpkg-divert.man
-#, fuzzy
-#| msgid ""
-#| "Print the name of the package that diverts I<file>.  Prints LOCAL if "
-#| "I<file> is locally diverted and nothing if I<file> is not diverted."
 msgid ""
 "Print the name of the package that diverts I<file> (since dpkg 1.15.0).  "
 "Prints LOCAL if I<file> is locally diverted and nothing if I<file> is not "
 "diverted."
 msgstr ""
-"Affiche le nom du paquet qui dérive (« divert ») I<fichier>. Affiche LOCAL "
-"si I<fichier> est dérivé localement et n'affiche rien si I<fichier> n'est "
-"pas dérivé."
+"Affiche le nom du paquet qui détourne I<fichier> (depuis dpkg 1.15.0). "
+"Affiche LOCAL si I<fichier> est détourné localement et n'affiche rien si "
+"I<fichier> n'est pas détourné."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15889,10 +15641,43 @@ msgstr "B<--admindir>I< répertoire>"
 #. type: Plain text
 #: dpkg-divert.man
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
+msgstr ""
+"Définit le répertoire d'administration comme I<répertoire>. Par défaut c'est "
+"« I<%ADMINDIR%> »."
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<--instdir>I< directory>"
+msgstr "B<--instdir> I<répertoire>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+"Définit le répertoire d'installation qui désigne le répertoire où les "
+"paquets sont installés (depuis dpkg 1.19.2). Par défaut c'est « I</> »."
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<--root>I< directory>"
+msgstr "B<--root> I<répertoire>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
 msgstr ""
-"Définit le répertoire de données de B<dpkg> comme I<répertoire> (par défaut "
-"c'est I<%ADMINDIR%>)."
+"Définit le répertoire root à B<directory>, ce qui définit le répertoire "
+"d'installation à « I<répertoire> » et le répertoire d'administration à "
+"« I<répertoire>B<%ADMINDIR%> » (depuis dpkg 1.19.2)."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15965,10 +15750,37 @@ msgstr "B<--rename>"
 #: dpkg-divert.man
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
 msgstr ""
 "Met en fait le fichier de côté. Quand le fichier de destination existe, "
-"B<dpkg-divert> interrompt l'opération."
+"B<dpkg-divert> interrompt l'opération. C'est le comportement courant utilisé "
+"pour les détournements de fichiers à partir de l'ensemble de paquets non-"
+"B<Essential> (voir B<--no-rename> pour plus de détails)."
+
+#. type: TP
+#: dpkg-divert.man
+#, no-wrap
+msgid "B<--no-rename>"
+msgstr "B<--no-rename>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
+msgstr ""
+"Indique que le fichier ne doit pas être renommé lors de l'ajout ou du "
+"retrait d'un détournement de la base de données (depuis dpkg 1.19.1). Cela "
+"est destiné au détournement de fichiers de l'ensemble de paquets "
+"B<essential>, où la disparition temporaire du fichier original n'est pas "
+"acceptable, car il rend non fonctionnel le système. C'est le comportement "
+"par défaut, mais cela changera durant le cycle de dpkg 1.20.x."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15982,14 +15794,24 @@ msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr "Mode de test, ne modifie rien réellement, montre seulement."
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
 msgstr ""
-"Si cette variable est positionnée et que l'option B<--admindir> n'est pas "
-"précisée, ce répertoire sera utilisé comme répertoire de données pour "
-"B<dpkg>."
+"Si cette variable est positionnée et que les options B<--admindir> ou B<--"
+"root> ne sont pas précisées, ce répertoire sera utilisé comme répertoire "
+"racine du système de fichiers (depuis dpkg 1.19.2)."
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
+msgstr ""
+"Si cette variable est positionnée et que les options B<--admindir> ou B<--"
+"root> ne sont pas précisées, ce répertoire sera utilisé comme répertoire de "
+"données pour B<dpkg>."
 
 #. type: Plain text
 #: dpkg-divert.man
@@ -15997,7 +15819,7 @@ msgid ""
 "If set and the B<--local> and B<--package> options have not been specified, "
 "B<dpkg-divert> will use it as the package name."
 msgstr ""
-"Si cette variable est positionnée et que les options B<--local> et  B<--"
+"Si cette variable est positionnée et que les options B<--local> et B<--"
 "package> ne le sont pas, B<dpkg-divert> en utilisera la valeur comme nom de "
 "paquet."
 
@@ -16016,7 +15838,7 @@ msgid ""
 msgstr ""
 "Ce fichier contient la liste des détournements en œuvre sur le système. Il "
 "se trouve dans le répertoire d'administration de B<dpkg>, avec d'autres "
-"fichiers importants comme « status » ou « available »."
+"fichiers importants comme I<status> ou I<available>."
 
 #. type: Plain text
 #: dpkg-divert.man
@@ -16025,7 +15847,7 @@ msgid ""
 "old>, before replacing it with the new one."
 msgstr ""
 "Note : B<dpkg-divert> préserve l'ancienne copie de ce fichier, avec "
-"l'extension « -old », avant de la remplacer par la nouvelle."
+"l'extension I<-old>, avant de la remplacer par la nouvelle."
 
 #. type: Plain text
 #: dpkg-divert.man
@@ -16133,9 +15955,9 @@ msgid ""
 "upload control file (B<.changes> file)."
 msgstr ""
 "B<dpkg-genchanges> lit les informations à la fois dans une arborescence "
-"debian dépaquetée et déjà construite et sur les fichiers qui ont été créés ; "
-"puis il crée un fichier de contrôle pour la mise en place dans l'archive "
-"Debian (c'est le fichier B<.changes>)."
+"debian dépaquetée et déjà construite et à partir des fichiers qui ont été "
+"créés, et il crée un fichier de contrôle pour la mise en place dans "
+"l'archive Debian (c'est le fichier B<.changes>)."
 
 #. type: Plain text
 #: dpkg-genchanges.man
@@ -16143,23 +15965,23 @@ msgid ""
 "Specifies the build I<type> from a comma-separated list of components (since "
 "dpkg 1.18.5)."
 msgstr ""
+"Indique le I<type> de construction à partir d'une liste, séparée par des "
+"virgules, de composants (depuis dpkg 1.18.5)."
 
 #. type: Plain text
 #: dpkg-genchanges.man
-#, fuzzy
-#| msgid "Do not sign the source package."
 msgid "Upload the source package."
-msgstr "Ne pas signer le paquet source."
+msgstr "Envoyer le paquet source."
 
 #. type: Plain text
 #: dpkg-genchanges.man
 msgid "Upload the architecture specific binary packages."
-msgstr ""
+msgstr "Envoyer les paquets binaires spécifiques à l'architecture."
 
 #. type: Plain text
 #: dpkg-genchanges.man
 msgid "Upload the architecture independent binary packages."
-msgstr ""
+msgstr "Envoyer les paquets binaires indépendants de l'architecture."
 
 #. type: Plain text
 #: dpkg-genchanges.man
@@ -16167,19 +15989,17 @@ msgid ""
 "Upload the architecture specific and independent binary packages.  This is "
 "an alias for B<any,all>."
 msgstr ""
+"Envoyer les paquets binaires spécifiques et indépendants de l'architecture. "
+"C'est un alias pour B<any,all>."
 
 #. type: Plain text
 #: dpkg-genchanges.man
-#, fuzzy
-#| msgid ""
-#| "Specifies a normal full build, binary and source packages will be built.  "
-#| "This is the same as the default case when no build option is specified."
 msgid ""
 "Upload everything.  This is alias for B<source,any,all>, and the same as the "
 "default case when no build option is specified."
 msgstr ""
-"Construction complète où les paquets sources et binaires sont construits. "
-"Identique au cas par défaut où aucune option de construction n'est indiquée."
+"Envoyer tout. C'est un alias de B<source,any,all> et identique au cas par "
+"défaut où aucune option de construction n'est indiquée."
 
 #. type: Plain text
 #: dpkg-genchanges.man
@@ -16290,17 +16110,10 @@ msgstr ""
 #: dpkg-genchanges.man dpkg-gencontrol.man dpkg-shlibdeps.man dpkg-source.man
 #, no-wrap
 msgid "B<-T>I<substvars-file>"
-msgstr "B<-T>I<fichier/substvars>"
+msgstr "B<-T>I<fichier-substvars>"
 
 #. type: Plain text
 #: dpkg-genchanges.man
-#, fuzzy
-#| msgid ""
-#| "Read substitution variables in I<substvars-file>; the default is B<debian/"
-#| "substvars>.  No variable substitution is done on any of the fields that "
-#| "are output, however the special variable I<Format> will override the "
-#| "field of the same name. This option can be used multiple times to read "
-#| "substitution variables from multiple files."
 msgid ""
 "Read substitution variables in I<substvars-file>; the default is B<debian/"
 "substvars>.  No variable substitution is done on any of the fields that are "
@@ -16310,12 +16123,13 @@ msgid ""
 "multiple times to read substitution variables from multiple files (since "
 "dpkg 1.15.6)."
 msgstr ""
-"Lecture des variables de substitution depuis I<substvarsfile> ; la valeur "
-"par défaut est B<debian/substvars>. Aucune substitution de variable n'est "
-"faite sur les champs de sortie, cependant la variable spéciale I<Format> "
-"remplacera le champ qui porte le même nom. Cette option peut être utilisée "
-"plusieurs fois pour lire les variables de substitution depuis plusieurs "
-"fichiers."
+"Lecture des variables de substitution depuis I<fichier-substvars> ; la "
+"valeur par défaut est B<debian/substvars>. Aucune substitution de variable "
+"n'est faite sur les champs de sortie, sauf pour les contenus extraits de "
+"chaque champ B<Description> du paquet binaire (depuis dpkg 1.19.0), "
+"cependant la variable spéciale I<Format> remplacera le champ qui porte le "
+"même nom. Cette option peut être utilisée plusieurs fois pour lire les "
+"variables de substitution depuis plusieurs fichiers (depuis dpkg 1.15.6)."
 
 #. type: TP
 #: dpkg-genchanges.man dpkg-gencontrol.man dpkg-source.man
@@ -16377,6 +16191,8 @@ msgid ""
 "Print the changes file to standard output (the default) or to I<filename> if "
 "specified (since dpkg 1.18.5)."
 msgstr ""
+"Affiche le fichier des modifications sur la sortie standard (par défaut) ou "
+"dans I<nom-de-fichier> s'il est indiqué (depuis dpkg 1.18.5)."
 
 #. type: Plain text
 #: dpkg-genchanges.man
@@ -16390,12 +16206,12 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-genchanges.man
-#, fuzzy
-#| msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgid ""
 "B<deb-substvars>(5), B<deb-src-control>(5), B<deb-src-files>(5), B<deb-"
 "changelog>(5), B<deb-changes>(5)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+msgstr ""
+"B<deb-substvars>(5), B<deb-src-control>(5), B<deb-src-files>(5), B<deb-"
+"changelog>(5), B<deb-changes>(5)."
 
 #. type: TH
 #: dpkg-gencontrol.man
@@ -16445,8 +16261,8 @@ msgstr ""
 "qui sont déjà validées par la version du paquet déjà installé). Logiquement, "
 "il conserve les correspondances entre plusieurs dépendances dans le même "
 "paquet. L'ordre des dépendances est conservé du mieux possible : si une "
-"dépendance doit être supprimée à cause d'une autre dépendance qui se trouve "
-"dans un champ suivant, la dépendance remplaçante prendra la place de celle "
+"dépendance doit être supprimée à cause d'une autre dépendance qui apparaît "
+"plus loin dans le champ, la dépendance remplaçante prendra la place de celle "
 "éliminée."
 
 #. type: Plain text
@@ -16487,20 +16303,15 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-gencontrol.man
-#, fuzzy
-#| msgid ""
-#| "Read substitution variables in I<substvars-file>; the default is B<debian/"
-#| "substvars>.  This option can be used multiple times to read substitution "
-#| "variables from multiple files."
 msgid ""
 "Read substitution variables in I<substvars-file>; the default is B<debian/"
 "substvars>.  This option can be used multiple times to read substitution "
 "variables from multiple files (since dpkg 1.15.6)."
 msgstr ""
-"Lecture des variables de substitution depuis I<substvarsfile> ; la valeur "
-"par défaut est B<debian/substvars>. Cette option peut être utilisée "
+"Lecture des variables de substitution depuis I<fichier-substvars> ; la "
+"valeur par défaut est B<debian/substvars>. Cette option peut être utilisée "
 "plusieurs fois pour lire les variables de substitution depuis plusieurs "
-"fichiers."
+"fichiers (depuis dpkg 1.15.6)."
 
 #. type: TP
 #: dpkg-gencontrol.man dpkg-source.man
@@ -16580,7 +16391,7 @@ msgid ""
 "B<du>), and for the default location of the output file."
 msgstr ""
 "Cette option indique à B<dpkg-source> que le répertoire de construction du "
-"paquet est I<rep-de-construction-du-paquet> au lieu de B<debian/tmp>. Cette "
+"paquet est I<répertoire-construction-paquet> au lieu de B<debian/tmp>. Cette "
 "valeur sert à trouver la valeur par défaut de la variable de substitution "
 "B<Installed-Size> et celle du champ correspondant dans le fichier de "
 "contrôle (on utilise la commande B<du>) ; elle donne aussi l'emplacement par "
@@ -16588,19 +16399,15 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-gencontrol.man
-#, fuzzy
-#| msgid ""
-#| "Print the control file to standard output (or I<filename> if specified), "
-#| "rather than to B<debian/tmp/DEBIAN/control> (or I<package-build-dir>B</"
-#| "DEBIAN/control> if B<-P> was used)."
 msgid ""
 "Print the control file to standard output (or I<filename> if specified, "
 "since dpkg 1.17.2), rather than to B<debian/tmp/DEBIAN/control> (or "
 "I<package-build-dir>B</DEBIAN/control> if B<-P> was used)."
 msgstr ""
-"Affiche le fichier « control » sur la sortie standard (ou I<nom-de-fichier>) "
-"au lieu de B<debian/tmp/DEBIAN/control> (ou I<rep-de-construction-du-"
-"paquet>B</DEBIAN/control> si l'option B<-P> a été utilisée)."
+"Affiche le fichier « control » sur la sortie standard (ou I<nom-de-fichier>, "
+"depuis dpkg 1.17.2), au lieu de B<debian/tmp/DEBIAN/control> (ou "
+"I<répertoire-construction-paquet>B</DEBIAN/control> si l'option B<-P> a été "
+"utilisée)."
 
 #. type: TP
 #: dpkg-gencontrol.man
@@ -16631,12 +16438,12 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-gencontrol.man
-#, fuzzy
-#| msgid "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
 msgid ""
 "B<deb-substvars>(5), B<deb-src-control>(5), B<deb-changelog>(5), B<deb-"
 "control>(5)."
-msgstr "B<deb>(5), B<deb-control>(5), B<dpkg>(1), B<dselect>(1)."
+msgstr ""
+"B<deb-substvars>(5), B<deb-src-control>(5), B<deb-changelog>(5), B<deb-"
+"control>(5)."
 
 #. type: TH
 #: dpkg-gensymbols.man
@@ -16650,8 +16457,8 @@ msgid ""
 "dpkg-gensymbols - generate symbols files (shared library dependency "
 "information)"
 msgstr ""
-"dpkg-gensymbols - création des fichiers de symboles (information destinée "
-"aux dépendances de bibliothèques partagées)"
+"dpkg-gensymbols - Création des fichiers de symboles (information de "
+"dépendances de bibliothèques partagées)"
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -16733,7 +16540,7 @@ msgid ""
 msgstr ""
 "Quand les fichiers de symboles créés sont différents de ceux fournis par le "
 "responsable, B<dpkg-gensymbols> affichera les différences entre les deux "
-"fichiers. Si ces différences sont trop importantes, le programme peut même "
+"versions. Si ces différences sont trop importantes, le programme peut même "
 "se terminer en échec (le nombre de différences tolérées peut être réglé avec "
 "l'option B<-c>)."
 
@@ -16745,23 +16552,6 @@ msgstr "TENUE À JOUR DES FICHIERS SYMBOLES"
 
 #. type: Plain text
 #: dpkg-gensymbols.man
-#, fuzzy
-#| msgid ""
-#| "The symbols files are really useful only if they reflect the evolution of "
-#| "the package through several releases. Thus the maintainer has to update "
-#| "them every time that a new symbol is added so that its associated minimal "
-#| "version matches reality.  The diffs contained in the build logs can be "
-#| "used as a starting point, but the maintainer, additionally, has to make "
-#| "sure that the behaviour of those symbols has not changed in a way that "
-#| "would make anything using those symbols and linking against the new "
-#| "version, stop working with the old version.  In most cases, the diff "
-#| "applies directly to the debian/I<package>.symbols file. That said, "
-#| "further tweaks are usually needed: it's recommended for example to drop "
-#| "the Debian revision from the minimal version so that backports with a "
-#| "lower version number but the same upstream version still satisfy the "
-#| "generated dependencies.  If the Debian revision can't be dropped because "
-#| "the symbol really got added by the Debian specific change, then one "
-#| "should suffix the version with \"~\"."
 msgid ""
 "The symbols files are really useful only if they reflect the evolution of "
 "the package through several releases. Thus the maintainer has to update them "
@@ -16791,7 +16581,7 @@ msgstr ""
 "de version inférieur mais avec la même version amont continuent à répondre "
 "aux pré-requis. Si le numéro de révision Debian ne peut vraiment pas être "
 "retiré car le nouveau symbole est la conséquence d'une modification propre à "
-"Debian, il est suggéré d'ajouter un suffixe « ~ » au numéro de version."
+"Debian, il est suggéré d'ajouter un suffixe « B<~> » au numéro de version."
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -16806,12 +16596,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-gensymbols.man
-#, fuzzy
-#| msgid ""
-#| "Note that you can put comments in symbols files: any line with '#' as the "
-#| "first character is a comment except if it starts with '#include' (see "
-#| "section B<Using includes>). Lines starting with '#MISSING:' are special "
-#| "comments documenting symbols that have disappeared."
 msgid ""
 "Note that you can put comments in symbols files: any line with ‘#’ as the "
 "first character is a comment except if it starts with ‘#include’ (see "
@@ -16834,15 +16618,15 @@ msgid ""
 "they can work with older packages they cannot work with. This will introduce "
 "hard to find bugs with (partial)  upgrades."
 msgstr ""
-"N'oubliez pas de vérifier les anciennes versions des symboles ne doivent pas "
-"être incrémentées. Il n'y a pas de moyen pour que B<dpkg-gensymbols> "
+"N'oubliez pas de vérifier si les anciennes versions des symboles ne doivent "
+"pas être incrémentées. Il n'y a pas de moyen pour que B<dpkg-gensymbols> "
 "prévienne de cela. Appliquer aveuglement le fichier de différences ou "
 "supposer qu'il n'y a rien à changer, s'il n'y a pas de fichier de "
-"différences, sans vérifier si il de telles modifications, ce qui peut faire "
-"que des paquets, avec des dépendances lâches, prétendent qu'ils peuvent "
-"fonctionner avec des paquets plus anciens avec lesquels ils ne peuvent "
-"fonctionner. Cela introduira des bogues difficiles à trouver avec des mises "
-"à jour (partielles)."
+"différences, sans vérifier s'il y a ces modifications, peut faire que des "
+"paquets, avec des dépendances lâches, prétendent qu'ils peuvent fonctionner "
+"avec des paquets plus anciens avec lesquels ils ne peuvent fonctionner. Cela "
+"introduira des bogues difficiles à trouver avec des mises à niveau "
+"(partielles)."
 
 #. type: SS
 #: dpkg-gensymbols.man
@@ -16984,17 +16768,6 @@ msgstr "B<optional>"
 
 #. type: Plain text
 #: dpkg-gensymbols.man
-#, fuzzy
-#| msgid ""
-#| "A symbol marked as optional can disappear from the library at any time "
-#| "and that will never cause B<dpkg-gensymbols> to fail. However, "
-#| "disappeared optional symbols will continuously appear as MISSING in the "
-#| "diff in each new package revision.  This behaviour serves as a reminder "
-#| "for the maintainer that such a symbol needs to be removed from the symbol "
-#| "file or readded to the library. When the optional symbol, which was "
-#| "previously declared as MISSING, suddenly reappears in the next revision, "
-#| "it will be upgraded back to the \"existing\" status with its minimum "
-#| "version unchanged."
 msgid ""
 "A symbol marked as optional can disappear from the library at any time and "
 "that will never cause B<dpkg-gensymbols> to fail. However, disappeared "
@@ -17010,7 +16783,7 @@ msgstr ""
 "symboles optionnels disparus apparaîtront en permanence comme manquants dans "
 "le fichier de différences, à chaque nouvelle version du paquet. Ce "
 "comportement sert de rappel au responsable qu'un tel symbole doit être "
-"supprimé du fichier de symboles ou bien réajouté à la bibliothèque. Un tel "
+"supprimé du fichier de symboles ou bien rajouté à la bibliothèque. Un tel "
 "symbole optionnel, précédemment déclaré comme manquant (« MISSING »), peut "
 "réapparaître soudainement dans la version suivante en étant remis à l'état "
 "existant (« existing »), sans modification de sa version minimale."
@@ -17033,40 +16806,24 @@ msgstr ""
 
 #. type: TP
 #: dpkg-gensymbols.man
-#, fuzzy, no-wrap
-#| msgid "B<arch=>I<architecture list>"
+#, no-wrap
 msgid "B<arch=>I<architecture-list>"
-msgstr "B<arch=>I<liste d'architectures>"
+msgstr "B<arch=>I<liste-d'architectures>"
 
 #. type: TQ
 #: dpkg-gensymbols.man
-#, fuzzy, no-wrap
-#| msgid "B<arch=>I<architecture list>"
+#, no-wrap
 msgid "B<arch-bits=>I<architecture-bits>"
-msgstr "B<arch=>I<liste d'architectures>"
+msgstr "B<arch-bits=>I<octets-architecture>"
 
 #. type: TQ
 #: dpkg-gensymbols.man
-#, fuzzy, no-wrap
-#| msgid "B<-E>, B<--match-endian> I<architecture-endianness>"
+#, no-wrap
 msgid "B<arch-endian=>I<architecture-endianness>"
-msgstr "B<-E>, B<--match-endian> I<boutisme-d'architecture>"
+msgstr "B<arch-endian=>I<boutisme-d'architecture>"
 
 #. type: Plain text
 #: dpkg-gensymbols.man
-#, fuzzy
-#| msgid ""
-#| "This tag allows one to restrict the set of architectures where the symbol "
-#| "is supposed to exist. When the symbols list is updated with the symbols "
-#| "discovered in the library, all arch-specific symbols which do not concern "
-#| "the current host architecture are treated as if they did not exist. If an "
-#| "arch-specific symbol matching the current host architecture does not "
-#| "exist in the library, normal procedures for missing symbols apply and it "
-#| "may cause B<dpkg-gensymbols> to fail. On the other hand, if the arch-"
-#| "specific symbol is found when it was not supposed to exist (because the "
-#| "current host architecture is not listed in the tag), it is made arch "
-#| "neutral (i.e. the arch tag is dropped and the symbol will appear in the "
-#| "diff due to this change), but it is not considered as new."
 msgid ""
 "These tags allow one to restrict the set of architectures where the symbol "
 "is supposed to exist. The B<arch-bits> and B<arch-endian> tags are supported "
@@ -17082,17 +16839,20 @@ msgid ""
 "tags are dropped and the symbol will appear in the diff due to this change), "
 "but it is not considered as new."
 msgstr ""
-"Cette étiquette permet de restreindre la liste des architectures avec "
-"lesquelles le symbole est censé exister. Lorsque la liste des symboles est "
-"mise à jour avec ceux découverts dans la bibliothèque, tous les symboles "
-"spécifiques d'architectures qui ne concernent pas l'architecture en cours "
-"sont ignorés. Si un symbole propre à l'architecture en cours n'existe pas "
-"dans la bibliothèque, les processus normaux pour des symboles manquants "
-"s'appliquent jusqu'à éventuellement provoquer l'échec de B<dpkg-gensymbols>. "
-"D'un autre côté, si le symbole propre à une architecture est trouvé alors "
-"qu'il n'est pas censé exister (parce que l'architecture courante n'est pas "
-"mentionnée dans l'étiquette), il est rendu indépendant de l'architecture "
-"(l'étiquette d'architecture est abandonnée et le symbole apparaît dans le "
+"Ces étiquettes permettent de restreindre la liste des architectures avec "
+"lesquelles le symbole est censé exister. Les étiquettes B<arch-bits> et "
+"B<arch-endian> sont prises en charge depuis dpkg 1.18.0. Lorsque la liste "
+"des symboles est mise à jour avec ceux découverts dans la bibliothèque, tous "
+"les symboles spécifiques d'architectures qui ne concernent pas "
+"l'architecture en cours sont ignorés. Si un symbole propre à l'architecture "
+"en cours n'existe pas dans la bibliothèque, les processus normaux pour des "
+"symboles manquants s'appliquent jusqu'à éventuellement provoquer l'échec de "
+"B<dpkg-gensymbols>. D'un autre côté, si le symbole propre à une architecture "
+"est trouvé alors qu'il n'est pas censé exister (parce que l'architecture "
+"courante n'est pas mentionnée dans l'étiquette ou ne correspond pas au "
+"boutisme et aux octets), il est rendu indépendant de l'architecture (c'est-à-"
+"dire que les étiquettes d'architecture, d'octets de l'architecture et de "
+"boutisme d'architecture sont abandonnées et le symbole apparaît dans le "
 "fichier de différences) mais non considéré comme nouveau. (NdT : une "
 "aspirine peut être nécessaire après la lecture de ce paragraphe)"
 
@@ -17114,13 +16874,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-gensymbols.man
-#, fuzzy
-#| msgid ""
-#| "The format of I<architecture list> is the same as the one used in the "
-#| "B<Build-Depends> field of I<debian/control> (except the enclosing square "
-#| "brackets []). For example, the first symbol from the list below will be "
-#| "considered only on alpha, any-amd64 and ia64 architectures, the second "
-#| "only on linux architectures, while the third one anywhere except on armel."
 msgid ""
 "The format of I<architecture-list> is the same as the one used in the "
 "B<Build-Depends> field of I<debian/control> (except the enclosing square "
@@ -17128,7 +16881,7 @@ msgid ""
 "considered only on alpha, any-amd64 and ia64 architectures, the second only "
 "on linux architectures, while the third one anywhere except on armel."
 msgstr ""
-"Le format de I<liste d'architectures> est le même que le format utilisé dans "
+"Le format de I<liste-d'architectures> est le même que le format utilisé dans "
 "les champs B<Build-Depends> des fichiers I<debian/control> (à l'exception "
 "des crochets d'inclusion []). Par exemple, le premier symbole de la liste "
 "qui suit sera pris en compte sur les architectures alpha, n'importe quelle "
@@ -17150,7 +16903,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg-gensymbols.man
 msgid "The I<architecture-bits> is either B<32> or B<64>."
-msgstr ""
+msgstr "Les I<octets-architecture> sont soit B<32> soit B<64>."
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -17159,11 +16912,13 @@ msgid ""
 " (arch-bits=32)32bit_specific_symbol@Base 1.0\n"
 " (arch-bits=64)64bit_specific_symbol@Base 1.0\n"
 msgstr ""
+" (arch-bits=32)32bit_specific_symbol@Base 1.0\n"
+" (arch-bits=64)64bit_specific_symbol@Base 1.0\n"
 
 #. type: Plain text
 #: dpkg-gensymbols.man
 msgid "The I<architecture-endianness> is either B<little> or B<big>."
-msgstr ""
+msgstr "Le I<boutisme-d'architecture> est soit B<little> soit B<big>."
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -17172,17 +16927,19 @@ msgid ""
 " (arch-endian=little)little_endian_specific_symbol@Base 1.0\n"
 " (arch-endian=big)big_endian_specific_symbol@Base 1.0\n"
 msgstr ""
+" (arch-endian=little)little_endian_specific_symbol@Base 1.0\n"
+" (arch-endian=big)big_endian_specific_symbol@Base 1.0\n"
 
 #. type: Plain text
 #: dpkg-gensymbols.man
 msgid "Multiple restrictions can be chained."
-msgstr ""
+msgstr "Plusieurs restrictions peuvent être chaînées."
 
 #. type: Plain text
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid " (arch-bits=32|arch-endian=little)32bit_le_symbol@Base 1.0\n"
-msgstr ""
+msgstr " (arch-bits=32|arch-endian=little)32bit_le_symbol@Base 1.0\n"
 
 #. type: TP
 #: dpkg-gensymbols.man
@@ -17200,7 +16957,7 @@ msgid ""
 "B<ignore-blacklist>. It can be necessary for some low level toolchain "
 "libraries like libgcc."
 msgstr ""
-"dpkg-gensymbols comporte une liste interne de symboles ignorés qui ne "
+"B<dpkg-gensymbols> comporte une liste interne de symboles ignorés qui ne "
 "devraient pas apparaître dans les fichiers de symboles car ils sont en "
 "général uniquement des effets de bord de détails de mise en œuvre de la "
 "chaîne d'outils de construction. Si, pour une raison précise, vous voulez "
@@ -17235,7 +16992,7 @@ msgid ""
 "patterns> subsection below."
 msgstr ""
 "Indique un motif de symbole I<symver> (version de symbole). Voir la sous-"
-"section B<Utilisation des motifs de symboles> plus loin."
+"section B<Utilisation des motifs de symbole> plus loin."
 
 #. type: TP
 #: dpkg-gensymbols.man
@@ -17249,14 +17006,14 @@ msgid ""
 "Denotes I<regex> symbol pattern. See B<Using symbol patterns> subsection "
 "below."
 msgstr ""
-"Indique un motif de symbole basé sur des I<expressions rationnelles>. Voir "
-"la sous-section B<Utilisation des motifs de symboles> plus loin."
+"Indique un motif de symbole basé sur une I<expression-rationnelle>. Voir la "
+"sous-section B<Utilisation des motifs de symbole> plus loin."
 
 #. type: SS
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "Using symbol patterns"
-msgstr "Utilisation des motifs de symboles"
+msgstr "Utilisation de motifs de symbole"
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -17337,16 +17094,16 @@ msgid ""
 "ones, it can be matched with a single I<c++> pattern:"
 msgstr ""
 "Ce motif est repéré par l'étiquette I<c++>. Il ne sera comparé qu'aux "
-"symboles C++ avec leur nom de symbole complet (demangled) tel qu'affiché "
+"symboles C++ avec leur nom de symbole rétabli (demangled) tel qu'affiché "
 "avec l'utilitaire B<c++filt>. Ce motif est très pratique pour faire "
-"correspondre les symboles dont les noms raccourcis (mangled) peuvent "
-"différer selon les architectures bien que leurs noms complets restent les "
-"mêmes. Un tel groupe de symboles sont les I<non-virtual thunks> pour "
-"lesquels les décalages (offsets) spécifiques d'architectures sont inclus "
-"dans leur nom court. Une manifestation usuelle de ce cas est le destructeur "
-"virtuel qui, dans le contexte d'un « problème du diamant », a besoin d'un "
-"symbole de transition spécial (ou « thunk ») non virtuel. Par exemple, même "
-"si _ZThn8_N3NSB6ClassDD1Ev@Base sur une architecture 32 bits est identique à "
+"correspondre les symboles dont les noms décorés (mangled) peuvent différer "
+"selon les architectures bien que leurs noms d'origine restent les mêmes. Un "
+"tel groupe de symboles sont les I<non-virtual thunks> pour lesquels les "
+"décalages (offsets) spécifiques d'architectures sont inclus dans leur nom "
+"décoré. Une manifestation usuelle de ce cas est le destructeur virtuel qui, "
+"dans le contexte d'un « problème du diamant », a besoin d'un symbole de "
+"transition spécial (ou « thunk ») non virtuel. Par exemple, même si "
+"_ZThn8_N3NSB6ClassDD1Ev@Base sur une architecture 32 bits est identique à "
 "_ZThn16_N3NSB6ClassDD1Ev@Base sur une architecture 64 bits, les deux peuvent "
 "être indiqués avec le même motif I<c++> :"
 
@@ -17368,7 +17125,8 @@ msgstr ""
 #: dpkg-gensymbols.man
 msgid ""
 "The demangled name above can be obtained by executing the following command:"
-msgstr "Le nom complet ci-dessus peut être obtenu avec la commande suivante :"
+msgstr ""
+"Le nom non décoré ci-dessus peut être obtenu avec la commande suivante :"
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -17387,9 +17145,9 @@ msgid ""
 "for them). However, as these collisions happen on the ABI level, they should "
 "not degrade quality of the symbol file."
 msgstr ""
-"Veuillez noter que, bien que le nom complet soit unique dans la bibliothèque "
-"par définition, cela n'est pas forcément vrai pour le nom raccourci. Deux "
-"symboles réels différents peuvent avoir le même nom raccourci. C'est par "
+"Veuillez noter que, bien que le nom décoré soit unique dans la bibliothèque "
+"par définition, cela n'est pas forcément vrai pour le nom non décoré. Deux "
+"symboles réels différents peuvent avoir le même nom non décoré. C'est par "
 "exemple le cas avec les symboles « thunk » non virtuels dans des "
 "configurations d'héritage complexes ou avec la plupart des constructeurs et "
 "destructeurs (puisque g++ crée usuellement deux symboles réels pour eux). "
@@ -17437,9 +17195,9 @@ msgid ""
 "because specific symbols take precedence over patterns."
 msgstr ""
 "Tous les symboles associés avec les versions GLIBC_2.0 et GLIBC_2.7 "
-"conduiront respectivement à des versions minimales de 2.0 et 2.7, à "
+"conduiront respectivement à des versions minimales de 2.0 et 2.7, à "
 "l'exception du symbole access@GLIBC_2.0. Ce dernier amène à une dépendance "
-"minimale sur la version 2.2 de libc6 bien qu'il soit dans le scope de "
+"minimale sur la version 2.2 de libc6 bien qu'il soit dans le scope de "
 "« (symvar)GLIBC_2.0 ». Cela est dû au fait que les symboles spécifiques "
 "prennent le pas sur les motifs."
 
@@ -17455,8 +17213,8 @@ msgstr ""
 "Veuillez noter que les anciens motifs avec caractères génériques (indiqués "
 "sous la forme « *@version ») dans le champ de nom de symbole sont toujours "
 "gérés. La nouvelle syntaxe « (symver|optional)version » doit toutefois leur "
-"être préférée. Par exemple, « *@GLIBC_2.0 2.0 » devrait être écrit sous la "
-"forme « (symver|optional)GLIBC_2.0 2.0 » si un comportement analogue est "
+"être préférée. Par exemple, « *@GLIBC_2.0 2.0 » devrait être écrit sous la "
+"forme « (symver|optional)GLIBC_2.0 2.0 » si un comportement analogue est "
 "recherché."
 
 #. type: Plain text
@@ -17469,11 +17227,11 @@ msgid ""
 "string. For example:"
 msgstr ""
 "Les motifs d'expressions rationnelles sont indiqués par l'étiquette "
-"I<regex>. La correspondance se fait avec une expression rationnelle Perl sur "
-"le champ de nom de symbole. La correspondance est faite telle quelle et il "
-"ne faut donc pas oublier le caractère I<^>, sinon la correspondance est "
-"faite sur n'importe quelle partie du symbole réel I<name@version>. Par "
-"exemple :"
+"I<expression-rationnelle>. La correspondance se fait avec une expression "
+"rationnelle Perl sur le champ de nom de symbole. La correspondance est faite "
+"telle quelle et il ne faut donc pas oublier le caractère I<^>, sinon la "
+"correspondance est faite sur n'importe quelle partie du symbole réel "
+"I<name@version>. Par exemple :"
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -17497,7 +17255,7 @@ msgid ""
 "I<optional> tag from the pattern."
 msgstr ""
 "Les symboles tels que « mystack_new@Base », « mystack_push@Base », "
-"« mystack_pop@Base », etc. seront en correspondance avec le premier motif "
+"« mystack_pop@Base », etc., seront en correspondance avec le premier motif "
 "alors que, par exemple, « ng_mystack_new@Base » ne le sera pas. Le deuxième "
 "motif correspondra pour tous les symboles qui comportent la chaîne "
 "« private » dans leur nom et les correspondances hériteront de l'étiquette "
@@ -17538,15 +17296,15 @@ msgid ""
 "\"__N3NSA6ClassA7Private11privmethod\\edEi@Base\" will not match either of "
 "the patterns because it is not a valid C++ symbol."
 msgstr ""
-"Seront en correspondance avec les symboles "
+"seront en correspondance avec les symboles "
 "« _ZN3NSA6ClassA7Private11privmethod1Ei@Base\" » et "
 "« _ZN3NSA6ClassA7Private11privmethod2Ei@Base ». Lors de la correspondance "
-"avec le premier motif, le symbole complet est d'abord décodé en tant que "
-"symbole C++, puis comparé à l'expression rationnelle. D'un autre côté, lors "
-"de la correspondance avec le deuxième motif, l'expression rationnelle est "
-"comparée au nom de symbole brut, puis le symbole est testé en tant que "
-"symbole C++ en tentant de le décoder. L'échec de n'importe quel motif de "
-"base provoquera l'échec de l'ensemble du motif. Ainsi, par exemple, "
+"avec le premier motif, le symbole brut est d'abord rétabli d’origine en tant "
+"que symbole C++, puis comparé à l'expression rationnelle. D'un autre côté, "
+"lors de la correspondance avec le deuxième motif, l'expression rationnelle "
+"est comparée au nom de symbole brut, puis le symbole est testé en tant que "
+"symbole C++ en tentant de le rétablir d’origine. L'échec de n'importe quel "
+"motif basique provoquera l'échec de l'ensemble du motif. Ainsi, par exemple, "
 "« __N3NSA6ClassA7Private11privmethod\\edEi@Base » ne correspondra à aucun "
 "des motifs car ce n'est pas un symbole C++ valable (NdT : j'ai l'impression "
 "de traduire du Klingon !)."
@@ -17561,11 +17319,11 @@ msgid ""
 "symbol.  Therefore, it is recommended not to overuse generic patterns."
 msgstr ""
 "En général, les motifs sont divisés en deux groupes : les alias (I<c++> et "
-"I<symver> de base) et les motifs génériques (I<regex> et toutes les "
-"combinaisons de motifs de base multiples). La correspondance de motifs basés "
-"sur des alias est rapide (O(1)) alors que les motifs génériques sont O(N) (N "
-"étant le nombre de motifs génériques) pour chaque symbole. En conséquence, "
-"il est déconseillé d'abuser des motifs génériques."
+"I<symver> basique) et les motifs génériques (I<expression-rationnelle> et "
+"toutes les combinaisons de motifs basiques multiples). La correspondance de "
+"motifs basés sur des alias est rapide (O(1)) alors que les motifs génériques "
+"sont O(N) (N étant le nombre de motifs génériques) pour chaque symbole. En "
+"conséquence, il est déconseillé d'abuser des motifs génériques."
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -17730,7 +17488,7 @@ msgid ""
 "ideally, it uses symbol versioning to achieve ABI stability despite internal "
 "changes and API extension;"
 msgstr ""
-"idéalement, elle utilise le versionnement des symboles pour garantir la "
+"idéalement, elle utilise le versionnage des symboles pour garantir la "
 "stabilité de l'interface applicative binaire (ABI) malgré ses modifications "
 "internes et l'extension de son API ;"
 
@@ -17810,6 +17568,36 @@ msgstr ""
 "avec un seul paramètre (afin d'éviter d'utiliser plusieurs options B<-e>)."
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, no-wrap
+msgid "B<-l>I<directory>"
+msgstr "B<-l>I<répertoire>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+"Ajoute I<répertoire> au début de la liste des répertoires où chercher des "
+"bibliothèques partagées privées (depuis dpkg 1.19.1). Cette option peut être "
+"utilisée plusieurs fois."
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+"Note : Utilisez cette option plutôt que le réglage de B<LD_LIBRARY_PATH>, "
+"parce que cette variable d'environnement est utilisée pour contrôler "
+"l'éditeur de liens d'exécution et se servir d'elle pour définir les chemins "
+"des bibliothèques partagées au moment de la construction peut être "
+"problématique, par exemple, lors d'une compilation croisée."
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<-I>I<filename>"
@@ -17860,11 +17648,11 @@ msgid ""
 "are always written to the symbol file template."
 msgstr ""
 "Écrit le fichier de symboles en mode modèle plutôt que dans un format "
-"compatible avec B<deb-symbols(5)>. La différence majeure réside dans le fait "
+"compatible avec B<deb-symbols>(5). La différence majeure réside dans le fait "
 "que les noms de symboles et les étiquettes sont écrits dans leur forme "
 "d'origine au lieu d'être interprétés, avec réduction des étiquettes en mode "
 "de compatibilité. De plus, certains symboles peuvent être omis lors de "
-"l'écriture d'un fichier B<deb-symbols(5)> standard (selon les règles de "
+"l'écriture d'un fichier B<deb-symbols>(5) standard (selon les règles de "
 "traitement des étiquettes) alors que tous les symboles sont écrits lors de "
 "la création d'un modèle de fichier de symboles."
 
@@ -17884,15 +17672,15 @@ msgid ""
 "new symbols have been introduced. Level 3 fails if some libraries have "
 "disappeared. Level 4 fails if some libraries have been introduced."
 msgstr ""
-"Définit les contrôles à effectuer lors de la comparaison des symboles créés "
-"en utilisant le fichier de modèle comme point de départ. Le niveau par "
-"défaut est 1. Plus le niveau est augmenté, plus le nombre de contrôles "
-"effectués est important. Chaque niveau de contrôle comporte les contrôles "
-"effectués pour les niveaux inférieurs. Le niveau 0 n'échoue jamais. Le "
-"niveau 1 échoue si certains symboles ont disparu. Le niveau 2 échoue si de "
-"nouveaux symboles ont été ajoutés. Le niveau 3 échoue si certaines "
-"bibliothèques ont disparu. Le niveau 4 échoue si des bibliothèques ont été "
-"ajoutées."
+"Définit les contrôles à effectuer lors de la comparaison du fichier de "
+"symboles créé en utilisant le fichier de modèle comme point de départ. Le "
+"niveau par défaut est 1. Plus le niveau est augmenté, plus le nombre de "
+"contrôles effectués est important. Chaque niveau de contrôle comporte les "
+"contrôles effectués pour les niveaux inférieurs. Le niveau 0 n'échoue "
+"jamais. Le niveau 1 échoue si certains symboles ont disparu. Le niveau 2 "
+"échoue si de nouveaux symboles ont été ajoutés. Le niveau 3 échoue si "
+"certaines bibliothèques ont disparu. Le niveau 4 échoue si des bibliothèques "
+"ont été ajoutées."
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -17973,7 +17761,7 @@ msgstr ""
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<DPKG_GENSYMBOLS_CHECK_LEVEL>"
-msgstr ""
+msgstr "B<DPKG_GENSYMBOLS_CHECK_LEVEL>"
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -17982,6 +17770,10 @@ msgid ""
 "was given (note that this goes against the common convention of command-line "
 "arguments having precedence over environment variables)."
 msgstr ""
+"Remplace le niveau de vérification de commande, même si l'argument en ligne "
+"de commande B<-c> a été donné (notez que cela va à l'encontre de la "
+"convention générale qui veut que les arguments en ligne de commande ont la "
+"préséance sur les variables d'environnement)."
 
 #. type: Plain text
 #: dpkg-gensymbols.man
@@ -18015,7 +17807,7 @@ msgid ""
 "dpkg-maintscript-helper - works around known dpkg limitations in maintainer "
 "scripts"
 msgstr ""
-"dpkg-maintscript-helper - contournement des limitations connues de dpkg dans "
+"dpkg-maintscript-helper - Contournement des limitations connues de dpkg dans "
 "les scripts du responsable"
 
 #. type: Plain text
@@ -18024,7 +17816,7 @@ msgid ""
 "B<dpkg-maintscript-helper> I<command> [I<parameter>...] B<--> I<maint-script-"
 "parameter>..."
 msgstr ""
-"B<dpkg-maintscript-helper> I<commande> [I<paramètres>...] B<--> I<paramètres-"
+"B<dpkg-maintscript-helper> I<commande> [I<paramètre>...] B<--> I<paramètre-"
 "script-responsable>..."
 
 #. type: SH
@@ -18121,12 +17913,12 @@ msgid ""
 "operation is tried on every upgrade (note: it's safer to give the version "
 "and have the operation tried only once)."
 msgstr ""
-"Indique la dernière version du paquet pour laquelle la mise à jour doit "
+"Indique la dernière version du paquet pour laquelle la mise à niveau doit "
 "provoquer l'opération. Il est important de déterminer correctement I<version-"
 "précédente> afin que les opérations s'accomplissent correctement même si "
 "l'utilisateur reconstruit le paquet avec une version locale. Si le paramètre "
 "I<version-précédente> est vide ou omis, l'opération sera tentée à chaque "
-"mise à jour (il est toutefois plus sûr d'indiquer la version afin que "
+"mise à niveau (il est toutefois plus sûr d'indiquer la version afin que "
 "l'opération n'ait lieu qu'une fois)."
 
 #. type: Plain text
@@ -18142,7 +17934,7 @@ msgstr ""
 "autre dans plusieurs versions et que vous modifiez les scripts du "
 "responsable pour nettoyer l'ancien fichier, I<version-précédente> doit être "
 "basé sur la version actuellement préparée et non la première version qui ne "
-"fournissait plus ce fichier de configuration. Ceci s'applique à toutes les "
+"fournissait plus ce fichier de configuration. Cela s'applique à toutes les "
 "autres actions de la même manière"
 
 #. type: Plain text
@@ -18157,13 +17949,13 @@ msgid ""
 "should set I<prior-version> to B<3.0-1~>."
 msgstr ""
 "Par exemple, pour un fichier de configuration supprimé dans la version "
-"B<2.0-1> d'un paquet, I<dernière-version> doit être B<2.0-1~>. Cela "
+"B<2.0-1> d'un paquet, I<version-précédente> doit être B<2.0-1~>. Cela "
 "provoquera la suppression du fichier même si la version précédente B<1.0-1> "
 "a été reconstruite avec B<1.0-1local1> comme numéro de version. Ou bien, si "
 "un paquet substitue un chemin d'un lien symbolique (fourni dans la version "
 "B<1.0-1>) à un répertoire (fourni dans la version B<2.0-1>), mais ne réalise "
 "réellement la substitution que dans les scripts du responsable dans la "
-"version B<3.0-1>, I<dernière-version> doit être B<3.0-1~>."
+"version B<3.0-1>, I<version-précédente> doit être B<3.0-1~>."
 
 #. type: TP
 #: dpkg-maintscript-helper.man
@@ -18183,6 +17975,15 @@ msgid ""
 "variables (as set by B<dpkg> when running the maintainer scripts) will be "
 "used to generate an arch-qualified package name."
 msgstr ""
+"Le nom du paquet propriétaire du (des) nom(s) de chemin. Si le paquet est "
+"« Multi-Arch: same » ce paramètre doit inclure le type d'architecture, "
+"sinon, il ne devrait B<pas> habituellement inclure le type d'architecture "
+"(parce qu'il pourrait interdire les catégories croisées, ou le passage d'une "
+"architecture spécifique à architecture B<all> ou vice-versa). Si le "
+"paramètre est vide ou omis, les variables d'environnement "
+"B<DPKG_MAINTSCRIPT_PACKAGE> et B<DPKG_MAINTSCRIPT_ARCH> (telles que définies "
+"par B<dpkg> lors de l'exécution des scripts du responsable) seront utilisées "
+"pour créer un nom de paquet avec une qualification d'architecture."
 
 #. type: TP
 #: dpkg-maintscript-helper.man
@@ -18217,16 +18018,16 @@ msgid ""
 "maintained conffile to a file maintained by the package's maintainer "
 "scripts, usually with a tool like debconf or ucf."
 msgstr ""
-"Lors de la mise à jour d'un paquet, B<dpkg> ne supprime pas automatiquement "
-"les fichiers de configuration (comportant des modifications locales à "
+"Lors de la mise à niveau d'un paquet, B<dpkg> ne supprime pas un fichier de "
+"configuration automatiquement (comportant des modifications locales à "
 "préserver) s'il n'est pas présent dans la nouvelle version. Il existe deux "
 "raisons principales à cela. En premier lieu, le fichier de configuration "
 "peut avoir été supprimé par accident, être réintégré dans la version "
 "suivante et il peut être nécessaire de retrouver les modifications locales. "
 "Ensuite, l'objectif est également de permettre d'effectuer la transition "
-"depuis des fichiers de configuration gérés par dpkg vers un fichier géré via "
-"les scripts du responsable, en général à l'aide d'un outil comme debconf ou "
-"ucf."
+"depuis des fichiers de configuration gérés par dpkg vers un fichier géré à "
+"l'aide des scripts du responsable, en général à l'aide d'un outil comme "
+"debconf ou ucf."
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
@@ -18239,7 +18040,7 @@ msgstr ""
 "Cela signifie que si un paquet a besoin de renommer ou supprimer un fichier "
 "de configuration, il doit le faire explicitement. L'objectif de B<dpkg-"
 "maintscript-helper> est donc de fournir des méthodes de suppression ou "
-"renommage de fichiers de configuration via les scripts du responsable."
+"renommage de fichiers de configuration à l'aide de scripts du responsable."
 
 #. type: SS
 #: dpkg-maintscript-helper.man
@@ -18278,7 +18079,7 @@ msgid ""
 "        I<conffile> I<prior-version> I<package> -- \"$@\"\n"
 msgstr ""
 "    dpkg-maintscript-helper rm_conffile \\e\n"
-"        I<fichier-de-configuration> I<dernière-version> I<paquet> -- \"$@\"\n"
+"        I<fichier-de-configuration> I<version-précédente> I<paquet> -- \"$@\"\n"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
@@ -18347,7 +18148,9 @@ msgstr ""
 msgid ""
 "    dpkg-maintscript-helper mv_conffile \\e\n"
 "        I<old-conffile> I<new-conffile> I<prior-version> I<package> -- \"$@\"\n"
-msgstr "    dpkg-maintscript-helper mv_conffile \\e\n"
+msgstr ""
+"    dpkg-maintscript-helper mv_conffile \\e\n"
+"        I<ancien-fichier-configuration> I<nouveau-fichier-configuration>         I<version-précédente> I<paquet> -- \"$@\"\n"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
@@ -18355,8 +18158,8 @@ msgid ""
 "I<old-conffile> and I<new-conffile> are the old and new name of the conffile "
 "to rename."
 msgstr ""
-"I<ancien-fichier> et I<nouveau-fichier> sont l'ancien et le nouveau nom du "
-"fichier de configuration à renommer."
+"I<ancien-fichier-configuration> et I<nouveau-fichier-configuration> sont "
+"l'ancien et le nouveau nom du fichier de configuration à renommer."
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
@@ -18371,12 +18174,14 @@ msgid ""
 msgstr ""
 "Détails de la mise en œuvre actuelle : dans le script B<preinst>, il est "
 "vérifié si le fichier de configuration a été modifié. Celui-ci est alors "
-"soit laissé en place s'il a été modifié, soit renommé en I<ancien-fichier>B<."
-"dpkg-remove> s'il ne l'a pas été. Lors de la configuration, le script "
-"B<postinst> supprime I<ancien-fichier>B<.dpkg-remove> et renomme I<ancien-"
-"fichier> et I<nouveau-fichier> si I<ancien-fichier> existe toujours. Si la "
+"soit laissé en place s'il a été modifié, soit renommé en I<ancien-fichier-"
+"configuration>B<.dpkg-remove> s'il ne l'a pas été. Lors de la configuration, "
+"le script B<postinst> supprime I<ancien-fichier-configuration>B<.dpkg-"
+"remove> et renomme I<ancien-fichier-configuration> et I<nouveau-fichier-"
+"configuration> si I<ancien-fichier-configuration> existe toujours. Si la "
 "mise à jour ou l'installation sont interrompues, le script B<postrm> renomme "
-"I<ancien-fichier>B<.dpkg-remove> en I<ancien-fichier> si c'est indispensable."
+"I<ancien-fichier-configuration>B<.dpkg-remove> en I<ancien-fichier-"
+"configuration> si c'est indispensable."
 
 #. type: SH
 #: dpkg-maintscript-helper.man
@@ -18391,10 +18196,10 @@ msgid ""
 "a directory or vice-versa. Downgrades are not supported and the path will be "
 "left as is."
 msgstr ""
-"Lors de la mise à jour d'un paquet, B<dpkg> ne substitue pas automatiquement "
-"un lien symbolique à un répertoire ou le contraire. Les retours à une "
-"version inférieure ne sont pas pris en charge et le chemin sera laissé comme "
-"il est."
+"Lors de la mise à niveau d'un paquet, B<dpkg> ne substitue pas "
+"automatiquement un lien symbolique à un répertoire ou le contraire. Les "
+"retours à une version inférieure ne sont pas pris en charge et le chemin "
+"sera laissé comme il est."
 
 #. type: SS
 #: dpkg-maintscript-helper.man
@@ -18412,7 +18217,7 @@ msgid ""
 "package."
 msgstr ""
 "Si un lien symbolique est substitué à un répertoire réel, il est nécessaire "
-"de garantir qu'avant le dépaquettage le lien symbolique est retiré. À "
+"de garantir qu'avant le dépaquetage le lien symbolique est retiré. À "
 "première vue, cela peut sembler être une simple modification dans le script "
 "B<preinst>, mais cela risque de résulter en problèmes si l'administrateur "
 "local a personnalisé le lien symbolique ou si l'on revient à une version "
@@ -18451,12 +18256,12 @@ msgid ""
 "symlink. On abort-upgrade/abort-install, the B<postrm> renames I<pathname>B<."
 "dpkg-backup> back to I<pathname> if required."
 msgstr ""
-"Détails de la mise en œuvre actuelle : dans le script B<preinst>, il est "
+"Détails de la mise en œuvre actuelle : dans le script B<preinst>, il est "
 "vérifié si le lien symbolique existe et pointe vers I<ancienne-cible>. Si ce "
 "n'est pas le cas, il est alors soit laissé en place, soit renommé en I<nom-"
 "de-chemin>B<.dpkg-backup>. Lors de la configuration, le script B<postinst> "
 "supprime I<nom-de-chemin>B<.dpkg-backup> si I<nom-de-chemin>B<.dpkg-backup> "
-"est encore un lien symbolique. Si la mise à jour ou l'installation sont "
+"est encore un lien symbolique. Si la mise à niveau ou l'installation sont "
 "interrompues, le script B<postrm> renomme I<nom-de-chemin>B<.dpkg-backup> en "
 "I<nom-de-chemin> si c'est indispensable."
 
@@ -18476,7 +18281,7 @@ msgid ""
 "locally created pathnames, or when downgrading the package."
 msgstr ""
 "Si un répertoire réel est substitué à un lien symbolique, il est nécessaire "
-"de garantir qu'avant le dépaquettage le répertoire est retiré. À première "
+"de garantir qu'avant le dépaquetage le répertoire est retiré. À première "
 "vue, cela peut sembler être une simple modification dans le script "
 "B<preinst>, mais cela risque de résulter en problèmes si le répertoire "
 "contient des fichiers de configuration, des noms de chemins qui "
@@ -18531,9 +18336,9 @@ msgid ""
 "I<pathname>B<.dpkg-backup>. On abort-upgrade/abort-install, the B<postrm> "
 "renames I<pathname>B<.dpkg-backup> back to I<pathname> if required."
 msgstr ""
-"Détails de la mise en œuvre actuelle : dans le script B<preinst>, il est "
+"Détails de la mise en œuvre actuelle : dans le script B<preinst>, il est "
 "vérifié si le répertoire existe et ne contient pas de fichiers de "
-"configuration, de noms de chemins qui appartiennent à d'autres paquets, de "
+"configuration, de noms de chemin qui appartiennent à d'autres paquets, de "
 "noms de chemin créés localement. Si ce n'est pas le cas, il est alors soit "
 "laissé en place, soit renommé en I<nom-de-chemin>B<.dpkg-backup> et un "
 "répertoire vide provisoire nommé I<nom-de-chemin> est créé, marqué par un "
@@ -18542,9 +18347,9 @@ msgstr ""
 "encore un répertoire et si I<nom-de-chemin> est le répertoire provisoire. Il "
 "supprime le fichier qui marque le fichier provisoire et déplace les fichiers "
 "nouvellement créés dans le répertoire provisoire vers la cible du lien "
-"symbolique I<nouvelle cible>, remplace le répertoire provisoire I<nom-de-"
+"symbolique I<nouvelle-cible>, remplace le répertoire provisoire I<nom-de-"
 "chemin>, maintenant vide, par un lien symbolique vers la I<nouvelle-cible> "
-"et, enfin supprime I<nom-de-chemin>B<.dpkg-backup>. Si la mise à jour ou "
+"et, enfin supprime I<nom-de-chemin>B<.dpkg-backup>. Si la mise à niveau ou "
 "l'installation sont interrompues, le script B<postrm> renomme I<nom-de-"
 "chemin>B<.dpkg-backup> en I<nom-de-chemin> si c'est indispensable."
 
@@ -18578,8 +18383,8 @@ msgstr ""
 "l'utiliser sans conditions impose une pré-dépendance afin de garantir que la "
 "version minimale nécessaire de B<dpkg> ait bien été préalablement "
 "configurée. La version minimale dépend de la commande utilisée : ainsi pour "
-"B<rm_conffile> et B<mv_conffile>, cette version est 1.15.7.2, pour "
-"B<symlink_to_dir> et B<dir_to_symlink>, c'est 1.17.14 :"
+"B<rm_conffile> et B<mv_conffile>, cette version est 1.15.7.2, pour "
+"B<symlink_to_dir> et B<dir_to_symlink>, c'est 1.17.14 :"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
@@ -18620,10 +18425,19 @@ msgid ""
 "and required by the script are present, and will consider it a failure in "
 "case the environment is not sufficient."
 msgstr ""
-"La commande B<supports> retournera  0 en cas de réussite, 1 autrement. Elle "
-"vérifiera si les variables d'environnement telles que définies par B<dpkg> "
-"et requises par le script sont présentes, et considérera que c'est un échec "
-"si l'environnement n'est pas suffisant."
+"La commande B<supports> retournera B<0> en cas de réussite, B<1> autrement. "
+"Elle vérifiera si les variables d'environnement telles que définies par "
+"B<dpkg> et requises par le script sont présentes, et considérera que c'est "
+"un échec si l'environnement n'est pas suffisant."
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+"Fixe le mode de couleur (depuis dpkg 1.19.1). Les valeurs admises "
+"actuellement sont B<auto> (par défaut), B<always> et B<never>."
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
@@ -18639,7 +18453,7 @@ msgstr "dpkg-mergechangelogs"
 #. type: Plain text
 #: dpkg-mergechangelogs.man
 msgid "dpkg-mergechangelogs - 3-way merge of debian/changelog files"
-msgstr "dpkg-mergechangelogs - fusion triple de fichiers debian/changelog"
+msgstr "dpkg-mergechangelogs - Fusion triple de fichiers debian/changelog"
 
 #. type: Plain text
 #: dpkg-mergechangelogs.man
@@ -18678,19 +18492,18 @@ msgstr ""
 "pas censées entrer en conflit, mais sont simplement fusionnées dans le bon "
 "ordre (par numéro de version décroissant). Si l'option B<--merge-"
 "prereleases> est utilisée, la partie de numéro de version qui suit le "
-"dernier caractère tilde est omise ; les versions 1.0-1~exp1 et 1.0-1~exp5 "
+"dernier caractère tilde est omise ; les versions 1.0-1~exp1 et 1.0-1~exp5 "
 "sont ainsi considérées comme la même entrée. Quand la même version est "
 "mentionnée dans I<nouveau-a> et I<nouveau-b>, une fusion « 3-way » standard "
-"est tentée (sous réserve que le module Algorithm::Merge soit disponible — il "
-"est fourni par le paquet libalgorithm-merge-perl —. Dans le cas contraire, "
-"un conflit global est créé dans le contexte de cette entrée."
+"est tentée (sous réserve que le module Algorithm::Merge soit disponible — il "
+"est fourni par le paquet libalgorithm-merge-perl. Dans le cas contraire, un "
+"conflit global est créé dans le contexte de cette entrée."
 
 #. type: TP
 #: dpkg-mergechangelogs.man
-#, fuzzy, no-wrap
-#| msgid "B<--merge-prereleases>, B<-m>"
+#, no-wrap
 msgid "B<-m>, B<--merge-prereleases>"
-msgstr "B<--merge-prereleases>, B<-m>"
+msgstr "B<-m>, B<--merge-prereleases>"
 
 #. type: Plain text
 #: dpkg-mergechangelogs.man
@@ -18712,7 +18525,7 @@ msgid ""
 msgstr ""
 "Cette option est utile lorsqu'on conserve la même entrée de journal mais que "
 "la version est incrémentée régulièrement. Par exemple, cela permet "
-"d'utiliser les numéros 2.3-1~exp1, 2.3-1~exp2, etc. jusqu'à une publication "
+"d'utiliser les numéros 2.3-1~exp1, 2.3-1~exp2, etc., jusqu'à une publication "
 "officielle numérotée 2.3-1, toutes ces versions étant considérées comme "
 "l'évolution dans le temps de la même version."
 
@@ -18724,19 +18537,14 @@ msgstr "LIMITATIONS"
 
 #. type: Plain text
 #: dpkg-mergechangelogs.man
-#, fuzzy
-#| msgid ""
-#| "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-#| "This might include stuff like vim modelines, comments which were not "
-#| "supposed to be there, etc."
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 "Tout ce qui ne peut pas être analysé par Dpkg::Changelog est perdu lors de "
-"la fusion. Cela peut comprendre des lignes de mode vim, des commentaires qui "
-"ne sont pas censés se trouver là, etc."
+"la fusion. Cela peut comprendre des commentaires qui ne sont pas censés se "
+"trouver là, etc."
 
 #. type: SH
 #: dpkg-mergechangelogs.man
@@ -18793,7 +18601,7 @@ msgstr "dpkg-name"
 #. type: Plain text
 #: dpkg-name.man
 msgid "dpkg-name - rename Debian packages to full package names"
-msgstr "dpkg-name - redonne aux paquets Debian leur nom complet"
+msgstr "dpkg-name - Redonne aux paquets Debian leur nom complet"
 
 #. type: Plain text
 #: dpkg-name.man
@@ -18813,11 +18621,11 @@ msgid ""
 msgstr ""
 "Cette page de manuel documente le programme B<dpkg-name> qui fournit une "
 "façon simple de redonner aux paquets B<Debian> leur nom complet. Ce nom "
-"consiste en une chaîne « I<paquet>B<_>I<version>B<_>I<architecture>B<."
-">I<type_de_paquet> » telle qu'elle est indiquée dans le fichier « control » "
-"du paquet. La partie I<version> du nom est composée d'informations sur la "
-"version originelle qui peuvent ou non être suivies d'un trait d'union et "
-"d'informations sur la révision. La partie I<type_de_paquet> provient de ce "
+"consiste en une chaîne I<paquet>B<_>I<version>B<_>I<architecture>B<.>I<type-"
+"de-paquet> telle qu'elle est indiquée dans le fichier « control » du paquet. "
+"La partie I<version> du nom est composée d'informations sur la version "
+"originelle qui peuvent ou non être suivies d'un trait d'union et "
+"d'informations sur la révision. La partie I<type-de-paquet> provient de ce "
 "champ s'il existe. La valeur par défaut est B<deb>."
 
 #. type: TP
@@ -18840,7 +18648,7 @@ msgstr "B<-k>, B<--symlink>"
 #. type: Plain text
 #: dpkg-name.man
 msgid "Create a symlink, instead of moving."
-msgstr "Faire un lien symbolique plutôt qu'une création de fichier."
+msgstr "Fait un lien symbolique plutôt qu'une transposition."
 
 #. type: TP
 #: dpkg-name.man
@@ -18865,18 +18673,6 @@ msgstr "B<-s>, B<--subdir> [I<rep>]"
 
 #. type: Plain text
 #: dpkg-name.man
-#, fuzzy
-#| msgid ""
-#| "Files will be moved into a subdirectory. If the directory given as "
-#| "argument exists the files will be moved into that directory otherwise the "
-#| "name of the target directory is extracted from the section field in the "
-#| "control part of the package. The target directory will be `unstable/"
-#| "binary-I<architecture>/I<section>'. If the section is not found in the "
-#| "control, then `no-section' is assumed, and in this case, as well as for "
-#| "sections `non-free' and `contrib' the target directory is `I<section>/"
-#| "binary-I<architecture>'. The section field isn't required so a lot of "
-#| "packages will find their way to the `no-section' area. Use this option "
-#| "with care, it's messy."
 msgid ""
 "Files will be moved into a subdirectory. If the directory given as argument "
 "exists the files will be moved into that directory otherwise the name of the "
@@ -18890,14 +18686,14 @@ msgid ""
 msgstr ""
 "Met les fichiers dans un sous-répertoire. Si le répertoire donné en "
 "paramètre existe, les fichiers sont déplacés dans ce répertoire ; sinon le "
-"répertoire cible, extrait du champ « section » que contient la partie de "
+"répertoire cible, extrait du champ « section » que contient la partie "
 "contrôle du paquet, sera « unstable/binary-I<architecture>/I<section> ». "
 "Quand aucune information sur la section n'est trouvée dans le fichier "
-"« control », la section est supposée être « no-section ». Dans ce cas, ainsi "
-"que si la section est « non-free » ou « contrib », le répertoire cible est "
+"« control », la section est supposée être B<no-section>. Dans ce cas, ainsi "
+"que si la section est B<non-free> ou B<contrib>, le répertoire cible est "
 "« I<section>/binary-I<architecture> ». Le champ « section » est facultatif ; "
 "aussi beaucoup de paquets sont dans la zone « no-section ». Utilisez cette "
-"option avec soin : elle est compliquée."
+"option avec précaution : elle est compliquée."
 
 #. type: TP
 #: dpkg-name.man
@@ -18944,19 +18740,14 @@ msgstr "B<dpkg-name bar-foo.deb>"
 
 #. type: Plain text
 #: dpkg-name.man
-#, fuzzy
-#| msgid ""
-#| "The file `bar-foo.deb' will be renamed to bar-foo_1.0-2_i386.deb or "
-#| "something similar (depending on whatever information is in the control "
-#| "part of `bar-foo.deb')."
 msgid ""
 "The file B<bar-foo.deb> will be renamed to bar-foo_1.0-2_i386.deb or "
 "something similar (depending on whatever information is in the control part "
 "of B<bar-foo.deb>)."
 msgstr ""
-"Le nom du fichier « bar-foo.deb » devient « bar-foo_1.0-2_i386.deb » ou "
+"Le nom du fichier I<bar-foo.deb> devient I<bar-foo_1.0-2_i386.deb> ou "
 "quelque chose de similaire suivant les renseignements que contient la partie "
-"de contrôle de « bar-foo.deb »."
+"de contrôle de I<bar-foo.deb>."
 
 #. type: TP
 #: dpkg-name.man
@@ -18966,11 +18757,6 @@ msgstr "B<find /root/debian/ -name '*.deb' | xargs -n 1 dpkg-name -a>"
 
 #. type: Plain text
 #: dpkg-name.man
-#, fuzzy
-#| msgid ""
-#| "All files with the extension `deb' in the directory /root/debian and its "
-#| "subdirectory's will be renamed by B<dpkg-name> if required into names "
-#| "with no architecture information."
 msgid ""
 "All files with the extension B<deb> in the directory /root/debian and its "
 "subdirectory's will be renamed by B<dpkg-name> if required into names with "
@@ -18978,7 +18764,7 @@ msgid ""
 msgstr ""
 "Cette commande B<dpkg-name> redonne leur nom complet à tous les fichiers qui "
 "se trouvent dans le répertoire /root/debian et ses sous-répertoires et qui "
-"possèdent une extension « deb », mais supprime l'information sur "
+"possèdent une extension B<deb>, mais supprime l'information sur "
 "l'architecture."
 
 #. type: TP
@@ -19047,18 +18833,12 @@ msgstr ""
 
 #. type: TP
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-l>I<changelog-file>"
+#, no-wrap
 msgid "B<-l>, B<--file> I<changelog-file>"
-msgstr "B<-l>I<fichier-des-changements>"
+msgstr "B<-l>, B<--file> I<fichier-des-changements>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid ""
-#| "Specifies the changelog file to read information from. A '-' can be used "
-#| "to specify reading from standard input. The default is B<debian/"
-#| "changelog>."
 msgid ""
 "Specifies the changelog file to read information from.  A ‘-’ can be used to "
 "specify reading from standard input.  The default is B<debian/changelog>."
@@ -19069,18 +18849,12 @@ msgstr ""
 
 #. type: TP
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-F>I<changelog-format>"
+#, no-wrap
 msgid "B<-F> I<changelog-format>"
-msgstr "B<-F>I<format-du-fichiers-des-changements>"
+msgstr "B<-F> I<format-du-fichier-des-changements>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid ""
-#| "Specifies the format of the changelog. By default the format is read from "
-#| "a special line near the bottom of the changelog or failing that defaults "
-#| "to the I<debian> standard format. See also B<CHANGELOG FORMATS>."
 msgid ""
 "Specifies the format of the changelog. By default the format is read from a "
 "special line near the bottom of the changelog or failing that defaults to "
@@ -19088,15 +18862,14 @@ msgid ""
 msgstr ""
 "Indique le format du fichier changelog. Par défaut, c'est une ligne "
 "spéciale, près de la fin du fichier, qui l'indique ; sinon, on utilise le "
-"format classique I<debian>. Voir aussi B<FORMATS DES FICHIERS DE "
+"format classique B<debian>. Voir aussi B<FORMATS DES FICHIERS DE "
 "CHANGEMENTS>."
 
 #. type: TP
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-L>I<libdir>"
+#, no-wrap
 msgid "B<-L> I<libdir>"
-msgstr "B<-L>I<rep_lib>"
+msgstr "B<-L> I<rep_lib>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
@@ -19105,6 +18878,9 @@ msgid ""
 "environment variables B<PERL5LIB> or B<PERLLIB> has a similar effect when "
 "looking for the parser perl modules."
 msgstr ""
+"Option obsolète sans effet (depuis dpkg 1.18.8). Fixer les variables "
+"d'environnement de Perl B<PERL5LIB> ou B<PERLLIB> a un effet similaire lors "
+"de la recherche des modules d'analyse de Perl."
 
 #. type: TP
 #: dpkg-parsechangelog.man
@@ -19118,7 +18894,7 @@ msgid ""
 "Specifies the name of the field to show (since dpkg 1.17.0).  The field name "
 "is not printed, only its value."
 msgstr ""
-"Indique le nom du champ à afficher (depuis dpkg 1.17.0). Le nom du champ "
+"Indique le nom du champ à afficher (depuis dpkg 1.17.0). Le nom du champ "
 "n'est pas affiché, mais seulement sa valeur."
 
 #. type: SS
@@ -19129,20 +18905,13 @@ msgstr "Options de filtrage"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid ""
-#| "The following options can be used to influence the output of the "
-#| "changelog parser, e.g. the range of entries or the format of the output. "
-#| "They need to be supported by the parser script in question. See also "
-#| "B<NOTES>."
 msgid ""
 "The following options can be used to influence the output of the changelog "
 "parser, e.g. the range of entries or the format of the output."
 msgstr ""
 "Les options suivantes peuvent être utilisées pour influencer la sortie de "
 "l'analyseur du journal des modifications (« changelog »), par exemple la "
-"gamme d'entrées ou le format de sortie. Ils doivent être gérés par le script "
-"d'analyse en question. Voir aussi B<NOTES>."
+"gamme d'entrées ou le format de sortie."
 
 #. type: TP
 #: dpkg-parsechangelog.man
@@ -19152,26 +18921,20 @@ msgstr "B<--format>I< format-de-sortie>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid ""
-#| "Set the output format. Currently supported values are I<dpkg> and "
-#| "I<rfc822>.  I<dpkg> is the classic output format (from before this option "
-#| "existed) and the default. It consists of one paragraph in Debian control "
-#| "format (see B<deb-control>(5)). If more than one entry is requested, then "
-#| "most fields are taken from the most recent entry, except otherwise stated:"
 msgid ""
 "Set the output format. Currently supported values are B<dpkg> and "
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 "Règle le format de sortie. Actuellement les valeurs gérées sont I<dpkg> et "
-"I<rfc822>. I<dpkg> est le format classique de sortie (avant que cette option "
+"B<rfc822>. I<dpkg> est le format classique de sortie (avant que cette option "
 "n'existe) et l'option par défaut. Il se compose d'un paragraphe dans le "
 "format du fichier de contrôle Debian (voir B<deb-control>(5)). Si plus d'une "
-"entrée est demandée, alors la plupart des champs sont tirés de l'entrée la "
-"plus récente, sauf si c'est indiqué autrement."
+"entrée est demandée, alors la plupart des champs sont tirés de la première "
+"entrée (habituellement la plus récente), sauf si c'est indiqué autrement."
 
 #. type: TP
 #: dpkg-parsechangelog.man
@@ -19204,8 +18967,8 @@ msgid ""
 "concatenated (space-separated) comments from all the versions requested."
 msgstr ""
 "La priorité la plus élevée de toutes les entrées incluses est utilisée, "
-"suivie par les commentaires concaténés et séparés par une espace pour toutes "
-"les versions demandées."
+"suivie par les commentaires concaténés et séparés par des espaces pour "
+"toutes les versions demandées."
 
 #. type: TP
 #: dpkg-parsechangelog.man
@@ -19229,13 +18992,19 @@ msgid ""
 "use the B<Timestamp> field, but take into account it might not be possible "
 "to map it back to the exact value in this field."
 msgstr ""
+"La date de l'entrée sous forme d'une chaîne, telle qu'elle apparaît dans le "
+"changelog. Avec un format B<strptime>(3) « B<%a, %d %b %Y %T %z> » mais où "
+"le nom du jour de la semaine pourrait ne pas vraiment correspondre au jour "
+"réel obtenu à partir du reste de la chaîne de date. Si une représentation "
+"plus précise du jour est nécessaire, utilisez le champ B<Timestamp>, mais il "
+"faut prendre en compte qu'il pourrait ne pas être possible de la faire "
+"correspondre à la valeur exacte de ce champ."
 
 #. type: TP
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<Tag:>I< tag-list>"
+#, no-wrap
 msgid "B<Timestamp:>I< timestamp>"
-msgstr "B<Tag:>I< liste-d'étiquettes>"
+msgstr "B<Timestamp:> I<horodatage>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
@@ -19243,6 +19012,8 @@ msgid ""
 "The date of the entry as a timestamp in seconds since the epoch (since dpkg "
 "1.18.8)."
 msgstr ""
+"La date de l'entrée comme horodatage en secondes depuis « l'epoch » (depuis "
+"dpkg 1.18.8)."
 
 #. type: TP
 #: dpkg-parsechangelog.man
@@ -19270,7 +19041,7 @@ msgid ""
 "content depends on the changelog format."
 msgstr ""
 "Les textes de toutes les entrées de changelog sont concaténés. Pour faire de "
-"ce champ un champ de contrôle Debian valide, les lignes multiples qui sont "
+"ce champ un champ de contrôle Debian valable, les lignes multiples qui sont "
 "vides sont remplacées par un point B<« . »> et toutes les lignes sont "
 "indentées par une seule espace. Le contenu exact dépend du format du "
 "changelog."
@@ -19301,6 +19072,22 @@ msgstr ""
 "métadonnées de chaque entrée soit préservées."
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, no-wrap
+msgid "B<--reverse>"
+msgstr "B<--reverse>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+"Inclut toutes les modifications en ordre inverse (depuis dpkg 1.19.1). "
+"Note : pour le format de B<dpkg>, la première entrée sera l'entrée la plus "
+"ancienne."
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, no-wrap
 msgid "B<--all>"
@@ -19308,125 +19095,97 @@ msgstr "B<--all>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid ""
-#| "include all changes. Note: other options have no effect when this is in "
-#| "use."
 msgid ""
 "Include all changes. Note: other options have no effect when this is in use."
 msgstr ""
-"inclut toutes les modifications. Note : d'autres options deviennent sans "
+"Inclut toutes les modifications. Note : d'autres options deviennent sans "
 "effet lorsque celle-ci est utilisée."
 
 #. type: TP
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-s>, B<--signal> I<signal>"
+#, no-wrap
 msgid "B<-s>, B<--since> I<version>"
-msgstr "B<-s>, B<--signal> I<signal>"
+msgstr "B<-s>, B<--since> I<version>"
 
 #. type: TQ
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-v>I<version>"
+#, no-wrap
 msgid "B<-v> I<version>"
-msgstr "B<-v>I<version>"
+msgstr "B<-v> I<version>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid "include all changes later than I<version>."
 msgid "Include all changes later than I<version>."
-msgstr "inclut tous les changements qui ont suivi la I<version>."
+msgstr "Inclut tous les changements qui ont suivi la I<version>."
 
 #. type: TP
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-m>, B<--multiversion>"
+#, no-wrap
 msgid "B<-u>, B<--until> I<version>"
-msgstr "B<-m>, B<--multiversion>"
+msgstr "B<-u>, B<--until> I<version>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid "include all changes earlier than I<version>."
 msgid "Include all changes earlier than I<version>."
-msgstr "inclut tous les changements qui ont eu lieu avant la I<version>."
+msgstr "Inclut tous les changements qui ont eu lieu avant la I<version>."
 
 #. type: TP
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-v>, B<--version>"
+#, no-wrap
 msgid "B<-f>, B<--from> I<version>"
-msgstr "B<-v>, B<--version>"
+msgstr "B<-f>, B<--from> I<version>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid "include all changes equal or later than I<version>."
 msgid "Include all changes equal or later than I<version>."
-msgstr "inclut tous les changements depuis la I<version> (incluse)."
+msgstr "Inclut tous les changements depuis la I<version> (incluse)."
 
 #. type: TP
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-v>, B<--version>"
+#, no-wrap
 msgid "B<-t>, B<--to> I<version>"
-msgstr "B<-v>, B<--version>"
+msgstr "B<-t>, B<--to> I<version>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid "include all changes up to or equal than I<version>."
 msgid "Include all changes up to or equal than I<version>."
-msgstr "inclut tous les changements apportés jusqu'à la I<version> comprise."
+msgstr "Inclut tous les changements apportés jusqu'à la I<version> comprise."
 
 #. type: TP
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-c>, B<--contents> I<archive>"
+#, no-wrap
 msgid "B<-c>, B<--count> I<number>"
-msgstr "B<-c>, B<--contents> I<archive>"
+msgstr "B<-c>, B<--count> I<nombre>"
 
 #. type: TQ
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-n>I<filename>"
+#, no-wrap
 msgid "B<-n> I<number>"
-msgstr "B<-n>I<nom-de-fichier>"
+msgstr "B<-n> I<nombre>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid ""
-#| "include I<number> entries from the top (or the tail if I<number> is lower "
-#| "than 0)."
 msgid ""
 "Include I<number> entries from the top (or the tail if I<number> is lower "
 "than 0)."
 msgstr ""
-"inclut ce I<nombre> d'entrées depuis le début (ou la fin si le I<nombre> est "
-"inférieur à 0)."
+"Inclut ce I<nombre> d'entrées depuis le début (ou la fin si le I<nombre> est "
+"inférieur à 0)."
 
 #. type: TP
 #: dpkg-parsechangelog.man
-#, fuzzy, no-wrap
-#| msgid "B<-a>, B<--startas> I<pathname>"
+#, no-wrap
 msgid "B<-o>, B<--offset> I<number>"
-msgstr "I<-a>, B<--startas> I<nom-de-chemin>"
+msgstr "B<-o>, B<--offset> I<nombre>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid ""
-#| "change the starting point for B<--count>, counted from the top (or the "
-#| "tail if I<number> is lower than 0)."
 msgid ""
 "Change the starting point for B<--count>, counted from the top (or the tail "
 "if I<number> is lower than 0)."
 msgstr ""
-"modifie le point de départ pour B<--count>, à compter du début (ou la fin si "
-"le I<nombre> est inférieur à 0)."
+"Modifie le point de départ pour B<--count>, à compter du début (ou la fin si "
+"le I<nombre> est inférieur à 0)."
 
 #. type: SH
 #: dpkg-parsechangelog.man
@@ -19452,7 +19211,7 @@ msgid ""
 "part in parentheses should be the name of the format. For example:"
 msgstr ""
 "Afin que B<dpkg-parsechangelog> utilise le nouvel analyseur, il doit exister "
-"une ligne, parmi les 40 dernières du fichier, qui corresponde à l'expression "
+"une ligne, parmi les 40 dernières du fichier, qui corresponde à l'expression "
 "régulière Perl “B<\\eschangelog-format:\\es+([0-9a-z]+)\\eW>\\ (la partie "
 "entre parenthèses doit être le nom du format). Exemple :"
 
@@ -19464,20 +19223,15 @@ msgstr "       @@@ changelog-format: I<autreformat> @@@\n"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
 "Les noms de formats de journaux de modifications sont des chaînes non vides "
-"de caractères alphanumériques."
+"de caractères alphanumériques en minuscules (« a-z0-9 »)."
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid ""
-#| "If such a line exists then B<dpkg-parsechangelog> will look for the "
-#| "parser as B</usr/lib/dpkg/parsechangelog/>I<otherformat> or B</usr/local/"
-#| "lib/dpkg/parsechangelog/>I<otherformat>; it is an error for it not being "
-#| "present or not being an executable program.  The default changelog format "
-#| "is B<debian>, and a parser for it is provided by default."
 msgid ""
 "If such a line exists then B<dpkg-parsechangelog> will look for the parser "
 "as a B<Dpkg::Changelog::>I<Otherformat> perl module; it is an error for it "
@@ -19486,11 +19240,11 @@ msgid ""
 "is provided by default."
 msgstr ""
 "Si une telle ligne existe, B<dpkg-parsechangelog> recherchera l'analyseur "
-"sous les noms B</usr/lib/dpkg/parsechangelog/>I<autreformat> ou B</usr/local/"
-"lib/dpkg/parsechangelog/>I<autreformat> ; si aucun de ces fichiers n'est "
-"présent et exécutable, c'est une condition d'erreur. Le format de journaux "
-"des modifications par défaut est B<debian> et un analyseur pour ce format "
-"est fourni par défaut."
+"sous le nom du module Perl B<Dpkg::Changelog::>I<autreformat> ; s'il n'est "
+"pas présent, c'est une condition d'erreur. Le nom de l'analyseur dans le "
+"module Perl sera automatiquement mis en capitale. Le format de journaux des "
+"modifications par défaut est B<debian> et un analyseur pour ce format est "
+"fourni par défaut."
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
@@ -19498,6 +19252,8 @@ msgid ""
 "The parser should be derived from the Dpkg::Changelog class and implement "
 "the required documented interface."
 msgstr ""
+"L'analyseur doit être dérivée de la classe Dpkg::Changelog et implémenter "
+"l'interface documentée requise."
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
@@ -19524,19 +19280,14 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid ""
-#| "If the changelog does not have the expected format the parser should exit "
-#| "with a nonzero exit status, rather than trying to muddle through and "
-#| "possibly generating incorrect output."
 msgid ""
 "If the changelog does not have the expected format the parser should error "
 "out, rather than trying to muddle through and possibly generating incorrect "
 "output."
 msgstr ""
 "Si le journal des modifications n'utilise pas le format attendu, l'analyseur "
-"doit se terminer avec un état de sortie non nul, plutôt que d'essayer de "
-"s'en tirer comme il peut et produire une sortie incorrecte."
+"produira une erreur, plutôt que d'essayer de s'en tirer comme il peut et "
+"produire une sortie incorrecte."
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
@@ -19547,29 +19298,20 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid ""
-#| "All B<Parser Options> except for B<-v> are only supported since dpkg "
-#| "1.14.16. Third party parsers for changelog formats other than I<debian> "
-#| "might not support all options."
 msgid ""
 "All B<Parser Options> except for B<-v> are only supported since dpkg 1.14.16."
 msgstr ""
 "Toutes les B<options d'analyse> sauf B<-v> sont gérées par B<dpkg> seulement "
-"depuis la version 1.14.16. Les analyseurs tiers pour les formats de journaux "
-"de modifications autres que I<debian> ne gèrent peut-être pas toutes les "
-"options."
+"depuis la version 1.14.16."
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid "All long command and option names available only since dpkg 1.17.17."
 msgid ""
 "Short option parsing with non-bundled values available only since dpkg "
 "1.18.0."
 msgstr ""
-"Tous les noms de commandes et d'options longs ne sont disponibles qu'à "
-"partir de dpkg 1.17.17."
+"Analyse des options courtes avec des valeurs non-groupées, disponible "
+"seulement à partir de dpkg 1.18.0."
 
 #. type: TP
 #: dpkg-parsechangelog.man
@@ -19592,10 +19334,8 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#, fuzzy
-#| msgid "B<debian/changelog>"
 msgid "B<deb-changelog>(5)."
-msgstr "B<debian/changelog>"
+msgstr "B<deb-changelog>(5)."
 
 #. type: TH
 #: dpkg-query.man
@@ -19630,31 +19370,27 @@ msgstr "B<-l>, B<--list> [I<motif-de-nom-de-paquet>...]"
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-#| msgid ""
-#| "List packages matching given pattern. If no I<package-name-pattern> is "
-#| "given, list all packages in I<%ADMINDIR%/status>, excluding the ones "
-#| "marked as not-installed (i.e. those which have been previously purged). "
-#| "Normal shell wildchars are allowed in I<package-name-pattern>. Please "
-#| "note you will probably have to quote I<package-name-pattern> to prevent "
-#| "the shell from performing filename expansion. For example this will list "
-#| "all package names starting with ``libc6'':"
-msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
-msgstr ""
-"Affiche les paquets correspondant au motif donné. Si aucun I<motif-de-nom-de-"
-"paquet> n'est indiqué, affiche tous les paquets de I<%ADMINDIR%/status>, "
-"sauf ceux qui ne sont pas installés (c'est-à-dire ceux qui ont été "
-"précédemment purgés). Les métacaractères ordinaires de l'interpréteur de "
-"commandes sont autorisés dans I<motif-de-nom-de-paquet>. Il faudra sans "
-"doute mettre I<motif-de-nom-de-paquet> entre apostrophes pour éviter "
-"l'expansion des noms de fichier par l'interpréteur de commandes. Par "
+msgid ""
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
+msgstr ""
+"Affiche les paquets correspondant à un ou plusieurs motifs, quelque soit "
+"leur statut, ce qui comprend tout paquet réel ou virtuel référencé dans tout "
+"champ de relation de dépendance (tel que B<Breaks>, B<Enhances>, etc.). Si "
+"aucun I<motif-de-nom-de-paquet> n'est indiqué, affiche tous les paquets de I<"
+"%ADMINDIR%/status>, sauf ceux qui ne sont pas installés (c'est-à-dire ceux "
+"qui ont été précédemment purgés). Les métacaractères ordinaires de "
+"l'interpréteur de commandes sont autorisés dans I<motif-de-nom-de-paquet>. "
+"Il faudra sans doute mettre I<motif-de-nom-de-paquet> entre apostrophes pour "
+"éviter l'expansion des noms de fichier par l'interpréteur de commandes. Par "
 "exemple, tous les paquets dont le nom commence par « libc6 » seront affichés "
 "par la commande :"
 
@@ -19786,22 +19522,26 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
-msgstr "B<-s>, B<--status> I<nom-du-paquet> ..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
+msgstr "B<-s>, B<--status> [I<nom-du-paquet> ...]"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 "Donne l'état du paquet indiqué. C'est simplement l'affichage de l'entrée de "
-"la base de données concernant les états des paquets installés. Lorsque des "
-"I<noms-de-paquets> multiples sont indiqués, les entrées d'état demandées "
-"sont séparées par une ligne vide et sont dans l'ordre utilisé pour la liste "
-"de paramètres."
+"la base de données concernant les états des paquets installés. Si aucun "
+"I<nom-de-paquet> n'est indiqué, toutes les entrées de paquet dans la base de "
+"données d'état seront affichées (depuis dpkg 1.19.1). Lorsque des entrées de "
+"I<nom-de-paquet> multiples sont indiquées, les entrées d'état demandées sont "
+"séparées par une ligne vide et sont dans l'ordre utilisé pour la liste de "
+"paramètres."
 
 #. type: TP
 #: dpkg-query.man
@@ -19833,17 +19573,13 @@ msgstr "B<--control-list> I<nom-du-paquet>"
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-#| msgid ""
-#| "List control files installed to your system from I<package-name>.  These "
-#| "can be used as input arguments to B<--control-show>."
 msgid ""
 "List control files installed to your system from I<package-name> (since dpkg "
 "1.16.5).  These can be used as input arguments to B<--control-show>."
 msgstr ""
 "Affiche les fichiers de contrôle installés sur le système à partir de I<nom-"
-"du-paquet>. Ceux-ci peuvent être utilisés en paramètres d'entrée de B<--"
-"control-show>."
+"du-paquet> (depuis dpkg 1.16.5). Ceux-ci peuvent être utilisés en paramètres "
+"d'entrée de B<--control-show>."
 
 #. type: TP
 #: dpkg-query.man
@@ -19853,16 +19589,12 @@ msgstr "B<--control-show> I<nom-du-paquet> I<fichier-de-contrôle>"
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-#| msgid ""
-#| "Print the I<control-file> installed to your system from I<package-name> "
-#| "to the standard output."
 msgid ""
 "Print the I<control-file> installed to your system from I<package-name> to "
 "the standard output (since dpkg 1.16.5)."
 msgstr ""
 "Affiche sur la sortie standard le I<fichier-de-contrôle> installé sur le "
-"système pour I<nom-du-paquet>."
+"système pour I<nom-du-paquet> (depuis dpkg 1.16.5)."
 
 #. type: TP
 #: dpkg-query.man
@@ -19872,19 +19604,15 @@ msgstr "B<-c>, B<--control-path> I<nom-du-paquet> [I<fichier-contrôle>]"
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-#| msgid ""
-#| "List paths for control files installed to your system from I<package-"
-#| "name>.  If I<control-file> is specified then only list the path for that "
-#| "control file if it is present."
 msgid ""
 "List paths for control files installed to your system from I<package-name> "
 "(since dpkg 1.15.4).  If I<control-file> is specified then only list the "
 "path for that control file if it is present."
 msgstr ""
 "Affiche les chemins pour les fichiers de contrôle installés sur votre "
-"système pour I<nom-du-paquet>. Si I<fichier-contrôle> est indiqué, seul le "
-"chemin pour ce fichier de contrôle sera affiché, s'il est présent."
+"système pour I<nom-du-paquet> (depuis dpkg 1.15.4). Si I<fichier-contrôle> "
+"est indiqué, seul le chemin pour ce fichier de contrôle sera affiché, s'il "
+"est présent."
 
 #. type: Plain text
 #: dpkg-query.man
@@ -19897,7 +19625,7 @@ msgid ""
 "script), and while there is no good solution for that, this command will not "
 "get removed."
 msgstr ""
-"B<Attention> : cette commande est obsolète parce qu'elle donne un accès "
+"B<Attention> : cette commande est obsolète parce qu'elle donne un accès "
 "direct à la base de données interne de dpkg, et il est conseillé d'utiliser "
 "B<--control-list> et B<--control-show> à la place dans tous les cas où ces "
 "commandes peuvent donner le même résultat. Néanmoins,aussi longtemps qu'il y "
@@ -19914,23 +19642,17 @@ msgstr "B<-S>, B<--search> I<motif-de-nom-à-rechercher>..."
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-#| msgid ""
-#| "Search for packages that own files corresponding to the given pattern.  "
-#| "Standard shell wildchars can be used in the pattern.  This command will "
-#| "not list extra files created by maintainer scripts, nor will it list "
-#| "alternatives."
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 "Recherche les paquets propriétaires de fichiers dont le nom correspond au "
-"motif indiqué. On peut utiliser dans le motif tous les métacaractères de "
-"l'interpréteur de commandes. Cette commande ne donne pas les fichiers "
-"supplémentaires créés par les scripts du responsable de paquet, ni les "
-"alternatives."
+"motif indiqué. On peut utiliser tous les métacaractères de l'interpréteur de "
+"commandes dans le motif, où l'astérisque (B<*> et le point d'interrogation "
+"(B<?>) correspondront à une barre oblique et la barre oblique inverse sert "
+"de caractère d'échappement."
 
 #. type: Plain text
 #: dpkg-query.man
@@ -19942,43 +19664,44 @@ msgid ""
 "glob pattern, otherwise any trailing ‘B</>’ or ‘B</.>’ will be removed and a "
 "literal path lookup will be performed."
 msgstr ""
+"Si le premier caractère du I<motif-de-nom-à-rechercher> est aucun des "
+"caractères « B<*[?/> », il sera alors considéré comme une sous-chaîne de "
+"correspondance et sera implicitement entouré de « B<*> » (comme B<*>I<motif-"
+"de-nom-à-rechercher>B<*>). Si la chaîne suivante contient un des caractères "
+"« B<*[?\\e> », il sera géré comme un motif global, sinon tout « B</> » ou "
+"« B</.> » terminal sera supprimé et une recherche littérale de chemin sera "
+"exécutée."
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-#| msgid ""
-#| "Search for packages that own files corresponding to the given pattern.  "
-#| "Standard shell wildchars can be used in the pattern.  This command will "
-#| "not list extra files created by maintainer scripts, nor will it list "
-#| "alternatives."
 msgid ""
 "This command will not list extra files created by maintainer scripts, nor "
 "will it list alternatives."
 msgstr ""
-"Recherche les paquets propriétaires de fichiers dont le nom correspond au "
-"motif indiqué. On peut utiliser dans le motif tous les métacaractères de "
-"l'interpréteur de commandes. Cette commande ne donne pas les fichiers "
-"supplémentaires créés par les scripts du responsable de paquet, ni les "
-"alternatives."
+"Cette commande ne donne pas les fichiers supplémentaires créés par les "
+"scripts du responsable de paquet, ni les alternatives."
 
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
-msgstr "B<-p>, B<--print-avail> I<nom-du-paquet>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
+msgstr "B<-p>, B<--print-avail> [I<nom-du-paquet>...]"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
-"Affiche les détails relatifs à I<nom-du-paquet>, tels que présents dans I</"
-"var/lib/dpkg/available>. Si des I<nom-paquet> multiples sont indiqués, les "
-"entrées I<available> correspondantes seront séparées par des lignes vides et "
-"apparaîtront dans l'ordre de la liste de paramètres."
+"Affiche les détails relatifs aux paquets, tels que présents dans I<%ADMINDIR"
+"%/available>. Si aucun I<nom-de-paquet> n'est indiqué, toutes les entrées de "
+"paquet dans la base de données d'état seront affichées (depuis dpkg 1.19.1). "
+"Lorsque des entrées de I<nom-de-paquet> multiples sont indiquées, les "
+"entrées I<available> demandées sont séparées par une ligne vide et sont dans "
+"l'ordre utilisé pour la liste de paramètres."
 
 #. type: Plain text
 #: dpkg-query.man
@@ -19993,10 +19716,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man dpkg-trigger.man
-#, fuzzy
-#| msgid ""
-#| "Change the location of the B<dpkg> database. The default location is I</"
-#| "var/lib/dpkg>."
 msgid ""
 "Change the location of the B<dpkg> database. The default location is I<"
 "%ADMINDIR%>."
@@ -20012,10 +19731,6 @@ msgstr "B<--load-avail>"
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-#| msgid ""
-#| "Also load the available file when using the B<--show> and B<--list> "
-#| "commands, which now default to only querying the status file."
 msgid ""
 "Also load the available file when using the B<--show> and B<--list> "
 "commands, which now default to only querying the status file (since dpkg "
@@ -20023,7 +19738,7 @@ msgid ""
 msgstr ""
 "Charge également le fichier I<available> à l'utilisation des commandes B<--"
 "show> et B<--list>, ce qui désormais revient à n'interroger que le fichier "
-"d'état."
+"d'état (depuis dpkg 1.16.2)."
 
 #. type: TP
 #: dpkg-query.man
@@ -20033,8 +19748,19 @@ msgstr "B<-f>, B<--showformat=>I<format>"
 
 #. type: Plain text
 #: dpkg-query.man
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+"Cette option sert à spécifier le format de sortie de l'option B<--show> "
+"(option courte depuis dpkg 1.13.1). Ce format est une chaîne qui sera "
+"utilisée pour chaque paquet listé."
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
-msgstr "Dans la chaîne, “B<\\e>” déspécifie le caractère :"
+msgstr "Dans la chaîne, « B<\\e> » préfixe des caractères de contrôle :"
 
 #. type: Plain text
 #: dpkg-query.man
@@ -20054,8 +19780,8 @@ msgid ""
 "“B<\\e>” before any other character suppresses any special meaning of the "
 "following character, which is useful for “B<\\e>” and “B<$>”."
 msgstr ""
-"“B<\\e>” avant un caractère supprime la signification du caractère qui suit. "
-"C'est utile pour les caractères “B<\\e>” et “B<$>”."
+"“B<\\e>” avant n'importe quel caractère supprime la signification spécial du "
+"caractère qui suit. C'est utile pour les caractères « B<\\e> » et « B<$> »."
 
 #. type: Plain text
 #: dpkg-query.man
@@ -20068,8 +19794,8 @@ msgid ""
 "stored in the binary package end up in it):"
 msgstr ""
 "L'information relative à un paquet peut être indiquée en insérant des appels "
-"de variables spécifiant des champs du paquet avec la syntaxe suivante : “B<"
-"${>I<field>[B<;>I<width>]B<}>”. Les champs sont alignés à droite, à moins "
+"de variables spécifiant des champs du paquet avec la syntaxe suivante : « B<"
+"${>I<champ>[B<;>I<largeur>]B<}> ». Les champs sont alignés à droite, à moins "
 "que la largeur ne soit négative, auquel cas ils sont alignés à gauche. Les "
 "champs suivants sont reconnus, mais pas nécessairement disponibles dans le "
 "fichier d'état (seuls les champs internes ou les champs conservés avec le "
@@ -20142,7 +19868,8 @@ msgstr ""
 "    B<Source>\n"
 "    B<Status> (interne)\n"
 "    B<Suggests>\n"
-"    B<Tag> (en général pas dans le .deb mais dans les fichiers Packages des dépôts)\n"
+"    B<Tag> (en général pas dans le .deb mais dans les fichiers\n"
+"            Packages des dépôts)\n"
 "    B<Triggers-Awaited> (interne)\n"
 "    B<Triggers-Pending> (interne)\n"
 "    B<Version>\n"
@@ -20166,12 +19893,6 @@ msgstr "B<binary:Package>"
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-#| msgid ""
-#| "It contains the binary package name with a possible architecture "
-#| "qualifier like \"libc6:amd64\" (since dpkg 1.16.2). The architecture "
-#| "qualifier will only be present if the package has a B<Multi-Arch> field "
-#| "with a value of B<same>. This makes the package name unambiguous."
 msgid ""
 "It contains the binary package name with a possible architecture qualifier "
 "like “libc6:amd64” (since dpkg 1.16.2).  An architecture qualifier will be "
@@ -20180,9 +19901,21 @@ msgid ""
 "architecture."
 msgstr ""
 "Contient le nom du paquet binaire avec éventuellement le type d'architecture "
-"tel que « libc6:amd64 » (depuis dpkg 1.16.2). Le type d'architecture sera "
-"présent uniquement si le champ B<Multi-Arch> du paquet a la valeur B<same>. "
-"Le nom du paquet est ainsi non ambigu."
+"tel que « libc6:amd64 » (depuis dpkg 1.16.2). Le type d'architecture sera "
+"présent pour rendre le nom de paquet non ambigu, par exemple si le champ "
+"B<Multi-Arch> du paquet a la valeur B<same> ou si le paquet appartient à une "
+"architecture différente."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<binary:Synopsis>"
+msgstr "B<binary:Synopsis>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid "It contains the package short description (since dpkg 1.19.1)."
+msgstr "Il contient la description courte du paquet (depuis dpkg 1.19.1)."
 
 #. type: TP
 #: dpkg-query.man
@@ -20192,8 +19925,8 @@ msgstr "B<binary:Summary>"
 
 #. type: Plain text
 #: dpkg-query.man
-msgid "It contains the package short description (since dpkg 1.16.2)."
-msgstr "Il contient la description courte du paquet (depuis dpkg 1.16.2)."
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
+msgstr "C'est un alias de B<binary:Synopsis> (depuis dpkg 1.16.2)."
 
 #. type: TP
 #: dpkg-query.man
@@ -20203,17 +19936,14 @@ msgstr "B<db:Status-Abbrev>"
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-#| msgid ""
-#| "It contains the abbreviated package status, such as “ii” (since dpkg "
-#| "1.16.2)."
 msgid ""
 "It contains the abbreviated package status (as three characters), such as "
 "“ii ” or “iHR” (since dpkg 1.16.2).  See the B<--list> command description "
 "for more details."
 msgstr ""
-"Il contient le statut du paquet dans sa forme abrégée comme “ii” (depuis "
-"dpkg 1.16.2)."
+"Il contient l'état du paquet dans sa forme abrégée en trois caractères, "
+"comme « ii  » ou « iHR » (depuis dpkg 1.16.2). Voir la description de la "
+"commande B<--list> pour plus de détails."
 
 #. type: TP
 #: dpkg-query.man
@@ -20227,8 +19957,8 @@ msgid ""
 "It contains the package wanted status, part of the Status field (since dpkg "
 "1.17.11)."
 msgstr ""
-"Il contient le statut désiré du paquet, extrait du champ Status (depuis dpkg "
-"1.17.11)."
+"Il contient l'état désiré du paquet, extrait du champ Status (depuis "
+"dpkg 1.17.11)."
 
 #. type: TP
 #: dpkg-query.man
@@ -20242,8 +19972,8 @@ msgid ""
 "It contains the package status word, part of the Status field (since dpkg "
 "1.17.11)."
 msgstr ""
-"Il contient le statut actuel du paquet, extrait du champ Status (depuis dpkg "
-"1.17.11)."
+"Il contient l'expression d'état du paquet, extrait du champ Status (depuis "
+"dpkg 1.17.11)."
 
 #. type: TP
 #: dpkg-query.man
@@ -20257,8 +19987,39 @@ msgid ""
 "It contains the package status error flag, part of the Status field (since "
 "dpkg 1.17.11)."
 msgstr ""
-"Il contient le drapeau d'erreur du statut du paquet, extrait du champ Status "
-"(depuis dpkg 1.17.11)."
+"Il contient le drapeau d'erreur d'état du paquet, extrait du champ Status "
+"(depuis dpkg 1.17.11)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Files>"
+msgstr "B<db-fsys:Files>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr ""
+"Il contient la liste des entrées de paquets du système de fichiers, séparées "
+"par des sauts de lignes (depuis dpkg 1.19.3)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr "B<db-fsys:Last-Modified>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+"Il contient l'horodatage en seconde de la dernière date à laquelle les "
+"entrées de paquets du système de fichiers ont été modifiées (depuis "
+"dpkg 1.19.3)."
 
 #. type: TP
 #: dpkg-query.man
@@ -20272,8 +20033,8 @@ msgid ""
 "It contains the source package name for this binary package (since dpkg "
 "1.16.2)."
 msgstr ""
-"Il contient le nom du paquet source de ce paquet binaire (depuis dpkg "
-"1.16.2)."
+"Il contient le nom du paquet source de ce paquet binaire (depuis "
+"dpkg 1.16.2)."
 
 #. type: Plain text
 #: dpkg-query.man
@@ -20281,21 +20042,17 @@ msgid ""
 "It contains the source package version for this binary package (since dpkg "
 "1.16.2)"
 msgstr ""
-"Il contient la version du paquet source de ce paquet binaire (depuis dpkg "
-"1.16.2)."
+"Il contient la version du paquet source de ce paquet binaire (depuis "
+"dpkg 1.16.2)."
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-#| msgid ""
-#| "It contains the source package version for this binary package (since "
-#| "dpkg 1.16.2)"
 msgid ""
 "It contains the source package upstream version for this binary package "
 "(since dpkg 1.18.16)"
 msgstr ""
-"Il contient la version du paquet source de ce paquet binaire (depuis dpkg "
-"1.16.2)."
+"Il contient la version du paquet source amont de ce paquet binaire (depuis "
+"dpkg 1.18.16)."
 
 #. type: Plain text
 #: dpkg-query.man
@@ -20306,8 +20063,8 @@ msgid ""
 "conversion nor error checking is done on them. To get the name of the "
 "B<dpkg> maintainer and the installed version, you could run:"
 msgstr ""
-"Le format par défaut est le suivant : “B<${binary:Package}\\et"
-"${Version}\\en>”. Tous les autres champs du fichier d'état, par exemple des "
+"Le format par défaut est le suivant : « B<${binary:Package}\\et"
+"${Version}\\en> ». Tous les autres champs du fichier d'état, par exemple des "
 "champs définis par l'utilisateur, peuvent être demandés. Ils seront affichés "
 "mais sans aucune mise en forme et aucune conversion ou vérification n'est "
 "faite. Pour obtenir le nom du responsable de B<dpkg> et la version "
@@ -20331,15 +20088,57 @@ msgid ""
 "package being found (except for B<--control-path>, B<--control-list> and B<--"
 "control-show> were such errors are fatal)."
 msgstr ""
+"La requête demandée a échoué soit totalement, soit partiellement, du fait "
+"qu'aucun fichier ni paquet n'a été trouvé (sauf pour B<--control-path>, B<--"
+"control-list> et B<--control-show> où de telles erreurs sont fatales)."
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
 msgstr ""
-"Ce réglage influence la sortie de l'option B<--list> en modifiant la largeur "
-"d'affichage."
+"Définit le programme à exécuter lors du lancement d'une commande avec un "
+"shell (depuis dpkg 1.19.2)."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+"Définit la commande d'afficheur à utiliser (depuis dpkg 1.19.1) qui sera "
+"exécutée avec « B<$SHELL -c> ». Si B<SHELL> n'est pas défini, « B<sh> » sera "
+"utilisé à la place. B<DPKG_PAGER> remplace la variable d'environnement "
+"B<PAGER> (depuis dpkg 1.19.2)."
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+"Si cette variable est positionnée et que l'option B<--admindir> n'est pas "
+"précisée, ce répertoire sera utilisé comme répertoire de données pour "
+"B<dpkg>."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+"Définie à « B<-FRSXMQ> » par B<dpkg-query>, si elle n'est pas déjà fixée, "
+"lors du lancement d'un afficheur (depuis dpkg 1.19.2). Pour modifier le "
+"comportement par défaut, cette variable peut être réglée à une autre valeur "
+"y compris une chaîne vide, ou les variables B<PAGER> ou B<DPKG_PAGER> "
+"peuvent être fixées pour désactiver des options spécifiques avec « B<-+> », "
+"par exemple B<DPKG_PAGER=\"less -+F\">."
 
 #. type: TH
 #: dpkg-scanpackages.man
@@ -20350,20 +20149,16 @@ msgstr "dpkg-scanpackages"
 #. type: Plain text
 #: dpkg-scanpackages.man
 msgid "dpkg-scanpackages - create Packages index files"
-msgstr "dpkg-scanpackages - créer des fichiers d'index de paquets."
+msgstr "dpkg-scanpackages - Créer des fichiers d'index de paquets."
 
 #. type: Plain text
 #: dpkg-scanpackages.man
-#, fuzzy
-#| msgid ""
-#| "B<dpkg-scanpackages> [I<option>...] I<binary-dir> [I<override-file> "
-#| "[I<path-prefix>]] B<E<gt>> I<Packages>"
 msgid ""
 "B<dpkg-scanpackages> [I<option>...] I<binary-path> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Packages>"
 msgstr ""
-"B<dpkg-scanpackages> [I<option>...] I<rep-de-binaires> [I<fichier-"
-"d'override> [I<chemin-à-préfixer>]] B<E<gt>> I<Packages> "
+"B<dpkg-scanpackages> [I<option>...] I<chemin-de-binaires> [I<fichier-"
+"override> [I<préfixe-chemin>]] B<E<gt>> I<Paquets>"
 
 #. type: Plain text
 #: dpkg-scanpackages.man
@@ -20385,13 +20180,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-scanpackages.man
-#, fuzzy
-#| msgid ""
-#| "B<Note:> If you want to access the generated Packages file with B<apt> "
-#| "you will probably need to compress the file with B<bzip2>(1)  (generating "
-#| "a Packages.bz2 file) or B<gzip>(1)  (generating a Packages.gz file). apt "
-#| "ignores uncompressed Packages files except on local access (i.e.  "
-#| "B<file://> sources)."
 msgid ""
 "B<Note:> If you want to access the generated Packages file with B<apt> you "
 "will probably need to compress the file with B<xz>(1)  (generating a "
@@ -20399,54 +20187,44 @@ msgid ""
 "B<gzip>(1)  (generating a Packages.gz file). apt ignores uncompressed "
 "Packages files except on local access (i.e.  B<file://> sources)."
 msgstr ""
-"B<Note :> Pour pouvoir accéder avec B<apt> au fichier « Packages » créé, il "
-"faudra sans doute le compresser avec B<bzip2>(1) (qui crée un fichier "
-"Packages.bz2) ou B<gzip>(1) (qui crée un fichier Packages.gz). apt ignore "
-"les fichiers « Packages » non compressés, sauf pour des sources locales "
-"(c'est-à-dire B<file://>)."
+"B<Note> : Pour pouvoir accéder avec B<apt> au fichier « Packages » créé, il "
+"faudra sans doute le compresser avec B<xz>(1) (qui crée un fichier Packages."
+"xz), B<bzip2>(1) (qui crée un fichier Packages.bz2) ou B<gzip>(1) (qui crée "
+"un fichier Packages.gz). B<apt> ignore les fichiers « Packages » non "
+"compressés, sauf pour des sources locales (c'est-à-dire les sources B<file://"
+">)."
 
 #. type: Plain text
 #: dpkg-scanpackages.man
-#, fuzzy
-#| msgid ""
-#| "I<binary-dir> is the name of the tree of the binary packages to process "
-#| "(for example, B<contrib/binary-i386>).  It is best to make this relative "
-#| "to the root of the Debian archive, because every Filename field in the "
-#| "new Packages file will start with this string."
 msgid ""
 "I<binary-path> is the name of the tree of the binary packages to process "
 "(for example, B<contrib/binary-i386>).  It is best to make this relative to "
 "the root of the Debian archive, because every Filename field in the new "
 "Packages file will start with this string."
 msgstr ""
-"I<rep-de-binaires> est le nom de l'arborescence des paquets binaires (par "
-"exemple B<contrib/binary-i386)> que l'on veut traiter. Il vaut mieux qu'elle "
-"soit relative à la racine de l'archive Debian ; ainsi chaque champ "
+"I<chemin-de-binaires> est le nom de l'arborescence des paquets binaires (par "
+"exemple B<contrib/binary-i386)> que l'on veut traiter. Il vaut mieux qu'il "
+"soit relatif à la racine de l'archive Debian ; ainsi chaque champ "
 "« Filename » dans le nouveau fichier « Packages » commencera par cette "
 "chaîne."
 
 #. type: Plain text
 #: dpkg-scanpackages.man
-#, fuzzy
-#| msgid ""
-#| "I<override-file> is the name of a file to read which contains information "
-#| "about how the package fits into the distribution (it can be a compressed "
-#| "file); see B<deb-override>(5)."
 msgid ""
 "I<override-file> is the name of a file to read which contains information "
 "about how the package fits into the distribution (the file can be compressed "
 "since dpkg 1.15.5); see B<deb-override>(5)."
 msgstr ""
-"I<fichier-d'override> est le nom du fichier qui contient les renseignements "
+"I<fichier-override> est le nom du fichier qui contient les renseignements "
 "sur la manière dont le paquet s'insère dans la distribution (ce fichier peut "
-"être compressé) ; voir B<deb-override>(5)."
+"être compressé depuis dpkg 1.15.5) ; voir B<deb-override>(5)."
 
 #. type: Plain text
 #: dpkg-scanpackages.man
 msgid ""
 "I<path-prefix> is an optional string to be prepended to the Filename fields."
 msgstr ""
-"I<chemin-à-préfixer> est une chaîne facultative qui préfixera les champs "
+"I<préfixe-chemin> est une chaîne facultative qui préfixera les champs "
 "« Filename »."
 
 #. type: Plain text
@@ -20479,19 +20257,14 @@ msgstr "B<-e>, B<--extra-override> I<fichier>"
 
 #. type: Plain text
 #: dpkg-scanpackages.man
-#, fuzzy
-#| msgid ""
-#| "Scan I<file> to find supplementary overrides (the file can be "
-#| "compressed). See B<deb-extra-override>(5)  for more information on its "
-#| "format."
 msgid ""
 "Scan I<file> to find supplementary overrides (the file can be compressed "
 "since dpkg 1.15.5).  See B<deb-extra-override>(5)  for more information on "
 "its format."
 msgstr ""
 "Examine I<fichier> à la recherche d'« overrides » supplémentaires (ce "
-"fichier peut être compressé). Voir B<deb-extra-override>(5) pour plus "
-"d'information sur le format utilisé."
+"fichier peut être compressé depuis dpkg 1.15.5). Voir B<deb-extra-"
+"override>(5) pour plus d'information sur le format utilisé."
 
 #. type: TP
 #: dpkg-scanpackages.man
@@ -20505,8 +20278,8 @@ msgid ""
 "Use a pattern consisting of I<*_all.deb> and I<*_arch.deb> instead of "
 "scanning for all debs."
 msgstr ""
-"Utilise un motif équivalent à I<*_all.deb> et à I<*_arch.deb>, plutôt que de "
-"rechercher tous les fichiers debs."
+"Utilise un motif se composant de I<*_all.deb> et de I<*_arch.deb>, plutôt "
+"que de rechercher tous les fichiers debs."
 
 #. type: TP
 #: dpkg-scanpackages.man
@@ -20516,19 +20289,15 @@ msgstr "B<-h>, B<--hash> I<liste-de-hachage>"
 
 #. type: Plain text
 #: dpkg-scanpackages.man
-#, fuzzy
-#| msgid ""
-#| "Only generate file hashes for the comma-specified list specified.  The "
-#| "default is to generate all currently supported hashes.  Supported values: "
-#| "B<md5>, B<sha1>, B<sha256>."
 msgid ""
 "Only generate file hashes for the comma-specified list specified (since dpkg "
 "1.17.14).  The default is to generate all currently supported hashes.  "
 "Supported values: B<md5>, B<sha1>, B<sha256>."
 msgstr ""
 "Générer uniquement le hachage de fichiers spécifiés (liste séparée par des "
-"virgules). Par défaut cela génére tous les hachages actuellement pris en "
-"charge. Valeurs supportées: B<md5>, B<sha1>, B<sha256>."
+"virgules - depuis dpkg 1.17.14). Par défaut, cela génère tous les hachages "
+"actuellement pris en charge. Valeurs prises en charges : B<md5>, B<sha1>, "
+"B<sha256>."
 
 #. type: TP
 #: dpkg-scanpackages.man
@@ -20545,23 +20314,18 @@ msgstr "Affiche tous les paquets trouvés en sortie."
 #: dpkg-scanpackages.man
 #, no-wrap
 msgid "B<-M>, B<--medium> I<id-string>"
-msgstr "B<-M>, B<--medium> I<id-chaîne>"
+msgstr "B<-M>, B<--medium> I<chaîne-id>"
 
 #. type: Plain text
 #: dpkg-scanpackages.man
-#, fuzzy
-#| msgid ""
-#| "Add an X-Medium field containing the value I<id-string>. This field is "
-#| "required if you want to generate B<Packages.cd> files for use by the "
-#| "multicd access method of dselect."
 msgid ""
 "Add an B<X-Medium> field containing the value I<id-string> (since dpkg "
 "1.15.5).  This field is required if you want to generate B<Packages.cd> "
 "files for use by the multicd access method of dselect."
 msgstr ""
-"Ajoute un champ X-Medium qui contient la valeur I<id-chaîne>. Ce champ est "
-"obligatoire si vous voulez créer des fichiers B<Packages.cd> destinés à être "
-"utilisés avec la méthode multicd de dselect."
+"Ajoute un champ B<X-Medium> qui contient la valeur I<chaîne-id> (depuis "
+"dpkg 1.15.5). Ce champ est obligatoire si vous voulez créer des fichiers "
+"B<Packages.cd> destinés à être utilisés avec la méthode multicd de dselect."
 
 #. type: SH
 #: dpkg-scanpackages.man dpkg-shlibdeps.man dpkg-source.man
@@ -20603,7 +20367,7 @@ msgstr "dpkg-scansources"
 #. type: Plain text
 #: dpkg-scansources.man
 msgid "dpkg-scansources - create Sources index files"
-msgstr "dpkg-scansources - crée des fichiers d'index de sources"
+msgstr "dpkg-scansources - Crée des fichiers d'index de sources"
 
 #. type: Plain text
 #: dpkg-scansources.man
@@ -20611,8 +20375,8 @@ msgid ""
 "B<dpkg-scansources> [I<option>...] I<binary-dir> [I<override-file> [I<path-"
 "prefix>]] B<E<gt>> I<Sources>"
 msgstr ""
-"B<dpkg-scansources> [I<option>...] I<rep-de-binaires> [I<fichier-d'override> "
-"[I<chemin-à-préfixer>]] B<E<gt>> I<Sources> "
+"B<dpkg-scansources> [I<option>...] I<rep-de-binaires> [I<fichier-override> "
+"[I<préfixe-chemin>]] B<E<gt>> I<Sources>"
 
 #. type: Plain text
 #: dpkg-scansources.man
@@ -20626,17 +20390,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-scansources.man
-#, fuzzy
-#| msgid ""
-#| "The I<override-file>, if given, is used to set priorities in the "
-#| "resulting index records and to override the maintainer field given in the "
-#| "I<.dsc> files. The file can be compressed. See B<deb-override>(5)  for "
-#| "the format of this file. Note: Since the override file is indexed by "
-#| "binary, not source packages, there's a bit of a problem here. The current "
-#| "implementation uses the highest priority of all the binary packages "
-#| "produced by a I<.dsc> file for the priority of the source package, and "
-#| "the override entry for the first binary package listed in the I<.dsc> "
-#| "file to modify maintainer information. This might change."
 msgid ""
 "The I<override-file>, if given, is used to set priorities in the resulting "
 "index records and to override the maintainer field given in the I<.dsc> "
@@ -20648,15 +20401,16 @@ msgid ""
 "override entry for the first binary package listed in the I<.dsc> file to "
 "modify maintainer information. This might change."
 msgstr ""
-"Le I<fichier-d'override>, s'il est indiqué, est utilisé pour fixer les "
+"Le I<fichier-override>, s'il est indiqué, est utilisé pour fixer les "
 "priorités dans l'index créé et pour modifier le responsable donné par les "
-"fichiers I<.dsc>. Consultez B<deb-override>(5) pour plus de détails sur le "
-"format de ce fichier. Note : comme le fichier override est indexé par paquet "
-"binaire et non pas par paquet source, cela pose un léger problème. "
-"L'implémentation actuelle utilise la priorité la plus élevée des paquets "
-"produits par un fichier I<.dsc> comme priorité du paquet source, et l'entrée "
-"du fichier override du premier paquet binaire listé dans le fichier I<.dsc> "
-"pour modifier l'information sur le responsable. Cela pourra changer."
+"fichiers I<.dsc> (depuis dpkg 1.15.5). Consultez B<deb-override>(5) pour "
+"plus de détails sur le format de ce fichier. Note : comme le fichier "
+"override est indexé par paquet binaire et non pas par paquet source, cela "
+"pose un léger problème. L'implémentation actuelle utilise la priorité la "
+"plus élevée des paquets produits par un fichier I<.dsc> comme priorité du "
+"paquet source, et l'entrée du fichier override du premier paquet binaire "
+"listé dans le fichier I<.dsc> pour modifier l'information sur le "
+"responsable. Cela pourra changer."
 
 #. type: Plain text
 #: dpkg-scansources.man
@@ -20665,7 +20419,7 @@ msgid ""
 "generated source index. You generally use this to make the directory fields "
 "contain the path from the top of the Debian archive hierarchy."
 msgstr ""
-"Le I<chemin-à-préfixer>, s'il est indiqué, est ajouté au début du champ "
+"Le I<préfixe-chemin>, s'il est indiqué, est ajouté au début du champ "
 "Directory (« répertoire ») dans l'index des sources généré. C'est, en règle "
 "générale, utilisé pour que le champ Directory contienne un chemin depuis la "
 "racine de l'archive Debian."
@@ -20678,10 +20432,10 @@ msgid ""
 "Sources.gz file). apt ignores uncompressed Sources files except on local "
 "access (i.e.  B<file://> sources)."
 msgstr ""
-"B<Note :> Si vous voulez accéder au fichier Sources généré avec B<apt>(8), "
+"B<Note> : Si vous voulez accéder au fichier Sources généré avec B<apt>(8), "
 "vous devrez probablement compresser ce fichier avec B<gzip>(1) (pour créer "
-"un fichier Sources.gz). Apt ignore les fichiers Sources non compressés sauf "
-"pour les accès locaux (c'est-à-dire les sources B<file://>)."
+"un fichier Sources.gz). B<apt> ignore les fichiers Sources non compressés "
+"sauf pour les accès locaux (c'est-à-dire les sources B<file://>)."
 
 #. type: IP
 #: dpkg-scansources.man
@@ -20700,19 +20454,14 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-scansources.man
-#, fuzzy
-#| msgid ""
-#| "Scan I<file> to find supplementary overrides (the file can be "
-#| "compressed). See B<deb-extra-override>(5)  for more information on its "
-#| "format."
 msgid ""
 "Scan I<file> to find supplementary overrides (since dpkg 1.15.4; the file "
 "can be compressed since dpkg 1.15.5).  See B<deb-extra-override>(5)  for "
 "more information on its format."
 msgstr ""
-"Examine I<fichier> à la recherche d'« overrides » supplémentaires (ce "
-"fichier peut être compressé). Voir B<deb-extra-override>(5) pour plus "
-"d'information sur le format utilisé."
+"Examine I<fichier> à la recherche d'« overrides » supplémentaires (depuis "
+"dpkg 1.15.4 ; ce fichier peut être compressé depuis dpkg 1.15.5). Voir B<deb-"
+"extra-override>(5) pour plus d'information sur le format utilisé."
 
 #. type: IP
 #: dpkg-scansources.man
@@ -20722,19 +20471,14 @@ msgstr "B<-s>, B<--source-override> I<fichier>"
 
 #. type: Plain text
 #: dpkg-scansources.man
-#, fuzzy
-#| msgid ""
-#| "Use I<file> as the source override file (the file can be compressed).  "
-#| "The default is the name of the override file you specified with I<.src> "
-#| "appended."
 msgid ""
 "Use I<file> as the source override file (the file can be compressed since "
 "dpkg 1.15.5).  The default is the name of the override file you specified "
 "with I<.src> appended."
 msgstr ""
 "Utilise I<fichier> comme fichier override des sources (ce fichier peut être "
-"compressé). La valeur par défaut est le fichier override indiqué auquel est "
-"ajoutée l'extension I<.src>."
+"compressé depuis dpkg 1.15.5). La valeur par défaut est le nom du fichier "
+"override indiqué auquel est ajoutée l'extension I<.src>."
 
 #. type: Plain text
 #: dpkg-scansources.man
@@ -20752,8 +20496,8 @@ msgstr ""
 "l'habitude. Si un paquet apparaît dans chaque fichier, le fichier des "
 "sources est prioritaire pour fixer la section."
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
@@ -20778,7 +20522,7 @@ msgstr "dpkg-shlibdeps"
 #: dpkg-shlibdeps.man
 msgid "dpkg-shlibdeps - generate shared library substvar dependencies"
 msgstr ""
-"dpkg-shlibdeps - générateur de variables de substitution de dépendances pour "
+"dpkg-shlibdeps - Générateur de variables de substitution de dépendances pour "
 "bibliothèques partagées"
 
 #. type: Plain text
@@ -20798,9 +20542,9 @@ msgstr ""
 "B<dpkg-shlibdeps> calcule, pour les exécutables indiqués dans ses "
 "paramètres, les dépendances envers les bibliothèques partagées. Ces "
 "dépendances sont ajoutées au fichier de variables de substitution B<debian/"
-"substvars> sous la forme B<shlibs:>I<dependencyfield> où I<dependencyfield> "
-"est le nom du champ de dépendance. Toute autre variable après I<shlibs:> est "
-"supprimée du fichier."
+"substvars> sous la forme B<shlibs:>I<champ-dépendance> où I<champ-"
+"dépendance> est le nom du champ de dépendance. Toute autre variable après "
+"I<shlibs:> est supprimée du fichier."
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
@@ -20819,16 +20563,16 @@ msgid ""
 "the library."
 msgstr ""
 "B<dpkg-shlibdeps> a deux sources possibles pour créer les informations "
-"concernant les dépendances. Soit les fichiers I<symbols>, soit les fichiers "
+"concernant les dépendances, soit les fichiers I<symbols>, soit les fichiers "
 "I<shlibs>. Pour chaque fichier binaire qu'il analyse, B<dpkg-shlibdeps> "
 "recherche la liste des bibliothèques partagées qui lui sont liées. Puis, "
 "pour chacune d'elles il analyse soit le fichier I<symbols>, soit le fichier "
 "I<shlibs> (si le premier n'existe pas ou si debian/shlibs.local contient les "
-"dépendances appropriées). Ces deux fichiers sont sensés être fournis par le "
+"dépendances appropriées). Ces deux fichiers sont censés être fournis par le "
 "paquet de la bibliothèque et disponibles dans %ADMINDIR%/info/I<paquet>."
 "I<symbols> ou %ADMINDIR%/info/I<paquet>.I<shlibs>. Le nom du paquet est "
-"trouvé en deux étapes : en cherchant les fichiers de la bibliothèque sur le "
-"système, dans le répertoire que B<ld.so> utiliserait, puis un utilisant "
+"trouvé en deux étapes : en cherchant le fichier de la bibliothèque sur le "
+"système, dans le répertoire que B<ld.so> utiliserait, puis en utilisant "
 "B<dpkg -S >I<fichier-bibliothèque> pour trouver le paquet qui fournit cette "
 "bibliothèque."
 
@@ -20867,7 +20611,7 @@ msgid ""
 "symbols file in that build tree takes precedence over symbols files from "
 "other binary packages."
 msgstr ""
-"L'information des bibliothèques partagées générée par l'actuel processus de "
+"Les informations de bibliothèque partagée générée par l'actuel processus de "
 "construction qui invoque aussi B<dpkg-shlibdeps>. Elles sont générées par "
 "B<dpkg-gensymbols>(1) et ne sont utilisées que si la bibliothèque se trouve "
 "dans l'arbre de construction d'un paquet. Le fichier des symboles qui "
@@ -20893,8 +20637,8 @@ msgid ""
 "architecture of the current system (obtained by B<dpkg-architecture -"
 "qDEB_HOST_ARCH>)."
 msgstr ""
-"L'information de dépendance des bibliothèques partagées associée aux "
-"systèmes. I<arch> est l'architecture du système actuel (obtenu par B<dpkg-"
+"Les informations de dépendance de bibliothèque partagée principales par "
+"système. I<arch> est l'architecture du système actuel (obtenu par B<dpkg-"
 "architecture -qDEB_HOST_ARCH>)."
 
 #. type: IP
@@ -20909,9 +20653,9 @@ msgid ""
 "Package-provided shared library dependency information.  Unless overridden "
 "by B<--admindir>, those files are located in %ADMINDIR%."
 msgstr ""
-"Paquet fournissant des informations concernant les dépendances envers des "
-"bibliothèques partagées. Sauf indication contraire par le biais de B<--"
-"admindir>, ces fichiers sont par défaut dans %ADMINDIR%."
+"Les informations de dépendance de bibliothèque partagée fournies par le "
+"paquet. Sauf indication contraire par le biais de B<--admindir>, ces "
+"fichiers sont par défaut dans %ADMINDIR%."
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
@@ -20956,8 +20700,8 @@ msgid ""
 "and easy to handle."
 msgstr ""
 "Les fichiers Shlibs associent directement une bibliothèque à une dépendance "
-"(sans regarder les symboles). Il agit donc souvent plus fortement que ce "
-"dont on aurait besoin mais il reste très sûr et facile à manipuler."
+"(sans regarder les symboles). C'est donc souvent plus puissant que les "
+"besoins réels mais cela reste très sûr et facile à manipuler."
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
@@ -21019,7 +20763,7 @@ msgstr ""
 #: dpkg-shlibdeps.man
 #, no-wrap
 msgid "Output from “B<dpkg-query --control-path> I<package> shlibs”"
-msgstr "Affichage de “B<dpkg-query --control-path> I<paquet> shlibs”"
+msgstr "Affichage de « B<dpkg-query --control-path> I<paquet> shlibs »"
 
 #. type: IP
 #: dpkg-shlibdeps.man
@@ -21070,40 +20814,16 @@ msgstr ""
 "partagées que demande I<exécutable>. Cette option peut être utilisée "
 "plusieurs fois."
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, no-wrap
-msgid "B<-l>I<directory>"
-msgstr "B<-l>I<répertoire>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "Add I<directory> to the list of directories to search for private shared "
-#| "libraries (since dpkg 1.17.0). This option can be used multiple times."
 msgid ""
 "Prepend I<directory> to the list of directories to search for private shared "
 "libraries (since dpkg 1.17.0). This option can be used multiple times."
 msgstr ""
-"Ajoute I<répertoire> à la liste des répertoires où chercher des "
-"bibliothèques partagées privées (depuis dpkg 1.17.0). Cette option peut être "
+"Ajoute I<répertoire> au début de la liste des répertoires où chercher des "
+"bibliothèques partagées privées (depuis dpkg 1.17.0). Cette option peut être "
 "utilisée plusieurs fois."
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-"Note : Utilisez cette option plutôt que le réglage de B<LD_LIBRARY_PATH>, "
-"parce que cette variable d'environnement est utilisé pour contrôler "
-"l'éditeur de liens d'exécution et et servir d'elle pour définir les chemins "
-"des bibliothèques partagées au moment de la construction peut être "
-"problématique, par exemple, lors d'une compilation croisée."
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
@@ -21168,19 +20888,15 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "Print substitution variable settings to standard output (or I<filename> "
-#| "if specified), rather than being added to the substitution variables file "
-#| "(B<debian/substvars> by default)."
 msgid ""
 "Print substitution variable settings to standard output (or I<filename> if "
 "specified, since dpkg 1.17.2), rather than being added to the substitution "
 "variables file (B<debian/substvars> by default)."
 msgstr ""
 "Affiche les définitions des variables de substitution sur la sortie standard "
-"(ou I<nom-de-fichier> si spécifié), plutôt que de les ajouter dans le "
-"fichier de substitution des variables qui est par défaut B<debian/substvars>."
+"(ou I<nom-de-fichier> si spécifié, depuis dpkg 1.17.2), plutôt que de les "
+"ajouter dans le fichier de substitution des variables qui est par défaut "
+"B<debian/substvars>."
 
 #. type: TP
 #: dpkg-shlibdeps.man
@@ -21190,13 +20906,6 @@ msgstr "B<-t>I<type>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "Prefer shared library dependency information tagged for the given package "
-#| "type. If no tagged information is available, falls back to untagged "
-#| "information. The default package type is \"deb\". Shared library "
-#| "dependency information is tagged for a given type by prefixing it with "
-#| "the name of the type, a colon, and whitespace."
 msgid ""
 "Prefer shared library dependency information tagged for the given package "
 "type. If no tagged information is available, falls back to untagged "
@@ -21207,7 +20916,7 @@ msgstr ""
 "Préférer les informations sur les dépendances des bibliothèques partagées "
 "qui sont étiquetées pour un type de paquet donné. Si aucune information de "
 "type n'est donnée, il n'utilisera pas d'information. Par défaut, le type de "
-"paquet est « deb ». On peut créer une étiquette pour ces informations en les "
+"paquet est B<deb>. On peut créer une étiquette pour ces informations en les "
 "préfixant par le nom du type, un deux-points et une espace."
 
 #. type: TP
@@ -21232,7 +20941,7 @@ msgid ""
 "Write substitution variables in I<substvars-file>; the default is B<debian/"
 "substvars>."
 msgstr ""
-"Écrire les variables de substitution dans I<fichier/substvars> ; le fichier "
+"Écrire les variables de substitution dans I<fichier-substvars> ; le fichier "
 "par défaut est B<debian/substvars>."
 
 #. type: TP
@@ -21243,16 +20952,12 @@ msgstr "B<-v>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "Enable verbose mode. Numerous messages are displayed to explain what "
-#| "B<dpkg-shlibdeps> does."
 msgid ""
 "Enable verbose mode (since dpkg 1.14.8).  Numerous messages are displayed to "
 "explain what B<dpkg-shlibdeps> does."
 msgstr ""
-"Active le mode bavard. De nombreux messages sont affichés pour expliquer ce "
-"que B<dpkg-shlibdeps> fait."
+"Active le mode bavard (depuis dpkg 1.14.8). De nombreux messages sont "
+"affichés pour expliquer ce que B<dpkg-shlibdeps> fait."
 
 #. type: TP
 #: dpkg-shlibdeps.man
@@ -21262,13 +20967,6 @@ msgstr "B<-x>I<package>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "Exclude the package from the generated dependencies. This is useful to "
-#| "avoid self-dependencies for packages which provide ELF binaries "
-#| "(executables or library plugins) using a library contained in the same "
-#| "package. This option can be used multiple times to exclude several "
-#| "packages."
 msgid ""
 "Exclude the package from the generated dependencies (since dpkg 1.14.8).  "
 "This is useful to avoid self-dependencies for packages which provide ELF "
@@ -21276,11 +20974,11 @@ msgid ""
 "same package. This option can be used multiple times to exclude several "
 "packages."
 msgstr ""
-"Exclut le paquet des dépendances générées. Cela évite les auto-dépendances "
-"pour les paquets fournissant des exécutables ELF (exécutables ou modules "
-"complémentaires de bibliothèque) qui utilisent une bibliothèque incluse dans "
-"ce même paquet. Cette option peut être utilisée plusieurs fois pour exclure "
-"plusieurs paquets."
+"Exclut le paquet des dépendances générées (depuis dpkg 1.14.8). Cela évite "
+"les auto-dépendances pour les paquets fournissant des exécutables ELF "
+"(exécutables ou modules complémentaires de bibliothèque) qui utilisent une "
+"bibliothèque incluse dans ce même paquet. Cette option peut être utilisée "
+"plusieurs fois pour exclure plusieurs paquets."
 
 #. type: TP
 #: dpkg-shlibdeps.man
@@ -21290,13 +20988,6 @@ msgstr "B<-S>I<répertoire-construction-paquet>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "Look into I<package-build-dir> first when trying to find a library. This "
-#| "is useful when the source package builds multiple flavors of the same "
-#| "library and you want to ensure that you get the dependency from a given "
-#| "binary package. You can use this option multiple times: directories will "
-#| "be tried in the same order before directories of other binary packages."
 msgid ""
 "Look into I<package-build-dir> first when trying to find a library (since "
 "dpkg 1.14.15).  This is useful when the source package builds multiple "
@@ -21306,18 +20997,18 @@ msgid ""
 "other binary packages."
 msgstr ""
 "Recherche dans I<répertoire-construction-paquet> en premier et essaie de "
-"trouver une bibliothèque. C'est utile lorsque le paquet source construit "
-"plusieurs saveurs de la même bibliothèque et que vous voulez vous assurer "
-"que vous obtiendrez la dépendance d'un paquet binaire donné. Cette option "
-"peut être utilisée plusieurs fois : les répertoires seront examinés dans le "
-"même ordre avant les répertoires d'autres paquets binaires."
+"trouver une bibliothèque (depuis dpkg 1.14.15). C'est utile lorsque le "
+"paquet source construit plusieurs saveurs de la même bibliothèque et que "
+"vous voulez vous assurer que vous obtiendrez la dépendance d'un paquet "
+"binaire donné. Cette option peut être utilisée plusieurs fois : les "
+"répertoires seront examinés dans le même ordre avant les répertoires "
+"d'autres paquets binaires."
 
 #. type: TP
 #: dpkg-shlibdeps.man
-#, fuzzy, no-wrap
-#| msgid "B<-P>I<package-build-dir>"
+#, no-wrap
 msgid "B<-I>I<package-build-dir>"
-msgstr "B<-P>I<répertoire-construction-paquet>"
+msgstr "B<-I>I<répertoire-construction-paquet>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
@@ -21325,6 +21016,9 @@ msgid ""
 "Ignore I<package-build-dir> when looking for shlibs, symbols, and shared "
 "library files (since dpkg 1.18.5).  You can use this option multiple times."
 msgstr ""
+"Ignore I<répertoire-construction-paquet> lors de la recherche des fichiers "
+"shlibs, de symboles et des bibliothèques partagées (depuis dpkg 1.18.5). "
+"Cette option peut être utilisée plusieurs fois."
 
 #. type: TP
 #: dpkg-shlibdeps.man
@@ -21334,12 +21028,6 @@ msgstr "B<--ignore-missing-info>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "Do not fail if dependency information can't be found for a shared "
-#| "library.  Usage of this option is discouraged, all libraries should "
-#| "provide dependency information (either with shlibs files, or with symbols "
-#| "files)  even if they are not yet used by other packages."
 msgid ""
 "Do not fail if dependency information can't be found for a shared library "
 "(since dpkg 1.14.8).  Usage of this option is discouraged, all libraries "
@@ -21347,10 +21035,11 @@ msgid ""
 "symbols files)  even if they are not yet used by other packages."
 msgstr ""
 "Pas d'échec si l'information de dépendance ne peut pas être trouvée pour une "
-"bibliothèque partagée. L'utilisation de cette option est déconseillée, "
-"toutes les bibliothèques devraient fournir leurs informations de dépendance "
-"(que ce soit avec les fichiers shlibs, ou avec les fichiers symboles), même "
-"si elles ne sont pas encore utilisées par d'autres paquets."
+"bibliothèque partagée (depuis dpkg 1.14.8). L'utilisation de cette option "
+"est déconseillée, toutes les bibliothèques devraient fournir leurs "
+"informations de dépendance (que ce soit avec les fichiers shlibs, ou avec "
+"les fichiers symboles), même si elles ne sont pas encore utilisées par "
+"d'autres paquets."
 
 #. type: TP
 #: dpkg-shlibdeps.man
@@ -21360,16 +21049,6 @@ msgstr "B<--warnings=>I<valeur>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "I<value> is a bit field defining the set of warnings that can be emitted "
-#| "by B<dpkg-shlibdeps>.  Bit 0 (value=1) enables the warning \"symbol "
-#| "I<sym> used by I<binary> found in none of the libraries\", bit 1 "
-#| "(value=2) enables the warning \"package could avoid a useless dependency"
-#| "\" and bit 2 (value=4)  enables the warning \"I<binary> should not be "
-#| "linked against I<library>\".  The default I<value> is 3: the first two "
-#| "warnings are active by default, the last one is not. Set I<value> to 7 if "
-#| "you want all warnings to be active."
 msgid ""
 "I<value> is a bit field defining the set of warnings that can be emitted by "
 "B<dpkg-shlibdeps> (since dpkg 1.14.17).  Bit 0 (value=1) enables the warning "
@@ -21381,14 +21060,15 @@ msgid ""
 "to be active."
 msgstr ""
 "I<valeur> est un champ de « bit » définissant l'ensemble des avertissements "
-"qui peuvent être émis par B<dpkg-shlibdeps>. Le bit 0 (valeur = 1) active "
-"l'avertissement « symbole I<sym> utilisé par le I<binaire> trouvé dans "
-"aucune des bibliothèques ». Le bit 1 (valeur = 2) active l'avertissement "
-"« le paquet pourrait éviter une dépendance inutile ». Le bit 2 (valeur = 4) "
-"active l'avertissement « Le I<binaire> ne devrait pas être lié à "
-"I<bibliothèque> ». La I<valeur> par défaut est 3 : les deux premières mises "
-"en garde sont actives par défaut, la dernière ne l'est pas. Positionnez la "
-"I<valeur> à 7 si vous souhaitez que tous les avertissements soient actifs."
+"qui peuvent être émis par B<dpkg-shlibdeps> (depuis dpkg 1.14.17). Le bit "
+"B<0> (valeur = 1) active l'avertissement « symbole I<sym> utilisé par le "
+"I<binaire> trouvé dans aucune des bibliothèques ». Le bit B<1> (valeur = 2) "
+"active l'avertissement « le paquet pourrait éviter une dépendance inutile ». "
+"Le bit B<2> (valeur = 4) active l'avertissement « Le I<binaire> ne devrait "
+"pas être lié à I<bibliothèque> ». La I<valeur> par défaut est B<3> : les "
+"deux premières mises en garde sont actives par défaut, la dernière ne l'est "
+"pas. Positionnez la I<valeur> à 7 si vous souhaitez que tous les "
+"avertissements soient actifs."
 
 #. type: SS
 #: dpkg-shlibdeps.man
@@ -21427,15 +21107,15 @@ msgid ""
 "of the linker)."
 msgstr ""
 "Le symbole indiqué n'a pas été trouvé dans les bibliothèques liées au "
-"binaire. Le I<binaire> est probablement plutôt une bibliothèque et elle doit "
-"être liée avec une bibliothèque supplémentaire durant le processus de "
+"binaire. Le I<binaire> est probablement plutôt une bibliothèque et il doit "
+"être lié avec une bibliothèque supplémentaire durant le processus de "
 "construction (l'option B<-l>I<bibliothèque> de l'éditeur de liens)."
 
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
 msgid "I<binary>B< contains an unresolvable reference to symbol >I<sym>B<: it's probably a plugin>"
-msgstr "I<binary>B< contient une référence non résolue au symbole >I<sym>B<: il s'agit probablement d'un greffon (plugin)>"
+msgstr "I<binary>B< contient une référence non résolue au symbole >I<sym> B<: il s'agit probablement d'un greffon (plugin)>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
@@ -21451,7 +21131,7 @@ msgid ""
 "linking to it are using an RPATH so that the dynamic loader finds it. In "
 "that case, the library is broken and needs to be fixed."
 msgstr ""
-"Le symbole indiqué n'a pas été trouvé dans les bilbiothèques liées avec le "
+"Le symbole indiqué n'a pas été trouvé dans les bibliothèques liées avec le "
 "fichier binaire. Le I<binaire> est très probablement un greffon (plugin) et "
 "le symbole est probablement fourni par le programme qui charge ce greffon. "
 "En théorie, un greffon n'a pas de « SONAME » mais ce binaire en possède un "
@@ -21468,7 +21148,7 @@ msgstr ""
 #: dpkg-shlibdeps.man
 #, no-wrap
 msgid "B<package could avoid a useless dependency if >I<binary>B< was not linked against >I<library>B< (it uses none of the library's symbols)>"
-msgstr "B<paquet pourrait éviter une dépendance inutile si >I<le binaire>B< n'était pas lié avec >I<bibliothèque>B< (il ne fait usage d'aucun de ses symboles)>"
+msgstr "B<paquet pourrait éviter une dépendance inutile si> I<le binaire> B<n'était pas lié avec> I<bibliothèque> B<(il ne fait usage d'aucun de ses symboles)>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
@@ -21485,10 +21165,9 @@ msgstr ""
 
 #. type: TP
 #: dpkg-shlibdeps.man
-#, fuzzy, no-wrap
-#| msgid "B<package could avoid a useless dependency if >I<binaries>B< were not linked against >I<library>B< (they uses none of the library's symbols)>"
+#, no-wrap
 msgid "B<package could avoid a useless dependency if >I<binaries>B< were not linked against >I<library>B< (they use none of the library's symbols)>"
-msgstr "B<paquet pourrait éviter une dépendance inutile si >I<les binaires>B< n'étaient pas liés avec >I<bibliothèque>B< (ils ne font usage d'aucun de ses symboles)>"
+msgstr "B<paquet pourrait éviter une dépendance inutile si> I<les binaires> B<n'étaient pas liés avec> I<bibliothèque> B<(ils ne font usage d'aucun de ses symboles)>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
@@ -21499,17 +21178,10 @@ msgstr "Identique à l'avertissement précédent, pour des binaires multiples."
 #: dpkg-shlibdeps.man
 #, no-wrap
 msgid "I<binary>B< should not be linked against >I<library>B< (it uses none of the library's symbols)>"
-msgstr "I<le binaire>B< ne devrait pas être lié avec la >I<bibliothèque>B< (il ne fait usage d'aucun de ses symboles)>"
+msgstr "I<le binaire> B<ne devrait pas être lié avec la> I<bibliothèque> B<(il ne fait usage d'aucun de ses symboles)>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "The I<binary> is linked to a library that it doesn't need. It's not a "
-#| "problem but some small performance improvements in binary load time can "
-#| "be obtained by not linking this library to this binary. This warning "
-#| "checks the same information than the previous one but does it for each "
-#| "binary instead of doing the check globally on all binaries analyzed."
 msgid ""
 "The I<binary> is linked to a library that it doesn't need. It's not a "
 "problem but some small performance improvements in binary load time can be "
@@ -21541,7 +21213,7 @@ msgid ""
 msgstr ""
 "B<dpkg-shlibdeps> échouera s'il ne peut pas trouver de bibliothèque publique "
 "utilisée par un binaire ou si cette bibliothèque n'a pas d'informations sur "
-"les dépendances associées (soit les fichier shlibs, soit le fichier des "
+"les dépendances associées (soit le fichier shlibs, soit le fichier des "
 "symboles). Une bibliothèque publique a un SONAME et un numéro de version "
 "(libsomething.so.I<X>). Une bibliothèque privée (comme un module "
 "additionnel) ne devrait pas avoir de SONAME et n'a pas besoin d'avoir de "
@@ -21551,24 +21223,10 @@ msgstr ""
 #: dpkg-shlibdeps.man
 #, no-wrap
 msgid "B<couldn't find library >I<library-soname>B< needed by >I<binary>B< (its RPATH is '>I<rpath>B<')>"
-msgstr "B<impossible de trouver la bibliothèque >I<library-soname> B<demandée par le> I<binaire> B<(son RPATH est '>I<rpath>B<')>"
+msgstr "B<impossible de trouver la bibliothèque> I<library-soname> B<demandée par le> I<binaire> B<(son RPATH est « >I<rpath>B< »)>"
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "The I<binary> uses a library called I<library-soname> but B<dpkg-"
-#| "shlibdeps> has been unable to find the library.  B<dpkg-shlibdeps> "
-#| "creates a list of directories to check as following: directories listed "
-#| "in the RPATH of the binary, directories listed in %CONFDIR%/ld.so.conf, "
-#| "directories added by the B<-l> option, directories listed in the "
-#| "B<LD_LIBRARY_PATH> environment variable, and standard public directories "
-#| "(/lib, /usr/lib, /lib32, /usr/lib32, /lib64, /usr/lib64). Then it checks "
-#| "those directories in the package's build tree of the binary being "
-#| "analyzed, in the packages' build trees indicated with the B<-S> command-"
-#| "line option, in other packages' build trees that contains a DEBIAN/shlibs "
-#| "or DEBIAN/symbols file and finally in the root directory.  If the library "
-#| "is not found in any of those directories, then you get this error."
 msgid ""
 "The I<binary> uses a library called I<library-soname> but B<dpkg-shlibdeps> "
 "has been unable to find the library.  B<dpkg-shlibdeps> creates a list of "
@@ -21587,11 +21245,13 @@ msgstr ""
 "Le I<binaire> utilise une bibliothèque appelée I<library-soname> mais B<dpkg-"
 "shlibdeps> n'a pas été en mesure de trouver cette bibliothèque. B<dpkg-"
 "shlibdeps> crée une liste de répertoires à vérifier de la manière suivante : "
-"les répertoires énumérés dans le RPATH du binaire, les répertoires listés "
-"dans %CONFDIR%/ld.so.conf, les répertoires ajoutés par l'option B<-l>, les "
-"répertoires listés dans la variable d'environnement LD_LIBRARY_PATH, et les "
-"répertoires publics standard (/lib, /usr/lib, /lib32, /usr/lib32, /lib64, /"
-"usr/lib64). Ensuite, il vérifie les répertoires qui sont dans l'arbre de "
+"les répertoires énumérés dans le RPATH du binaire, les répertoires ajoutés "
+"par l'option B<-l>, les répertoires listés dans la variable d'environnement "
+"B<LD_LIBRARY_PATH>, les répertoires croisés multi-architerctures (par "
+"exemple, /lib/arm64-linux-gnu, /usr/lib/arm64-linux-gnu), les répertoires "
+"publics standard (/lib, /usr/lib), les répertoires listés dans /etc/ld.so."
+"conf et les répertoires obsolètes multilib (/lib32, /usr/lib32, /lib64, /usr/"
+"lib64). Ensuite, il vérifie les répertoires qui sont dans l'arbre de "
 "construction du paquet binaire en cours d'analyse, dans l'arbre de "
 "construction du paquet indiqué avec l'option de ligne de commande B<-S>, "
 "dans les autres arbres de paquets qui contiennent un fichier DEBIAN/shlibs "
@@ -21611,9 +21271,8 @@ msgstr ""
 "Si la bibliothèque non trouvée est cependant disponible dans le répertoire "
 "privé de ce même paquet, alors il vous faut ajouter ce répertoire avec B<-"
 "l>. S'il est dans un autre paquet binaire en cours de construction, alors "
-"assurez-vous que les fichiers shlibs/symbols de ce paquet sont déjà créés et "
-"que B<-l> contient le répertoire approprié si c'est aussi un répertoire "
-"privé."
+"assurez-vous que le fichier shlibs/symbols de ce paquet a déjà créé et que "
+"B<-l> contient le répertoire approprié si c'est aussi un répertoire privé."
 
 #. type: TP
 #: dpkg-shlibdeps.man
@@ -21623,15 +21282,6 @@ msgstr "B<aucune information de dépendance trouvée pour> I<la bibliothèque> B
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
-#, fuzzy
-#| msgid ""
-#| "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
-#| "I<library-file> but B<dpkg-shlibdeps> has been unable to find any "
-#| "dependency information for that library. To find out the dependency, it "
-#| "has tried to map the library to a Debian package with the help of B<dpkg -"
-#| "S >I<library-file>.  Then it checked the corresponding shlibs and symbols "
-#| "files in /var/lib/dpkg/info/, and in the various package's build trees "
-#| "(debian/*/DEBIAN/)."
 msgid ""
 "The library needed by I<binary> has been found by B<dpkg-shlibdeps> in "
 "I<library-file> but B<dpkg-shlibdeps> has been unable to find any dependency "
@@ -21669,12 +21319,12 @@ msgstr ""
 "fichiers shlibs n'aient pas encore été créés (dans ce cas debian/rules doit "
 "être modifié pour créer le shlibs avant l'appel de B<dpkg-shlibdeps>). Un "
 "mauvais RPATH peut aussi conduire à ce que la bibliothèque soit trouvée sous "
-"un nom non-canonique (comme : /usr/lib/openoffice.org/../lib/libssl.so.0.9.8 "
+"un nom non canonique (comme : /usr/lib/openoffice.org/../lib/libssl.so.0.9.8 "
 "au lieu de /usr/lib/libssl.so.0.9.8) qui n'est associé à aucun paquet, "
-"B<dpkg-shlibdeps> essaie de travailler sur ce nom non-canonique (en "
-"utilisant B<realpath>(3)), mais cela ne fonctionne pas toujours. Il est "
-"toujours préférable de bien nettoyer le RPATH du binaire afin d'éviter ces "
-"problèmes."
+"B<dpkg-shlibdeps> essaie de contourner cela en se repliant vers un nom "
+"canonique (en utilisant B<realpath>(3)), mais cela ne fonctionne pas "
+"toujours. Il est toujours préférable de bien nettoyer le RPATH du binaire "
+"afin d'éviter ces problèmes."
 
 #. type: Plain text
 #: dpkg-shlibdeps.man
@@ -21685,7 +21335,7 @@ msgid ""
 msgstr ""
 "L'appel de B<dpkg-shlibdeps> en mode bavard (B<-v>) fournira beaucoup plus "
 "d'informations sur l'endroit où il a essayé de trouver l'information sur les "
-"dépendances. Ceci peut être utile si vous ne comprenez pas pourquoi vous "
+"dépendances. Cela peut être utile si vous ne comprenez pas pourquoi vous "
 "obtenez cette erreur."
 
 #. type: Plain text
@@ -21702,7 +21352,7 @@ msgstr "dpkg-source"
 #. type: Plain text
 #: dpkg-source.man
 msgid "dpkg-source - Debian source package (.dsc) manipulation tool"
-msgstr "dpkg-source - outil de manipulation des paquets sources Debian (.dsc)."
+msgstr "dpkg-source - Outil de manipulation des paquets sources Debian (.dsc)."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -21733,15 +21383,6 @@ msgstr "B<-x >, B<--extract> I<nom-de-fichier>.dsc [I<répertoire-de-sortie>]"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Extract a source package.  The B<--extract> alias was added in dpkg "
-#| "1.17.14.  One non-option argument must be supplied, the name of the "
-#| "Debian source control file (B<.dsc>).  An optional second non-option "
-#| "argument may be supplied to specify the directory to extract the source "
-#| "package to, this must not exist. If no output directory is specified, the "
-#| "source package is extracted into a directory named I<source>-I<version> "
-#| "under the current working directory."
 msgid ""
 "Extract a source package (B<--extract> since dpkg 1.17.14).  One non-option "
 "argument must be supplied, the name of the Debian source control file (B<."
@@ -21750,13 +21391,13 @@ msgid ""
 "output directory is specified, the source package is extracted into a "
 "directory named I<source>-I<version> under the current working directory."
 msgstr ""
-"Cette option sert à extraire un paquet source. L'alias B<--extract> a été "
-"ajouté dans dpkg 1.17.14. On doit donner un seul argument sans option : le "
-"nom du fichier de contrôle des sources Debian (B<.dsc>). Un deuxième "
-"argument sans option peut également être donné pour indiquer le répertoire "
-"où extraire le paquet source : ce répertoire ne doit pas déjà exister. Quand "
-"aucun répertoire n'est indiqué, le paquet source est extrait dans un "
-"répertoire I<source>-I<version> du répertoire courant."
+"Cette option sert à extraire un paquet source (B<--extract> depuis "
+"dpkg 1.17.14). Un seul argument sans option doit être donné : le nom du "
+"fichier de contrôle des sources Debian (B<.dsc>). Un deuxième argument sans "
+"option peut également être donné pour indiquer le répertoire où extraire le "
+"paquet source : ce répertoire ne doit pas déjà exister. Quand aucun "
+"répertoire n'est indiqué, le paquet source est extrait dans un répertoire "
+"I<source>-I<version> du répertoire courant."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -21779,29 +21420,23 @@ msgid ""
 "umask; if the parent directory is setgid then the extracted directories will "
 "be too, and all the files and directories will inherit its group ownership."
 msgstr ""
-"Les fichiers extraits du paquet auront le même système de propriété et de "
-"permission que s'ils avaient été simplement créés -- les répertoires et les "
-"fichiers exécutables auront un système de permission égal à 0777 et les "
-"simples fichiers, 0666 ; ces deux systèmes étant modifiés par le masque de "
-"celui qui fait l'extraction ; si le répertoire parent est « setgid », les "
+"Les fichiers extraits du paquet auront leurs propriétaires et permissions "
+"définis à ceux attendus s'ils avaient été simplement créés. Les répertoires "
+"et les fichiers exécutables auront une permission égale à 0777 et les "
+"simples fichiers à 0666, les deux étant modifiées par le masque (umask) de "
+"celui qui fait l'extraction. Si le répertoire parent est « setgid », les "
 "répertoires extraits le seront aussi et tous les fichiers et répertoires "
-"hériteront du système de propriété de ce groupe."
+"hériteront de sa propriété de groupe."
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "If the source package uses a non-standard format (currently this means "
-#| "all formats except \"1.0\"), its name will be stored in B<debian/source/"
-#| "format> so that the following builds of the source package use the same "
-#| "format by default."
 msgid ""
 "If the source package uses a non-standard format (currently this means all "
 "formats except “1.0”), its name will be stored in B<debian/source/format> so "
 "that the following builds of the source package use the same format by "
 "default."
 msgstr ""
-"Si le paquet source utilise un format non-standard (actuellement, cela "
+"Si le paquet source utilise un format non standard (actuellement, cela "
 "signifie tous les formats sauf le « 1.0 »), son nom sera enregistré dans "
 "B<debian/source/format> de sorte que la construction du paquet source "
 "utilise le même format par défaut."
@@ -21814,14 +21449,6 @@ msgstr "B<-b>, B<--build> I<répertoire> [I<paramètres-dans-un-format-spécifiq
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Build a source package.  The B<--build> alias was added in dpkg 1.17.14.  "
-#| "The first non-option argument is taken as the name of the directory "
-#| "containing the debianized source tree (i.e. with a debian sub-directory "
-#| "and maybe changes to the original files).  Depending on the source "
-#| "package format used to build the package, additional parameters might be "
-#| "accepted."
 msgid ""
 "Build a source package (B<--build> since dpkg 1.17.14).  The first non-"
 "option argument is taken as the name of the directory containing the "
@@ -21829,24 +21456,15 @@ msgid ""
 "to the original files).  Depending on the source package format used to "
 "build the package, additional parameters might be accepted."
 msgstr ""
-"Construit un paquet source. L'alias B<--build> a été ajouté dans dpkg "
-"1.17.14. Le premier argument sans option est pris comme nom du répertoire "
-"contenant l'arborescence des sources Debianisées (c'est-à-dire avec un sous-"
-"répertoire debian et peut-être des modifications sur les fichiers "
-"d'origine). Selon le format du paquet source utilisé pour construire le "
-"paquet, d'autres paramètres peuvent être acceptés."
+"Construit un paquet source (B<--build> depuis dpkg 1.17.14). Le premier "
+"argument sans option est pris comme nom du répertoire contenant "
+"l'arborescence des sources debianisée (c'est-à-dire avec un sous-répertoire "
+"debian et peut-être des modifications sur les fichiers d'origine). Selon le "
+"format du paquet source utilisé pour construire le paquet, d'autres "
+"paramètres peuvent être acceptés."
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "B<dpkg-source> will build the source package with the first format found "
-#| "in this ordered list: the format indicated with the I<--format> command "
-#| "line option, the format indicated in B<debian/source/format>, \"1.0\". "
-#| "The fallback to \"1.0\" is deprecated and will be removed at some point "
-#| "in the future, you should always document the desired source format in "
-#| "B<debian/source/format>. See section B<SOURCE PACKAGE FORMATS> for an "
-#| "extensive description of the various source package formats."
 msgid ""
 "B<dpkg-source> will build the source package with the first format found in "
 "this ordered list: the format indicated with the I<--format> command line "
@@ -21856,14 +21474,14 @@ msgid ""
 "source/format>. See section B<SOURCE PACKAGE FORMATS> for an extensive "
 "description of the various source package formats."
 msgstr ""
-"B<dpkg-source> va construire le paquet source dans le premier format qui "
-"fonctionnera dans la liste suivante : le(s) format(s) indiqué(s) avec le "
-"paramètre de la ligne de commande I<--format>, le format indiqué dans "
-"B<debian/source/format>, « 1.0 ». L'utilisation de « 1.0 » comme dernier "
-"recours est obsolète et sera retirée dans le futur. Le format source devrait "
-"toujours être indiqué dans B<debian/source/format>. Voir la section "
-"B<FORMATS DE PAQUETS SOURCE> pour une description plus détaillée des "
-"différents formats de paquet source."
+"B<dpkg-source> va construire le paquet source dans le premier format trouvé "
+"dans la liste suivante : le(s) format(s) indiqué(s) avec le paramètre de la "
+"ligne de commande I<--format>, le format indiqué dans B<debian/source/"
+"format>, « 1.0 ». L'utilisation de « 1.0 » comme dernier recours est "
+"obsolète et sera retirée dans le futur. Le format source devrait toujours "
+"être indiqué dans B<debian/source/format>. Voir la section B<FORMATS DE "
+"PAQUET SOURCE> pour une description plus détaillée des différents formats de "
+"paquet source."
 
 #. type: TP
 #: dpkg-source.man
@@ -21873,11 +21491,6 @@ msgstr "B<--print-format> I<répertoire>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Print the source format that would be used to build the source package if "
-#| "B<dpkg-source --build >I<directory> was called (in the same conditions "
-#| "and with the same parameters)."
 msgid ""
 "Print the source format that would be used to build the source package if "
 "B<dpkg-source --build >I<directory> was called (in the same conditions and "
@@ -21885,7 +21498,7 @@ msgid ""
 msgstr ""
 "Affiche le format source qui serait utilisé pour construire le paquet source "
 "si B<dpkg-source --build >I<répertoire> était utilisé (dans les mêmes "
-"conditions et avec les mêmes options)."
+"conditions et avec les mêmes options ; depuis dpkg 1.15.5)."
 
 #. type: TP
 #: dpkg-source.man
@@ -21895,14 +21508,6 @@ msgstr "B<--before-build> I<répertoire>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Run the corresponding hook of the source package format. This hook is "
-#| "called before any build of the package (B<dpkg-buildpackage> calls it "
-#| "very early even before B<debian/rules clean>). This command is idempotent "
-#| "and can be called multiple times. Not all source formats implement "
-#| "something in this hook, and those that do usually prepare the source tree "
-#| "for the build for example by ensuring that the Debian patches are applied."
 msgid ""
 "Run the corresponding hook of the source package format (since dpkg "
 "1.15.8).  This hook is called before any build of the package (B<dpkg-"
@@ -21912,13 +21517,13 @@ msgid ""
 "the source tree for the build for example by ensuring that the Debian "
 "patches are applied."
 msgstr ""
-"Exécute le point d'entrée correspondant du format de paquet source. Ce point "
-"d'entrée doit être utilisé avant toute construction du paquet (B<dpkg-"
-"buildpackage> l'utilise très tôt, avant même B<debian/rules clean>). Il doit "
-"être autonome et pouvoir être lancé plusieurs fois. Tous les formats source "
-"ne mettent pas en œuvre ce branchement et ceux qui le font préparent "
-"l'arborescence source pour la construction, par exemple en garantissant que "
-"les correctifs Debian sont appliqués."
+"Exécute le point d'entrée correspondant du format de paquet source (depuis "
+"dpkg 1.15.8). Ce point d'entrée doit être utilisé avant toute construction "
+"du paquet (B<dpkg-buildpackage> l'utilise très tôt, avant même B<debian/"
+"rules clean>). Cette commande est idempotente et peut être lancée plusieurs "
+"fois. Tous les formats source ne mettent pas en œuvre ce branchement et ceux "
+"qui le font préparent l'arborescence source pour la construction, par "
+"exemple en garantissant que les correctifs Debian sont appliqués."
 
 #. type: TP
 #: dpkg-source.man
@@ -21928,13 +21533,6 @@ msgstr "B<--after-build> I<répertoire>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Run the corresponding hook of the source package format. This hook is "
-#| "called after any build of the package (B<dpkg-buildpackage> calls it "
-#| "last). This command is idempotent and can be called multiple times. Not "
-#| "all source formats implement something in this hook, and those that do "
-#| "usually use it to undo what B<--before-build> has done."
 msgid ""
 "Run the corresponding hook of the source package format (since dpkg "
 "1.15.8).  This hook is called after any build of the package (B<dpkg-"
@@ -21942,12 +21540,12 @@ msgid ""
 "multiple times. Not all source formats implement something in this hook, and "
 "those that do usually use it to undo what B<--before-build> has done."
 msgstr ""
-"Exécute le point d'entrée correspondant du format de paquet source. Ce point "
-"d'entrée doit être utilisé après toute construction du paquet (B<dpkg-"
-"buildpackage> l'utilise en dernier). Il doit être autonome et doit pouvoir "
-"être lancé plusieurs fois. Tous les formats source ne mettent pas en œuvre "
-"ce branchement et ceux qui le font s'en servent pour défaire ce qui a été "
-"fait par B<--before-build>."
+"Exécute le point d'entrée correspondant du format de paquet source (depuis "
+"dpkg 1.15.8). Ce point d'entrée doit être utilisé après toute construction "
+"du paquet (B<dpkg-buildpackage> l'utilise en dernier). Cette commande est "
+"idempotente et peut être lancée plusieurs fois. Tous les formats source ne "
+"mettent pas en œuvre ce branchement et ceux qui le font s'en servent pour "
+"défaire ce qui a été fait par B<--before-build>."
 
 #. type: TP
 #: dpkg-source.man
@@ -21957,11 +21555,6 @@ msgstr "B<--commit> [I<répertoire>] ..."
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Record changes in the source tree unpacked in I<directory>. This command "
-#| "can take supplementary parameters depending on the source format.  It "
-#| "will error out for formats where this operation doesn't mean anything."
 msgid ""
 "Record changes in the source tree unpacked in I<directory> (since dpkg "
 "1.16.1).  This command can take supplementary parameters depending on the "
@@ -21969,9 +21562,9 @@ msgid ""
 "mean anything."
 msgstr ""
 "Enregistre les modifications dans l'arborescence source décompressée dans "
-"I<répertoire>. Cette commande peut accepter des paramètres supplémentaires "
-"selon le format source. Elle provoquera une erreur pour les formats où cette "
-"opération n'a pas de signification."
+"I<répertoire> (depuis dpkg 1.16.1). Cette commande peut accepter des "
+"paramètres supplémentaires selon le format source. Elle provoquera une "
+"erreur pour les formats où cette opération n'a pas de signification."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -21979,6 +21572,9 @@ msgid ""
 "Show the usage message and exit.  The format specific build and extract "
 "options can be shown by using the B<--format> option."
 msgstr ""
+"Affiche un message d'aide puis quitte. Les options de construction et "
+"d'extraction spécifiques au format peuvent être montrées avec l'option B<--"
+"format>."
 
 #. type: SS
 #: dpkg-source.man
@@ -22018,24 +21614,16 @@ msgstr "B<--format=>I<valeur>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Use the given format for building the source package. It does override "
-#| "any format given in B<debian/source/format>."
 msgid ""
 "Use the given format for building the source package (since dpkg 1.14.17).  "
 "It does override any format given in B<debian/source/format>."
 msgstr ""
-"Utilise le format indiqué pour la construction du paquet source. Ce choix "
-"remplace le format indiqué dans B<debian/source/format>."
+"Utilise le format indiqué pour la construction du paquet source (depuis "
+"dpkg 1.14.17). Ce choix remplace le format indiqué dans B<debian/source/"
+"format>."
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Read substitution variables in I<substvars-file>; the default is to not "
-#| "read any file. This option can be used multiple times to read "
-#| "substitution variables from multiple files."
 msgid ""
 "Read substitution variables in I<substvars-file>; the default is to not read "
 "any file. This option can be used multiple times to read substitution "
@@ -22043,7 +21631,8 @@ msgid ""
 msgstr ""
 "Lit les variables de substitution dans I<fichier-substvars> ; par défaut "
 "aucun fichier n'est lu. Cette option peut être utilisée plusieurs fois pour "
-"lire des variables de substitution depuis plusieurs fichiers."
+"lire des variables de substitution depuis plusieurs fichiers (depuis "
+"dpkg 1.15.6)."
 
 #. type: TP
 #: dpkg-source.man
@@ -22053,14 +21642,6 @@ msgstr "B<-Z>I<compression>, B<--compression>=I<compression>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Specify the compression to use for created files (tarballs and diffs).  "
-#| "Note that this option will not cause existing tarballs to be "
-#| "recompressed, it only affects new files. Supported values are: I<gzip>, "
-#| "I<bzip2>, I<lzma> and I<xz>.  The default is I<xz> for formats 2.0 and "
-#| "newer, and I<gzip> for format 1.0. I<xz> is only supported since dpkg "
-#| "1.15.5."
 msgid ""
 "Specify the compression to use for created tarballs and diff files (B<--"
 "compression> since dpkg 1.15.5).  Note that this option will not cause "
@@ -22069,13 +21650,13 @@ msgid ""
 "formats 2.0 and newer, and I<gzip> for format 1.0. I<xz> is only supported "
 "since dpkg 1.15.5."
 msgstr ""
-"Spécifie le niveau de compression à utiliser pour les fichiers créés "
-"(archives et fichiers diffs). Notez que cette option ne causera pas la "
-"recompression des archives existantes, cela ne concerne que les nouveaux "
-"fichiers. Les valeurs acceptées sont les suivantes : I<gzip>, I<bzip2>, "
-"I<lzma> et I<xz>. L'option par défaut est I<xz> pour les formats 2.0 et plus "
-"récents et I<gzip> est l'option par défaut pour le format 1.0. I<xz> n'est "
-"géré que depuis dpkg-dev 1.15.5."
+"Spécifie le niveau de compression à utiliser pour les fichiers archive et "
+"diff créés (B<--compression> depuis dpkg 1.15.5). Notez que cette option ne "
+"causera pas la recompression des archives existantes, cela ne concerne que "
+"les nouveaux fichiers. Les valeurs acceptées sont les suivantes : I<gzip>, "
+"I<bzip2>, I<lzma> et I<xz>. L'option par défaut est I<xz> pour les "
+"formats 2.0 et plus récents, et I<gzip> pour le format 1.0. I<xz> n'est géré "
+"que depuis dpkg 1.15.5."
 
 #. type: TP
 #: dpkg-source.man
@@ -22085,37 +21666,26 @@ msgstr "B<-z>I<niveau>, B<--compression-level>=I<niveau>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Compression level to use. As with B<-Z> it only affects newly created "
-#| "files. Supported values are: I<1> to I<9>, I<best>, and I<fast>.  The "
-#| "default is I<9> for gzip and bzip2, I<6> for xz and lzma."
 msgid ""
 "Compression level to use (B<--compression-level> since dpkg 1.15.5).  As "
 "with B<-Z> it only affects newly created files. Supported values are: I<1> "
 "to I<9>, I<best>, and I<fast>.  The default is I<9> for gzip and bzip2, I<6> "
 "for xz and lzma."
 msgstr ""
-"Niveau de compression à utiliser. Comme avec B<-Z> cela ne concerne que les "
-"fichiers nouvellement créés. Les valeurs prises possibles sont les "
-"suivantes : I<1> à I<9>, I<best>, et I<fast>. La valeur par défaut est I<9> "
-"pour gzip et bzip2, I<6> pour xz et lzma."
+"Niveau de compression à utiliser (B<--compression-level> depuis "
+"dpkg 1.15.5). Comme avec B<-Z> cela ne concerne que les fichiers "
+"nouvellement créés. Les valeurs prises possibles sont les suivantes : I<1> à "
+"I<9>, I<best> et I<fast>. La valeur par défaut est I<9> pour gzip et bzip2, "
+"I<6> pour xz et lzma."
 
 #. type: TP
 #: dpkg-source.man
 #, no-wrap
 msgid "B<-i>[I<regex>], B<--diff-ignore>[=I<regex>]"
-msgstr "B<-i>[I<expr. rat.>], B<--diff-ignore>[=I<expr. rat.>]"
+msgstr "B<-i>[I<expression-rationnelle>], B<--diff-ignore>[=I<expression-rationnelle>]"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "You may specify a perl regular expression to match files you want "
-#| "filtered out of the list of files for the diff. (This list is generated "
-#| "by a find command.) (If the source package is being built as a version 3 "
-#| "source package using a VCS, this can be used to ignore uncommitted "
-#| "changes on specific files. Using -i.* will ignore all of them.)"
 msgid ""
 "You may specify a perl regular expression to match files you want filtered "
 "out of the list of files for the diff (B<--diff-ignore> since dpkg 1.15.6).  "
@@ -22125,10 +21695,11 @@ msgid ""
 msgstr ""
 "Il est possible de donner une expression rationnelle Perl pour filtrer les "
 "fichiers qui doivent être éliminés de la liste des fichiers pour le "
-"« diff ». Cette liste est créée avec une commande « find ». Si le fichier "
-"source en construction est un fichier source de version 3 utilisant un "
-"système de suivi de versions, cette option est utile pour ignorer les "
-"modifications non envoyées. Utiliser -i.* les ignorera toutes."
+"« diff » (B<--diff-ignore> depuis dpkg 1.15.6). Cette liste est créée avec "
+"une commande « find ». Si le fichier source en construction est un fichier "
+"source de version 3 utilisant un système de suivi de versions, cette option "
+"est utile pour ignorer les modifications non envoyées. Utiliser B<-i>I<.*> "
+"les ignorera toutes."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22141,27 +21712,16 @@ msgid ""
 "multiple B<-i> options only the last one will take effect."
 msgstr ""
 "L'option B<-i> active cette fonction avec une expression rationnelle par "
-"défaut (en préservant toutes les modifications faites à l'expression "
+"défaut (en préservant toutes les modifications faites avec l'expression "
 "rationnelle par défaut par une utilisation précédente de B<--extend-diff-"
 "ignore>) qui couvre les fichiers de contrôle des plus usuels systèmes de "
-"gestion de version, les fichiers de sauvegardes, les fichiers d'échange et "
+"gestion de version, les fichiers de sauvegarde, les fichiers d'échange et "
 "les répertoires utilisés par Libtool. Il ne peut y avoir qu'une seule "
 "expression rationnelle active ; avec de multiples options B<-i>, seule la "
 "dernière mentionnée sera prise en compte."
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "This is very helpful in cutting out extraneous files that get included in "
-#| "the diff, e.g. if you maintain your source in a revision control system "
-#| "and want to use a checkout to build a source package without including "
-#| "the additional files and directories that it will usually contain (e.g. "
-#| "CVS/, .cvsignore, .svn/). The default regex is already very exhaustive, "
-#| "but if you need to replace it, please note that by default it can match "
-#| "any part of a path, so if you want to match the begin of a filename or "
-#| "only full filenames, you will need to provide the necessary anchors (e.g. "
-#| "'(^|/)', '($|/)') yourself."
 msgid ""
 "This is very helpful in cutting out extraneous files that get included in "
 "the diff, e.g. if you maintain your source in a revision control system and "
@@ -22181,24 +21741,17 @@ msgstr ""
 "exhaustive, mais si avez besoin de la remplacer, veuillez noter que par "
 "défaut, il sait vérifier n'importe quelle partie d'un chemin, donc si vous "
 "voulez trouver le début d'un nom de fichier ou des noms de fichiers "
-"complets, vous devrez fournir les caractères spéciaux vous-même (par "
-"exemple'(^|/)', '($|/)')."
+"complets, vous devrez fournir les caractères spéciaux vous-même (par exemple "
+"« (^|/) », « ($|/) »)."
 
 #. type: TP
 #: dpkg-source.man
 #, no-wrap
 msgid "B<--extend-diff-ignore>=I<regex>"
-msgstr "B<--extend-diff-ignore>=I<expr.rat.>"
+msgstr "B<--extend-diff-ignore>=I<expression-rationnelle>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "The perl regular expression specified will extend the default value used "
-#| "by B<--diff-ignore> and its current value (if set). It does this by "
-#| "concatenating \"B<|>I<regex>\" to the existing value.  This option is "
-#| "convenient to use in B<debian/source/options> to exclude some auto-"
-#| "generated files from the automatic patch generation."
 msgid ""
 "The perl regular expression specified will extend the default value used by "
 "B<--diff-ignore> and its current value, if set (since dpkg 1.15.6).  It does "
@@ -22207,10 +21760,11 @@ msgid ""
 "files from the automatic patch generation."
 msgstr ""
 "L'expression rationnelle Perl indiquée complétera la valeur par défaut "
-"utilisée par B<--diff-ignore> et sa valeur courante (si définie). Cela est "
-"effectué en concaténant « B<|>I<expr.rat.> » à la valeur existante. Cette "
-"option est pratique dans B<debian/source/options> pour exclure certains "
-"fichiers auto-créés de la création automatique de correctifs."
+"utilisée par B<--diff-ignore> et sa valeur courante si elle est définie "
+"(depuis dpkg 1.15.6). Cela est effectué en concaténant « B<|>I<expression-"
+"rationnelle> » à la valeur existante. Cette option est pratique dans "
+"B<debian/source/options> pour exclure certains fichiers auto-créés de la "
+"création automatique de correctifs."
 
 #. type: TP
 #: dpkg-source.man
@@ -22220,13 +21774,6 @@ msgstr "B<-I>[I<motif-fichier>], B<--tar-ignore>[=I<motif-fichier>]"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "If this option is specified, the pattern will be passed to B<tar>(1)'s "
-#| "B<--exclude> option when it is called to generate a .orig.tar or .tar "
-#| "file. For example, B<-I>CVS will make tar skip over CVS directories when "
-#| "generating a .tar.gz file. The option may be repeated multiple times to "
-#| "list multiple patterns to exclude."
 msgid ""
 "If this option is specified, the pattern will be passed to B<tar>(1)'s B<--"
 "exclude> option when it is called to generate a .orig.tar or .tar file (B<--"
@@ -22235,10 +21782,10 @@ msgid ""
 "repeated multiple times to list multiple patterns to exclude."
 msgstr ""
 "Avec cette option, le fichier est passé à l'option B<--exclude> de B<tar>(1) "
-"quand on veut créer un fichier .orig.tar.gz ou .tar.gz. Par exemple, B<-"
-"I>CVS fera que tar sautera les répertoires du CVS quand il doit créer un "
-"fichier .tar.gz. On peut répéter cette option pour exclure plusieurs "
-"fichiers."
+"quand on veut créer un fichier .orig.tar ou .tar (B<--tar-ignore> depuis "
+"dpkg 1.15.6). Par exemple, B<-I>CVS fera que tar sautera les répertoires du "
+"CVS quand il doit créer un fichier .tar.gz. On peut répéter cette option "
+"pour exclure à partir de plusieurs motifs."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22264,7 +21811,7 @@ msgid ""
 "semantic of tar's B<--exclude> option is somewhat complicated, see https://"
 "www.gnu.org/software/tar/manual/tar.html#wildcards for a full documentation."
 msgstr ""
-"B<Note :> même si elles ont des rôles similaires, B<-i> et B<-I> ont une "
+"B<Note> : même si elles ont des rôles similaires, B<-i> et B<-I> ont une "
 "syntaxe et une sémantique très différentes. B<-i> ne peut être spécifié "
 "qu'une fois et reçoit une expression rationnelle compatible avec le langage "
 "Perl qui est appliquée sur chaque chemin relatif complet de chaque fichier. "
@@ -22298,13 +21845,12 @@ msgstr "B<--no-copy>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid "Do not copy original tarballs near the extracted source package."
 msgid ""
 "Do not copy original tarballs near the extracted source package (since dpkg "
 "1.14.17)."
 msgstr ""
-"Ne copie pas l'archive d'origine à côté de l'extraction du paquet source."
+"Ne copie pas l'archive d'origine à côté de l'extraction du paquet source "
+"(depuis dpkg 1.14.17)."
 
 #. type: TP
 #: dpkg-source.man
@@ -22314,19 +21860,17 @@ msgstr "B<--no-check>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid "Do not check signatures and checksums before unpacking."
 msgid ""
 "Do not check signatures and checksums before unpacking (since dpkg 1.14.17)."
 msgstr ""
-"Ne vérifie pas les signatures et les sommes de contrôle avant de dépaqueter."
+"Ne vérifie pas les signatures et les sommes de contrôle avant de "
+"dépaqueter(depuis dpkg 1.14.17)."
 
 #. type: TP
 #: dpkg-source.man
-#, fuzzy, no-wrap
-#| msgid "B<-o>, B<--overwrite>"
+#, no-wrap
 msgid "B<--no-overwrite-dir>"
-msgstr "B<-o>, B<--overwrite>"
+msgstr "B<--no-overwrite-dir>"
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22334,6 +21878,8 @@ msgid ""
 "Do not overwrite the extraction directory if it already exists (since dpkg "
 "1.18.8)."
 msgstr ""
+"Ne pas remplacer le répertoire d'extraction s'il existe déjà (depuis "
+"dpkg 1.18.8)"
 
 #. type: TP
 #: dpkg-source.man
@@ -22343,13 +21889,6 @@ msgstr "B<--require-valid-signature>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Refuse to unpack the source package if it doesn't contain an OpenPGP "
-#| "signature that can be verified either with the user's I<trustedkeys.gpg> "
-#| "keyring, one of the vendor-specific keyrings, or one of the official "
-#| "Debian keyrings (I</usr/share/keyrings/debian-keyring.gpg> and I</usr/"
-#| "share/keyrings/debian-maintainers.gpg>)."
 msgid ""
 "Refuse to unpack the source package if it doesn't contain an OpenPGP "
 "signature that can be verified (since dpkg 1.15.0) either with the user's "
@@ -22358,16 +21897,17 @@ msgid ""
 "I</usr/share/keyrings/debian-maintainers.gpg>)."
 msgstr ""
 "Refuse de décompresser le paquet source s'il ne contient pas de signature "
-"OpenPGP pouvant être vérifiée soit avec le fichier de clés I<trustedkeys."
-"gpg> de l'utilisateur, un des fichiers de clés propre à un distributeur ou "
-"un des fichiers de clés officiels de Debian (I</usr/share/keyrings/debian-"
-"keyring.gpg> et I</usr/share/keyrings/debian-maintainers.gpg>)."
+"OpenPGP pouvant être vérifiée (depuis dpkg 1.15.0) soit avec le fichier de "
+"clés I<trustedkeys.gpg> de l'utilisateur, un des fichiers de clés propre à "
+"un distributeur ou un des fichiers de clés officiels de Debian (I</usr/share/"
+"keyrings/debian-keyring.gpg> et I</usr/share/keyrings/debian-maintainers."
+"gpg>)."
 
 #. type: TP
 #: dpkg-source.man
 #, no-wrap
 msgid "B<--require-strong-checksums>"
-msgstr ""
+msgstr "B<--require-strong-checksums>"
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22376,6 +21916,9 @@ msgid ""
 "checksums (since dpkg 1.18.7).  Currently the only known checksum considered "
 "strong is B<SHA-256>."
 msgstr ""
+"Refuse de décompresser le paquet source s'il ne contient pas de somme de "
+"contrôle robuste (depuis dpkg 1.18.7). Actuellement, B<SHA-256> est le seul "
+"type de somme de contrôle considéré comme robuste."
 
 #. type: TP
 #: dpkg-source.man
@@ -22385,20 +21928,15 @@ msgstr "B<--ignore-bad-version>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Turns the bad source package version check into a non-fatal warning.  "
-#| "This option should only be necessary when extracting ancient source "
-#| "packages with broken versions, just for backwards compatibility."
 msgid ""
 "Turns the bad source package version check into a non-fatal warning (since "
 "dpkg 1.17.7).  This option should only be necessary when extracting ancient "
 "source packages with broken versions, just for backwards compatibility."
 msgstr ""
 "Transforme la vérification des mauvaises versions des paquets source en "
-"avertissement non-fatal. Cette option sera seulement nécessaire quand on "
-"extrait des anciens paquets source avec des versions cassées, pour préserver "
-"la compatibilité avec les versions précédentes."
+"avertissement non fatal (since dpkg 1.17.7). Cette option sera seulement "
+"nécessaire quand on extrait des anciens paquets source avec des versions "
+"cassées, pour préserver la compatibilité avec les versions précédentes."
 
 #. type: SH
 #: dpkg-source.man
@@ -22408,12 +21946,6 @@ msgstr "FORMATS DE PAQUET SOURCE"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "If you don't know what source format to use, you should probably pick "
-#| "either \"3.0 (quilt)\" or \"3.0 (native)\". See https://wiki.debian.org/"
-#| "Projects/DebSrc3.0 for information on the deployment of those formats "
-#| "within Debian."
 msgid ""
 "If you don't know what source format to use, you should probably pick either "
 "“3.0 (quilt)” or “3.0 (native)”.  See https://wiki.debian.org/Projects/"
@@ -22428,15 +21960,10 @@ msgstr ""
 #: dpkg-source.man
 #, no-wrap
 msgid "Format: 1.0"
-msgstr "Format: 1.0"
+msgstr "Format : 1.0"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "A source package in this format consists either of a B<.orig.tar.gz> "
-#| "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the "
-#| "package is said to be I<native>)."
 msgid ""
 "A source package in this format consists either of a B<.orig.tar.gz> "
 "associated to a B<.diff.gz> or a single B<.tar.gz> (in that case the package "
@@ -22446,12 +21973,14 @@ msgid ""
 msgstr ""
 "Un paquet source dans ce format se compose soit d'un B<.orig.tar.gz> associé "
 "à un B<.diff.gz> ou un simple B<.tar.gz> (dans ce cas, le paquet est appelé "
-"natif I<« native »>)."
+"natif I<native>). L'archive tar originale pourrait être accompagnée de façon "
+"facultative d'une signature amont séparée B<.orig.tar.gz.asc>, extraction "
+"prise en charge depuis dpkg 1.18.5."
 
 #. type: Plain text
 #: dpkg-source.man
 msgid "B<Extracting>"
-msgstr "B<Extracting>"
+msgstr "B<Extraction>"
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22465,12 +21994,12 @@ msgid ""
 "files (the whole debian directory is created that way) but can't remove "
 "files (empty files will be left over)."
 msgstr ""
-"Extraire un paquet natif revient à une simple extraction de l'archive TAR "
-"dans le répertoire cible. L'extraction d'un paquet non-natif consiste au "
+"Extraire un paquet natif revient à une simple extraction de l'archive tar "
+"dans le répertoire cible. L'extraction d'un paquet non natif consiste au "
 "dépaquetage du B<.orig.tar.gz> puis l'application des correctifs contenus "
-"dans le B<.diff.gz>. La date de tous les fichiers correctifs est celle du "
-"moment où a eu lieu l'extraction depuis le paquet source (cela évite les "
-"heures fausses menant à des problèmes lorsque des fichiers générés "
+"dans le B<.diff.gz>. La date de tous les fichiers correctifs est réglée à "
+"celle du moment de l'extraction depuis le paquet source (cela évite les "
+"horodatages faux menant à des problèmes lorsque des fichiers générés "
 "automatiquement sont modifiés). Le diff peut créer de nouveaux fichiers "
 "(tout le répertoire debian est créé de cette façon) mais ne peut pas "
 "supprimer de fichiers (les fichiers vides seront laissés là)."
@@ -22482,41 +22011,25 @@ msgstr "B<Construction>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Building a native package is just creating a single tarball with the "
-#| "source directory. Building a non-native package involves extracting the "
-#| "original tarball in a separate \".orig\" directory and regenerating the "
-#| "B<.diff.gz> by comparing the source package I<directory> with the .orig "
-#| "directory."
 msgid ""
 "Building a native package is just creating a single tarball with the source "
 "directory. Building a non-native package involves extracting the original "
 "tarball in a separate “.orig” directory and regenerating the B<.diff.gz> by "
 "comparing the source package I<directory> with the .orig directory."
 msgstr ""
-"Construire un paquet natif revient simplement à créer une archive TAR avec "
-"le répertoire du source. La création d'un paquet non-natif consiste à "
-"extraire l'archive d'origine dans un répertoire séparé « .orig » puis "
+"Construire un paquet natif revient simplement à créer une archive tar avec "
+"le répertoire du source. La création d'un paquet non natif consiste à "
+"extraire l'archive d'origine dans un répertoire séparé « .orig » puis à "
 "régénérer le B<.diff.gz> en comparant le I<répertoire> du paquet source avec "
-"répertoire « .orig »."
+"le répertoire « .orig »."
 
 #. type: Plain text
 #: dpkg-source.man
 msgid "B<Build options (with --build):>"
-msgstr "B<Options de construction (avec --build) :>"
+msgstr "B<Options de construction (avec --build)> :"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "If a second non-option argument is supplied it should be the name of the "
-#| "original source directory or tarfile or the empty string if the package "
-#| "is a Debian-specific one and so has no Debianisation diffs. If no second "
-#| "argument is supplied then B<dpkg-source> will look for the original "
-#| "source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-#| "original source directory I<directory>B<.orig> depending on the B<-sX> "
-#| "arguments."
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -22527,12 +22040,11 @@ msgid ""
 msgstr ""
 "Si l'on donne un second argument, ce sera le nom du répertoire source "
 "d'origine ou le nom du fichier tar ou bien une chaîne vide si le paquet est "
-"un « Debian pure souche » et n'a donc pas de fichiers « diffs » concernant "
-"sa « debianization ». S'il n'y a pas de second argument, et selon les autres "
-"arguments donnés, B<dpkg-source> cherche le fichier tar des sources "
-"d'origine I<paquet>B<_>I<version-d'origine>B<.orig.tar.gz> ou bien le "
-"répertoire source d'origine I<répertoire>B<.orig> selon les paramètres B<-"
-"sX>."
+"un « Debian pure souche » et n'a donc pas de fichiers « diffs » pour sa "
+"« debianisation ». S'il n'y a pas de second argument, B<dpkg-source> cherche "
+"le fichier tar des sources d'origine I<paquet>B<_>I<version-amont>B<.orig."
+"tar.gz> ou bien le répertoire source d'origine I<répertoire>B<.orig> selon "
+"les paramètres B<-sX>."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22555,10 +22067,10 @@ msgid ""
 "I<directory>B<.orig> for the generation of the diff."
 msgstr ""
 "Spécifie que le source d'origine est attendu sous forme tar ; par défaut, "
-"I<paquet>B<_>I<version-d'origine>B<.orig.tar>I<extension>. Il le laisse en "
-"place en tant que fichier tar ou le copie dans le répertoire en cours s'il "
-"n'y est pas déjà. Le fichier sera dépaqueté dans I<répertoire>B<.orig> pour "
-"la génération du fichier diff."
+"I<paquet>B<_>I<version-amont>B<.orig.tar>I<extension>. Il le laisse en place "
+"en tant que fichier tar ou le copie dans le répertoire en cours s'il n'y est "
+"pas déjà. Le fichier sera dépaqueté dans I<répertoire>B<.orig> pour la "
+"génération du fichier diff."
 
 #. type: TP
 #: dpkg-source.man
@@ -22579,7 +22091,7 @@ msgid ""
 "new original source archive from it."
 msgstr ""
 "Quand on spécifie que le source d'origine est un répertoire ; la valeur par "
-"défaut est le répertoire I<paquet>B<->I<version-d'origine>B<.orig> et B<dpkg-"
+"défaut est le répertoire I<paquet>B<->I<version-amont>B<.orig> et B<dpkg-"
 "source> crée une nouvelle archive du source d'origine."
 
 #. type: Plain text
@@ -22611,8 +22123,8 @@ msgid ""
 msgstr ""
 "Indique de ne pas chercher de source d'origine et de ne pas créer de "
 "« diff ». Le second argument, s'il existe, doit être une chaîne vide. Cela "
-"sert pour les paquets Debian pure souche qui n'ont pas une source d'origine "
-"distincte et donc pas de fichier « diff » de debianization."
+"sert pour les paquets Debian pure souche qui n'ont pas un source d'origine "
+"distincte et donc pas de fichier « diff » de debianisation."
 
 #. type: TP
 #: dpkg-source.man
@@ -22633,21 +22145,21 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 "Indique comme source d'origine soit un fichier tar, soit un répertoire — le "
 "deuxième argument, s'il existe, doit être l'un d'eux ou bien une chaîne vide "
 "(cela revient à utiliser l'option B<-sn)>. Quand un fichier tar existe, il "
 "est dépaqueté pour créer le fichier « diff » ; ensuite il est supprimé (cela "
 "revient à utiliser l'option B<-sp)> ; quand un répertoire est trouvé, il est "
-"dépaqueté et B<dpkg-source> crée le source d'origine et supprime ensuite ce "
+"empaqueté et B<dpkg-source> crée le source d'origine et supprime ensuite ce "
 "répertoire (cela revient à utiliser l'option B<-sr)> ; quand ni l'un ni "
 "l'autre n'est trouvé, B<dpkg-source> suppose que le paquet ne possède pas de "
-"fichier « diff » de debianization, mais seulement une simple archive source "
+"fichier « diff » de debianisation, mais seulement une simple archive source "
 "(cela revient à utiliser l'option B<-sn>). Quand les deux sont trouvés, "
 "B<dpkg-source> ignore le répertoire et le remplace si l'option B<-sA> a été "
 "spécifiée (cela revient à utiliser l'option B<-sP)> ou il provoque une "
-"erreur si l'option B<-sa> a été spécifiée. L'option par défaut est B<-sA>."
+"erreur si l'option B<-sa> a été spécifiée. L'option par défaut est B<-sa>."
 
 #. type: TP
 #: dpkg-source.man
@@ -22657,25 +22169,20 @@ msgstr "B<--abort-on-upstream-changes>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "The process fails if the generated diff contains changes to files outside "
-#| "of the debian sub-directory. This option is not allowed in B<debian/"
-#| "source/options> but can be used in B<debian/source/local-options>."
 msgid ""
 "The process fails if the generated diff contains changes to files outside of "
 "the debian sub-directory (since dpkg 1.15.8).  This option is not allowed in "
 "B<debian/source/options> but can be used in B<debian/source/local-options>."
 msgstr ""
 "Ce processus échoue si le fichier de différences contient des modifications "
-"apportées à des fichiers en dehors du sous-répertoire debian. Cette option "
-"n'est pas autorisée dans B<debian/source/options> mais peut être utilisée "
-"dans B<debian/source/local-options>."
+"apportées à des fichiers en dehors du sous-répertoire debian (depuis "
+"dpkg 1.15.8). Cette option n'est pas autorisée dans B<debian/source/options> "
+"mais peut être utilisée dans B<debian/source/local-options>."
 
 #. type: Plain text
 #: dpkg-source.man
 msgid "B<Extract options (with --extract):>"
-msgstr "B<options d'extraction (avec --extract) :>"
+msgstr "B<options d'extraction (avec --extract)> :"
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22695,7 +22202,7 @@ msgstr ""
 "Quand on extrait le répertoire source d'origine (s'il existe), il est "
 "conservé en tant que fichier tar. S'il n'est pas déjà dans le répertoire "
 "courant ou si ce répertoire contient un fichier différent, le fichier tar "
-"est copié dans ce répertoire. (B<Ceci est le comportement par défaut>)."
+"est copié dans ce répertoire. (B<Cela est le comportement par défaut>)."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22730,47 +22237,35 @@ msgstr "B<--skip-debianization>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid "Skips application of the debian diff on top of the upstream sources."
 msgid ""
 "Skips application of the debian diff on top of the upstream sources (since "
 "dpkg 1.15.1)."
 msgstr ""
 "Passe l'étape d'application du fichier de différences Debian aux sources "
-"amont."
+"amont (depuis dpkg 1.15.1)."
 
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
 msgid "Format: 2.0"
-msgstr "Format: 2.0"
+msgstr "Format : 2.0"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Also known as wig&pen. This format is not recommended for wide-spread "
-#| "usage, the format \"3.0 (quilt)\" replaces it. Wig&pen was the first "
-#| "specification of a new-generation source package format."
 msgid ""
 "Extraction supported since dpkg 1.13.9, building supported since dpkg "
 "1.14.8.  Also known as wig&pen. This format is not recommended for wide-"
 "spread usage, the format “3.0 (quilt)” replaces it.  Wig&pen was the first "
 "specification of a new-generation source package format."
 msgstr ""
-"Aussi connu sous le nom de « wig&pen ». Ce format n'est pas recommandé afin "
-"d'assurer une utilisation massive du format « 3.0 (quilt) » qui le remplace. "
-"Wig&pen a été la première spécification d'une nouvelle génération de format "
-"de paquet source."
+"Extraction prise en charge depuis dpkg 1.13.9, construction depuis "
+"dpkg 1.14.8. Aussi connu sous le nom de « wig&pen ». Ce format n'est pas "
+"recommandé pour une utilisation massive, le format « 3.0 (quilt) » le "
+"remplace. Wig&pen a été la première spécification d'une nouvelle génération "
+"de format de paquet source."
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "The behaviour of this format is the same as the \"3.0 (quilt)\" format "
-#| "except that it doesn't use an explicit list of patches. All files in "
-#| "B<debian/patches/> matching the perl regular expression B<[\\ew-]+> must "
-#| "be valid patches: they are applied at extraction time."
 msgid ""
 "The behaviour of this format is the same as the “3.0 (quilt)” format except "
 "that it doesn't use an explicit list of patches. All files in B<debian/"
@@ -22780,7 +22275,7 @@ msgstr ""
 "Le comportement de ce format est le même que pour le format « 3.0 (quilt) » "
 "sauf qu'il n'utilise pas de liste explicite de correctifs. Tous les fichiers "
 "dans B<debian/patches/> correspondant à l'expression rationnelle Perl "
-"B<[\\ew-]+> doivent être des correctifs valides : ils sont appliqués au "
+"B<[\\ew-]+> doivent être des correctifs valables : ils sont appliqués au "
 "moment de l'extraction."
 
 #. type: Plain text
@@ -22790,24 +22285,17 @@ msgid ""
 "stored in a patch named B<zz_debian-diff-auto>."
 msgstr ""
 "Lors de la construction d'un nouveau paquet source, toute modification "
-"apportée à la source amont est enregistrée dans un correctif nommé "
-"B<zz_debian-diff-auto>."
+"apportée au source amont est enregistrée dans un correctif nommé B<zz_debian-"
+"diff-auto>."
 
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
 msgid "Format: 3.0 (native)"
-msgstr "Format: 3.0 (native)"
+msgstr "Format : 3.0 (native)"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "This format is an extension of the native package format as defined in "
-#| "the 1.0 format. It supports all compression methods and will ignore by "
-#| "default any VCS specific files and directories as well as many temporary "
-#| "files (see default value associated to B<-I> option in the B<--help> "
-#| "output)."
 msgid ""
 "Supported since dpkg 1.14.17.  This format is an extension of the native "
 "package format as defined in the 1.0 format. It supports all compression "
@@ -22815,44 +22303,41 @@ msgid ""
 "well as many temporary files (see default value associated to B<-I> option "
 "in the B<--help> output)."
 msgstr ""
-"Ce format est une extension du format de paquet natif tel que défini dans le "
-"format 1.0. Il gère toutes les méthodes de compression et ignore par défaut "
-"tout fichier et répertoire VCS ainsi que de nombreux fichiers temporaires "
-"(voir la valeur par défaut associée à l'option B<-I> dans la sortie de B<--"
-"help>)."
+"Pris en charge depuis dpkg 1.14.17. Ce format est une extension du format de "
+"paquet natif tel que défini dans le format 1.0. Il gère toutes les méthodes "
+"de compression et ignore par défaut tout fichier et répertoire spécifique à "
+"VCS ainsi que de nombreux fichiers temporaires (voir la valeur par défaut "
+"associée à l'option B<-I> dans la sortie de B<--help>)."
 
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
 msgid "Format: 3.0 (quilt)"
-msgstr "Format: 3.0 (quilt)"
+msgstr "Format : 3.0 (quilt)"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "A source package in this format contains at least an original tarball (B<."
-#| "orig.tar.>I<ext> where I<ext> can be B<gz>, B<bz2>, B<lzma> and B<xz>) "
-#| "and a debian tarball (B<.debian.tar.>I<ext>). It can also contain "
-#| "additional original tarballs (B<.orig->I<component>B<.tar.>I<ext>).  "
-#| "I<component> can only contain alphanumeric characters and hyphens (\"-\")."
 msgid ""
 "Supported since dpkg 1.14.17.  A source package in this format contains at "
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
-msgstr ""
-"Un paquet source dans ce format contient au moins une archive tar d'origine "
-"(B<.orig.tar.>I<ext> où I<ext> peut être B<gz>, B<bz2> B<lzma> et B<xz>) et "
-"une archive tar debian (B<.debian.tar.>I<ext>). Il peut également contenir "
-"d'autres archives tar d'origine (B<.orig->I<composant>B<.tar.>I<ext>). "
-"I<composant> ne peut être constitué que de caractères alphanumériques et de "
-"tirets (« - »)."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
+msgstr ""
+"Pris en charge depuis 1.14.17. Un paquet source dans ce format contient au "
+"moins une archive tar d'origine (B<.orig.tar.>I<ext> où I<ext> peut être "
+"B<gz>, B<bz2> B<lzma> et B<xz>) et une archive tar debian (B<.debian.tar."
+">I<ext>). Il peut également contenir d'autres archives tar d'origine (B<."
+"orig->I<composant>B<.tar.>I<ext>). I<composant> ne peut être constitué que "
+"de caractères alphanumériques (« a-zA-Z0-9 ») et de tirets (« - »). Chaque "
+"archive tar originale peut être accompagnée de façon facultative d'une "
+"signature amont séparée (B<.orig.tar.>I<ext>B<.asc> et B<.orig-"
+">I<composant>B<.tar.>I<ext>B<.asc>), extraction prise en charge depuis "
+"dpkg 1.17.20, construction depuis dpkg 1.18.5."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22868,35 +22353,50 @@ msgstr ""
 "L'archive principale tar d'origine est extraite tout d'abord, puis toutes "
 "les autres archives tar d'origine sont extraites dans des sous-répertoires "
 "dont le nom est formé à partir de la partie I<composant> de leur nom. "
-"L'archive tar Debian est extraite par dessus le répertoire source, après la "
-"suppression de tout répertoire B<debian> existant. Notez que l'archive tar "
-"Debian doit contenir un sous-répertoire B<debian>, mais il peut également "
-"contenir des fichiers binaires en dehors de ce répertoire (voir l'option B<--"
-"include-binaries>)."
+"L'archive tar Debian est extraite du répertoire source, après la suppression "
+"de tout répertoire B<debian> existant. Notez que l'archive tar Debian doit "
+"contenir un sous-répertoire B<debian>, mais elle peut également contenir des "
+"fichiers binaires en dehors de ce répertoire (voir l'option B<--include-"
+"binaries>)."
 
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
 "of B<patch>. It will thus emit a warning when it encounters such options, "
 "and the build is likely to fail."
 msgstr ""
-"Toutes les modifications figurant dans B<debian/patches/debian.series> ou "
-"B<debian/patches/series> sont alors appliquées. Si l'ancien fichier est "
-"utilisé et qu'il n'y en a pas de plus récent (ou si c'est un lien "
-"symbolique), alors celui-ci est remplacé par un lien symbolique vers "
-"l'ancien. Cette disposition vise à simplifier l'utilisation de B<quilt> pour "
-"gérer l'ensemble des correctifs. Notez toutefois que si B<dpkg-source> "
-"analyse correctement une série de fichiers avec les options utilisées pour "
+"Toutes les modifications figurant dans B<debian/patches/>I<distributeur>B<."
+"series> ou B<debian/patches/series> sont alors appliquées, où "
+"I<distributeur> sera le nom en minuscules du distributeur actuel, ou Debian "
+"s'il n'y a pas de distributeur défini. Si l'ancien fichier est utilisé et "
+"qu'il n'y en a pas de plus récent (ou si c'est un lien symbolique), alors "
+"celui-ci est remplacé par un lien symbolique vers l'ancien. Cette "
+"disposition vise à simplifier l'utilisation de B<quilt> pour gérer "
+"l'ensemble des correctifs. Les fichiers de séries propres au distributeur "
+"sont destinés à permettre de sérialiser plusieurs branches de développement "
+"en se basant sur le distributeur, d'une manière déclarative, de préférence "
+"au codage ouvert de cette gestion dans B<debian/rules>. Cela est "
+"particulièrement utile quand le source à besoin de correctifs de manière "
+"conditionnelle car les fichiers affectés n’ont pas de gestion interne "
+"d’inclusion conditionnelle. Notez toutefois que si B<dpkg-source> analyse "
+"correctement les fichiers de séries avec les options utilisées pour "
 "l'application du correctif (stockées sur chaque ligne après le nom du "
-"correctif et d'une ou plusieurs espaces), il n'ignore pas ces options et "
+"correctif et une ou plusieurs espaces), il n'ignore pas ces options et "
 "s'attendra toujours à ce que les correctifs puissent être appliqués avec "
 "l'option B<-p1> de B<patch>. Il va donc émettre un avertissement lorsqu'il "
 "rencontrera ces options, et la construction est susceptible d'échouer."
@@ -22904,10 +22404,27 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+"Notez que B<lintian>(1) émettra des avertissements sans condition lors de "
+"l'utilisation de séries de distributeur du fait d'une règle controversée "
+"particulière de Debian qui ne devrait pas affecter une utilisation externe ; "
+"pour les faire taire, le profil lintian de dpkg peut être utilisé en passant "
+"l'option «B<--profile dpkg>» à B<lintian>(1)."
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
 "The timestamp of all patched files is reset to the extraction time of the "
 "source package (this avoids timestamp skews leading to problems when "
 "autogenerated files are patched)."
 msgstr ""
+"La date de tous les fichiers correctifs est celle du moment où se déroule "
+"l'extraction du paquet source (cela évite les horodatages faux menant à des "
+"problèmes lorsque des fichiers générés automatiquement sont modifiés)."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22955,12 +22472,14 @@ msgstr ""
 "Les originaux de toutes les archives tar trouvées dans le répertoire courant "
 "sont extraits dans un répertoire temporaire en suivant la même logique que "
 "pour le dépaquetage, le répertoire debian est copié dans le répertoire "
-"temporaire, et toutes les mises à jour sauf B<debian-changes->I<version> "
+"temporaire, et tous les correctifs excepté le correctif automatique B<debian-"
+"changes->I<version> ou B<debian-changes>, selon B<--single-debian-patch>) "
 "sont appliquées. Le répertoire temporaire est comparé à celui du paquet "
-"source. Si le fichier de différences n'est pas vide, il est stocké dans le "
-"correctif automatique. Si le correctif automatique est créé ou supprimé, il "
-"est ajouté ou supprimé dans le fichier series et les méta-données de "
-"B<quilt>."
+"source. Si le fichier de différences n'est pas vide, la construction échoue "
+"à moins que B<--single-debian-patch> ou B<--auto-commit>  aient été "
+"utilisés, et dans ce cas le diff est stocké dans le correctif automatique. "
+"Si le correctif automatique est créé ou supprimé, il est ajouté ou supprimé "
+"dans le fichier « series » et les métadonnées de B<quilt>."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -23094,14 +22613,6 @@ msgstr "B<--allow-version-of-quilt-db=>I<version>"
 # type: Plain text
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Allow B<dpkg-source> to build the source package if the version of the "
-#| "B<quilt> metadata is the one specified, even if B<dpkg-source> doesn't "
-#| "know about it. Effectively this says that the given version of the "
-#| "B<quilt> metadata is compatible with the version 2 that B<dpkg-source> "
-#| "currently supports. The version of the B<quilt> metadata is stored in B<."
-#| "pc/.version>."
 msgid ""
 "Allow B<dpkg-source> to build the source package if the version of the "
 "B<quilt> metadata is the one specified, even if B<dpkg-source> doesn't know "
@@ -23110,11 +22621,12 @@ msgid ""
 "B<dpkg-source> currently supports. The version of the B<quilt> metadata is "
 "stored in B<.pc/.version>."
 msgstr ""
-"Autorise B<dpkg-source> à construire le fichier si la version des méta-"
-"données de B<quilt> est celle indiquée, même si B<dpkg-source> n'en n'a pas "
-"connaissance. En fait, cela indique que la version indiquée des méta-données "
-"de B<quilt> est compatible avec la version 2 que B<dpkg-source> gère. La "
-"version des méta-données de B<quilt> est conservée dans B<.pc/.version>."
+"Autorise B<dpkg-source> à construire le fichier si la version des "
+"métadonnées de B<quilt> est celle indiquée, même si B<dpkg-source> n'en n'a "
+"pas connaissance (depuis dpkg 1.15.5.4). En fait, cela indique que la "
+"version indiquée des métadonnées de B<quilt> est compatible avec la "
+"version 2 que B<dpkg-source> gère. La version des métadonnées de B<quilt> "
+"est conservée dans B<.pc/.version>."
 
 #. type: TP
 #: dpkg-source.man
@@ -23129,7 +22641,7 @@ msgid ""
 "patch."
 msgstr ""
 "N'ignore pas les fichiers supprimés et les inclut dans le fichier de "
-"modification généré automatiquement."
+"modifications généré automatiquement."
 
 #. type: TP
 #: dpkg-source.man
@@ -23157,7 +22669,7 @@ msgid ""
 msgstr ""
 "Ajoute tous les binaires modifiés dans l'archive tar debian. Les ajoute "
 "aussi à B<debian/source/include-binaries> : elles seront ajoutées par défaut "
-"dans les constructions correspondantes aussi cette option n'est donc plus "
+"dans les constructions suivantes aussi cette option n'est donc plus "
 "nécessaire."
 
 #. type: TP
@@ -23168,16 +22680,12 @@ msgstr "B<--no-preparation>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Do not try to prepare the build tree by applying patches which are "
-#| "apparently unapplied."
 msgid ""
 "Do not try to prepare the build tree by applying patches which are "
 "apparently unapplied (since dpkg 1.14.18)."
 msgstr ""
 "N'essaye pas de préparer l'arbre de la construction en appliquant les "
-"correctifs qui ne lui sont apparemment pas appliqués."
+"correctifs qui ne sont apparemment pas appliqués (depuis dpkg 1.14.8)."
 
 #. type: TP
 #: dpkg-source.man
@@ -23188,16 +22696,6 @@ msgstr "B<--single-debian-patch>"
 # type: Plain text
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
-#| "changes->I<version> for the name of the automatic patch generated during "
-#| "build. This option is particularly useful when the package is maintained "
-#| "in a VCS and a patch set can't reliably be generated. Instead the current "
-#| "diff with upstream should be stored in a single patch. The option would "
-#| "be put in B<debian/source/local-options> and would be accompanied by a "
-#| "B<debian/source/local-patch-header> file explaining how the Debian "
-#| "changes can be best reviewed, for example in the VCS that is used."
 msgid ""
 "Use B<debian/patches/debian-changes> instead of B<debian/patches/debian-"
 "changes->I<version> for the name of the automatic patch generated during "
@@ -23209,14 +22707,14 @@ msgid ""
 "Debian changes can be best reviewed, for example in the VCS that is used."
 msgstr ""
 "Utilise B<debian/patches/debian-changes> au lieu de B<debian/patches/debian-"
-"changes->I<version> comme nom du correctif automatiquement créé au cours de "
-"la construction. Cette option est particulièrement pratique lorsque le "
-"paquet est géré avec un outil de gestion de versions et qu'un jeu de "
-"correctifs ne peut être créé de façon fiable. Dans ce cas, les différences "
-"avec la version amont doivent être conservées dans un correctif unique. "
-"Cette option serait indiquée dans B<debian/source/local-options> et "
-"accompagnée par un fichier B<debian/source/patch-header> qui explique la "
-"meilleure méthode pour relire les corrections spécifiques à Debian, par "
+"changes->I<version> comme nom du correctif automatique créé au cours de la "
+"construction (depuis dpkg 1.15.5.4). Cette option est particulièrement "
+"pratique lorsque le paquet est géré avec un outil de gestion de versions et "
+"qu'un jeu de correctifs ne peut être créé de façon fiable. Dans ce cas, les "
+"différences avec la version amont doivent être conservées dans un correctif "
+"unique. Cette option serait indiquée dans B<debian/source/local-options> et "
+"accompagnée par un fichier B<debian/source/local-patch-header> qui explique "
+"la meilleure méthode pour revoir les corrections spécifiques à Debian, par "
 "exemple dans le gestionnaire de versions utilisé."
 
 #. type: TP
@@ -23227,22 +22725,17 @@ msgstr "B<--create-empty-orig>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Automatically create the main original tarball as empty if it's missing "
-#| "and if there are supplementary original tarballs. This option is meant to "
-#| "be used when the source package is just a bundle of multiple upstream "
-#| "software and where there's no \"main\" software."
 msgid ""
 "Automatically create the main original tarball as empty if it's missing and "
 "if there are supplementary original tarballs (since dpkg 1.15.6).  This "
 "option is meant to be used when the source package is just a bundle of "
 "multiple upstream software and where there's no “main” software."
 msgstr ""
-"Crée automatiquement une archive tar d'origine vide si elle est manquante et "
-"qu'il existe des archives tar d'origine additionnelles. Cette option peut "
-"être utilisée lorsque le paquet source est une collection de différentes "
-"sources amont et qu'il n'existe pas de logiciel « principal »."
+"Crée automatiquement l'archive principale tar d'origine vide si elle est "
+"manquante et qu'il existe des archives tar d'origine additionnelles (depuis "
+"dpkg 1.15.6). Cette option peut être utilisée lorsque le paquet source est "
+"une collection de différents sources amont et qu'il n'existe pas de logiciel "
+"« principal »."
 
 #. type: TP
 #: dpkg-source.man
@@ -23252,14 +22745,6 @@ msgstr "B<--no-unapply-patches, --unapply-patches>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "By default, B<dpkg-source> will automatically unapply the patches in the "
-#| "B<--after-build> hook if it did apply them during B<--before-build>. "
-#| "Those options allow you to forcefully disable or enable the patch "
-#| "unapplication process. Those options are only allowed in B<debian/source/"
-#| "local-options> so that all generated source packages have the same "
-#| "behavior by default."
 msgid ""
 "By default, B<dpkg-source> will automatically unapply the patches in the B<--"
 "after-build> hook if it did apply them during B<--before-build> (B<--unapply-"
@@ -23271,20 +22756,14 @@ msgid ""
 msgstr ""
 "Par défaut, B<dpkg-source> retire automatiquement les correctifs dans le "
 "point d'entrée B<--after-build> s'ils ont été appliqués pendant B<--before-"
-"build>. Ces options permettent de désactiver ou activer unilatéralement ce "
-"retrait des correctifs. Elles ne sont permises que dans B<debian/source/"
-"local-options> afin que tous les paquets source créés aient le même "
-"comportement par défaut."
+"build> (B<--unapply-patches> depuis dpkg 1.15.8, B<--no-unapply-patches> "
+"depuis dpkg 1.16.5). Ces options permettent de désactiver ou activer "
+"unilatéralement ce retrait des correctifs. Elles ne sont permises que dans "
+"B<debian/source/local-options> afin que tous les paquets source créés aient "
+"le même comportement par défaut."
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "The process fails if an automatic patch has been generated. This option "
-#| "can be used to ensure that all changes were properly recorded in separate "
-#| "B<quilt> patches prior to the source package build. This option is not "
-#| "allowed in B<debian/source/options> but can be used in B<debian/source/"
-#| "local-options>."
 msgid ""
 "The process fails if an automatic patch has been generated (since dpkg "
 "1.15.8).  This option can be used to ensure that all changes were properly "
@@ -23292,11 +22771,12 @@ msgid ""
 "This option is not allowed in B<debian/source/options> but can be used in "
 "B<debian/source/local-options>."
 msgstr ""
-"Ce processus échouera si un correctif automatique a été créé. Cette "
-"optionpeut servir à vérifier que toutes les modifications ont été "
-"enregistrées correctement dans des correctifs B<quilt> distincts avant la "
-"construction du paquet source. Elle n'est pas autorisée dans B<debian/source/"
-"options> mais peut prendre place dans B<debian/source/local-options>."
+"Ce processus échouera si un correctif automatique a été créé (depuis "
+"dpkg 1.15.8). Cette option peut servir à vérifier que toutes les "
+"modifications ont été enregistrées correctement dans des correctifs B<quilt> "
+"distincts avant la construction du paquet source. Elle n'est pas autorisée "
+"dans B<debian/source/options> mais peut prendre place dans B<debian/source/"
+"local-options>."
 
 #. type: TP
 #: dpkg-source.man
@@ -23320,15 +22800,12 @@ msgstr "B<Options d'extraction>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Skips extraction of the debian tarball on top of the upstream sources."
 msgid ""
 "Skips extraction of the debian tarball on top of the upstream sources (since "
 "dpkg 1.15.1)."
 msgstr ""
-"Passe l'étape d'extraction de l'archive tar debian par dessus les sources "
-"amont"
+"Passe l'étape d'extraction de l'archive tar debian des sources amont (depuis "
+"dpkg 1.15.1)."
 
 #. type: TP
 #: dpkg-source.man
@@ -23338,31 +22815,27 @@ msgstr "B<--skip-patches>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid "Do not apply patches at the end of the extraction."
 msgid "Do not apply patches at the end of the extraction (since dpkg 1.14.18)."
-msgstr "Ne pas appliquer des correctifs à la fin de l'extraction."
+msgstr ""
+"Ne pas appliquer des correctifs à la fin de l'extraction (depuis "
+"dpkg 1.14.18)."
 
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
 msgid "Format: 3.0 (custom)"
-msgstr "Format: 3.0 (custom)"
+msgstr "Format : 3.0 (custom)"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "This format is special. It doesn't represent a real source package format "
-#| "but can be used to create source packages with arbitrary files."
 msgid ""
 "Supported since dpkg 1.14.17.  This format is special.  It doesn't represent "
 "a real source package format but can be used to create source packages with "
 "arbitrary files."
 msgstr ""
-"Ce format est particulier. Il ne représente pas un réel format de paquet "
-"source mais peut être utilisé pour créer des paquets sources avec des "
-"fichiers arbitraires."
+"Pris en charge depuis dpkg 1.14.17. Ce format est particulier. Il ne "
+"représente pas un réel format de paquet source mais peut être utilisé pour "
+"créer des paquets sources avec des fichiers arbitraires."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -23383,11 +22856,6 @@ msgstr "B<--target-format=>I<valeur>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "B<Required>. Defines the real format of the generated source package.  "
-#| "The generated .dsc file will contain this value in its B<Format> field "
-#| "and not \"3.0 (custom)\"."
 msgid ""
 "B<Required>. Defines the real format of the generated source package.  The "
 "generated .dsc file will contain this value in its B<Format> field and not "
@@ -23401,14 +22869,12 @@ msgstr ""
 #: dpkg-source.man
 #, no-wrap
 msgid "Format: 3.0 (git)"
-msgstr "Format: 3.0 (git)"
+msgstr "Format : 3.0 (git)"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid "This format is experimental."
 msgid "Supported since dpkg 1.14.17.  This format is experimental."
-msgstr "Ce format est expérimental."
+msgstr "Pris en charge depuis dpkg 1.14.17. Ce format est expérimental."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -23417,35 +22883,24 @@ msgid ""
 "repository B<.git> to hold the source of a package.  There may also be a B<."
 "gitshallow> file listing revisions for a shallow git clone."
 msgstr ""
-"Un paquet source qui utilise ce format est constitué d'un ensemble d'un seul "
+"Un paquet source qui utilise ce format est constitué d'un seul ensemble d'un "
 "dépôt git B<.git> qui contient les sources du paquet. Il peut également "
-"exister un fichier B<.gitshallow> qui donne les révisions d'un clone git "
+"exister un fichier I<.gitshallow> qui donne les révisions d'un clone git "
 "« shallow »."
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "The bundle is cloned as a git repository to the target directory.  If "
-#| "there is a gitshallow file, it is installed as `.git/shallow` inside the "
-#| "cloned git repository."
 msgid ""
 "The bundle is cloned as a git repository to the target directory.  If there "
 "is a gitshallow file, it is installed as I<.git/shallow> inside the cloned "
 "git repository."
 msgstr ""
 "Cet ensemble est cloné sous forme d'un dépôt git dans le répertoire cible. "
-"S'il existe un fichier .gitshallow, il est installé en tant que « .git/"
-"shallow » dans le dépôt git cloné."
+"S'il existe un fichier I<.gitshallow>, il est installé en tant que I<.git/"
+"shallow> dans le dépôt git cloné."
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Note that by default the new repository will have the same branch checked "
-#| "out that was checked out in the original source. (Typically \"master\", "
-#| "but it could be anything.) Any other branches will be available under "
-#| "`remotes/origin/`."
 msgid ""
 "Note that by default the new repository will have the same branch checked "
 "out that was checked out in the original source.  (Typically “master”, but "
@@ -23455,7 +22910,7 @@ msgstr ""
 "Veuillez noter que, par défaut, le nouveau dépôt aura la même branche "
 "récupérée que celle qui était récupérée dans les sources d'origine (souvent "
 "« master » mais cela peut être tout à fait autre chose). Toutes les autres "
-"branches seront disponibles sous « remotes/origin »."
+"branches seront disponibles sous I<remotes/origin>."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -23464,7 +22919,7 @@ msgid ""
 "any non-ignored uncommitted changes."
 msgstr ""
 "Avant d'aller plus loin, quelques vérifications sont effectuées afin de "
-"s'assurer qu'il n'existe aucun changement non-soumis et à ne pas ignorer."
+"s'assurer qu'il n'existe aucun changement non ignoré non soumis."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -23499,7 +22954,7 @@ msgstr ""
 "utilisée plusieurs fois. Le paramètre I<réf> peut être le nom d'une branche "
 "ou une étiquette à inclure. Il peut également être tout paramètre que l'on "
 "peut passer à B<git-rev-list>(1). Par exemple, pour n'inclure que la branche "
-"« master », on peut utiliser B<--git-ref>=master. Pour inclure toutes les "
+"« master », on peut utiliser B<--git-ref=>master. Pour inclure toutes les "
 "étiquettes et toutes les branches, sauf la branche privée, on peut utiliser -"
 "B<git-ref=>--all B<-- git-ref=>^private."
 
@@ -23522,20 +22977,16 @@ msgstr ""
 #: dpkg-source.man
 #, no-wrap
 msgid "Format: 3.0 (bzr)"
-msgstr "Format: 3.0 (bzr)"
+msgstr "Format : 3.0 (bzr)"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "This format is experimental. It generates a single tarball containing the "
-#| "bzr repository."
 msgid ""
 "Supported since dpkg 1.14.17.  This format is experimental.  It generates a "
 "single tarball containing the bzr repository."
 msgstr ""
-"Ce format est expérimental. Il crée une archive tar contenant le dépôt bzr "
-"correspondant."
+"Pris en charge depuis dpkg 1.14.17. Ce format est expérimental. Il crée une "
+"archive tar contenant le dépôt bzr correspondant."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -23565,13 +23016,6 @@ msgstr "aucun format source indiqué dans debian/source/format"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "The file B<debian/source/format> should always exist and indicate the "
-#| "desired source format. For backwards compatibility, format \"1.0\" is "
-#| "assumed when the file doesn't exist but you should not rely on this: at "
-#| "some point in the future B<dpkg-source> will be modified to fail when "
-#| "that file doesn't exist."
 msgid ""
 "The file B<debian/source/format> should always exist and indicate the "
 "desired source format. For backwards compatibility, format “1.0” is assumed "
@@ -23588,13 +23032,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "The rationale is that format \"1.0\" is no longer the recommended format, "
-#| "you should usually pick one of the newer formats (\"3.0 (quilt)\", \"3.0 "
-#| "(native)\") but B<dpkg-source> will not do this automatically for you.  "
-#| "If you want to continue using the old format, you should be explicit "
-#| "about it and put \"1.0\" in B<debian/source/format>."
 msgid ""
 "The rationale is that format “1.0” is no longer the recommended format, you "
 "should usually pick one of the newer formats (“3.0 (quilt)”, “3.0 (native)”) "
@@ -23617,14 +23054,6 @@ msgstr "le fichier de différences modifie les fichiers amont suivants"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "When using source format \"1.0\" it is usually a bad idea to modify "
-#| "upstream files directly as the changes end up hidden and mostly "
-#| "undocumented in the .diff.gz file. Instead you should store your changes "
-#| "as patches in the debian directory and apply them at build-time. To avoid "
-#| "this complexity you can also use the format \"3.0 (quilt)\" that offers "
-#| "this natively."
 msgid ""
 "When using source format “1.0” it is usually a bad idea to modify upstream "
 "files directly as the changes end up hidden and mostly undocumented in the ."
@@ -23717,59 +23146,61 @@ msgid ""
 "If set, it will be used as the timestamp (as seconds since the epoch) to "
 "clamp the mtime in the B<tar>(5) file entries."
 msgstr ""
+"Si cette option est utilisée, elle sera utilisée comme horodatage (en "
+"seconde à partir de « l'epoch ») pour fixer le « mtime » dans les entrées du "
+"fichier B<tar>(5)."
 
 #. type: TP
 #: dpkg-source.man
 #, no-wrap
 msgid "B<VISUAL>"
-msgstr ""
+msgstr "B<VISUAL>"
 
 #. type: TQ
 #: dpkg-source.man
 #, no-wrap
 msgid "B<EDITOR>"
-msgstr ""
+msgstr "B<EDITOR>"
 
 #. type: Plain text
 #: dpkg-source.man
 msgid "Used by the “2.0” and “3.0 (quilt)” source format modules."
-msgstr ""
+msgstr "Utilisé par les modules de format source « 2.0 » et « 3.0 (quilt) »."
 
 #. type: TP
 #: dpkg-source.man
-#, fuzzy, no-wrap
-#| msgid "B<TMPDIR>"
+#, no-wrap
 msgid "B<GIT_DIR>"
-msgstr "B<TMPDIR>"
+msgstr "B<GIT_DIR>"
 
 #. type: TQ
 #: dpkg-source.man
 #, no-wrap
 msgid "B<GIT_INDEX_FILE>"
-msgstr ""
+msgstr "B<GIT_INDEX_FILE>"
 
 #. type: TQ
 #: dpkg-source.man
 #, no-wrap
 msgid "B<GIT_OBJECT_DIRECTORY>"
-msgstr ""
+msgstr "B<GIT_OBJECT_DIRECTORY>"
 
 #. type: TQ
 #: dpkg-source.man
 #, no-wrap
 msgid "B<GIT_ALTERNATE_OBJECT_DIRECTORIES>"
-msgstr ""
+msgstr "B<GIT_ALTERNATE_OBJECT_DIRECTORIES>"
 
 #. type: TQ
 #: dpkg-source.man
 #, no-wrap
 msgid "B<GIT_WORK_TREE>"
-msgstr ""
+msgstr "B<GIT_WORK_TREE>"
 
 #. type: Plain text
 #: dpkg-source.man
 msgid "Used by the “3.0 (git)” source format modules."
-msgstr ""
+msgstr "Utilisés par les modules de format source « 3.0 (git) »."
 
 #. type: SS
 #: dpkg-source.man
@@ -23786,7 +23217,7 @@ msgid ""
 msgstr ""
 "Ce fichier contient sur une seule ligne le format à utiliser pour construire "
 "le paquet source (les formats acceptés sont décrits plus haut). Il ne doit "
-"pas contenir d'espaces avant ou après l'indication du format."
+"pas contenir d'espace avant ou après l'indication du format."
 
 #. type: SS
 #: dpkg-source.man
@@ -23796,12 +23227,6 @@ msgstr "debian/source/include-binaries"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "This file contains a list of binary files (one per line) that should be "
-#| "included in the debian tarball. Leading and trailing spaces are "
-#| "stripped.  Lines starting with \"#\" are comments and are skipped. Empty "
-#| "lines are ignored."
 msgid ""
 "This file contains a list of binary files (one per line) that should be "
 "included in the debian tarball. Leading and trailing spaces are stripped.  "
@@ -23810,7 +23235,7 @@ msgid ""
 msgstr ""
 "Ce fichier contient une liste de fichiers binaires (un par ligne) qui "
 "doivent être inclus dans l'archive tar debian. Les espaces placées avant ou "
-"après ces noms sont supprimées. Les lignes commençant par « # » sont des "
+"après ces noms sont supprimées. Les lignes commençant par « B<#> » sont des "
 "commentaires et sont ignorées, ainsi que les lignes vides."
 
 #. type: SS
@@ -23834,13 +23259,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Each option should be put on a separate line. Empty lines and lines "
-#| "starting with \"#\" are ignored. The leading \"--\" should be stripped "
-#| "and short options are not allowed. Optional spaces are allowed around the "
-#| "\"=\" symbol and optional quotes are allowed around the value.  Here's an "
-#| "example of such a file:"
 msgid ""
 "Each option should be put on a separate line. Empty lines and lines starting "
 "with ‘B<#>’ are ignored.  The leading ‘B<-->’ should be stripped and short "
@@ -23849,11 +23267,11 @@ msgid ""
 "of such a file:"
 msgstr ""
 "Chaque option doit être placée sur une ligne distincte. Les lignes vides et "
-"les lignes commençant par le caractère « # » sont ignorées. Les caractères "
-"initiaux « -- » doivent être retirés et les options courtes ne peuvent pas "
-"être utilisées. Des espaces optionnelles sont autorisées autour du symbole "
-"« = », ainsi que des guillemets optionnels autour de la valeur d'une option "
-"donnée. Voici un exemple d'un tel fichier :"
+"les lignes commençant par le caractère « B<#> » sont ignorées. Les "
+"caractères initiaux « B<--> » doivent être retirés et les options courtes ne "
+"peuvent pas être utilisées. Des espaces optionnelles sont autorisées autour "
+"du symbole « B<=> », ainsi que des guillemets optionnels autour de la valeur "
+"d'une option donnée. Voici un exemple d'un tel fichier :"
 
 #. type: Plain text
 #: dpkg-source.man
@@ -23867,7 +23285,8 @@ msgid ""
 "  # ignore changes on config.{sub,guess}\n"
 "  extend-diff-ignore = \"(^|/)(config.sub|config.guess)$\"\n"
 msgstr ""
-"  # autoriser dpkg-source à créer un fichier debian.tar.bz2 avec la compression maximale\n"
+"  # autoriser dpkg-source à créer un fichier debian.tar.bz2 avec la\n"
+"  #compression maximale\n"
 "  compression = \"bzip2\"\n"
 "  compression-level = 9\n"
 "  # utiliser debian/patches/debian-changes comme correctif automatique\n"
@@ -23912,19 +23331,20 @@ msgstr "debian/source/local-patch-header R<et> debian/source/patch-header"
 # type: Plain text
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Free form text that is put on top of the automatic patch generated in "
-#| "formats \"2.0\" or \"3.0 (quilt)\". B<local-patch-header> is not included "
-#| "in the generated source package while B<patch-header> is."
 msgid ""
 "Free form text that is put on top of the automatic patch generated in "
 "formats “2.0” or “3.0 (quilt)”. B<local-patch-header> is not included in the "
 "generated source package while B<patch-header> is."
 msgstr ""
-"Texte en format libre qui sera ajouté au correctif automatique créé dans les "
-"formats « 2.0 » et « 3.0 (quilt) ». B<local-patch-header> n'est pas inclus "
-"dans le paquet source créé alors que B<patch-header> l'est."
+"Texte en format libre qui sera ajouté au début du correctif automatique créé "
+"dans les formats « 2.0 » et « 3.0 (quilt) ». B<local-patch-header> n'est pas "
+"inclus dans le paquet source créé alors que B<patch-header> l'est."
+
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr "debian/patches/I<distributeur>.series"
 
 #. type: SS
 #: dpkg-source.man
@@ -23934,36 +23354,32 @@ msgstr "debian/patches/series"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "This file lists all patches that have to be applied (in the given order)  "
-#| "on top of the upstream source package. Leading and trailing spaces are "
-#| "stripped. Lines starting with \"#\" are comments and are skipped. Empty "
-#| "lines are ignored. Remaining lines start with a patch filename (relative "
-#| "to the B<debian/patches/> directory) up to the first space character or "
-#| "the end of line. Optional B<quilt> options can follow up to the end of "
-#| "line or the first \"#\" preceded by one or more spaces (which marks the "
-#| "start of a comment up to the end of line)."
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
-"Ce fichier comporte la liste de toutes les corrections qui ont été "
-"appliquées (dans l'ordre indiqué) aux sources amont. Les espaces situées "
-"avant et après les noms sont ignorées. Les lignes commençant par « # » sont "
-"des commentaires et sont ignorées, ainsi que les lignes vides. Les autres "
-"lignes débutent par le nom du fichier de corrections (relatif au répertoire "
-"B<debian/patches/>) et se terminent à la première espace ou à la fin de la "
-"ligne. Des options facultatives de B<quilt> peuvent être ajoutées jusqu'à la "
-"fin de la ligne ou jusqu'au premier caractère « # » précédé par une ou "
-"plusieurs espaces (ce qui indique le début d'un commentaire se terminant à "
-"la fin de la ligne)."
+"Ce fichier comporte la liste de toutes les correctifs qui ont été appliqués "
+"(dans l'ordre indiqué) aux sources amont. Les espaces situées avant et après "
+"les noms sont ignorées. L'argument I<distributeur> sera le nom en minuscules "
+"du distributeur ou B<debian> si aucun distributeur n'est défini. Si le "
+"fichier de séries propre au distributeur n'existe pas, le fichier de séries "
+"sans distributeur sera utilisé. Les lignes commençant par « B<#> » sont des "
+"commentaires et sont ignorées, ainsi que les lignes vides. Les autres lignes "
+"débutent par le nom du fichier de correctifs (relatif au répertoire B<debian/"
+"patches/>) et se terminent à la première espace ou à la fin de la ligne. Des "
+"options facultatives de B<quilt> peuvent être ajoutées jusqu'à la fin de la "
+"ligne ou jusqu'au premier caractère « B<#> » précédé par une ou plusieurs "
+"espaces (ce qui indique le début d'un commentaire se terminant à la fin de "
+"la ligne)."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -23971,16 +23387,14 @@ msgid ""
 "The point at which field overriding occurs compared to certain standard "
 "output field settings is rather confused."
 msgstr ""
-"Le moment où a lieu le remplacement d'un champ par rapport à certaines "
+"Le moment où se déroule le remplacement d'un champ par rapport à certaines "
 "déterminations de champ affichées sur la sortie standard est plutôt "
 "embrouillé."
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid "B<deb-control>(5), B<deb>(5), B<dpkg>(1)"
 msgid "B<deb-src-control>(5), B<deb-changelog>(5), B<dsc>(5)."
-msgstr "B<deb-control>(5), B<deb>(5), B<dpkg>(1)."
+msgstr "B<deb-src-control>(5), B<deb-changelog>(5), B<dsc>(5)."
 
 #. type: TH
 #: dpkg-split.man
@@ -23991,7 +23405,7 @@ msgstr "dpkg-split"
 #. type: Plain text
 #: dpkg-split.man
 msgid "dpkg-split - Debian package archive split/join tool"
-msgstr "dpkg-split - outil de décomposition/recomposition des paquets Debian"
+msgstr "dpkg-split - Outil de décomposition/recomposition des paquets Debian"
 
 #. type: Plain text
 #: dpkg-split.man
@@ -24124,8 +23538,8 @@ msgid ""
 "By default the output file is called I<package>B<_>I<version>B<_>I<arch>B<."
 "deb>."
 msgstr ""
-"Par défaut, le fichier produit "
-"s'appelle I<paquet>B<_>I<version>B<_>I<arch>B<.deb>."
+"Par défaut, le fichier produit s'appelle "
+"I<paquet>B<_>I<version>B<_>I<arch>B<.deb>."
 
 #. type: TP
 #: dpkg-split.man
@@ -24268,14 +23682,14 @@ msgid ""
 "reassembly. The default is B<%ADMINDIR%>."
 msgstr ""
 "Indique un répertoire différent pour la file comprenant les parties en "
-"attente d'une recomposition automatique. Par défaut, c'est le répertoire B</"
-"var/lib/dpkg>."
+"attente d'une recomposition automatique. Par défaut, c'est le répertoire B<"
+"%ADMINDIR%>."
 
 #. type: TP
 #: dpkg-split.man
 #, no-wrap
 msgid "B<-S>, B<--partsize> I<kibibytes>"
-msgstr "B<-S>, B<--partsize> I<kibi-octets>"
+msgstr "B<-S>, B<--partsize> I<kibioctets>"
 
 #. type: Plain text
 #: dpkg-split.man
@@ -24283,7 +23697,7 @@ msgid ""
 "Specifies the maximum part size when splitting, in kibibytes (1024 bytes). "
 "The default is 450 KiB."
 msgstr ""
-"Indique, en kibi-octets (1024 octets), la taille maximum d'une partie lors "
+"Indique, en kibioctet (1024 octets), la taille maximum d'une partie lors "
 "d'une décomposition. Par défaut, la taille maximum est de 450 Kio."
 
 #. type: TP
@@ -24339,7 +23753,7 @@ msgstr "B<--msdos>"
 msgid ""
 "Forces the output filenames generated by B<--split> to be msdos-compatible."
 msgstr ""
-"Oblige le nom des fichiers produits par B<--split> à se conformer à msdos."
+"Oblige le nom des fichiers produits par B<--split> à se conformer à MS-DOS."
 
 #. type: Plain text
 #: dpkg-split.man
@@ -24348,10 +23762,10 @@ msgid ""
 "or the one supplied as an argument: alphanumerics are lowercased, plus signs "
 "are replaced by B<x>'s and all other characters are discarded."
 msgstr ""
-"Cela supprime le préfixe - soit celui par défaut dérivé du fichier d'entrée, "
-"soit celui donné comme argument : les caractères alphanumériques sont en "
-"minuscules, les signes plus sont remplacés par des B<x> et tous les autres "
-"caractères sont abandonnés."
+"Cela supprime le préfixe, soit celui par défaut dérivé du nom du fichier "
+"d'entrée, soit celui donné comme argument : les caractères alphanumériques "
+"sont en minuscules, les signes plus sont remplacés par des B<x> et tous les "
+"autres caractères sont abandonnés."
 
 #. type: Plain text
 #: dpkg-split.man
@@ -24388,6 +23802,10 @@ msgid ""
 "looked like a package part file but was corrupted, or interactions with the "
 "system, such as accesses to the database, memory allocations, etc."
 msgstr ""
+"Erreur fatale ou irrécupérable due à une utilisation non valable de la ligne "
+"de commande, à un fichier qui ressemble à fichier appartenant à un paquet "
+"mais qui est corrompu, ou à des interactions avec le système, telles que des "
+"accès à la base de données, des allocations mémoires, etc."
 
 #. type: Plain text
 #: dpkg-split.man
@@ -24395,6 +23813,9 @@ msgid ""
 "If set, it will be used as the timestamp (as seconds since the epoch) in the "
 "B<deb-split>(5)'s B<ar>(5) container."
 msgstr ""
+"Si cette option est utilisée, elle sera utilisée comme horodatage (en "
+"seconde à partir de « l'epoch ») dans le conteneur B<ar>(5) de B<deb-"
+"split>(5)."
 
 #. type: TP
 #: dpkg-split.man
@@ -24454,7 +23875,7 @@ msgstr "dpkg-statoverride"
 #. type: Plain text
 #: dpkg-statoverride.man
 msgid "dpkg-statoverride - override ownership and mode of files"
-msgstr "dpkg-statoverride - annuler la propriété et le mode des fichiers"
+msgstr "dpkg-statoverride - Annuler la propriété et le mode des fichiers"
 
 #. type: Plain text
 #: dpkg-statoverride.man
@@ -24463,13 +23884,6 @@ msgstr "B<dpkg-statoverride> [I<option>...] I<commande>"
 
 #. type: Plain text
 #: dpkg-statoverride.man
-#, fuzzy
-#| msgid ""
-#| "`B<stat overrides>' are a way to tell B<dpkg>(1)  to use a different "
-#| "owner or mode for a path when a package is installed (this applies to any "
-#| "filesystem object that B<dpkg> handles, including directories, devices, "
-#| "etc.). This can be used to force programs that are normally setuid to be "
-#| "install without a setuid flag, or only executable by a certain group."
 msgid ""
 "“B<stat overrides>” are a way to tell B<dpkg>(1)  to use a different owner "
 "or mode for a path when a package is installed (this applies to any "
@@ -24477,10 +23891,10 @@ msgid ""
 "etc.). This can be used to force programs that are normally setuid to be "
 "install without a setuid flag, or only executable by a certain group."
 msgstr ""
-"Les « B<dérogations au statut> » sont une façon de demander à B<dpkg>(1) de "
+"Les « B<dérogations d'état> » sont une façon de demander à B<dpkg>(1) de "
 "changer le propriétaire ou le mode d'un chemin lors de l'installation d'un "
 "paquet (cela s'applique à tout objet de système de fichiers que B<dpkg> "
-"gère, notamment les répertoires, les périphériques, etc.) On peut s'en "
+"gère, notamment les répertoires, les périphériques, etc.). On peut s'en "
 "servir pour forcer l'installation de programmes qui sont normalement "
 "« setuid » sans ce drapeau « setuid », ou pour les rendre exécutables "
 "seulement par un groupe donné."
@@ -24503,13 +23917,6 @@ msgstr "B<--add>I< utilisateur groupe mode chemin>"
 
 #. type: Plain text
 #: dpkg-statoverride.man
-#, fuzzy
-#| msgid ""
-#| "Add an override for I<path>. I<path> does not need to exist when this "
-#| "command is used; the override will be stored and used later.  Users and "
-#| "groups can be specified by their name (for example B<root> or B<nobody>), "
-#| "or by their number by prepending the number with a `B<#>' (for example "
-#| "B<#0> or B<#65534>). The I<mode> needs to be specified in octal."
 msgid ""
 "Add an override for I<path>. I<path> does not need to exist when this "
 "command is used; the override will be stored and used later.  Users and "
@@ -24556,28 +23963,62 @@ msgstr "B<--list> [I<motif-global>]"
 
 #. type: Plain text
 #: dpkg-statoverride.man
-#, fuzzy
-#| msgid ""
-#| "List all overrides. If a glob pattern is specified restrict the output to "
-#| "overrides which match the glob. If there are no overrides or none match "
-#| "the glob B<dpkg-statoverride> will exit with an exitcode of 1."
 msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob."
 msgstr ""
-"Liste toutes les dérogations. Quand on donne une expression rationnelle, on "
-"réduit la sortie aux dérogations qui correspondent au motif. Quand il n'y a "
-"pas de dérogation, ou quand aucune ne correspond au motif, B<dpkg-"
-"statoverride> se termine avec un code de sortie égal à 1."
+"Liste toutes les dérogations. Quand on donne une expression rationnelle "
+"(« glob »), la sortie est limitée aux dérogations qui correspondent au motif."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr ""
+"Donne des renseignements sur les options B<--force->I<quelque-chose> (depuis "
+"dpkg 1.19.5)."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
+msgstr ""
+"Fixe le répertoire d'administration à I<répertoire>, où se trouve aussi le "
+"fichier I<statoverride>. La valeur par défaut est I<%ADMINDIR%>."
 
 #. type: Plain text
 #: dpkg-statoverride.man
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
 msgstr ""
-"Change le I<répertoire> de la base de données de B<dpkg>, où se trouve aussi "
-"le fichier statoverride. La valeur par défaut est I<%ADMINDIR%>."
+"Définit le répertoire d'installation qui désigne le répertoire où les "
+"paquets sont installés (depuis dpkg 1.19.2). Par défaut c'est « I</> »."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
+msgstr ""
+"Force ou refuse (B<no-force> et B<refuse> signifient la même chose) de faire "
+"quelque chose (depuis dpkg 1.19.5). I<quelque-chose> est une liste d'actions "
+"séparées par des virgules, décrites ci-après. B<--force-help> affiche un "
+"message qui les décrit. Les actions marquées d'un (*) sont forcées par "
+"défaut."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Avertissement : ces options sont principalement destinées aux experts. Un "
+"usage auquel manque la pleine compréhension de leurs effets peut casser le "
+"système entier.>"
 
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
@@ -24589,10 +24030,12 @@ msgstr "B<--force>"
 #: dpkg-statoverride.man
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
-"Forcer une opération, même si une vérification raisonnable l'interdirait. "
-"C'est nécessaire pour annuler une précédente dérogation."
+"Force une opération, même si un test de validité l'interdirait. C'est "
+"nécessaire pour annuler une précédente dérogation. Cette option est obsolète "
+"(depuis dpkg 1.19.5), elle est remplacée par B<--force-all>."
 
 #. type: TP
 #: dpkg-statoverride.man
@@ -24618,6 +24061,18 @@ msgstr "Moins de bavardage sur ce qui est fait."
 msgid ""
 "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
+"Pour B<--list>, s'il n'y a pas de dérogation ou si aucune ne correspond au "
+"« glob » fourni."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+"Si cette variable est positionnée et qu'aucune des options B<--force->I<...> "
+"n'est précisée, elle sera considérée comme l'option de forçage à utiliser "
+"(depuis dpkg 1.19.5)."
 
 #. type: TP
 #: dpkg-statoverride.man
@@ -24627,11 +24082,6 @@ msgstr "I<%ADMINDIR%/statoverride>"
 
 #. type: Plain text
 #: dpkg-statoverride.man
-#, fuzzy
-#| msgid ""
-#| "File which contains the current list of stat overrides of the system. It "
-#| "is located in the B<dpkg> administration directory, along with other "
-#| "files important to B<dpkg>, such as `status' or `available'."
 msgid ""
 "File which contains the current list of stat overrides of the system. It is "
 "located in the B<dpkg> administration directory, along with other files "
@@ -24639,14 +24089,10 @@ msgid ""
 msgstr ""
 "Ce fichier contient la liste actuelle des dérogations concernant le système. "
 "Il se trouve dans le répertoire d'administration de B<dpkg>, avec les autres "
-"fichiers importants comme « status » ou « available »."
+"fichiers importants comme I<status> ou I<available>."
 
 #. type: Plain text
 #: dpkg-statoverride.man
-#, fuzzy
-#| msgid ""
-#| "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
-#| "extension \"-old\", before replacing it with the new one."
 msgid ""
 "Note: B<dpkg-statoverride> preserves the old copy of this file, with "
 "extension “-old”, before replacing it with the new one."
@@ -24664,7 +24110,7 @@ msgstr "dpkg-trigger"
 #: dpkg-trigger.man
 msgid "dpkg-trigger - a package trigger utility"
 msgstr ""
-"dpkg-trigger - un utilitaire pour activer les actions différées de paquets"
+"dpkg-trigger - Un utilitaire pour activer les actions différées de paquets"
 
 #. type: Plain text
 #: dpkg-trigger.man
@@ -24705,7 +24151,7 @@ msgstr ""
 #: dpkg-trigger.man
 msgid "Unrecognized trigger name syntaxes are an error for B<dpkg-trigger>."
 msgstr ""
-"Les syntaxes non-reconnues pour le nom des actions différées constituent une "
+"Les syntaxes non reconnues pour le nom des actions différées constituent une "
 "erreur pour B<dpkg-trigger>."
 
 #. type: TP
@@ -24776,16 +24222,14 @@ msgstr "B<--await>"
 
 #. type: Plain text
 #: dpkg-trigger.man
-#, fuzzy
-#| msgid ""
-#| "This option does the inverse of B<--no-await>. It is currently the "
-#| "default behavior."
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
-"Cette option a l'effet inverse de B<--no-await>. C'est actuellement le "
-"comportement par défaut."
+"Cette option a l'effet inverse de B<--no-await> (depuis dpkg 1.17.21). Si le "
+"paquet intéressé a déclaré une directive «noawait », cette option ne sera "
+"pas effective. C'est actuellement le comportement par défaut."
 
 #. type: TP
 #: dpkg-trigger.man
@@ -24816,7 +24260,7 @@ msgstr "dpkg-vendor"
 #: dpkg-vendor.man
 msgid "dpkg-vendor - queries information about distribution vendors"
 msgstr ""
-"dpkg-vendor - récupére les informations sur les éditeurs de distribution"
+"dpkg-vendor - Récupère les informations sur les éditeurs de distribution"
 
 #. type: Plain text
 #: dpkg-vendor.man
@@ -24825,11 +24269,6 @@ msgstr "B<dpkg-vendor> [I<option>...] I<commande>"
 
 #. type: Plain text
 #: dpkg-vendor.man
-#, fuzzy
-#| msgid ""
-#| "B<dpkg-vendor> is a tool to query information about vendors listed in B<"
-#| "%CONFDIR%/dpkg/origins>. B<%PKGCONFDIR%/origins/default> contains "
-#| "information about the current vendor."
 msgid ""
 "B<dpkg-vendor> is a tool to query information about vendors listed in B<"
 "%PKGCONFDIR%/origins>. B<%PKGCONFDIR%/origins/default> contains information "
@@ -24848,16 +24287,12 @@ msgstr "B<--is>I< éditeur>"
 
 #. type: Plain text
 #: dpkg-vendor.man
-#, fuzzy
-#| msgid ""
-#| "Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with "
-#| "non-zero."
 msgid ""
 "Exits with B<0> if the current vendor is I<vendor>. Otherwise exits with "
 "B<1>."
 msgstr ""
-"Retourne B<0> si l'éditeur est I<éditeur>. Retourne une valeur non nulle "
-"dans le cas contraire."
+"Retourne B<0> si l'éditeur est I<éditeur>. Retourne B<1> dans le cas "
+"contraire."
 
 #. type: TP
 #: dpkg-vendor.man
@@ -24867,19 +24302,14 @@ msgstr "B<--derives-from>I< éditeur>"
 
 #. type: Plain text
 #: dpkg-vendor.man
-#, fuzzy
-#| msgid ""
-#| "Exits with B<0> if the current vendor distribution is a derivative of "
-#| "I<vendor>, otherwise exits with non-zero. It uses the B<Parent> field to "
-#| "browse all ancestors of the current vendor."
 msgid ""
 "Exits with B<0> if the current vendor distribution is a derivative of "
 "I<vendor>, otherwise exits with B<1>.  It uses the B<Parent> field to browse "
 "all ancestors of the current vendor."
 msgstr ""
 "Retourne B<0> si la distribution de l'éditeur actuel est une distribution "
-"dérivée de I<éditeur>. Le champ B<Parent> est utilisé pour parcourir tous "
-"les ancêtres de l'éditeur actuel."
+"dérivée de I<éditeur>, autrement, retourne B<1>. Le champ B<Parent> est "
+"utilisé pour parcourir tous les ancêtres de l'éditeur actuel."
 
 #. type: TP
 #: dpkg-vendor.man
@@ -24938,10 +24368,8 @@ msgstr "dselect - Interface de gestion de paquets Debian."
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid "B<dselect> [I<option>...] [I<action>]"
 msgid "B<dselect> [I<option>...] [I<command>...]"
-msgstr "B<dselect> [I<option>...] [I<action>]"
+msgstr "B<dselect> [I<option>...] [I<commande>...]"
 
 #. type: Plain text
 #: dselect.man
@@ -24959,22 +24387,10 @@ msgstr ""
 " - Mettre à jour la liste des versions des paquets disponibles,\n"
 " - Voir l'état des paquets installés ou disponibles,\n"
 " - Modifier les sélections de paquets et gérer les dépendances,\n"
-" - Installer de nouveaux paquets ou mettre à jour vers de nouvelles versions.\n"
+" - Installer de nouveaux paquets ou mettre à niveau vers de nouvelles versions.\n"
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "B<dselect> operates as a front-end to B<dpkg>(1), the low-level debian "
-#| "package handling tool. It features a full-screen package selections "
-#| "manager with package depends and conflicts resolver. When run with "
-#| "administrator privileges, packages can be installed, upgraded and "
-#| "removed. Various access methods can be configured to retrieve available "
-#| "package version information and installable packages from package "
-#| "repositories.  Depending on the used access method, these repositories "
-#| "can be public archive servers on the internet, local archive servers or "
-#| "cdroms.  The recommended access method is I<apt>, which is provided by "
-#| "the package B<apt>."
 msgid ""
 "B<dselect> operates as a front-end to B<dpkg>(1), the low-level Debian "
 "package handling tool. It features a full-screen package selections manager "
@@ -24999,13 +24415,6 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "Normally B<dselect> is invoked without parameters. An interactive menu is "
-#| "presented, offering the user a list of actions. If an action is given as "
-#| "argument, then that action is started immediately. Several command line "
-#| "parameters are still available to modify the running behaviour of "
-#| "B<dselect> or show additional information about the program."
 msgid ""
 "Normally B<dselect> is invoked without parameters. An interactive menu is "
 "presented, offering the user a list of commands. If a command is given as "
@@ -25014,22 +24423,14 @@ msgid ""
 "or show additional information about the program."
 msgstr ""
 "Normalement, B<dselect> est appelé sans paramètre. Un menu interactif est "
-"présenté, offrant à l'utilisateur une liste d'actions. Si une action est "
-"donnée en paramètre, alors cette action est démarrée immédiatement. "
+"présenté, offrant à l'utilisateur une liste de commandes. Si une commande "
+"est donnée en paramètre, alors cette commande est démarrée immédiatement. "
 "Plusieurs paramètres en ligne de commande sont disponibles pour modifier le "
 "comportement de B<dselect> ou pour montrer des informations supplémentaires "
 "sur le programme."
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "All options can be specified both on the command line and in the "
-#| "B<dselect> configuration file I<%PKGCONFDIR%/dselect.cfg> or the files on "
-#| "the configuration directory I<%PKGCONFDIR%/dselect.cfg.d/>. Each line in "
-#| "the configuration file is either an option (exactly the same as the "
-#| "command line option but without leading hyphens) or a comment (if it "
-#| "starts with a B<#>)."
 msgid ""
 "All options can be specified both on the command line and in the B<dselect> "
 "configuration file I<%PKGCONFDIR%/dselect.cfg> or the files on the "
@@ -25043,15 +24444,10 @@ msgstr ""
 "les fichiers du répertoire de configuration I<%PKGCONFDIR%/dselect.cfg.d/>. "
 "Chaque ligne de ce fichier est soit une option (identique à une option en "
 "ligne de commande mais sans tiret), soit un commentaire (si il commence par "
-"B<#>)."
+"« B<#> »)."
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "Changes the directory where the dpkg `I<status>', `I<available>' and "
-#| "similar files are located. This defaults to I<%ADMINDIR%> and normally "
-#| "there shouldn't be any need to change it."
 msgid ""
 "Changes the directory where the dpkg ‘I<status>’, ‘I<available>’ and similar "
 "files are located.  This defaults to I<%ADMINDIR%> and normally there "
@@ -25063,10 +24459,9 @@ msgstr ""
 
 #. type: TP
 #: dselect.man
-#, fuzzy, no-wrap
-#| msgid "B<-l>, B<--label> I<file>"
+#, no-wrap
 msgid "B<-D>I<file>, B<--debug> I<file>"
-msgstr "B<-l>, B<--label> I<fichier>"
+msgstr "B<-D>I<fichier>, B<--debug> I<fichier>"
 
 #. type: Plain text
 #: dselect.man
@@ -25091,10 +24486,15 @@ msgstr ""
 
 #. type: TP
 #: dselect.man
-#, fuzzy, no-wrap
-#| msgid "B<--colour>|B<--color> I<screenpart:>[I<foreground>],[I<background>][I<:attr>[I<+attr+...>]]"
-msgid "B<--colour>|B<--color> I<screenpart>:[I<foreground>],[I<background>][:I<attr>[I<+attr>]...]"
-msgstr "B<--colour>|B<--color> I<partie_écran:>[I<premier_plan>],[I<arrière_plan>][I<:attr>[I<+attr+...>]]"
+#, no-wrap
+msgid "B<--color> I<screenpart>:[I<foreground>],[I<background>][:I<attr>[I<+attr>]...]"
+msgstr "B<--color> I<partie_écran:>[I<premier_plan>],[I<arrière_plan>][I<:attr>[I<+attr>]...]"
+
+#. type: TP
+#: dselect.man
+#, no-wrap
+msgid "B<--colour> I<screenpart>:[I<foreground>],[I<background>][:I<attr>[I<+attr>]...]"
+msgstr "B<--colour> I<partie_écran:>[I<premier_plan>],[I<arrière_plan>][I<:attr>[I<+attr>]...]"
 
 #. type: Plain text
 #: dselect.man
@@ -25267,13 +24667,6 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "Optionally, after the color specification is another colon, and an "
-#| "attribute specification. This is a list of one or more attributes, "
-#| "separated by plus (\"+\") characters. Available attributes include (not "
-#| "all of these will work on all terminals): normal, standout, underline, "
-#| "reverse, blink, bright, dim, bold"
 msgid ""
 "Optionally, after the color specification is another colon, and an attribute "
 "specification. This is a list of one or more attributes, separated by plus "
@@ -25285,7 +24678,8 @@ msgstr ""
 "deux-points et de la spécification d'un attribut. Il s'agit d'une liste "
 "d'attributs, séparés par des caractères plus (« + »). Parmi les attributs "
 "disponibles, on trouve (tous ne fonctionnent pas sur tous les terminaux) : "
-"normal, standout, underline, reverse, blink, bright, dim et bold."
+"B<normal>, B<standout>, B<underline>, B<reverse>, B<blink>, B<bright>, "
+"B<dim>, B<bold>."
 
 #. type: Plain text
 #: dselect.man
@@ -25299,11 +24693,6 @@ msgstr "Affiche la version et se termine normalement."
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "When B<dselect> is started it can perform the following actions, either "
-#| "directly if it was specified on the command line or by prompting the user "
-#| "with a menu of available actions if running interactively:"
 msgid ""
 "When B<dselect> is started it can perform the following commands, either "
 "directly if it was specified on the command line or by prompting the user "
@@ -25311,7 +24700,7 @@ msgid ""
 msgstr ""
 "Quand B<dselect> est démarré, il peut effectuer les actions suivantes, soit "
 "directement si elles sont indiquées dans la ligne de commande, soit "
-"interactivement avec un menu d'actions possibles :"
+"interactivement avec un menu de commandes possibles :"
 
 #. type: SS
 #: dselect.man
@@ -25326,13 +24715,6 @@ msgstr "Choisir et configurer une méthode d'accès aux dépôts de paquets."
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "By default, B<dselect> provides several methods such as I<cdrom>, "
-#| "I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, "
-#| "I<multi_mount>, I<floppy> or I<ftp>, but other packages may provide "
-#| "additional methods, eg. the I<apt> access method provided by the B<apt> "
-#| "package."
 msgid ""
 "By default, B<dselect> provides several methods such as I<cdrom>, "
 "I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount> "
@@ -25340,8 +24722,8 @@ msgid ""
 "access method provided by the B<apt> package."
 msgstr ""
 "Par défaut, B<dselect> fournit plusieurs méthodes telles que I<cdrom>, "
-"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
-"I<floppy> ou I<ftp>, mais d'autres paquets peuvent fournir des méthodes "
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount> "
+"ou I<ftp>, mais d'autres paquets peuvent fournir des méthodes "
 "supplémentaires, comme la méthode d'accès I<apt> fournie par le paquet "
 "B<apt>."
 
@@ -25379,18 +24761,13 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "Details of the update action depend on the access method's "
-#| "implementation.  Normally the process is straightforward and requires no "
-#| "user interaction."
 msgid ""
 "Details of the update command depend on the access method's implementation.  "
 "Normally the process is straightforward and requires no user interaction."
 msgstr ""
-"Le fonctionnement détaillé des mises à jour dépend de l'implémentation de la "
-"méthode d'accès. Normalement le processus se passe tout seul, sans "
-"intervention de l'utilisateur."
+"Le fonctionnement détaillé de la commande de mise à jour dépend de "
+"l'implémentation de la méthode d'accès. Normalement le processus se passe "
+"tout seul, sans intervention de l'utilisateur."
 
 #. type: SS
 #: dselect.man
@@ -25489,19 +24866,11 @@ msgstr ""
 "l'installation n'est pas correcte, veuillez examiner les causes et "
 "circonstances puis soumettez un rapport de bogue au système de suivi des "
 "bogues Debian. Les instructions pour soumettre ces rapports de bogues se "
-"trouvent sur https://bugs.debian.org/ ou dans la page de manuel de "
-"B<reportbug>(1), si ce paquet est installé."
+"trouvent sur https://bugs.debian.org/ ou dans la page de manuel de B<bug>(1) "
+"ou de B<reportbug>(1), si ce paquet est installé."
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "Details of the install action depend on the access method's "
-#| "implementation.  The user's attention and input may be required during "
-#| "installation, configuration or removal of packages. This depends on the "
-#| "maintainer scripts in the package. Some packages make use of the "
-#| "B<debconf>(1)  library, allowing for more flexible or even automated "
-#| "installation setups."
 msgid ""
 "Details of the install command depend on the access method's "
 "implementation.  The user's attention and input may be required during "
@@ -25510,12 +24879,12 @@ msgid ""
 "B<debconf>(1)  library, allowing for more flexible or even automated "
 "installation setups."
 msgstr ""
-"Les détails de l'action d'installation dépendent de l'implémentation de la "
-"méthode d'accès. L'attention et la contribution de l'utilisateur peuvent "
-"être nécessaires lors de l'installation ou du retrait des paquets. Cela "
-"dépend des scripts des responsables des paquets. Certains paquets utilisent "
-"la bibliothèque B<debconf>(1), ce qui permet la mise en place "
-"d'installations plus flexibles ou même automatisées."
+"Les détails de la commande d'installation dépendent de l'implémentation de "
+"la méthode d'accès. L'attention et la contribution de l'utilisateur peuvent "
+"être nécessaires lors de l'installation, de la configuration ou du retrait "
+"des paquets. Cela dépend des scripts des responsables des paquets. Certains "
+"paquets utilisent la bibliothèque B<debconf>(1), ce qui permet la mise en "
+"place d'installations plus flexibles ou même automatisées."
 
 #. type: SS
 #: dselect.man
@@ -25550,15 +24919,13 @@ msgstr "Quitter (quit)"
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid "Quit B<dselect>"
 msgid "Quit B<dselect>."
-msgstr "Quitter B<dselect>"
+msgstr "Quitter B<dselect>."
 
 #. type: Plain text
 #: dselect.man
 msgid "Exits the program with zero (successful) errorcode."
-msgstr "Quitte le programme avec un code d'erreur de 0 (succès)."
+msgstr "Quitte le programme avec un code d'erreur de B<0> (succès)."
 
 #. type: SH
 #: dselect.man
@@ -25574,19 +24941,6 @@ msgstr "Introduction"
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "B<dselect> directly exposes the administrator to some of the complexities "
-#| "involved with managing large sets of packages with many "
-#| "interdependencies. For a user who is unfamiliar with the concepts and the "
-#| "ways of the debian package management system, it can be quite "
-#| "overwhelming. Although B<dselect> is aimed at easing package management "
-#| "and administration, it is only instrumental in doing so and cannot be "
-#| "assumed to be a sufficient substitute for administrator skill and "
-#| "understanding. The user is required to be familiar with the concepts "
-#| "underlying the Debian packaging system.  In case of doubt, consult the "
-#| "B<dpkg>(1) manpage and the Debian Policy manual, contained in the "
-#| "B<debian-policy> package."
 msgid ""
 "B<dselect> directly exposes the administrator to some of the complexities "
 "involved with managing large sets of packages with many interdependencies. "
@@ -25606,18 +24960,10 @@ msgstr ""
 "outil, et ne doit pas remplacer la compréhension et les aptitudes d'un "
 "administrateur. L'utilisateur doit être familier des concepts sous-jacents "
 "au système de gestion des paquets Debian. En cas de doute, consultez la page "
-"de manuel B<dpkg>(1) et la Charte Debian présente dans le paquet B<debian-"
-"policy>."
+"de manuel B<dpkg>(1) et la Charte Debian."
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "Unless B<dselect> is run in expert or immediate mode, a help screen is "
-#| "first displayed when choosing this action from the menu. The user is "
-#| "I<strongly> advised to study all of the information presented in the "
-#| "online help screens, when one pops up.  The online help screens can at "
-#| "any time be invoked with the B<'?'> key."
 msgid ""
 "Unless B<dselect> is run in expert or immediate mode, a help screen is first "
 "displayed when choosing this command from the menu. The user is I<strongly> "
@@ -25656,11 +25002,6 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "Pressing the B<'I'> key toggles a full-screen display of the packages "
-#| "list, an enlarged view of the package details, or the equally split "
-#| "screen."
 msgid ""
 "Pressing the ‘B<I>’ key toggles a full-screen display of the packages list, "
 "an enlarged view of the package details, or the equally split screen."
@@ -25677,15 +25018,7 @@ msgstr "Vue des détails d'un paquet"
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy, no-wrap
-#| msgid ""
-#| "The package details view by default shows the extended package description\n"
-#| "for the package that is currently selected in the packages status list.\n"
-#| "The type of detail can be toggled by pressing the B<'i'> key. This\n"
-#| "alternates between:\n"
-#| " - the extended description\n"
-#| " - the control information for the installed version\n"
-#| " - the control information for the available version\n"
+#, no-wrap
 msgid ""
 "The package details view by default shows the extended package description\n"
 "for the package that is currently selected in the packages status list.\n"
@@ -25695,7 +25028,7 @@ msgid ""
 " - the control information for the installed version\n"
 " - the control information for the available version\n"
 msgstr ""
-"La vue des détails d'un paquet affiche par défaut la description longue du paquet sélectionné dans la liste des paquets. Le type de détail peut être modifié en pressant la touche « B<i> ». Cela permet de passer de :\n"
+"La vue des détails d'un paquet affiche par défaut la description longue du paquet sélectionné dans la liste des paquets. Le type de détail peut être modifié en pressant la touche « B<i> ». Cela permet d'alterner entre :\n"
 " - la description longue\n"
 " - les informations de contrôle de la version installée\n"
 " - les informations de contrôle de la version disponible\n"
@@ -25719,34 +25052,18 @@ msgstr "Liste des états des paquets"
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "The main select screen displays a list of all packages known to the "
-#| "debian package management system. This includes packages installed on the "
-#| "system and packages known from the available packages database."
 msgid ""
 "The main select screen displays a list of all packages known to the Debian "
 "package management system. This includes packages installed on the system "
 "and packages known from the available packages database."
 msgstr ""
 "L'écran principal de sélection affiche une liste de tous les paquets connus "
-"par le système de gestion des paquets Debian. Ceci inclut les paquets "
+"par le système de gestion des paquets Debian. Cela inclut les paquets "
 "installés sur le système et les paquets connus par la base de données des "
 "paquets disponibles."
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "For every package, the list shows the package's status, priority, "
-#| "section, installed and available architecture, installed and available "
-#| "versions, the package name and its short description, all in one line.  "
-#| "By pressing the B<'A'> key, the display of the installed and available "
-#| "architecture can be toggled between on an off.  By pressing the B<'V'> "
-#| "key, the display of the installed and available version can be toggled "
-#| "between on an off.  By pressing the B<'v'> key, the package status "
-#| "display is toggled between verbose and shorthand.  Shorthand display is "
-#| "the default."
 msgid ""
 "For every package, the list shows the package's status, priority, section, "
 "installed and available architecture, installed and available versions, the "
@@ -25761,7 +25078,7 @@ msgstr ""
 "priorité, sa section, les architectures installée et disponible, les "
 "versions installée et disponible, le nom du paquet et sa description courte. "
 "En appuyant sur la touche « B<A> », on peut activer ou désactiver "
-"l'affichage des architectures installée et disponible.En appuyant sur la "
+"l'affichage des architectures installée et disponible. En appuyant sur la "
 "touche « B<V> », on peut activer ou désactiver l'affichage des versions "
 "installée et disponible. En appuyant sur la touche « B<v> », l'affichage de "
 "l'état passe d'un mode bavard à un mode raccourci. Par défaut, l'état "
@@ -25883,17 +25200,6 @@ msgstr "Recherches et tris"
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "The list of packages can be searched by package name. This is done by "
-#| "pressing B<'/'>, and typing a simple search string. The string is "
-#| "interpreted as a B<regex>(7)  regular expression.  If you add B<'/d'> to "
-#| "the search expression, dselect will also search in descriptions. If you "
-#| "add B<'/i'> the search will be case insensitive.  You may combine these "
-#| "two suffixes like this: B<'/id'>.  Repeated searching is accomplished by "
-#| "repeatedly pressing the B<'n'> or B<'\\e'> keys, until the wanted package "
-#| "is found.  If the search reaches the bottom of the list, it wraps to the "
-#| "top and continues searching from there."
 msgid ""
 "The list of packages can be searched by package name. This is done by "
 "pressing ‘B</>’, and typing a simple search string. The string is "
@@ -25917,14 +25223,7 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy, no-wrap
-#| msgid ""
-#| "The list sort order can be varied by pressing\n"
-#| "the B<'o'> and B<'O'> keys repeatedly.\n"
-#| "The following nine sort orderings can be selected:\n"
-#| " alphabet          available           status\n"
-#| " priority+section  available+priority  status+priority\n"
-#| " section+priority  available+section   status+section\n"
+#, no-wrap
 msgid ""
 "The list sort order can be varied by pressing\n"
 "the ‘B<o>’ and ‘B<O>’ keys repeatedly.\n"
@@ -25968,7 +25267,7 @@ msgstr ""
 "Le type de sélection demandé d'un paquet peut être changé à l'aide des commandes suivantes :\n"
 "  B<+, Inser>     installer ou mettre à jour\n"
 "  B<=, H>         à garder dans l'état et la version actuels\n"
-"  B<:, G>         ne plus garder : mettre à jour ou laisser non installé\n"
+"  B<:, G>         ne plus garder : mettre à niveau ou laisser non installé\n"
 "  B<-, Suppr>     retirer, en gardant la configuration\n"
 "  B<_>            retirer et supprimer la configuration\n"
 
@@ -25981,7 +25280,7 @@ msgid ""
 msgstr ""
 "Lorsque la demande de modification entraîne des dépendances non satisfaites "
 "ou des conflits, B<dselect> fournit à l'utilisateur un écran de résolution "
-"des dépendances. Ceci sera décrit plus tard."
+"des dépendances. Cela sera décrit plus tard."
 
 #. type: Plain text
 #: dselect.man
@@ -26063,15 +25362,6 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "The listed packages' selection state may be reverted to the original "
-#| "settings, as they were before the unresolved depends or conflicts were "
-#| "created, by pressing the B<'R'> key. By pressing the B<'D'> key, the "
-#| "automatic suggestions are reset, but the change that caused the "
-#| "dependency resolution screen to be prompted is kept as requested.  "
-#| "Finally, by pressing B<'U'>, the selections are again set to the "
-#| "automatic suggestion values."
 msgid ""
 "The listed packages' selection state may be reverted to the original "
 "settings, as they were before the unresolved depends or conflicts were "
@@ -26080,8 +25370,8 @@ msgid ""
 "resolution screen to be prompted is kept as requested.  Finally, by pressing "
 "‘B<U>’, the selections are again set to the automatic suggestion values."
 msgstr ""
-"Le type de sélection des paquets listés peut être remis dans leurs états "
-"précédents, avant que le problème de dépendance ou le conflit ne soit créé, "
+"L'état de sélection des paquets listés peut être remis dans son état "
+"précédent, avant que le problème de dépendance ou le conflit ne soit créé, "
 "en appuyant sur la touche « B<R> ». La touche « B<D> » permet de remettre à "
 "zéro les suggestions automatiques, tout en conservant les modifications qui "
 "ont causé l'apparition de l'écran de résolution des dépendances. Enfin, la "
@@ -26110,12 +25400,6 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "To alter a set of selections that creates unresolved depends or conflicts "
-#| "and forcing B<dselect> to accept it, press the B<'Q'> key. This sets the "
-#| "selections as specified by the user, unconditionally. Generally, don't do "
-#| "this unless you've read the fine print."
 msgid ""
 "To alter a set of selections that creates unresolved depends or conflicts "
 "and forcing B<dselect> to accept it, press the ‘B<Q>’ key. This sets the "
@@ -26124,19 +25408,12 @@ msgid ""
 msgstr ""
 "Pour modifier un jeu de sélections qui causent des dépendances non résolues "
 "ou des conflits, et forcer B<dselect> à l'accepter, appuyez sur la touche "
-"« B<Q> ». Ceci fixe les sélections telles qu'elles sont définies par "
+"« B<Q> ». Cela fixe les sélections telles qu'elles sont définies par "
 "l'utilisateur, sans condition. En général, ne faites pas cela, sauf si vous "
 "avez bien lu ce qu'il y a d'écrit."
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "The opposite effect, to back out any selections change requests and go "
-#| "back to the previous list of selections, is attained by pressing the "
-#| "B<'X'> or B<escape> keys. By repeatedly pressing these keys, any possibly "
-#| "detrimental changes to the requested package selections can be backed out "
-#| "completely to the last established settings."
 msgid ""
 "The opposite effect, to back out any selections change requests and go back "
 "to the previous list of selections, is attained by pressing the ‘B<X>’ or "
@@ -26151,13 +25428,6 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "If you mistakenly establish some settings and wish to revert all the "
-#| "selections to what is currently installed on the system, press the B<'C'> "
-#| "key.  This is somewhat similar to using the unhold command on all "
-#| "packages, but provides a more obvious panic button in cases where the "
-#| "user pressed B<enter> by accident."
 msgid ""
 "If you mistakenly establish some settings and wish to revert all the "
 "selections to what is currently installed on the system, press the ‘B<C>’ "
@@ -26165,7 +25435,7 @@ msgid ""
 "but provides a more obvious panic button in cases where the user pressed "
 "B<enter> by accident."
 msgstr ""
-"Si par erreur vous avez fixé certains paramètres et que vous souhaitez "
+"Si vous avez fixé certains paramètres de façon erronée et que vous souhaitez "
 "revenir en arrière sur ce qui est actuellement installé sur le système, "
 "appuyez sur la touche « B<C> ». C'est un peu comme utiliser la commande de "
 "déblocage sur tous les paquets, mais cela offre un bouton panique plus "
@@ -26174,10 +25444,8 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid "The requested action was successfully performed."
 msgid "The requested command was successfully performed."
-msgstr "L'action demandée s'est correctement déroulée."
+msgstr "La commande demandée s'est correctement déroulée."
 
 #. type: Plain text
 #: dselect.man
@@ -26196,8 +25464,7 @@ msgid ""
 msgstr ""
 "L'interface B<dselect> de sélection de paquets est déroutante pour les "
 "nouveaux utilisateurs. On rapporte même qu'elle fait pleurer certains "
-"développeurs chevronnés du noyau (NdT : du moins les derniers historiques "
-"dinosaures qui s'en servent encore)."
+"développeurs chevronnés du noyau."
 
 #. type: Plain text
 #: dselect.man
@@ -26244,13 +25511,6 @@ msgstr "dselect.cfg - Fichier de configuration de dselect"
 
 #. type: Plain text
 #: dselect.cfg.man
-#, fuzzy
-#| msgid ""
-#| "This file contains default options for dselect. Each line contains a "
-#| "single option which is exactly the same as a normal command line option "
-#| "for dselect except for the leading hyphens which are not used here. "
-#| "Quotes surrounding option values are stripped. Comments are allowed by "
-#| "starting a line with a hash sign (\"B<#>\")."
 msgid ""
 "This file contains default options for dselect. Each line contains a single "
 "option which is exactly the same as a normal command line option for dselect "
@@ -26262,7 +25522,7 @@ msgstr ""
 "contient une seule option, écrite exactement comme sur la ligne de commande "
 "mais sans les tirets initiaux, inutilisés. Les guillemets placés autour des "
 "options sont supprimés. Les commentaires sont autorisés en faisant commencer "
-"la ligne par un caractère B<#>."
+"la ligne par un caractère croisillon B<#>."
 
 #. type: Plain text
 #: dselect.cfg.man
@@ -26293,7 +25553,7 @@ msgstr "start-stop-daemon"
 #. type: Plain text
 #: start-stop-daemon.man
 msgid "start-stop-daemon - start and stop system daemon programs"
-msgstr "start-stop-daemon - lance ou arrête des démons système"
+msgstr "start-stop-daemon - Lance ou arrête des démons système"
 
 #. type: Plain text
 #: start-stop-daemon.man
@@ -26352,11 +25612,11 @@ msgid ""
 msgstr ""
 "Vérifier l'existence d'un processus particulier. Quand il existe un tel "
 "processus, B<start-stop-daemon> ne fait rien et se termine avec un code "
-"d'erreur égal à 1 (0 si B<--oknodo> est précisé). Quand un tel processus "
-"n'existe pas, un exemplaire de l'exécutable est lancé, en utilisant le "
-"paramètre de B<--exec> ou celui de B<--startas> si cette option est "
-"précisée. Tout argument donné après B<--> sur la ligne de commande est passé "
-"tel quel au programme qui doit être lancé."
+"d'erreur égal à B<1> (B<0> si B<--oknodo> est précisé). Quand un tel "
+"processus n'existe pas, un exemplaire de l'exécutable est lancé, en "
+"utilisant le paramètre de B<--exec> ou celui de B<--startas> si cette option "
+"est précisée. Tout argument donné après B<--> sur la ligne de commande est "
+"passé tel quel au programme qui doit être lancé."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26376,10 +25636,11 @@ msgid ""
 msgstr ""
 "Vérifier aussi l'existence d'un processus particulier. Quand un tel "
 "processus existe, B<start-stop-daemon> lui envoie le signal précisé avec B<--"
-"signal> et se termine avec un code d'erreur égal à 0. Quand un tel processus "
-"n'existe pas, B<start-stop-daemon> se termine avec un code d'erreur égal à 1 "
-"(0 si B<--oknodo> est précisé). Si B<--retry> est indiquée, B<start-stop-"
-"daemon> recherche si le processus ou les processus se sont bien terminés."
+"signal> et se termine avec un code d'erreur égal à B<0>. Quand un tel "
+"processus n'existe pas, B<start-stop-daemon> se termine avec un code "
+"d'erreur égal à B<1> (B<0> si B<--oknodo> est précisé). Si B<--retry> est "
+"indiquée, B<start-stop-daemon> recherche si le processus ou les processus se "
+"sont bien terminés."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26389,17 +25650,13 @@ msgstr "B<-T>, B<--status>"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid ""
-#| "Check for the existence of a specified process, and returns an exit "
-#| "status code, according to the LSB Init Script Actions."
 msgid ""
 "Check for the existence of a specified process, and returns an exit status "
 "code, according to the LSB Init Script Actions (since version 1.16.1)."
 msgstr ""
 "Contrôle l'existence du processus indiqué et sort avec un code de sortie "
 "défini par les actions des scripts d'initialisation de la LSB (« LSB Init "
-"Script Actions »)."
+"Script Actions » – depuis la version 1.16.1)."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26437,16 +25694,12 @@ msgstr "[B<--pid>] I<pid>"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid ""
-#| "Check for a process with the specified I<pid>. The I<pid> must be a "
-#| "number greater than 0."
 msgid ""
 "Check for a process with the specified I<pid> (since version 1.17.6).  The "
 "I<pid> must be a number greater than 0."
 msgstr ""
-"Vérifie l'existence d'un processus avec le I<pid> spécifié. Le I<pid> doit "
-"avoir un numéro supérieur à 0."
+"Vérifie l'existence d'un processus avec le I<pid> spécifié (depuis la "
+"version 1.17.6). Le I<pid> doit avoir un numéro supérieur à 0."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26456,34 +25709,58 @@ msgstr "[B<--ppid>] I<pid parent>"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid ""
-#| "Check for a process with the specified I<ppid> (parent pid).  The I<ppid> "
-#| "must be a number greater than 0."
 msgid ""
 "Check for a process with the specified parent pid I<ppid> (since version "
 "1.17.7).  The I<ppid> must be a number greater than 0."
 msgstr ""
-"Vérifie l'existence d'un processus avec le I<ppid> spécifié (pid parent). Le "
-"I<ppid> doit avoir un numéro supérieur à 0."
+"Vérifie l'existence d'un processus avec le pid parent I<pid-parent> spécifié "
+"(depuis la version 1.17.7). Le I<pid-parent> doit avoir un numéro supérieur "
+"à 0."
 
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
 msgid "B<-p>, B<--pidfile> I<pid-file>"
-msgstr "B<-p>, B<--pidfile> I<pid-file>"
+msgstr "B<-p>, B<--pidfile> I<fichier-pid>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr ""
+"Cherche les processus dont les identifiants sont précisés dans I<fichier-"
+"pid>."
 
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
 msgstr ""
-"Contrôle si un processus a créé le fichier I<fichier-pid>. Note : "
-"l'utilisation de l'option de correspondance seule peut provoquer des actions "
-"sur des processus non prévus, si l'ancien processus s'est terminé dans "
-"savoir retiré le I<fichier-pid>."
+"Note : l'utilisation de l'option de correspondance seule peut provoquer des "
+"actions sur des processus non prévus, si l'ancien processus s'est terminé "
+"sans savoir retiré le I<fichier-pid>."
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
+msgstr ""
+"B<Attention> : L'utilisation de cette option de correspondance avec un "
+"fichier pid accessible à tous en écriture ou seule avec un démon qui écrit "
+"le fichier pid comme utilisateur non privilégié (pas root) sera refusée avec "
+"une erreur (depuis la version 1.19.3) car c'est un risque de sécurité, parce "
+"que, si le démon se trouve compromis, le contenu du fichier pid ne peut plus "
+"être sûr, et ainsi, un exécutant privilégié (comme un script init exécuté en "
+"tant que root) pourrait en fin de compte agir sur n'importe quel processus "
+"du système. L'utilisation de I</dev/null> est exclue de ces vérifications."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26501,12 +25778,11 @@ msgid ""
 "will also be matched, so other match restrictions might be needed."
 msgstr ""
 "Contrôle l'existence de processus qui soient des exemplaires de cet "
-"I<exécutable>. Le paramètre I<exécutable> doit être un chemin absolu. "
-"Note : cela peut ne pas fonctionner avec des scripts interprétés, car "
-"l'exécutable sera alors l'interpréteur. Des processus en exécution au sein "
-"d'un environnement fermé d'exécution (« chroot ») seront également trouvés "
-"et il peut donc être nécessaire d'ajouter d'autres restrictions de "
-"correspondance."
+"I<exécutable>. Le paramètre I<exécutable> doit être un chemin absolu. Note : "
+"cela peut ne pas fonctionner avec des scripts interprétés, car l'exécutable "
+"sera alors l'interpréteur. Des processus en exécution au sein d'un "
+"environnement fermé d'exécution (« chroot ») seront également trouvés et il "
+"peut donc être nécessaire d'ajouter d'autres restrictions de correspondance."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26528,7 +25804,7 @@ msgstr ""
 "avoir été modifié par le processus lui-même. Note : sur la plupart des "
 "systèmes, cette information est récupérée par le nom de communication du "
 "noyau, ce qui induit une limite de longueur assez courte (la portabilité "
-"impose de ne pas supposer plus de 15 caractères)."
+"impose de ne pas supposer plus de 15 caractères)."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26620,8 +25896,8 @@ msgid ""
 "schedule forever if necessary."
 msgstr ""
 "I<action-prévue> est une liste d'au moins deux items séparés par des barres "
-"obliques (B</>) ; chaque item peut être de la forme B<->I<signal-numéro> ou "
-"de la forme [B<->]I<signal-nom>, ce qui demande d'envoyer ce signal ; ou "
+"obliques (B</>) ; chaque item peut être de la forme B<->I<numéro-signal> ou "
+"de la forme [B<->]I<nom-signal>, ce qui demande d'envoyer ce signal ; ou "
 "bien de la forme I<durée,> ce qui demande d'attendre tant de secondes avant "
 "de terminer les processus, ou bien de la forme B<forever>, ce qui demande de "
 "répéter constamment le reste de action-prévue, si nécessaire."
@@ -26634,7 +25910,7 @@ msgid ""
 "then any signal specified with B<--signal> is ignored."
 msgstr ""
 "Quand la fin de l'action-prévue est atteinte et que B<forever> n'a pas été "
-"précisé, B<start-stop-daemon> se termine avec un code d'erreur égal à 2. "
+"précisé, B<start-stop-daemon> se termine avec un code d'erreur égal à B<2>. "
 "Quand une action-prévue est indiquée, tout signal donné par B<--signal> est "
 "ignoré."
 
@@ -26678,8 +25954,8 @@ msgstr "B<-o>, B<--oknodo>"
 #: start-stop-daemon.man
 msgid "Return exit status 0 instead of 1 if no actions are (would be) taken."
 msgstr ""
-"Retourne un code de sortie égal à 0 au lieu de 1 si rien n'est ou ne sera "
-"fait."
+"Retourne un code de sortie égal à B<0> au lieu de B<1> si rien n'est ou ne "
+"sera fait."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26702,17 +25978,6 @@ msgstr "B<-c>, B<--chuid> I<identifiant>|I<uid>[B<:>I<groupe>|I<gid>]"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid ""
-#| "Change to this username/uid before starting the process. You can also "
-#| "specify a group by appending a B<:>, then the group or gid in the same "
-#| "way as you would for the `chown' command (I<user>B<:>I<group>).  If a "
-#| "user is specified without a group, the primary GID for that user is "
-#| "used.  When using this option you must realize that the primary and "
-#| "supplemental groups are set as well, even if the B<--group> option is not "
-#| "specified. The B<--group> option is only for groups that the user isn't "
-#| "normally a member of (like adding per process group membership for "
-#| "generic users like B<nobody>)."
 msgid ""
 "Change to this username/uid before starting the process. You can also "
 "specify a group by appending a B<:>, then the group or gid in the same way "
@@ -26725,7 +25990,7 @@ msgid ""
 msgstr ""
 "Change pour cet utilisateur ou « uid » avant de lancer le processus. On peut "
 "aussi préciser un groupe en ajoutant un B<:>, puis le groupe ou un « gid » "
-"de la même façon qu'avec la commande « chown » (I<utilisateur>B<:"
+"de la même façon qu'avec la commande B<chown>(1) (I<utilisateur>B<:"
 ">I<groupe>). Lorsqu'un utilisateur est indiqué mais pas de groupe alors le "
 "groupe primaire de celui-ci est utilisé. Quand on utilise cette option, on "
 "doit veiller à ce que les groupes primaires ainsi que les groupes "
@@ -26775,15 +26040,6 @@ msgstr "B<-b>, B<--background>"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid ""
-#| "Typically used with programs that don't detach on their own. This option "
-#| "will force B<start-stop-daemon> to fork before starting the process, and "
-#| "force it into the background.  B<WARNING: start-stop-daemon> cannot check "
-#| "the exit status if the process fails to execute for B<any> reason. This "
-#| "is a last resort, and is only meant for programs that either make no "
-#| "sense forking on their own, or where it's not feasible to add the code "
-#| "for them to do this themselves."
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
 "will force B<start-stop-daemon> to fork before starting the process, and "
@@ -26805,17 +26061,92 @@ msgstr ""
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
+msgid "B<--notify-await>"
+msgstr "B<--notify-await>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+"Attend que le processus en arrière-plan envoie une notification de "
+"disponibilité avant de considérer que le service est démarré (depuis la "
+"version 1.19.3). Cela met en œuvre des éléments du protocole de "
+"disponibilité de systemd, comme spécifié dans la page de manuel de "
+"B<sd_notify>(3). Les variables suivantes sont prises en charge :"
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr "B<READY=1>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+"Le programme est prêt à offrir son service, il est possible de quitter sans "
+"risque."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr "B<EXTEND_TIMEOUT_USEC=>I<nombre>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+"Le programme demande l'extension de la durée de I<nombre> microsecondes. "
+"Cela fixera la durée en cours à la valeur spécifiée."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<ERRNO=>I<number>"
+msgstr "B<ERRNO=> I<nombre>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+"Le programme s'est terminé avec une erreur. Fait la même chose et affiche "
+"une chaîne conviviale pour la valeur de B<errno>."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr "B<--notify-timeout>I<durée>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+"Définit une durée pour l'option B<--notify-await> (depuis la "
+"version 1.19.3). Quand la durée est atteinte, B<start-stop-daemon> s'arrête "
+"avec un code d'erreur et aucune notification de disponibilité n'est "
+"attendue. La durée par défaut est de B<60> secondes."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<-C>, B<--no-close>"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid ""
-#| "Do not close any file descriptor when forcing the daemon into the "
-#| "background.  Used for debugging purposes to see the process output, or to "
-#| "redirect file descriptors to log the process output.  Only relevant when "
-#| "using B<--background>."
 msgid ""
 "Do not close any file descriptor when forcing the daemon into the background "
 "(since version 1.16.5).  Used for debugging purposes to see the process "
@@ -26823,10 +26154,10 @@ msgid ""
 "relevant when using B<--background>."
 msgstr ""
 "Ne fermer aucun descripteur de fichiers en forçant le démon à s'exécuter en "
-"arrière-plan. Utilisé à des fins de débogage afin de voir ce qu'affiche le "
-"processus ou pour rediriger les descripteurs de fichiers pour journaliser "
-"l'affichage du processus. N'est pertinent que lors de l'utilisation de B<--"
-"background>."
+"arrière-plan (depuis la version 1.16.5). Utilisé à des fins de débogage afin "
+"de voir ce qu'affiche le processus ou pour rediriger les descripteurs de "
+"fichiers pour journaliser l'affichage du processus. N'est pertinent que lors "
+"de l'utilisation de B<--background>."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26847,12 +26178,6 @@ msgstr "B<-P>, B<--procsched> I<politique>B<:>I<priorité>"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid ""
-#| "This alters the process scheduler policy and priority of the process "
-#| "before starting it. The priority can be optionally specified by appending "
-#| "a B<:> followed by the value. The default I<priority> is 0. The currently "
-#| "supported policy values are B<other>, B<fifo> and B<rr>."
 msgid ""
 "This alters the process scheduler policy and priority of the process before "
 "starting it (since version 1.15.0).  The priority can be optionally "
@@ -26860,10 +26185,10 @@ msgid ""
 "is 0. The currently supported policy values are B<other>, B<fifo> and B<rr>."
 msgstr ""
 "Modifie la politique du programmateur de processus (« process scheduler "
-"policy ») et la priorité du processus avant de le démarrer. La priorité peut "
-"être indiquée de manière facultative avec B<:> suivi de la valeur souhaitée. "
-"La I<priorité> par défaut est 0. Les valeurs de politiques actuellement "
-"gérées sont B<other>, B<fifo> et B<rr>."
+"policy ») et la priorité du processus avant de le démarrer (depuis la "
+"version 1.15.0). La priorité peut être indiquée de manière facultative avec "
+"B<:> suivi de la valeur souhaitée. La I<priorité> par défaut est 0. Les "
+"valeurs de politiques actuellement gérées sont B<other>, B<fifo> et B<rr>."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26873,13 +26198,6 @@ msgstr "B<-I>, B<--iosched> I<classe>B<:>I<priorité>"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid ""
-#| "This alters the IO scheduler class and priority of the process before "
-#| "starting it. The priority can be optionally specified by appending a B<:> "
-#| "followed by the value. The default I<priority> is 4, unless I<class> is "
-#| "B<idle>, then I<priority> will always be 7. The currently supported "
-#| "values for I<class> are B<idle>, B<best-effort> and B<real-time>."
 msgid ""
 "This alters the IO scheduler class and priority of the process before "
 "starting it (since version 1.15.0).  The priority can be optionally "
@@ -26889,11 +26207,11 @@ msgid ""
 "B<real-time>."
 msgstr ""
 "Modifie la classe du programmateur d'entrée/sortie (« IO scheduler ») et la "
-"priorité du processus avant de le démarrer. La priorité peut être indiquée "
-"de manière facultative avec B<:> suivi de la valeur souhaitée. La "
-"I<priorité> par défaut est 4, sauf si I<classe> est B<idle>, auquel cas "
-"I<priorité> sera toujours égale à 7. Les valeurs de I<classe> actuellement "
-"gérées sont B<idle>, B<best-effort> et B<real-time>."
+"priorité du processus avant de le démarrer (depuis la version 1.15.0). La "
+"priorité peut être indiquée de manière facultative avec B<:> suivi de la "
+"valeur souhaitée. La I<priorité> par défaut est 4, sauf si I<classe> est "
+"B<idle>, auquel cas I<priorité> sera toujours égale à 7. Les valeurs de "
+"I<classe> actuellement gérées sont B<idle>, B<best-effort> et B<real-time>."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26903,13 +26221,12 @@ msgstr "B<-k>, B<--umask> I<masque>"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid "This sets the umask of the process before starting it."
 msgid ""
 "This sets the umask of the process before starting it (since version "
 "1.13.22)."
 msgstr ""
-"Cela modifie le masque utilisateur du processus avant qu'il ne soit lancé."
+"Cela modifie le masque utilisateur du processus avant qu'il ne soit lancé "
+"(depuis la version 1.13.22)."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -26919,16 +26236,6 @@ msgstr "B<-m>, B<--make-pidfile>"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid ""
-#| "Used when starting a program that does not create its own pid file. This "
-#| "option will make B<start-stop-daemon> create the file referenced with B<--"
-#| "pidfile> and place the pid into it just before executing the process. "
-#| "Note, the file will only be removed when stopping the program if B<--"
-#| "remove-pidfile> is used.  B<NOTE:> This feature may not work in all "
-#| "cases. Most notably when the program being executed forks from its main "
-#| "process. Because of this, it is usually only useful when combined with "
-#| "the B<--background> option."
 msgid ""
 "Used when starting a program that does not create its own pid file. This "
 "option will make B<start-stop-daemon> create the file referenced with B<--"
@@ -26957,20 +26264,15 @@ msgstr "B<--remove-pidfile>"
 
 #. type: Plain text
 #: start-stop-daemon.man
-#, fuzzy
-#| msgid ""
-#| "Used when stopping a program that does not remove its own pid file. This "
-#| "option will make B<start-stop-daemon> remove the file referenced with B<--"
-#| "pidfile> after terminating the process."
 msgid ""
 "Used when stopping a program that does not remove its own pid file (since "
 "version 1.17.19).  This option will make B<start-stop-daemon> remove the "
 "file referenced with B<--pidfile> after terminating the process."
 msgstr ""
 "Utilisé lors de l'arrêt d'un programme qui ne supprime pas lui-même son "
-"fichier identificateur « pid ». Cette option indique à B<start-stop-daemon> "
-"de supprimer le fichier référencé par B<--pid-file> après l'arrêt du "
-"processus."
+"fichier identificateur « pid » (depuis la version 1.17.19). Cette option "
+"indique à B<start-stop-daemon> de supprimer le fichier référencé par B<--pid-"
+"file> après l'arrêt du processus."
 
 #. type: Plain text
 #: start-stop-daemon.man
@@ -27077,7 +26379,7 @@ msgstr ""
 #: start-stop-daemon.man
 msgid "Send B<SIGTERM> to B<food> and wait up to 5 seconds for it to stop:"
 msgstr ""
-"Envoie le signal B<SIGTERM> à B<food> et attend durant 5 secondes son arrêt :"
+"Envoie le signal B<SIGTERM> à B<food> et attend durant 5 secondes son arrêt :"
 
 #. type: Plain text
 #: start-stop-daemon.man
@@ -27115,7 +26417,7 @@ msgstr "update-alternatives"
 msgid ""
 "update-alternatives - maintain symbolic links determining default commands"
 msgstr ""
-"update-alternatives - maintenance des liens symboliques déterminant les noms "
+"update-alternatives - Maintenance des liens symboliques déterminant les noms "
 "par défaut de certaines commandes"
 
 #. type: Plain text
@@ -27228,7 +26530,7 @@ msgstr ""
 "gère ce problème avec les liens I<principaux (« master »)> et les liens "
 "I<secondaires (« slave »)>. Quand le lien principal est changé, tous les "
 "liens secondaires associés sont changés. Un lien principal et ses liens "
-"secondaires associés composent un I<groupe> de I<liens.>"
+"secondaires associés composent un I<groupe> de I<liens>."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -27276,15 +26578,6 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-#, fuzzy
-#| msgid ""
-#| "When using the B<--config> option, B<update-alternatives> will list all "
-#| "of the choices for the link group of which given I<name> is the master "
-#| "alternative name. The current choice is marked with a '*'.  You will then "
-#| "be prompted for your choice regarding this link group.  Depending on the "
-#| "choice made, the link group might no longer be in I<auto> mode. You will "
-#| "need to use the B<--auto> option in order to return to the automatic mode "
-#| "(or you can rerun B<--config> and select the entry marked as automatic)."
 msgid ""
 "When using the B<--config> option, B<update-alternatives> will list all of "
 "the choices for the link group of which given I<name> is the master "
@@ -27309,7 +26602,7 @@ msgid ""
 "instead (see below)."
 msgstr ""
 "Si vous voulez configurer de manière non interactive, vous pouvez utiliser "
-"l'option B<--set> (voyez ci-dessous)."
+"l'option B<--set> (voir ci-dessous)."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -27394,7 +26687,7 @@ msgid ""
 "A directory, by default I<%CONFDIR%/alternatives>, containing the symlinks."
 msgstr ""
 "C'est le répertoire qui contient les liens symboliques ; il s'agit par "
-"défaut de I<%CONFDIR%/alternatives.>"
+"défaut de I<%CONFDIR%/alternatives>."
 
 #. type: TP
 #: update-alternatives.man
@@ -27409,7 +26702,7 @@ msgid ""
 "alternatives>' state information."
 msgstr ""
 "C'est le répertoire qui contient des renseignements sur l'état de B<update-"
-"alternatives.> Il s'agit par défaut de I<%ADMINDIR%/alternatives.>"
+"alternatives.> Il s'agit par défaut de I<%ADMINDIR%/alternatives>."
 
 #. type: TP
 #: update-alternatives.man
@@ -27639,13 +26932,6 @@ msgstr "B<--display> I<nom>"
 
 #. type: Plain text
 #: update-alternatives.man
-#, fuzzy
-#| msgid ""
-#| "Display information about the link group.  Information displayed includes "
-#| "the group's mode (auto or manual), which alternative the master link "
-#| "currently points to, what other alternatives are available (and their "
-#| "corresponding slave alternatives), and the highest priority alternative "
-#| "currently installed."
 msgid ""
 "Display information about the link group.  Information displayed includes "
 "the group's mode (auto or manual), the master and slave links, which "
@@ -27654,10 +26940,11 @@ msgid ""
 "priority alternative currently installed."
 msgstr ""
 "Affiche des renseignements sur le groupe de liens. L'information affichée "
-"comprend le mode du groupe (auto ou manuel), vers quelle alternative le lien "
-"principal pointe actuellement, quelles autres alternatives sont disponibles "
-"(et les liens secondaires associés), et l'alternative actuellement installée "
-"qui possède la priorité la plus élevée."
+"comprend le mode du groupe (auto ou manuel), les liens principal et "
+"secondaires, vers quelle alternative le lien principal pointe actuellement, "
+"quelles autres alternatives sont disponibles (et les liens secondaires "
+"associés), et l'alternative actuellement installée qui possède la priorité "
+"la plus élevée."
 
 #. type: TP
 #: update-alternatives.man
@@ -27667,14 +26954,6 @@ msgstr "B<--get-selections>"
 
 #. type: Plain text
 #: update-alternatives.man
-#, fuzzy
-#| msgid ""
-#| "List all master alternative names (those controlling a link group)  and "
-#| "their status. Each line contains up to 3 fields (separated by one or more "
-#| "spaces). The first field is the alternative name, the second one is the "
-#| "status (either \"auto\" or \"manual\"), and the last one contains the "
-#| "current choice in the alternative (beware: it's a filename and thus might "
-#| "contain spaces)."
 msgid ""
 "List all master alternative names (those controlling a link group)  and "
 "their status (since version 1.15.0).  Each line contains up to 3 fields "
@@ -27684,27 +26963,22 @@ msgid ""
 "thus might contain spaces)."
 msgstr ""
 "Affiche tous les noms principaux d'alternatives (ceux qui contrôlent un "
-"groupe de liens) ainsi que leur état. Chaque ligne comporte jusqu'à trois "
-"champs (séparés par une ou plusieurs espaces). Le premier est le nom de "
-"l'alternative, le second est son état (« auto » ou « manual ») et le dernier "
-"montre le choix actuel pour l'alternative (il s'agit d'un nom de fichier "
-"etdonc peut contenir des espaces)."
+"groupe de liens) ainsi que leur état (depuis la version 1.15.0). Chaque "
+"ligne comporte jusqu'à trois champs (séparés par une ou plusieurs espaces). "
+"Le premier est le nom de l'alternative, le second est son état (B<auto> ou "
+"B<manual>) et le dernier montre le choix actuel pour l'alternative (il "
+"s'agit d'un nom de fichier et donc peut contenir des espaces)."
 
 #. type: Plain text
 #: update-alternatives.man
-#, fuzzy
-#| msgid ""
-#| "Read configuration of alternatives on standard input in the format "
-#| "generated by B<update-alternatives --get-selections> and reconfigure them "
-#| "accordingly."
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
 "by B<--get-selections> and reconfigure them accordingly (since version "
 "1.15.0)."
 msgstr ""
 "Lit la configuration des alternatives sur l'entrée standard, dans le format "
-"utilisé par B<update-alternatives --get-selections> et les configure en "
-"conséquence."
+"utilisé par B<--get-selections> et les configure en conséquence (depuis la "
+"version 1.15.0)."
 
 #. type: TP
 #: update-alternatives.man
@@ -27714,18 +26988,14 @@ msgstr "B<--query> I<nom>"
 
 #. type: Plain text
 #: update-alternatives.man
-#, fuzzy
-#| msgid ""
-#| "Display information about the link group like --display does, but in a "
-#| "machine parseable way (see section B<QUERY FORMAT> below)."
 msgid ""
 "Display information about the link group like B<--display> does, but in a "
 "machine parseable way (since version 1.15.0, see section B<QUERY FORMAT> "
 "below)."
 msgstr ""
-"Affiche des informations sur le groupe de liens de manière analogue à --"
-"display, mais sous une forme qui peut être analysée automatiquement (voir la "
-"section B<FORMAT DE REQUÊTE> ci-dessous)."
+"Affiche des informations sur le groupe de liens de manière analogue à B<--"
+"display>, mais sous une forme qui peut être analysée automatiquement (depuis "
+"la version 1.15.0, voir la section B<FORMAT DE REQUÊTE> ci-dessous)."
 
 #. type: TP
 #: update-alternatives.man
@@ -27786,29 +27056,21 @@ msgstr "B<--log>I< fichier>"
 
 #. type: Plain text
 #: update-alternatives.man
-#, fuzzy
-#| msgid ""
-#| "Specifies the log file, when this is to be different from the default (/"
-#| "var/log/alternatives.log)."
 msgid ""
 "Specifies the log file (since version 1.15.0), when this is to be different "
 "from the default (%LOGDIR%/alternatives.log)."
 msgstr ""
-"Indique le fichier journal, pour utiliser un fichier différent du fichier "
-"par défaut (%LOGDIR%/alternatives.log)."
+"Indique le fichier journal (depuis la version 1.15.0), pour utiliser un "
+"fichier différent du fichier par défaut (%LOGDIR%/alternatives.log)."
 
 #. type: Plain text
 #: update-alternatives.man
-#, fuzzy
-#| msgid ""
-#| "Let B<update-alternatives> replace or drop any real file that is "
-#| "installed where an alternative link has to be installed or removed."
 msgid ""
 "Allow replacing or dropping any real file that is installed where an "
 "alternative link has to be installed or removed."
 msgstr ""
-"Autorise B<update-alternatives> à remplacer ou supprimer tout fichier "
-"installé à la place d'un lien d'alternative qui doit être créé ou supprimé."
+"Autorise le remplacement ou la suppression de tout fichier installé à la "
+"place d'un lien d'alternative qui doit être créé ou supprimé."
 
 #. type: TP
 #: update-alternatives.man
@@ -27826,6 +27088,11 @@ msgstr ""
 "configurées en mode automatique. Cette option n'est pertinente qu'avec B<--"
 "config> ou B<--all>."
 
+#. type: Plain text
+#: update-alternatives.man
+msgid "Do not generate any comments unless errors occur."
+msgstr "Ne crée pas de commentaire à moins qu'une erreur ne survienne."
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -27834,15 +27101,17 @@ msgstr "B<--verbose>"
 
 #. type: Plain text
 #: update-alternatives.man
-#, fuzzy
-#| msgid "Generate more comments about what B<update-alternatives> is doing."
 msgid "Generate more comments about what is being done."
-msgstr "Produit plus de commentaires sur ce que fait B<update-alternatives>."
+msgstr "Produit plus de commentaires sur ce qui est fait."
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
-msgstr "Ne crée pas de commentaire à moins qu'une erreur ne survienne."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr ""
+"Produit plus de commentaires, utiles pour le débogage, sur ce qui est fait "
+"(depuis la version 1.19.3)."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -27901,21 +27170,15 @@ msgstr "FORMAT DE REQUÊTE"
 
 #. type: Plain text
 #: update-alternatives.man
-#, fuzzy
-#| msgid ""
-#| "The B<update-alternatives --query> format is using an RFC822-like flat "
-#| "format. It's made of I<n> + 1 blocks where I<n> is the number of "
-#| "alternatives available in the queried link group. The first block "
-#| "contains the following fields:"
 msgid ""
 "The B<--query> format is using an RFC822-like flat format. It's made of I<n> "
 "+ 1 blocks where I<n> is the number of alternatives available in the queried "
 "link group. The first block contains the following fields:"
 msgstr ""
-"Le format d'B<update-alternatives --query> est un format à plat de type "
-"RFC822. Il est constitué de I<n>+1 blocs où I<n> est le nombre "
-"d'alternatives disponibles dans le groupe de liens interrogé. Le premier "
-"bloc contient les champs suivants :"
+"Le format de B<--query> est un format à plat de type RFC822. Il est "
+"constitué de I<n> + 1 blocs où I<n> est le nombre d'alternatives disponibles "
+"dans le groupe de liens interrogé. Le premier bloc contient les champs "
+"suivants :"
 
 #. type: TP
 #: update-alternatives.man
@@ -28047,10 +27310,9 @@ msgstr ""
 
 #. type: SS
 #: update-alternatives.man
-#, fuzzy, no-wrap
-#| msgid "B<Example>"
+#, no-wrap
 msgid "Example"
-msgstr "B<Exemple>"
+msgstr "Exemple"
 
 #. type: Plain text
 #: update-alternatives.man
@@ -28130,9 +27392,9 @@ msgstr ""
 "Avec l'option B<--verbose>, B<update-alternatives> affiche de très "
 "nombreuses informations sur la sortie standard. Quand un problème survient, "
 "B<update-alternatives> envoie des messages d'erreur sur la sortie d'erreur "
-"standard et retourne un état de sortie égal à 2. Ces diagnostics devraient "
-"être simples à comprendre ; si ce n'est pas le cas, veuillez envoyer un "
-"rapport de bogue."
+"standard et retourne un état de sortie égal à B<2>. Ces diagnostics "
+"devraient être simples à comprendre ; si ce n'est pas le cas, veuillez "
+"envoyer un rapport de bogue."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -28196,2895 +27458,6 @@ msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, le standard pour l'organisation du système de fichiers."
 
 #, fuzzy
-#~| msgid ""
-#~| "These fields declare relationships between packages. They are discussed "
-#~| "in the B<deb-control>(5)  manpage and in the B<debian-policy> package."
-#~ msgid ""
-#~ "These fields declare relationships between packages. They are discussed "
-#~ "in the B<deb-control>(5)  manpage."
-#~ msgstr ""
-#~ "Ces champs indiquent les relations entre les paquets. Ils sont détaillés "
-#~ "dans la page de manuel B<deb-control>(5) et dans le paquet B<debian-"
-#~ "policy>."
-
-#~ msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
-#~ msgstr "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
-
-#, fuzzy
-#~| msgid ""
-#~| "This file contains directives, one per line. Leading and trailing "
-#~| "whitespace and everything after the first B<#> on any line will be "
-#~| "trimmed, and empty lines will be ignored."
-#~ msgid ""
-#~ "This file contains a list of files, one per line.  Trailing whitespace "
-#~ "will be trimmed, and empty lines will be ignored."
-#~ msgstr ""
-#~ "Ce fichier contient des directives, une par ligne. Les mises en page et "
-#~ "autres espaces ainsi que ce qui suit le caractère B<« # »> sont sautés, "
-#~ "et les lignes vides seront ignorées."
-
-#, fuzzy
-#~| msgid "B<Suggests:>I< package-list>"
-#~ msgid "B<Testsuite-Restrictions:>I< name-list>"
-#~ msgstr "B<Suggests:>I< liste-de-paquets>"
-
-#~ msgid "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
-#~ msgstr "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
-
-#~ msgid ""
-#~ "The following files are components of a binary package. See B<deb>(5)  "
-#~ "for more information about them:"
-#~ msgstr ""
-#~ "Les fichiers suivants font partie d'un paquet binaire. Voyez B<deb>(5) "
-#~ "pour des informations supplémentaires :"
-
-#, fuzzy
-#~| msgid ""
-#~| "I<control>\n"
-#~| "I<conffiles>\n"
-#~| "I<preinst>\n"
-#~| "I<postinst>\n"
-#~| "I<prerm>\n"
-#~| "I<postrm>\n"
-#~| "I<triggers>\n"
-#~ msgid ""
-#~ "I<control> (B<deb-control>(5))\n"
-#~ "I<conffiles> (B<deb-conffiles>(5))\n"
-#~ "I<preinst> (B<deb-preinst>(5))\n"
-#~ "I<postinst> (B<deb-postinst>(5))\n"
-#~ "I<prerm> (B<deb-prerm>(5))\n"
-#~ "I<postrm> (B<deb-postrm>(5))\n"
-#~ "I<triggers> (B<deb-triggers>(5))\n"
-#~ "I<shlibs> (B<deb-shlibs>(5))\n"
-#~ "I<symbols> (B<deb-symbols>(5))\n"
-#~ msgstr ""
-#~ "I<control>\n"
-#~ "I<conffiles>\n"
-#~ "I<preinst>\n"
-#~ "I<postinst>\n"
-#~ "I<prerm>\n"
-#~ "I<postrm>\n"
-#~ "I<triggers>\n"
-
-#~ msgid "B<--file>I< file>"
-#~ msgstr "B<--file>I< fichier>"
-
-#, fuzzy
-#~| msgid ""
-#~| "Set the changelog filename to parse. Default is '-' (standard input)."
-#~ msgid ""
-#~ "Set the changelog filename to parse.  Default is ‘-’ (standard input)."
-#~ msgstr ""
-#~ "Définit le nom de fichier changelog à analyser. Par défaut c'est « -"
-#~ " » (entrée standard)."
-
-#~ msgid "B<-l>, B<--label> I<file>"
-#~ msgstr "B<-l>, B<--label> I<fichier>"
-
-#~ msgid ""
-#~ "Set the name of the changelog file to use in error messages, instead of "
-#~ "using the name from the B<--file> option, or its default value."
-#~ msgstr ""
-#~ "Définit le nom du fichier changelog à utiliser dans les messages "
-#~ "d'erreur, plutôt que l'utilisation du nom de l'option B<--file> ou sa "
-#~ "valeur par défaut."
-
-#, fuzzy
-#~| msgid "B<Source:> I<source-package-name> (required)"
-#~ msgid "I<source-name>B<_>I<source-version>B<_>I<buildinfo-id>B<.buildinfo>"
-#~ msgstr "B<Source:> I<nom-du-paquet-source> (requis)"
-
-#, fuzzy
-#~| msgid "B<--infodir=>I<infodir>"
-#~ msgid "B<--buildinfo-id=>I<identifier>"
-#~ msgstr "B<--infodir=>I<rep-info>"
-
-#, fuzzy
-#~| msgid ""
-#~| "The value of this field is the name of the source package, and should "
-#~| "match the name of the source package in the debian/changelog file. A "
-#~| "package name must consist only of lower case letters (a-z), digits "
-#~| "(0-9), plus (+) and minus (-) signs, and periods (.). Package names must "
-#~| "be at least two characters long and must start with an alphanumeric "
-#~| "character."
-#~ msgid ""
-#~ "Specify the identifier part of the B<.buildinfo> file name (since dpkg "
-#~ "1.18.11).  By default, B<dpkg-buildpackage> will create an identifier "
-#~ "using the current time and the first characters of the MD5 hash.  An "
-#~ "arbitrary identifier can be specified as a replacement.  The identifier "
-#~ "has the same restriction as package names: it must consist only of lower "
-#~ "case letters (a-z), digits (0-9), plus (+) and minus (-)  signs, and "
-#~ "periods (.), be at least two characters long and must start with an "
-#~ "alphanumeric character."
-#~ msgstr ""
-#~ "La valeur de ce champ est le nom du paquet source et doit correspondre au "
-#~ "nom du paquet source dans le fichier debian/changelog. Un nom de paquet "
-#~ "doit être constitué uniquement de lettres minuscules (a-z), de chiffres "
-#~ "(0-9), des caractères plus (+) et moins (-) et de points (.). Les noms de "
-#~ "paquets doivent comporter au moins deux caractères et doivent commencer "
-#~ "par un caractère alphanumérique."
-
-#, fuzzy
-#~| msgid ""
-#~| "The value of this field is the name of the source package, and should "
-#~| "match the name of the source package in the debian/changelog file. A "
-#~| "package name must consist only of lower case letters (a-z), digits "
-#~| "(0-9), plus (+) and minus (-) signs, and periods (.). Package names must "
-#~| "be at least two characters long and must start with an alphanumeric "
-#~| "character."
-#~ msgid ""
-#~ "Specify the identifier part of the B<.buildinfo> file name.  By default, "
-#~ "B<dpkg-genbuildinfo> will create an identifier using the current time and "
-#~ "the first characters of the MD5 hash.  An arbitrary identifier can be "
-#~ "specified as a replacement.  The identifier has the same restriction as "
-#~ "package names: it must consist only of lower case letters (a-z), digits "
-#~ "(0-9), plus (+) and minus (-)  signs, and periods (.), be at least two "
-#~ "characters long and must start with an alphanumeric character."
-#~ msgstr ""
-#~ "La valeur de ce champ est le nom du paquet source et doit correspondre au "
-#~ "nom du paquet source dans le fichier debian/changelog. Un nom de paquet "
-#~ "doit être constitué uniquement de lettres minuscules (a-z), de chiffres "
-#~ "(0-9), des caractères plus (+) et moins (-) et de points (.). Les noms de "
-#~ "paquets doivent comporter au moins deux caractères et doivent commencer "
-#~ "par un caractère alphanumérique."
-
-#~ msgid ""
-#~ "If set, and containing B<nocheck> the B<DEB_CHECK_COMMAND> variable will "
-#~ "be ignored."
-#~ msgstr ""
-#~ "Si cette option est utilisée et contient la valeur B<nocheck>, la "
-#~ "variable B<DEB_CHECK_COMMAND> sera ignorée."
-
-#~ msgid ""
-#~ "This is not compatible with B<-fPIC> so care must be taken when building "
-#~ "shared objects."
-#~ msgstr ""
-#~ "Ce réglage n'est pas compatible avec B<-Fpic> : la prudence est donc "
-#~ "conseillée pour la construction d'objets partagés."
-
-#~ msgid "Debian"
-#~ msgstr "Debian"
-
-#, fuzzy
-#~| msgid "B<dpkg-shlibdeps>(1), B<dpkg-gensymbols>(1)."
-#~ msgid "B<dpkg-distaddfile>(1), B<dpkg-genchanges>(1)."
-#~ msgstr "B<dpkg-shlibdeps>(1), B<dpkg-gensymbols>(1)."
-
-#~ msgid "FILE FORMATS"
-#~ msgstr "FORMATS DE FICHIERS"
-
-#~ msgid "Debian project"
-#~ msgstr "Projet Debian"
-
-#, fuzzy
-#~| msgid ""
-#~| "These fields are used by the debian-installer and are usually not "
-#~| "needed.  See /usr/share/doc/debian-installer/devel/modules.txt from the "
-#~| "B<debian-installer> package for more details about them."
-#~ msgid ""
-#~ "These fields are used by the debian-installer and are usually not "
-#~ "needed.  See /usr/shared/doc/debian-installer/devel/modules.txt from the "
-#~ "B<debian-installer> package for more details about them."
-#~ msgstr ""
-#~ "Ces champs sont utilisés par l'installateur et ne sont en général pas "
-#~ "nécessaires. Veuillez consulter /usr/share/doc/debian-installer/devel/"
-#~ "modules.txt fourni avec le paquet B<debian-installer> pour plus de "
-#~ "détails."
-
-#, fuzzy
-#~| msgid ""
-#~| "This setting defines the current vendor. If not set, it will discover "
-#~| "the current vendor by reading B<%PKGCONFDIR%/origins/default>."
-#~ msgid ""
-#~ "This setting defines the current vendor.  If not set, it will discover "
-#~ "the current vendor by reading B<\\%%PKGCONFDIR%/origins/default>."
-#~ msgstr ""
-#~ "Ce réglage définit l'éditeur (« vendor ») actuel. Si cette valeur est "
-#~ "vide, le contenu du fichier B<%PKGCONFDIR%/origins/default> est utilisé."
-
-#, fuzzy
-#~| msgid ""
-#~| "This field is used to indicate how this package should behave on a multi-"
-#~| "arch installations. The value B<same> means that the package is co-"
-#~| "installable with itself, but it must not be used to satisfy the "
-#~| "dependency of any package of a different architecture from itself. The "
-#~| "value B<foreign> means that the package is not co-installable with "
-#~| "itself, but should be allowed to satisfy the dependency of a package of "
-#~| "a different arch from itself. The value B<allowed> allows reverse-"
-#~| "dependencies to indicate in their Depends field that they accept a "
-#~| "package from a foreign architecture, but has no effect otherwise.  The "
-#~| "value B<no> is the default when the field is omitted, in which case "
-#~| "adding the field with an explicit B<no> value is generally not needed."
-#~ msgid ""
-#~ "This field is used to indicate how this package should behave on a multi-"
-#~ "arch installations. The value B<same> means that the package is co-"
-#~ "installable with itself, but it must not be used to satisfy the "
-#~ "dependency of any package of a different architecture from itself.  The "
-#~ "value B<foreign> means that the package is not co-installable with "
-#~ "itself, but should be allowed to satisfy a non-arch-qualified dependency "
-#~ "of a package of a different arch from itself (if a dependency has an "
-#~ "explicit arch-qualifier then the value B<foreign> is ignored).  The value "
-#~ "B<allowed> allows reverse-dependencies to indicate in their B<Depends> "
-#~ "field that they accept a package from a foreign architecture by "
-#~ "qualifying the package name with B<:any>, but has no effect otherwise.  "
-#~ "The value B<no> is the default when the field is omitted, in which case "
-#~ "adding the field with an explicit B<no> value is generally not needed."
-#~ msgstr ""
-#~ "Ce champ sert à indiquer comment ce paquet se comporte sur des "
-#~ "installations multiarchitectures. La valeur B<same> indique que le paquet "
-#~ "peut être co-installé avec lui-même, mais ne doit pas être utilisé pour "
-#~ "satisfaire une dépendance d'un paquet d'une architecture différente de la "
-#~ "sienne. La valeur B<foreign> indique que le paquet ne peut pas être co-"
-#~ "installé avec lui-même, mais peut permettre de satisfaire les dépendances "
-#~ "d'un paquet d'une architecture différente de la sienne. La valeur "
-#~ "B<allowed> permet aux dépendances inverses d'indiquer dans leur champ "
-#~ "Depends qu'elles acceptent un paquet d'une autre architecture, et n'a pas "
-#~ "d'autres effets. La valeur B<no> est la valeur par défaut quand le champ "
-#~ "est omis ; dans ce cas, ajouter le champ avec une valeur B<no> explicite "
-#~ "est généralement inutile."
-
-#, fuzzy
-#~| msgid ""
-#~| "It is allowed to add additional user-defined fields to the control file. "
-#~| "The tools will ignore these fields. If you want the fields to be copied "
-#~| "over to the output files, such as the binary packages, you need to use a "
-#~| "custom naming scheme: the fields should start with an X, followed by one "
-#~| "or more of the letters BCS and a hypen. If the letter B is used, the "
-#~| "field will appear in the control file in the binary package, see B<deb-"
-#~| "control>(5), for the letter S in the source package control file as "
-#~| "constructed by B<dpkg-source>(1)  and for the letter C in the upload "
-#~| "control (.changes) file. Note that the X[BCS]- prefixes are stripped "
-#~| "when the fields are copied over to the output files. A field B<XC-"
-#~| "Approved-By> will appear as B<Approved-By> in the changes file and will "
-#~| "not appear in the binary or source package control files."
-#~ msgid ""
-#~ "It is allowed to add additional user-defined fields to the control file. "
-#~ "The tools will ignore these fields. If you want the fields to be copied "
-#~ "over to the output files, such as the binary packages, you need to use a "
-#~ "custom naming scheme: the fields should start with an X, followed by one "
-#~ "or more of the letters BCS and a hyphen.  If the letter B is used, the "
-#~ "field will appear in the control file in the binary package, see B<deb-"
-#~ "control>(5), for the letter S in the source package control file as "
-#~ "constructed by B<dpkg-source>(1)  and for the letter C in the upload "
-#~ "control (.changes) file. Note that the X[BCS]- prefixes are stripped when "
-#~ "the fields are copied over to the output files. A field B<XC-Approved-By> "
-#~ "will appear as B<Approved-By> in the changes file and will not appear in "
-#~ "the binary or source package control files."
-#~ msgstr ""
-#~ "Il est possible d'ajouter des champs définis par l'utilisateur au fichier "
-#~ "« control ». Les outils les ignoreront. Si ces champs doivent être copiés "
-#~ "vers les fichiers créés, par exemple les paquets binaires, il est "
-#~ "indispensable d'utiliser un schéma de nommage personnalisé : les champs "
-#~ "doivent commencer par la lettre X suivie de l'une des lettres B, C ou S "
-#~ "et d'un tiret. Si la lettre B est utilisée, le champ sera copié dans le "
-#~ "fichier « control » du paquet binaire, voir B<deb-control>(5). Avec la "
-#~ "lettre S, le champ sera copié dans le fichier « control » du paquet "
-#~ "source créé par B<dpkg-source>(1). Enfin, la lettre C provoquera la "
-#~ "recopie du champ dans le fichier de contrôle de l'envoi (« .changes »). "
-#~ "Les préfixes X[BCS]- sont supprimés lors de ces recopies. Ainsi, un champ "
-#~ "B<XC-Approved-By> apparaîtra sous le nom B<Approved-By> dans le fichier "
-#~ "« changes » mais pas dans le fichier « control » du paquet binaire ni "
-#~ "dans celui du paquet source."
-
-#, fuzzy
-#~| msgid ""
-#~| "Log status change updates and actions to I<filename>, instead of the "
-#~| "default I<%LOGDIR%/dpkg.log>. If this option is given multiple times, "
-#~| "the last filename is used. Log messages are of the form `YYYY-MM-DD HH:"
-#~| "MM:SS status I<state> I<pkg> I<installed-version>' for status change "
-#~| "updates; `YYYY-MM-DD HH:MM:SS I<action> I<pkg> I<installed-version> "
-#~| "I<available-version>' for actions where I<action> is one of B<install>, "
-#~| "B<upgrade>, B<remove>, B<purge>; and `YYYY-MM-DD HH:MM:SS conffile "
-#~| "I<filename> I<decision>' for conffile changes where I<decision> is "
-#~| "either B<install> or B<keep>."
-#~ msgid ""
-#~ "Log status change updates and actions to I<filename>, instead of the "
-#~ "default I<%LOGDIR%/dpkg.log>. If this option is given multiple times, the "
-#~ "last filename is used. Log messages are of the form ‘YYYY-MM-DD HH:MM:SS "
-#~ "startup I<type> I<command>’ for each dpkg invocation where I<type> is "
-#~ "B<archives> (with a I<command> of B<unpack> or B<install>) or B<packages> "
-#~ "(with a I<command> of B<configure>, B<triggers-only>, B<remove> or "
-#~ "B<purge>); ‘YYYY-MM-DD HH:MM:SS status I<state> I<pkg> I<installed-"
-#~ "version>’ for status change updates; ‘YYYY-MM-DD HH:MM:SS I<action> "
-#~ "I<pkg> I<installed-version> I<available-version>’ for actions where "
-#~ "I<action> is one of B<install>, B<upgrade>, B<configure>, B<trigproc>, "
-#~ "B<disappear>, B<remove> or B<purge>; and ‘YYYY-MM-DD HH:MM:SS conffile "
-#~ "I<filename> I<decision>’ for conffile changes where I<decision> is either "
-#~ "B<install> or B<keep>."
-#~ msgstr ""
-#~ "Enregistre la modification de l'état et les actions sur I<fichier> au "
-#~ "lieu de l'habituel I<%LOGDIR%/dpkg.log>. Si cette option est donnée "
-#~ "plusieurs fois, le dernier fichier est utilisé. Les messages "
-#~ "d'enregistrement sont de la forme « AAAA-MM-JJ HH:MM:SS status I<état> "
-#~ "I<paquet> I<version-installée> » pour les modifications d'état. Pour une "
-#~ "action où I<action> est B<install>, B<upgrade>, B<remove> ou B<purge>, le "
-#~ "message est de la forme « AAAA-MM-JJ HH:MM:SS I<action> I<paquet> "
-#~ "I<version-installée> I<version-disponible> ». Pour une modification de "
-#~ "fichier de configuration, le message est de la forme « AAAA-MM-JJ HH:MM:"
-#~ "SS conffile I<fichier> I<décision> » où I<décision> est soit B<install> "
-#~ "soit B<keep>."
-
-#~ msgid "B<--new>"
-#~ msgstr "B<--new>"
-
-#~ msgid "This is a legacy alias for B<--deb-format=2.0>."
-#~ msgstr "C'est un ancien alias pour B<--deb-format=2.0>."
-
-#~ msgid "B<--old>"
-#~ msgstr "B<--old>"
-
-#~ msgid "This is a legacy alias for B<--deb-format=0.939000>."
-#~ msgstr "C'est un ancien alias pour B<--deb-format=0.939000>."
-
-#~ msgid "AUTHOR"
-#~ msgstr "AUTEUR"
-
-#~ msgid "B<-T>I<target>"
-#~ msgstr "B<-T>I<cible>"
-
-#~ msgid "B<-P>I<profile>[B<,>...]"
-#~ msgstr "B<-P>I<profil>[B<,>...]"
-
-#~ msgid "B<-D>"
-#~ msgstr "B<-D>"
-
-#~ msgid "B<-nc>"
-#~ msgstr "B<-nc>"
-
-#~ msgid "B<-tc>"
-#~ msgstr "B<-tc>"
-
-#~ msgid "B<-r>I<gain-root-command>"
-#~ msgstr "B<-r>I<commande-pour-obtenir-privilèges-de-root>"
-
-#~ msgid "B<-R>I<rules-file>"
-#~ msgstr "B<-R>I<fichier-rules>"
-
-#~ msgid "B<-p>I<sign-command>"
-#~ msgstr "B<-p>I<commande-de-signature>"
-
-#~ msgid "B<-k>I<key-id>"
-#~ msgstr "B<-k>I<key-id>"
-
-#~ msgid "B<-us>"
-#~ msgstr "B<-us>"
-
-#~ msgid "Do not sign the source package."
-#~ msgstr "Ne pas signer le paquet source."
-
-#~ msgid "B<-uc>"
-#~ msgstr "B<-uc>"
-
-#~ msgid "B<-i>[I<regex>]"
-#~ msgstr "B<-i>[I<regex>]"
-
-#~ msgid "B<-I>[I<pattern>]"
-#~ msgstr "B<-I>[I<motif>]"
-
-#~ msgid "B<-s>[B<nsAkurKUR>]"
-#~ msgstr "B<-s>[B<nsAkurKUR>]"
-
-#~ msgid "B<-z>, B<-Z>"
-#~ msgstr "B<-z>, B<-Z>"
-
-#~ msgid "Reliance on exported environment flags"
-#~ msgstr "Dépendance des drapeaux d'environnement exportés"
-
-#~ msgid "Variables set by dpkg-architecture"
-#~ msgstr "Variables positionnées par B<dpkg-architecture>"
-
-#~ msgid ""
-#~ "Specify an additional directory to search for parser scripts.  This "
-#~ "directory is searched before the default directories which are currently "
-#~ "B</usr/local/lib/dpkg/parsechangelog> and B</usr/lib/dpkg/parsechangelog>."
-#~ msgstr ""
-#~ "Spécifie un répertoire supplémentaire pour la recherche de scripts "
-#~ "d'analyse. Ce répertoire est examiné avant les répertoires par défaut qui "
-#~ "sont B</usr/local/lib/dpkg/parsechangelog> et B</usr/lib/dpkg/"
-#~ "parsechangelog>."
-
-#~ msgid ""
-#~ "The parser will be invoked with the changelog open on standard input at "
-#~ "the start of the file. It should read the file (it may seek if it "
-#~ "wishes)  to determine the information required and return the parsed "
-#~ "information to standard output in the format specified by the B<--format> "
-#~ "option.  It should accept all B<Parser Options>."
-#~ msgstr ""
-#~ "L'analyseur est invoqué avec le journal des modifications sur l'entrée "
-#~ "standard en commençant à sa première ligne. Il doit lire le fichier (et y "
-#~ "accéder) pour déterminer les informations nécessaires, puis retourner les "
-#~ "informations analysées sur la sortie standard dans le format indiqué par "
-#~ "l'option B<--format>. Il doit accepter toutes les B<Options d'analyse>."
-
-#~ msgid ""
-#~ "See I<%PKGDOCDIR%/THANKS> for the list of people who have contributed to "
-#~ "B<dselect>."
-#~ msgstr ""
-#~ "Consultez I<%PKGDOCDIR%/THANKS> pour la liste de ceux qui ont contribué à "
-#~ "B<dselect>."
-
-#~ msgid "B<Source:>I< source-name>"
-#~ msgstr "B<Source:>I< nom-du-source>"
-
-#~ msgid ""
-#~ "The name of the source package that this binary package came from, if "
-#~ "different than the name of the package itself."
-#~ msgstr ""
-#~ "Le nom du paquet source d'où provient le paquet binaire, s'il y a une "
-#~ "différence entre les deux noms."
-
-#~ msgid ""
-#~ "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1), B</"
-#~ "usr/share/doc/debian-policy/policy.html/index.html>."
-#~ msgstr ""
-#~ "B<dpkg-scanpackages>(1), B<dpkg-scansources>(1), B<apt-ftparchive>(1), B</"
-#~ "usr/share/doc/debian-policy/policy.html/index.html>."
-
-#~ msgid ""
-#~ "This setting (disabled by default) adds any warning option that reliably "
-#~ "detects problematic source code. The warnings are fatal."
-#~ msgstr ""
-#~ "Ce paramètre (désactivé par défaut) ajoute toutes les options "
-#~ "d'avertissement détectant de façon fiable du code source problématique. "
-#~ "Les avertissements sont fatals."
-
-#, fuzzy
-#~| msgid ""
-#~| "Specifies a build limited to source and architecture independent "
-#~| "packages.  Passed to B<dpkg-genchanges>."
-#~ msgid ""
-#~ "Specifies a build limited to source and architecture independent packages "
-#~ "(since dpkg 1.17.11).  Passed to B<dpkg-genchanges>."
-#~ msgstr ""
-#~ "Indique une construction limitée aux paquets source et binaires "
-#~ "indépendants de l'architecture. Passé à B<dpkg-genchanges>."
-
-#~ msgid ""
-#~ "Specifies a binary-only build, no source files are to be built and/or "
-#~ "distributed. Passed to B<dpkg-genchanges>."
-#~ msgstr ""
-#~ "Indique que seul un paquet binaire est à construire ; aucun fichier "
-#~ "source n'est à construire et/ou à distribuer. Passé à B<dpkg-genchanges>."
-
-#~ msgid ""
-#~ "Specifies a binary-only build, limited to architecture dependent "
-#~ "packages.  Passed to B<dpkg-genchanges>."
-#~ msgstr ""
-#~ "Indique une construction uniquement binaire, limitée aux paquets "
-#~ "dépendant d'une architecture. Passé à B<dpkg-genchanges>."
-
-#~ msgid ""
-#~ "Specifies a binary-only build, limited to architecture independent "
-#~ "packages. Passed to B<dpkg-genchanges>."
-#~ msgstr ""
-#~ "Indique une construction uniquement binaire, limitée aux paquets ne "
-#~ "dépendant pas d'une architecture. Passé à B<dpkg-genchanges>."
-
-#, fuzzy
-#~| msgid ""
-#~| "Specifies that only source and architecture independent packages should "
-#~| "be uploaded (no architecture specific packages will be included)."
-#~ msgid ""
-#~ "Specifies that only source and architecture independent packages should "
-#~ "be uploaded, thus no architecture specific packages will be included "
-#~ "(since dpkg 1.17.11)."
-#~ msgstr ""
-#~ "Spécifie que seuls les paquets source ou indépendants d'une architecture "
-#~ "doivent être téléversés (aucun paquet propre à une architecture ne sera "
-#~ "inclus)."
-
-#, fuzzy
-#~| msgid ""
-#~| "Specifies that only source and architecture specific packages should be "
-#~| "uploaded (no architecture independent packages will be included)."
-#~ msgid ""
-#~ "Specifies that only source and architecture specific packages should be "
-#~ "uploaded, thus no architecture independent packages will be included "
-#~ "(since dpkg 1.17.11)."
-#~ msgstr ""
-#~ "Spécifie que seuls les paquets source ou propres à une architecture "
-#~ "doivent être téléversés (aucun paquet indépendant d'une architecture ne "
-#~ "sera inclus)."
-
-#~ msgid "B<-b>, B<-B>, B<-A>"
-#~ msgstr "B<-b>, B<-B>, B<-A>"
-
-#, fuzzy
-#~| msgid ""
-#~| "Specifies that a binary-only build is taking place (no source files are "
-#~| "to be included). There's no distinction between B<-b>, B<-B> and B<-A>, "
-#~| "the produced B<.changes> file will include whatever files were created "
-#~| "by the B<binary-*> target(s) of the package being built."
-#~ msgid ""
-#~ "Specifies that a binary-only build is taking place, thus no source files "
-#~ "are to be included.  There's no distinction between B<-b>, B<-B> and B<-"
-#~ "A>, the produced B<.changes> file will include whatever files were "
-#~ "created by the B<binary-*> target(s) of the package being built."
-#~ msgstr ""
-#~ "Précise que l'on veut uniquement une construction du binaire (les "
-#~ "fichiers sources ne seront pas inclus). Il n'y a pas de distinction entre "
-#~ "B<-b>, B<-B> et B<-A> ; le fichier produit B<.changes> reprendra tous les "
-#~ "fichiers créés par les cibles B<binary-*> du paquet en cours de "
-#~ "construction."
-
-#, fuzzy
-#~| msgid ""
-#~| "Specifies that only the source should be uploaded (no binary packages "
-#~| "will be included)."
-#~ msgid ""
-#~ "Specifies that only the source should be uploaded, thus no binary "
-#~ "packages will be included."
-#~ msgstr ""
-#~ "Ne construit que le paquet source (aucun paquet binaire ne sera "
-#~ "construit)."
-
-#~ msgid ""
-#~ "Problems were encountered while parsing the command line or performing "
-#~ "the query, including no file or package being found (except for B<--"
-#~ "control-path>)."
-#~ msgstr ""
-#~ "Des problèmes sont survenus lors de l'analyse de la ligne de commande ou "
-#~ "bien pendant l'exécution de la requête. Cela peut être une absence de "
-#~ "fichier ou de paquet (sauf pour B<--control-path>)."
-
-#~ msgid ""
-#~ "Some kind of trouble happened, such as a system call failure, a file that "
-#~ "looked like a package part file but was corrupted, a usage error or some "
-#~ "other problem."
-#~ msgstr ""
-#~ "Signale des problèmes, comme l'échec d'un appel système, ou un fichier "
-#~ "qui, bien que ressemblant à une partie de fichier, est défectueux, ou "
-#~ "bien une erreur d'utilisation, etc."
-
-#~ msgid "The machine the compiler is building for."
-#~ msgstr "Machine pour laquelle le compilateur est construit."
-
-#~ msgid "REQUIRED FIELDS"
-#~ msgstr "CHAMPS REQUIS"
-
-#~ msgid "B<Package:>I< package-name>"
-#~ msgstr "B<Package:>I< nom-du-paquet>"
-
-#~ msgid "OPTIONAL FIELDS"
-#~ msgstr "CHAMPS OPTIONNELS"
-
-#~ msgid "Quality Assurance (QA)"
-#~ msgstr "Assurance Qualité « AQ »"
-
-#, fuzzy
-#~| msgid ""
-#~| "If set, it will be used as the active build profile(s) for the package "
-#~| "being built. It is a space separated list of profile names. Overridden "
-#~| "by the B<-P> option."
-#~ msgid ""
-#~ "If set, it will be used as the active build profile(s) for the package "
-#~ "being built.  It is a space separated list of profile names (since dpkg "
-#~ "1.17.2).  Overridden by the B<-P> option."
-#~ msgstr ""
-#~ "Si cette option est utilisée, elle sera utilisée comme profil(s) de "
-#~ "construction actif(s) pour le paquet à construire. C'est une liste "
-#~ "séparée par des espaces de noms de profil. Cette option est outrepassée "
-#~ "par l'option B<-P>."
-
-#~ msgid ""
-#~ "This is a general field that gives the package a category based on the "
-#~ "software that it installs. Some common sections are `utils', `net', "
-#~ "`mail', `text', `x11' etc."
-#~ msgstr ""
-#~ "Champ général qui indique la catégorie d'un paquet ; cette catégorie est "
-#~ "fondée sur le programme que ce paquet installe. « utils », « net », "
-#~ "« mail », « text », « x11 », etc., représentent quelques catégories "
-#~ "habituelles."
-
-#~ msgid ""
-#~ "Sets the importance of this package in relation to the system as a "
-#~ "whole.  Common priorities are `required', `standard', `optional', `extra' "
-#~ "etc."
-#~ msgstr ""
-#~ "Définit l'importance du paquet à l'intérieur du système général. "
-#~ "« required », « standard », « optional », « extra », etc., représentent "
-#~ "des priorités habituelles."
-
-#~ msgid ""
-#~ "A version number may start with a \"E<gt>E<gt>\", in which case any later "
-#~ "version will match, and may specify or omit the Debian packaging revision "
-#~ "(separated by a hyphen). Accepted version relationships are \"E<gt>E<gt>"
-#~ "\" for greater than, \"E<lt>E<lt>\" for less than, \"E<gt>=\" for greater "
-#~ "than or equal to, \"E<lt>=\" for less than or equal to, and \"=\" for "
-#~ "equal to."
-#~ msgstr ""
-#~ "Un numéro de version peut commencer par « E<gt>E<gt> », et dans ce cas "
-#~ "toute version supérieure correspondra, et il peut indiquer (ou pas) le "
-#~ "numéro de révision pour le paquet Debian (les deux numéros étant séparés "
-#~ "par un trait d'union). Voici les relations acceptées pour les versions : "
-#~ "« E<gt>E<gt> » pour supérieur à, « E<lt>E<lt> » pour inférieur à, "
-#~ "« E<gt>= » pour supérieur ou égal, « E<lt>= » pour inférieur ou égal, et "
-#~ "« = » pour égal à."
-
-#~ msgid "The current build architecture (from B<dpkg --print-architecture>)."
-#~ msgstr ""
-#~ "L'architecture pour laquelle on construit (tirée de B<dpkg --print-"
-#~ "architecture>)."
-
-#~ msgid ""
-#~ "Specifies a source-only build, no binary packages need to be made.  "
-#~ "Passed to B<dpkg-genchanges>."
-#~ msgstr ""
-#~ "Ne construit qu'un paquet source, aucun paquet binaire ne sera construit. "
-#~ "Passé à B<dpkg-genchanges>."
-
-#~ msgid ""
-#~ "The package name. When the package is \"Multi-Arch: same\", this "
-#~ "parameter must include the architecture qualifier. If empty or omitted, "
-#~ "the B<DPKG_MAINTSCRIPT_PACKAGE> environment variable (as set by B<dpkg>) "
-#~ "will be used."
-#~ msgstr ""
-#~ "I<paquet> est le nom du paquet. Quand le paquet est « Multi-Arch: same », "
-#~ "ce paramètre doit inclure le qualificatif d'architecture. S'il est vide "
-#~ "ou omis, la variable d'environnement B<DPKG_MAINTSCRIPT_PACKAGE> (telle "
-#~ "que définie par B<dpkg>) sera utilisée."
-
-#~ msgid "B<--since> I<version>, B<-s>I<version>,B< -v>I<version>"
-#~ msgstr "B<--since> I<version>, B<-s>I<version>,B< -v>I<version>"
-
-#~ msgid "B<--from> I<version>, B<-f>I<version>"
-#~ msgstr "B<--from> I<version>, B<-f>I<version>"
-
-#~ msgid "B<--to> I<version>, B<-t>I<version>"
-#~ msgstr "B<--to> I<version>, B<-t>I<version>"
-
-#~ msgid "B<--count> I<number>, B<-c>I<number>, B<-n>I<number>"
-#~ msgstr "B<--count> I<nombre>, B<-c>I<nombre>, B<-n>I<nombre>"
-
-#~ msgid "B<--offset> I<number>, B<-o>I<number>"
-#~ msgstr "B<--offset> I<nombre>, B<-o>I<nombre>"
-
-#~ msgid "B<--debug>I< file >|I< >B<-D>I<file>"
-#~ msgstr "B<--debug>I< fichier >|I< >B<-D>I<fichier>"
-
-#~ msgid "B<-l>"
-#~ msgstr "B<-l>"
-
-#~ msgid "B<-e>I<debian-architecture>"
-#~ msgstr "B<-e>I<architecture-debian>"
-
-#~ msgid "B<-u>"
-#~ msgstr "B<-u>"
-
-#~ msgid "B<-c>I< command>"
-#~ msgstr "B<-c> I<commande>"
-
-#~ msgid "B<-L>"
-#~ msgstr "B<-L>"
-
-#~ msgid "B<-a>I<debian-architecture>"
-#~ msgstr "B<-a>I<architecture-debian>"
-
-#~ msgid "B<-A>I<debian-architecture>"
-#~ msgstr "B<-A>I<architecture-debian>"
-
-#~ msgid ""
-#~ "A profile specification consists of one or more profile names, prefixed "
-#~ "with the \"B<profile.>\" namespace, separated by whitespace. Exclamation "
-#~ "marks may be prepended to each of the names, meaning \"NOT\"."
-#~ msgstr ""
-#~ "Une indication de profil consiste en un ou plusieurs noms de profil "
-#~ "préfixés par l'espace de nommage du B<profile.>, séparés par des espaces. "
-#~ "Un nom de profil peut être précédé d'un point d'exclamation qui "
-#~ "correspond alors au « NON » logique."
-
-#~ msgid ""
-#~ "Check for identity of architecture by expanding I<architecture-wildcard> "
-#~ "as an architecture wildcard and comparing against the current Debian "
-#~ "architecture (since dpkg 1.13.13).  Command finishes with an exit status "
-#~ "of 0 if matched, 1 if not matched."
-#~ msgstr ""
-#~ "Vérifie l'égalité d'architectures en développant I<architecture-joker> et "
-#~ "en comparant à l'architecture Debian actuelle (depuis dpkg 1.13.13). La "
-#~ "commande quitte avec un code de retour de 0 si l'architecture correspond "
-#~ "et de 1 dans le cas contraire."
-
-#~ msgid "Print a list of valid architecture names."
-#~ msgstr "Affiche une liste des architectures valables."
-
-#~ msgid ""
-#~ "It contains the binary package name, in a multiarch conformant form, arch-"
-#~ "qualified if needed (since dpkg 1.16.2)."
-#~ msgstr ""
-#~ "Il contient le nom du paquet binaire, dans un format conforme à "
-#~ "multiarch, c'est-à-dire qualifié avec son architecture si nécessaire "
-#~ "(depuis dpkg 1.16.2)."
-
-#~ msgid ""
-#~ "    B<binary:Package>\n"
-#~ "    B<binary:Summary>\n"
-#~ "    B<db:Status-Abbrev>\n"
-#~ "    B<source:Package>\n"
-#~ "    B<source:Version>\n"
-#~ msgstr ""
-#~ "    B<binary:Package>\n"
-#~ "    B<binary:Summary>\n"
-#~ "    B<db:Status-Abbrev>\n"
-#~ "    B<source:Package>\n"
-#~ "    B<source:Version>\n"
-
-#~ msgid " B<-C>, B<--audit>"
-#~ msgstr "B<-C>, B<--audit>"
-
-#~ msgid ""
-#~ "Searches for packages that have been installed only partially on your "
-#~ "system. B<dpkg> will suggest what to do with them to get them working."
-#~ msgstr ""
-#~ "Recherche les paquets qui n'ont été que partiellement installés sur le "
-#~ "système. B<dpkg> suggère une manière de les faire fonctionner."
-
-#~| msgid "Pass option I<opt> to B<dpkg-genchanges>."
-#~ msgid "Pass option I<opt> to I<check-command>."
-#~ msgstr "Passe l'option I<opt> à B<dpkg-genchanges>."
-
-#~| msgid ""
-#~| "It calls B<gpg> to sign the B<.changes> file (unless B<-uc> is "
-#~| "specified)."
-#~ msgid ""
-#~ "It calls B<gpg2> or B<gpg> to sign the B<.changes> file (unless B<-uc> is "
-#~ "specified or on UNRELEASED builds)."
-#~ msgstr ""
-#~ "Appel de B<gpg> pour signer le fichier B<.changes> (sauf si B<-uc> est "
-#~ "utilisé)."
-
-#~ msgid "B<-O>"
-#~ msgstr "B<-O>"
-
-#~ msgid ""
-#~ "Print the generated symbols file to standard output, rather than being "
-#~ "stored in the package build tree."
-#~ msgstr ""
-#~ "Affiche le fichier de symboles créé sur la sortie standard au lieu de "
-#~ "l'écrire dans l'arborescence source du paquet."
-
-#~ msgid ""
-#~ "You might transfer this file to another computer, and install it there "
-#~ "with:"
-#~ msgstr ""
-#~ "Vous pourriez transférer ce fichier sur un autre ordinateur et "
-#~ "l'installer de cette manière :"
-
-#~ msgid "B<DM-Upload-Allowed:> B<yes>|B<no>"
-#~ msgstr "B<DM-Upload-Allowed:> B<yes>|B<no>"
-
-#~ msgid ""
-#~ "This field indicates whether the package can be uploaded by Debian "
-#~ "Maintainers appearing in the Maintainer or Uploaders field. The default "
-#~ "value is \"no\"."
-#~ msgstr ""
-#~ "Ce champ indique si un paquet peut être envoyé par les responsables "
-#~ "Debian qui sont indiqués dans le champ Maintainer ou le champ Uploaders. "
-#~ "La valeur par défaut est « no »."
-
-#~ msgid "CAVEATS"
-#~ msgstr "CAVEATS"
-
-#~ msgid "PACKAGE STATES"
-#~ msgstr "ÉTATS DES PAQUETS"
-
-#~ msgid "PACKAGE FLAGS"
-#~ msgstr "DRAPEAUX DES PAQUETS"
-
-#~ msgid "I<control>"
-#~ msgstr "I<control>"
-
-#~ msgid "DEBIAN/RULES"
-#~ msgstr "DEBIAN/RULES"
-
-#~ msgid "BACKWARD COMPATIBILITY"
-#~ msgstr "COMPATIBILITÉ ARRIÈRE"
-
-#~ msgid ""
-#~ "The %PKGDATADIR%/architecture.mk Makefile snippet is provided by dpkg-dev "
-#~ "since version 1.16.1."
-#~ msgstr ""
-#~ "Le fragment de fichier Makefile %PKGDATADIR%/architecture.mk Makefile est "
-#~ "fourni par dpkg-dev depuis la version 1.16.1."
-
-#~ msgid ""
-#~ "The DEB_*_ARCH_BITS and DEB_*_ARCH_ENDIAN variables were introduced in "
-#~ "dpkg-dev 1.15.4. Using them in I<debian/rules> thus requires a build-"
-#~ "dependency on dpkg-dev (E<gt>= 1.15.4)."
-#~ msgstr ""
-#~ "Les variables DEB_*_ARCH_BITS et DEB_*_ARCH_ENDIAN sont apparues avec la "
-#~ "version 1.15.4 de dpkg-dev. Si elles sont utilisées dans I<debian/rules>, "
-#~ "une dépendance de construction sur dpkg-dev (E<gt>= 1.15.4) est "
-#~ "nécessaire."
-
-#~ msgid ""
-#~ "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in "
-#~ "dpkg-dev 1.13.2."
-#~ msgstr ""
-#~ "Les variables DEB_HOST_ARCH_CPU et DEB_HOST_ARCH_OS sont apparues dans la "
-#~ "version 1.13.2 de dpkg-dev."
-
-#~ msgid ""
-#~ "The B<-e> and B<-i> options were only introduced in relatively recent "
-#~ "versions of B<dpkg-architecture> (since dpkg 1.13.13)."
-#~ msgstr ""
-#~ "Les options B<-e> et B<-i> n'ont été ajoutées que relativement récemment "
-#~ "à B<dpkg-architecture> (depuis la version 1.13.13 de dpkg)."
-
-#~ msgid "HARDENING"
-#~ msgstr "COMPILATION RENFORCÉE (« HARDENING »)"
-
-#~ msgid ""
-#~ "Note that for this option to have any effect, the source must also be "
-#~ "compiled with B<-O1> or higher."
-#~ msgstr ""
-#~ "Veuillez noter que pour que cette option ait une utilité, le code source "
-#~ "doit être compilé avec l'option B<-O1> ou supérieure."
-
-#~ msgid ""
-#~ "Ensures that B<dpkg-deb> builds a `new' format archive. This is the "
-#~ "default."
-#~ msgstr ""
-#~ "S'assure que B<dpkg-deb> construit une archive avec le « nouveau » "
-#~ "format. C'est le comportement par défaut."
-
-#~ msgid "REMOVING A CONFFILE"
-#~ msgstr "SUPPRESSION D'UN FICHIER DE CONFIGURATION"
-
-#~ msgid "RENAMING A CONFFILE"
-#~ msgstr "RENOMMAGE D'UN FICHIER DE CONFIGURATION"
-
-#~ msgid "WARNINGS"
-#~ msgstr "AVERTISSEMENTS"
-
-#~ msgid "ERRORS"
-#~ msgstr "ERREURS"
-
-#~ msgid "GENERIC BUILD OPTIONS"
-#~ msgstr "OPTIONS DE CONSTRUCTION GÉNÉRIQUES"
-
-#~ msgid "GENERIC EXTRACT OPTIONS"
-#~ msgstr "LES OPTIONS GENERIQUES POUR EXTRACTION"
-
-#~ msgid "WARNINGS AND ERRORS"
-#~ msgstr "AVERTISSEMENTS ET ERREURS"
-
-#~ msgid "debian/source/patch-header"
-#~ msgstr "debian/source/patch-header"
-
-#~ msgid "MATCHING OPTIONS"
-#~ msgstr "OPTIONS DE CORRESPONDANCE"
-
-#~ msgid ""
-#~ "If you find a bug, please report it using the Debian bug-tracking system."
-#~ msgstr ""
-#~ "Si vous trouvez un bogue, veuillez le signaler au système de suivi des "
-#~ "bogues de Debian."
-
-#~ msgid ""
-#~ "If you find any discrepancy between the operation of B<update-"
-#~ "alternatives> and this manual page, it is a bug, either in the "
-#~ "implementation or the documentation; please report it."
-#~ msgstr ""
-#~ "Si vous trouvez une discordance entre l'action de B<update-alternatives> "
-#~ "et cette page de manuel, c'est qu'il y a un bogue, soit dans "
-#~ "l'implémentation soit dans la documentation ; faites un rapport."
-
-#~ msgid "B<--command-fd >I<n>"
-#~ msgstr "B<--command-fd >I<n>"
-
-#~ msgid ""
-#~ "Accept a series of commands on input file descriptor I<n>. Note: "
-#~ "additional options set on the command line, and through this file "
-#~ "descriptor, are not reset for subsequent commands executed during the "
-#~ "same run."
-#~ msgstr ""
-#~ "Cette action accepte une série de commandes sur le descripteur du fichier "
-#~ "d'entrée I<n>. Note : des options supplémentaires définies sur la ligne "
-#~ "de commande à travers ce descripteur de fichier ne sont pas redéfinies "
-#~ "pour les commandes suivantes qui sont exécutées pendant la même séquence."
-
-#~ msgid ""
-#~ "$ update-alternatives --query editor\n"
-#~ "Link: editor\n"
-#~ "Status: auto\n"
-#~ "Best: /usr/bin/vim.gtk\n"
-#~ "Value: /usr/bin/vim.gtk\n"
-#~ msgstr ""
-#~ "$ update-alternatives --query editor\n"
-#~ "Link: editor\n"
-#~ "Status: auto\n"
-#~ "Best: /usr/bin/vim.gtk\n"
-#~ "Value: /usr/bin/vim.gtk\n"
-
-#~ msgid ""
-#~ "Alternative: /usr/bin/vim.gtk\n"
-#~ "Priority: 50\n"
-#~ "Slaves:\n"
-#~ " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-#~ " editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-#~ " editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-#~ " editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-#~ " editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-#~ " editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-#~ " editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
-#~ " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-#~ " editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
-#~ " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-#~ " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
-#~ msgstr ""
-#~ "Alternative: /usr/bin/vim.gtk\n"
-#~ "Priority: 50\n"
-#~ "Slaves:\n"
-#~ " editor.1.gz /usr/share/man/man1/vim.1.gz\n"
-#~ " editor.ru.1.gz /usr/share/man/ru/man1/vim.1.gz\n"
-#~ " editor.pl.ISO8859-2.1.gz /usr/share/man/pl.ISO8859-2/man1/vim.1.gz\n"
-#~ " editor.it.ISO8859-1.1.gz /usr/share/man/it.ISO8859-1/man1/vim.1.gz\n"
-#~ " editor.pl.UTF-8.1.gz /usr/share/man/pl.UTF-8/man1/vim.1.gz\n"
-#~ " editor.it.1.gz /usr/share/man/it/man1/vim.1.gz\n"
-#~ " editor.fr.UTF-8.1.gz /usr/share/man/fr.UTF-8/man1/vim.1.gz\n"
-#~ " editor.fr.1.gz /usr/share/man/fr/man1/vim.1.gz\n"
-#~ " editor.it.UTF-8.1.gz /usr/share/man/it.UTF-8/man1/vim.1.gz\n"
-#~ " editor.pl.1.gz /usr/share/man/pl/man1/vim.1.gz\n"
-#~ " editor.fr.ISO8859-1.1.gz /usr/share/man/fr.ISO8859-1/man1/vim.1.gz\n"
-
-#~ msgid ""
-#~ "The file is an B<ar> archive with a magic value of B<!E<lt>archE<gt>>.  "
-#~ "The file names might contain a trailing slash."
-#~ msgstr ""
-#~ "Le fichier est une archive B<ar> avec un numéro magique de B<!"
-#~ "E<lt>archE<gt>>. Les noms de fichiers peuvent comporter un caractère "
-#~ "« / » final."
-
-#~ msgid ""
-#~ "A list of packages that need to be installed and configured to be able to "
-#~ "build the source package."
-#~ msgstr ""
-#~ "liste des paquets qu'il est nécessaire d'installer et configurer pour "
-#~ "pouvoir construire le paquet source."
-
-#~ msgid ""
-#~ "A list of packages that should not be installed when the package is "
-#~ "build, for example because they interfere with the used build system."
-#~ msgstr ""
-#~ "Une liste de paquets qui ne doivent pas être installés lorsque le paquet "
-#~ "est construit, par exemple parce qu'ils interfèrent avec le système de "
-#~ "construction utilisé."
-
-#~ msgid "To list packages related to the editor B<vi>(1):"
-#~ msgstr "Pour afficher les paquets liés au programme B<vi>(1) :"
-
-#~ msgid "B<-P>I<packagebuilddir>"
-#~ msgstr "B<-P>I<rep-de-construction-du-paquet>"
-
-#~ msgid "The highest urgency of all included entries is used."
-#~ msgstr "La priorité la plus haute de celles indiquées est utilisée."
-
-#~ msgid "B<Obsolete> alias for B<-tudeb>."
-#~ msgstr "Alias B<obsolete> pour B<-tudeb>."
-
-#~ msgid "B<-S>I<pkgbuilddir>"
-#~ msgstr "B<-S>I<pkgbuilddir>"
-
-#~ msgid "See the Debian Policy Manual for further details."
-#~ msgstr "Lire la charte Debian pour plus d'informations."
-
-#~ msgid "[ ... ]"
-#~ msgstr "[ ... ]"
-
-#~ msgid "Instead of:"
-#~ msgstr "Au lieu de :"
-
-#~ msgid ""
-#~ "ARCH=\\`dpkg --print-architecture\\`\n"
-#~ "configure $(\\s-1ARCH\\s0)-linux\n"
-#~ msgstr ""
-#~ "ARCH=\\`dpkg --print-architecture\\`\n"
-#~ "configure $(\\s-1ARCH\\s0)-linux\n"
-
-#~ msgid "please use the following:"
-#~ msgstr "Veuillez utiliser :"
-
-#~ msgid ""
-#~ "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host="
-#~ "$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
-#~ msgstr ""
-#~ "configure --build=$(\\s-1DEB_BUILD_GNU_TYPE\\s0) --host="
-#~ "$(\\s-1DEB_HOST_GNU_TYPE\\s0)\n"
-
-#~ msgid ""
-#~ "ARCH=\\`dpkg --print-architecture\\`\n"
-#~ "ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-#~ "  ...\n"
-#~ "endif\n"
-#~ msgstr ""
-#~ "ARCH=\\`dpkg --print-architecture\\`\n"
-#~ "ifeq ($(\\s-1ARCH\\s0),alpha)\n"
-#~ "  ...\n"
-#~ "endif\n"
-
-#~ msgid "please use:"
-#~ msgstr "Veuillez utiliser :"
-
-#~ msgid ""
-#~ "In general, calling dpkg in the rules file to get architecture "
-#~ "information is deprecated (unless you want to provide backward "
-#~ "compatibility, see below).  Especially the --print-architecture option is "
-#~ "unreliable since we have Debian architectures which don't equal a "
-#~ "processor name."
-#~ msgstr ""
-#~ "Appeler dpkg dans les fichiers « rules » pour obtenir les informations "
-#~ "sur l'architecture est déconseillé (sauf pour des raisons de "
-#~ "compatibilité arrière, voyez ci-dessous). En particulier, l'option --"
-#~ "print-architecture n'est pas fiable puisque certaines architectures "
-#~ "Debian ne correspondent à aucun nom de processeur."
-
-#~ msgid ""
-#~ "The DEB_HOST_ARCH_CPU and DEB_HOST_ARCH_OS variables were introduced in "
-#~ "dpkg-dev 1.13.2. Before this I<debian/rules> files tended to check the "
-#~ "values of the DEB_HOST_GNU_CPU or DEB_HOST_GNU_TYPE variables which have "
-#~ "been subject to change."
-#~ msgstr ""
-#~ "Les variables DEB_HOST_ARCH_CPU et DEB_HOST_ARCH_OS sont apparues avec la "
-#~ "version 1.13.2 de dpkg-dev. Auparavant, les fichiers I<debian/rules> "
-#~ "utilisaient les variables DEB_HOST_GNU_CPU ou DEB_HOST_GNU_TYPE qui ont "
-#~ "eu tendance à varier dans le temps."
-
-#~ msgid ""
-#~ "Where I<debian/rules> files check these variables to decide how or what "
-#~ "to compile, this should be updated to use the new variables and values.  "
-#~ "You may wish to retain backwards compatibility with older version of dpkg-"
-#~ "dev by using the following code:"
-#~ msgstr ""
-#~ "Si ces variables sont encore utilisées dans un fichier I<debian/rules> "
-#~ "pour décider quoi construire et comment, il faut les remplacer par les "
-#~ "nouvelles variables. Vous pouvez rester compatible avec les versions "
-#~ "précédentes de dpkg-dev en utilisant le code suivant :"
-
-#~ msgid ""
-#~ "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/"
-#~ "dev/null)\n"
-#~ "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/"
-#~ "dev/null)\n"
-#~ msgstr ""
-#~ "DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2E<gt>/"
-#~ "dev/null)\n"
-#~ "DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2E<gt>/"
-#~ "dev/null)\n"
-
-#~ msgid ""
-#~ "# Take account of old dpkg-architecture output.\n"
-#~ "ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-#~ "  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-#~ "  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-#~ "    DEB_HOST_ARCH_CPU := amd64\n"
-#~ "  endif\n"
-#~ "endif\n"
-#~ "ifeq ($(DEB_HOST_ARCH_OS),)\n"
-#~ "  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -"
-#~ "qDEB_HOST_GNU_SYSTEM))\n"
-#~ "  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-#~ "    DEB_HOST_ARCH_OS := hurd\n"
-#~ "  endif\n"
-#~ "endif\n"
-#~ msgstr ""
-#~ "# Prise en compte des anciennes versions de dpkg-architecture.\n"
-#~ "ifeq ($(DEB_HOST_ARCH_CPU),)\n"
-#~ "  DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)\n"
-#~ "  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)\n"
-#~ "    DEB_HOST_ARCH_CPU := amd64\n"
-#~ "  endif\n"
-#~ "endif\n"
-#~ "ifeq ($(DEB_HOST_ARCH_OS),)\n"
-#~ "  DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -"
-#~ "qDEB_HOST_GNU_SYSTEM))\n"
-#~ "  ifeq ($(DEB_HOST_ARCH_OS),gnu)\n"
-#~ "    DEB_HOST_ARCH_OS := hurd\n"
-#~ "  endif\n"
-#~ "endif\n"
-
-#~ msgid "And similarly for DEB_BUILD_ARCH_CPU and DEB_BUILD_ARCH_OS."
-#~ msgstr "Et de la même façon pour DEB_BUILD_ARCH_CPU et DEB_BUILD_ARCH_OS."
-
-#~ msgid ""
-#~ "If you still wish to support versions of dpkg-dev that did not include "
-#~ "B<dpkg-architecture>, the following does the job:"
-#~ msgstr ""
-#~ "Pour accepter encore les versions de dpkg-dev qui n'incluent pas B<dpkg-"
-#~ "architecture>, vous pouvez utiliser :"
-
-#~ msgid ""
-#~ "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-#~ "\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH"
-#~ "\\s0))\n"
-#~ "ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-#~ "  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-#~ "else\n"
-#~ "  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-#~ "endif\n"
-#~ "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-"
-#~ "$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-#~ msgstr ""
-#~ "\\&\\s-1DEB_BUILD_ARCH\\s0 := $(shell dpkg --print-architecture)\n"
-#~ "\\&\\s-1DEB_BUILD_GNU_CPU\\s0 := $(patsubst hurd-%,%,$(\\s-1DEB_BUILD_ARCH"
-#~ "\\s0))\n"
-#~ "ifeq ($(filter-out hurd-%,$(\\s-1DEB_BUILD_ARCH\\s0)),)\n"
-#~ "  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := gnu\n"
-#~ "else\n"
-#~ "  \\s-1DEB_BUILD_GNU_SYSTEM\\s0 := linux-gnu\n"
-#~ "endif\n"
-#~ "DEB_BUILD_GNU_TYPE=$(\\s-1DEB_BUILD_GNU_CPU\\s0)-"
-#~ "$(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-
-#~ msgid ""
-#~ "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-#~ "\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-#~ "\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-#~ "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
-#~ msgstr ""
-#~ "\\&\\s-1DEB_HOST_ARCH\\s0 := $(\\s-1DEB_BUILD_ARCH\\s0)\n"
-#~ "\\&\\s-1DEB_HOST_GNU_CPU\\s0 := $(\\s-1DEB_BUILD_GNU_CPU\\s0)\n"
-#~ "\\&\\s-1DEB_HOST_GNU_SYSTEM\\s0 := $(\\s-1DEB_BUILD_GNU_SYSTEM\\s0)\n"
-#~ "\\&\\s-1DEB_HOST_GNU_TYPE\\s0 := $(\\s-1DEB_BUILD_GNU_TYPE\\s0)\n"
-
-#~ msgid ""
-#~ "Put a subset of these lines at the top of your debian/rules file; these "
-#~ "default values will be overwritten if dpkg-architecture is used."
-#~ msgstr ""
-#~ "Vous pouvez placer certaines de ces lignes au début de votre debian/"
-#~ "rules. Ces valeurs par défaut seront écrasées si dpkg-architecture est "
-#~ "utilisé."
-
-#~ msgid ""
-#~ "You don't need the full set. Choose a consistent set which contains the "
-#~ "values you use in the rules file. For example, if you only need the host "
-#~ "Debian architecture, `DEB_HOST_ARCH=\\`dpkg --print-architecture\\`' is "
-#~ "sufficient (this is indeed the Debian architecture of the build machine, "
-#~ "but remember that we are only trying to be backward compatible with "
-#~ "native compilation)."
-#~ msgstr ""
-#~ "Vous n'avez pas besoin de toutes ces lignes. Choisissez uniquement les "
-#~ "variables que vous utilisez dans votre fichier « rules ». Par exemple, si "
-#~ "vous n'avez besoin que de l'architecture hôte Debian, `DEB_HOST_ARCH="
-#~ "\\`dpkg --print-architecture\\`' est suffisant (il s'agit bien sûr de "
-#~ "l'architecture Debian de la machine de construction, mais le but est ici "
-#~ "de rester compatible avec les anciennes compilations natives)."
-
-#~ msgid ""
-#~ "I<conffile> is the filename of the conffile to remove.  I<lastversion> is "
-#~ "the last version of the package that contained the conffile (or the last "
-#~ "version of the package that did not take care to remove the obsolete "
-#~ "conffile if this was not immediately implemented).  If I<lastversion> is "
-#~ "empty or omitted, then the operation is tried on every upgrade. "
-#~ "I<package> is the package name, it's optional as it will default to "
-#~ "$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of "
-#~ "the package acted upon). All the parameters of the maintainer scripts "
-#~ "have to be forwarded to the program after \"--\"."
-#~ msgstr ""
-#~ "I<fichier-de-configuration> est le nom du fichier de configuration à "
-#~ "supprimer. I<dernière-version> est la dernière version du paquet qui le "
-#~ "fournissait (ou la dernière version du paquet qui ne prenait pas soin de "
-#~ "supprimer le fichier de configuration obsolète si la suppression correcte "
-#~ "n'a pas été immédiatement mise en oeuvre). Si I<dernière-version> est "
-#~ "vide ou est omis, cette suppression sera tenté pour toute mise à jour. "
-#~ "I<paquet> est le nom du paquet. Ce paramètre est optionnel, la valeur par "
-#~ "défaut étant $DPKG_MAINTSCRIPT_PACKAGE (cette variable est positionnée "
-#~ "par dpkg sur le nom du paquet sur lequel il travaille). Tous les "
-#~ "paramètres des scripts du responsable doivent être redirigés au programme "
-#~ "après « -- »."
-
-#~ msgid ""
-#~ "I<oldconffile> and I<newconffile> are the old and new name of the "
-#~ "conffile to rename. I<lastversion> is the last version of the package "
-#~ "that contained the conffile with the old name. If I<lastversion> is empty "
-#~ "or omitted, then the operation is tried on every upgrade (note: it's "
-#~ "safer to give the version and have the operation tried only once). "
-#~ "I<package> is the package name, it's optional as it will default to "
-#~ "$DPKG_MAINTSCRIPT_PACKAGE (this variable is set by dpkg to the name of "
-#~ "the package acted upon). All the parameters of the maintainer scripts "
-#~ "have to be forwarded to the program after \"--\"."
-#~ msgstr ""
-#~ "I<ancien-fichier> et I<nouveau-fichier> sont les deux noms successifs du "
-#~ "fichier de configuration. I<dernière-version> est la dernière version du "
-#~ "paquet qui contenait le fichier de configuration avec l'ancien nnom. Si "
-#~ "I<dernière-version> est vide ou manquant, l'opération sera tentée à "
-#~ "chaque mise à jour (il est plus sûr d'indiquer la bonne version afin qe "
-#~ "l'opération ne soit tentée qu'une fois). I<paquet> est le nom du paquet. "
-#~ "Ce paramètre est optionnel, la valeur par défaut étant "
-#~ "$DPKG_MAINTSCRIPT_PACKAGE (cette variable est positionnée par dpkg sur le "
-#~ "nom du paquet sur lequel il travaille). Tous les paramètres des scripts "
-#~ "du responsable doivent être redirigés au programme après « -- »."
-
-#~ msgid "Check whether a process has created the file I<pid-file>."
-#~ msgstr ""
-#~ "Cherche les processus dont les identifiants sont précisés dans I<pid-"
-#~ "file>."
-
-#~ msgid ""
-#~ "Check for processes that are instances of this executable (according to "
-#~ "B</proc/>I<pid>B</exe>)."
-#~ msgstr ""
-#~ "Cherche les processus qui sont des exemplaires de cet exécutable (selon "
-#~ "B</proc/>I<pid>B</exe>)."
-
-#~ msgid ""
-#~ "Check for processes with the name I<process-name> (according to B</proc/"
-#~ ">I<pid>B</stat>)."
-#~ msgstr ""
-#~ "Cherche les processus dont le nom est I<nomdeprocessus> (selon B</proc/"
-#~ ">I<pid>B</stat>)."
-
-#~ msgid ""
-#~ "Check for processes owned by the user specified by I<username> or I<uid>."
-#~ msgstr ""
-#~ "Cherche les processus qui appartiennent à l'utilisateur défini par "
-#~ "I<nomdutilisateur> ou I<uid.>"
-
-#~ msgid ""
-#~ "A comma-separated list of names of build-time features that are supported "
-#~ "by the source package. Currently, the only supported feature is B<build-"
-#~ "arch>. It allows dpkg-buildpackage to call the I<build-arch> or I<build-"
-#~ "indep> targets in place of I<build>."
-#~ msgstr ""
-#~ "donne la liste des noms des fonctionnalités qui sont gérées par le paquet "
-#~ "source. À ce jour, la seule fonctionnalité gérée est B<build-arch>. Elle "
-#~ "permet à dpkg-buildpackage d'utiliser les cibles I<build-arch> ou I<build-"
-#~ "indep> à la place de I<build>"
-
-#~| msgid "User configuration file."
-#~ msgid "Package maintainer configuration file."
-#~ msgstr "Fichier de configuration propre à l'utilisateur"
-
-#~ msgid "B<Package:> E<lt>package nameE<gt>"
-#~ msgstr "B<Package:> E<lt>nom du paquetE<gt>"
-
-#~| msgid "B<Source:> E<lt>source nameE<gt>"
-#~ msgid "B<Multi-Arch:> E<lt>same|foreign|allowedE<gt> "
-#~ msgstr "B<Source:> E<lt>nom du sourceE<gt>"
-
-#~ msgid ""
-#~ "The first member is named B<debian-split> and contains a series of lines, "
-#~ "separated by newlines. Currently seven lines are present.  The first is "
-#~ "the format version number, B<2.1> at the time this manual page was "
-#~ "written. The second is the package name. The third is the package "
-#~ "version. The fourth is the md5sum of the package.  The fifth is the total "
-#~ "size of the package. The sixth is the maximum part size. The seventh is "
-#~ "the current part number, followed by a slash and the total amount of "
-#~ "parts (as in ‘1/10’)."
-#~ msgstr ""
-#~ "Le premier membre est nommé B<debian-split> et contient une succession de "
-#~ "lignes, séparées par des retours-chariot. Pour le moment, sept lignes "
-#~ "sont présentes. La première est le numéro de version du format, B<2.1> à "
-#~ "l'heure où ce document a été écrit. Le second est le nom du paquet. Le "
-#~ "troisième est la version du paquet. Le quatrième est la somme MD5 du "
-#~ "paquet. Le cinquième est la taille totale du paquet. Le sixième est la "
-#~ "taille maximale d'une partie. Le septième est le numéro d'ordre de la "
-#~ "partie concernée, suivi du caractère « / » et du nombre total de parties "
-#~ "(de le forme ‘1/10’)."
-
-#~ msgid ""
-#~ "B<dpkg> can also be used as a front-end to B<dpkg-deb>(1).  The following "
-#~ "are B<dpkg-deb> actions, and if they are encountered, B<dpkg> just runs "
-#~ "B<dpkg-deb> with the parameters given to it:"
-#~ msgstr ""
-#~ "On peut aussi utiliser B<dpkg> comme une interface à B<dpkg-deb>(1). "
-#~ "Quand B<dpkg> rencontre les actions suivantes, qui sont des actions de "
-#~ "B<dpkg-deb>, il lance simplement B<dpkg-deb> avec les paramètres qui lui "
-#~ "ont été fournis :"
-
-#~ msgid ""
-#~ "    B<-b>, B<--build>,\n"
-#~ "    B<-c>, B<--contents>,\n"
-#~ "    B<-I>, B<--info>,\n"
-#~ "    B<-f>, B<--field>,\n"
-#~ "    B<-e>, B<--control>,\n"
-#~ "    B<-x>, B<--extract>,\n"
-#~ "    B<-X>, B<--vextract>, and\n"
-#~ "    B<--fsys-tarfile>.\n"
-#~ msgstr ""
-#~ "    B<-b>, B<--build>,\n"
-#~ "    B<-c>, B<--contents>,\n"
-#~ "    B<-I>, B<--info>,\n"
-#~ "    B<-f>, B<--field>,\n"
-#~ "    B<-e>, B<--control>,\n"
-#~ "    B<-x>, B<--extract>,\n"
-#~ "    B<-X>, B<--vextract>, et\n"
-#~ "    B<--fsys-tarfile>.\n"
-
-#~ msgid "Please refer to B<dpkg-deb>(1) for information about these actions."
-#~ msgstr ""
-#~ "Voyez B<dpkg-deb>(1) pour des renseignements supplémentaires sur ces "
-#~ "actions."
-
-#~ msgid "B<--new>, B<--old>"
-#~ msgstr "B<--new>, B<--old>"
-
-#~ msgid ""
-#~ "Select new or old binary package format. This is a B<dpkg-deb>(1)  option."
-#~ msgstr ""
-#~ "Sélectionne soit l'ancien format des paquet binaires, soit le nouveau. "
-#~ "C'est une option de B<dpkg-deb>(1)."
-
-#~ msgid ""
-#~ "Don't read or check contents of control file while building a package.  "
-#~ "This is a B<dpkg-deb>(1) option."
-#~ msgstr ""
-#~ "Ne pas lire ni vérifier le contenu du fichier de contrôle pendant la "
-#~ "construction d'un paquet. C'est une option de B<dpkg-deb>(1)."
-
-#~ msgid "Compiler flags"
-#~ msgstr "Drapeaux de compilation"
-
-#~ msgid ""
-#~ "The B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, B<CPPFLAGS> and B<LDFLAGS> "
-#~ "environment variables are set to the values that B<dpkg-buildflags> "
-#~ "returned. See its manual page for more information."
-#~ msgstr ""
-#~ "Les variables d'environnement B<CFLAGS>, B<CXXFLAGS>, B<FFLAGS>, "
-#~ "B<CPPFLAGS> et B<LDFLAGS> prennent les valeurs renvoyées par B<dpkg-"
-#~ "buildflags>. Veuillez consulter la page de manuel de ce programme pour "
-#~ "plus d'informations."
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid ""
-#~ "B<dpkg-split> uses some rather out-of-date conventions for the filenames "
-#~ "of Debian packages."
-#~ msgstr ""
-#~ "B<dpkg-split> utilise des conventions plutôt périmées pour les noms des "
-#~ "paquets Debian."
-
-#~ msgid ""
-#~ "The architecture is not represented in the part files' header, only in "
-#~ "the control information of the contained binary package file, and it is "
-#~ "not present in the filenames generated."
-#~ msgstr ""
-#~ "L'architecture n'est pas indiquée dans l'en-tête des fichiers ; elle "
-#~ "l'est seulement dans les informations de contrôle du paquet binaire ; et "
-#~ "elle n'est pas présente dans les fichiers produits."
-
-#~ msgid ""
-#~ "B<dselect> [B<--admindir> I<E<lt>directoryE<gt>>] [B<--help>] [B<--"
-#~ "version>] [B<--expert>] [B<--debug>|B<-D>I<E<lt>fileE<gt>>] "
-#~ "[I<E<lt>actionE<gt>>] [B<--colour>|B<--color> I<screenpart:"
-#~ ">[I<foreground>],[I<background>][I<:attr>[I<+attr+..>]]]"
-#~ msgstr ""
-#~ "B<dselect> [B<--admindir> I<E<lt>répertoireE<gt>>] [B<--help>] [B<--"
-#~ "version>] [B<--expert>] [B<--debug>|B<-D>I<E<lt>fichierE<gt>>] "
-#~ "[I<E<lt>actionE<gt>>] [B<--colour>|B<--color> I<partie-écran:>[I<avant-"
-#~ "plan>],[I<arrière-plan>][I<:attr>[I<+attr+..>]]]"
-
-#~ msgid "B<--admindir>I< E<lt>directoryE<gt>>"
-#~ msgstr "B<--admindir>I< E<lt>répertoireE<gt>>"
-
-#~ msgid "USAGE"
-#~ msgstr "UTILISATION"
-
-#~ msgid ""
-#~ "B<start-stop-daemon> returns 0 if the requested action was performed, or "
-#~ "if B<--oknodo> is specified and either B<--start> was specified and a "
-#~ "matching process was already running, or B<--stop> was specified and "
-#~ "there were no matching processes. If B<--oknodo> was not specified and "
-#~ "nothing was done, 1 is returned. If B<--stop> and B<--retry> were "
-#~ "specified, but the end of the schedule was reached and the processes were "
-#~ "still running, the error value is 2. For all other errors, the status is "
-#~ "3."
-#~ msgstr ""
-#~ "B<start-stop-daemon> renvoie 0 si l'action demandée a été effectuée, ou "
-#~ "si B<--oknodo> est spécifié et aussi si B<--start> a été spécifié et "
-#~ "qu'un processus de comparaison est déjà en cours d'exécution, ou si B<--"
-#~ "stop> a été spécifié et qu'il n'y avait pas de processus correspondant. "
-#~ "Si B<--oknodo> n'a pas été spécifié et rien n'a été fait, alors 1 est "
-#~ "retourné. Si B<--stop> et B<--retry> ont été précisés, mais que "
-#~ "l'ordonnanceur a atteint la fin du calendrier en ayant toujours le "
-#~ "processus en cours d'exécution, la valeur d'erreur est 2. Pour toutes les "
-#~ "autres erreurs, l'état est 3."
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid ""
-#~ "An error occurred. Unfortunately at the time of writing I<extended-error-"
-#~ "message> can contain newlines, although in locales where the translators "
-#~ "have not made mistakes every newline is followed by at least one space."
-#~ msgstr ""
-#~ "Une erreur s'est produite. Malheureusement, lors de l'écriture il se "
-#~ "trouve que I<message-d'erreur-complet> peut contenir des retour à la "
-#~ "ligne, alors que dans les locales où les traducteurs n'ont pas fait "
-#~ "d'erreurs, chaque nouvelle ligne est suivie par au moins une espace."
-
-#~ msgid "I<admindir>/info/I<package>.symbols"
-#~ msgstr "I<admindir>/info/I<paquet>.symbols"
-
-#~ msgid "I<admindir>/info/I<package>.shlibs"
-#~ msgstr "I<admindir>/info/I<paquet>.shlibs"
-
-#~ msgid "Format: 3.0 (git) and 3.0 (bzr)"
-#~ msgstr "Format: 3.0 (git) et 3.0 (bzr)"
-
-#~ msgid ""
-#~ "I<priority> and I<section> place the package within the release tree; "
-#~ "these ought not to be found in the control file. If the package is found "
-#~ "in a subdirectory of I<binarydir>, that will be checked against "
-#~ "I<section>."
-#~ msgstr ""
-#~ "Les éléments I<priorité> et I<section> placent le paquet dans "
-#~ "l'arborescence ; on ne devrait pas les trouver dans le fichier "
-#~ "« control ». Quand le paquet se trouve dans un sous-répertoire de I<rep-"
-#~ "de-binaires,> on le compare avec le contenu de I<section>."
-
-#~ msgid ""
-#~ "If the host architecture differs from the build architecture (as is the "
-#~ "case for a cross-compilation), and if the environment variable "
-#~ "B<PKG_CONFIG_LIBDIR> is not set, then it is set to a value suitable for "
-#~ "cross-compilation (\"/usr/I<gnu-system-type>/lib/pkgconfig/:/usr/share/"
-#~ "pkgconfig\")."
-#~ msgstr ""
-#~ "Si l'architecture de l'hôte est différente de l'architecture construite "
-#~ "(comme c'est le cas lors de compilation croisée) et si la variable "
-#~ "d'environnement B<PKG_CONFIG_LIBDIR> n'est pas renseignée, alors elle est "
-#~ "positionnée à une valeur adaptée à la compilation croisée (\"/usr/I<selon-"
-#~ "système-gnu>/lib/pkgconfig/:/usr/share/pkgconfig\")."
-
-#~ msgid ""
-#~ "Some environment variables defining compiler and linker options are set "
-#~ "to default values unless already present in the environment. Note that "
-#~ "this mechanism was only introduced in version 1.14.17 of dpkg-dev and not "
-#~ "all I<rules> files and build tools will honour these variables, yet."
-#~ msgstr ""
-#~ "Certaines variables d'environnement qui définissent les options du "
-#~ "compilateur et de l'éditeur de lien sont réglés par défaut sauf si elles "
-#~ "ont déjà été fixées dans l'environnement. Veuillez noter que ce mécanisme "
-#~ "n'a été mis en place qu'à partir de la version 1.14.17 de dpkg-dev et que "
-#~ "tous les fichiers I<rules> et les outils de construction n'utilisent pas "
-#~ "encore ces variables."
-
-#~ msgid ""
-#~ "Optimization options which are passed to the Debian build system and can/"
-#~ "should be overridden by the package build if needed (default value: B<-g -"
-#~ "O2>, or B<-g\\ -O0> if B<noopt> is specified in DEB_BUILD_OPTIONS). "
-#~ "Overriding options can be used to explicitly set a higher optimization "
-#~ "level, or work around compiler bugs, which only can be seen with some "
-#~ "optimization levels (the last opt level \"wins\")."
-#~ msgstr ""
-#~ "Les options d'optimisation qui sont passées au système de construction "
-#~ "Debian et qui peuvent être remplacées par le générateur de paquet si "
-#~ "besoin (valeur par défaut : B<-g\\ -O2>, ou B<-g\\ -O0> si B<noopt> est "
-#~ "indiqué dans DEB_BUILD_OPTIONS). Remplacer ces options peut être utilisé "
-#~ "pour fixer un niveau d'optimisation plus élevé, ou plus de travail dans "
-#~ "la recherche de bogues, qui ne peuvent être détectés qu'avec certains "
-#~ "niveaux d'optimisation (le dernier niveau d'optimisation \"gagne\")."
-
-#~ msgid "B<CFLAGS_APPEND>"
-#~ msgstr "B<CFLAGS_APPEND>"
-
-#~ msgid ""
-#~ "Optimization options appended to the compiler flags, which must not be "
-#~ "overwritten by the package (mostly used to for test builds). Default "
-#~ "value: empty."
-#~ msgstr ""
-#~ "Les options d'optimisation passées sur les drapeaux du compilateur, qui "
-#~ "ne doivent pas être remplacé par ceux du paquet (le plus souvent utilisé "
-#~ "pour faire des tests de construction). Valeur par défaut : aucune."
-
-#~ msgid "Same as B<CFLAGS> for C++ sources."
-#~ msgstr "Identique à B<CFLAGS> pour des sources en C++."
-
-#~ msgid "B<CXXFLAGS_APPEND>"
-#~ msgstr "B<CXXFLAGS_APPEND>"
-
-#~ msgid "Same as B<CFLAGS_APPEND> for C++ sources."
-#~ msgstr "Identique à B<CFLAGS_APPEND> pour des sources en C++."
-
-#~ msgid "Same as B<CFLAGS> for Fortran sources."
-#~ msgstr "Identique à B<CFLAGS> pour des sources en Fortran."
-
-#~ msgid "B<FFLAGS_APPEND>"
-#~ msgstr "B<FFLAGS_APPEND>"
-
-#~ msgid "Same as B<CFLAGS_APPEND> for Fortran sources."
-#~ msgstr "identique à B<CFLAGS_APPEND> pour des sources en Fortran."
-
-#~ msgid ""
-#~ "Preprocessor flags which are passed to the Debian build system and can/"
-#~ "should be overridden by the package build if needed (default: empty). "
-#~ "This macro is seldom used (most build systems just use B<CFLAGS> instead "
-#~ "of B<CPPFLAGS>)."
-#~ msgstr ""
-#~ "Les drapeaux du préprocesseur qui sont passés au système de construction "
-#~ "Debian peuvent être remplacés par ceux du paquet en construction si "
-#~ "besoin (par défaut : aucun). Cette macro est rarement utilisée (la "
-#~ "plupart des systèmes de construction utilisent simplement B<CFLAGS> au "
-#~ "lieu de B<CPPFLAGS>)."
-
-#~ msgid "B<CPPFLAGS_APPEND>"
-#~ msgstr "B<CPPFLAGS_APPEND>"
-
-#~ msgid ""
-#~ "Preprocessor flags appended to the preprocessor flags, which must not be "
-#~ "overwritten by the package (mostly used to for test builds). Default "
-#~ "value: empty."
-#~ msgstr ""
-#~ "Drapeaux du préprocesseur liés à ceux de ce dernier, qui ne doivent pas "
-#~ "être remplacés par ceux du paquet (le plus souvent utilisé pour des tests "
-#~ "de construction). Valeur par défaut : aucuns."
-
-#~ msgid "B<LDFLAGS_APPEND>"
-#~ msgstr "B<LDFLAGS_APPEND>"
-
-#~ msgid ""
-#~ "Optimization options appended to the compiler flags when linking code, "
-#~ "which must not be overwritten by the package (mostly used to for test "
-#~ "builds). Default value: empty."
-#~ msgstr ""
-#~ "Options d'optimisation passées par les drapeaux du compilateur durant la "
-#~ "phase de liaison, qui ne doivent pas être remplacés par ceux du paquet "
-#~ "(le plus souvent utilisé pour des tests de construction). Valeur par "
-#~ "défaut : aucunes."
-
-#~ msgid "include all changes."
-#~ msgstr "inclut tous les changements."
-
-#~ msgid "B<--licence>, B<--license>"
-#~ msgstr "B<--licence>, B<--license>"
-
-#~ msgid "Display B<dpkg> licence."
-#~ msgstr "Affiche la licence de B<dpkg>."
-
-#~ msgid "ENVIRONMENT VARIABLES"
-#~ msgstr "VARIABLES D'ENVIRONNEMENT"
-
-#~ msgid ""
-#~ "Define this to something if you prefer B<dpkg> starting a new shell "
-#~ "rather than suspending itself, while doing a shell escape."
-#~ msgstr ""
-#~ "Donnez lui une valeur si vous préférez que B<dpkg> lance un nouvel "
-#~ "interpréteur de commandes plutôt que de s'interrompre, pour faire un "
-#~ "appel à l'interpréteur de commandes."
-
-#~ msgid "B<--license>, B<--licence>"
-#~ msgstr "B<--license>, B<--licence>"
-
-#~ msgid "Show the copyright licensing terms and exit."
-#~ msgstr ""
-#~ "Affiche des renseignements sur le copyright et la licence, puis quitte."
-
-#~ msgid ""
-#~ "Read substitution variables in I<substvarsfile>; the default is B<debian/"
-#~ "substvars>."
-#~ msgstr ""
-#~ "Lire les variables de substitution dans I<fichier/substvars> ; le fichier "
-#~ "par défaut est B<debian/substvars>."
-
-#~ msgid "B<-l>, B<--license>"
-#~ msgstr "B<-l>, B<--license>"
-
-#~ msgid "B<-I>[I<file-pattern>]"
-#~ msgstr "B<-I>[I<motif-de-fichier>]"
-
-#~ msgid "B<--licence>|B<--license>"
-#~ msgstr "B<--licence>|B<--license>"
-
-#~ msgid ""
-#~ "Displays the B<dselect> copyright and license information and exits "
-#~ "successfully."
-#~ msgstr ""
-#~ "Affiche les informations sur le copyright et sur la licence de "
-#~ "B<dselect>, puis se termine normalement."
-
-#~ msgid "B<-h>"
-#~ msgstr "B<-h>"
-
-#~ msgid "B<--without-quilt>"
-#~ msgstr "B<--without-quilt>"
-
-#~ msgid ""
-#~ "Don't use quilt to apply patches but dpkg-source's own code. It won't be "
-#~ "possible to use quilt directly on the unpacked directory but it will be "
-#~ "free of quilt's temporary files as well."
-#~ msgstr ""
-#~ "Ne pas utiliser « quilt » afin d'appliquer des correctifs, mais le code "
-#~ "même de dpkg-source. Il ne sera pas possible d'utiliser directement "
-#~ "« quilt » sur le répertoire dépaqueté mais il sera libre d'en faire usage "
-#~ "sur les fichiers temporaires."
-
-#~ msgid "B<-z>I<level>"
-#~ msgstr "B<-z>I<niveau>"
-
-#~ msgid "Forget about uninstalled unavailable packages."
-#~ msgstr ""
-#~ "Oublie ce qui concerne les paquets non installés ou non disponibles."
-
-#~ msgid "install-info"
-#~ msgstr "install-info"
-
-#~ msgid "install-info - create or update entry in Info dir file"
-#~ msgstr ""
-#~ "install-info - Création ou mise à jour d'une entrée dans le fichier dir "
-#~ "du système Info."
-
-#~ msgid ""
-#~ "B<install-info> [B<--version>] [B<--help>] [B<--debug>] [B<--"
-#~ "maxwidth=>I<nnn>] [B<--section >I<regexp>B< >I<title>] [B<--"
-#~ "infodir=>I<xxx>] [B<--align=>I<nnn>] [B<--quiet>] [B<--menuentry=>I<xxx>] "
-#~ "[B<--description=>I<xxx>] [B<--remove>|B<--remove-exactly>] [B<-->] "
-#~ "I<filename>"
-#~ msgstr ""
-#~ "B<install-info> [B<--version>] [B<--help>] [B<--debug>] [B<--"
-#~ "maxwidth=nnn>] [B<--section >I<regexp>B< >I<title>] [B<--infodir=>I<xxx>] "
-#~ "[B<--align=>I<nnn>] [B<--quiet>] [B<--menuentry=>I<xxx>] [B<--"
-#~ "description=>I<xxx>] [B<--remove>|B<--remove-exactly>] [B<-->] I<fichier>"
-
-#~ msgid ""
-#~ "B<install-info> creates, updates or removes entries in the Info B<dir> "
-#~ "file. When updating or creating entries, if no description is specified "
-#~ "on the command line or in the Info file, it attempts to guess a "
-#~ "description from the contents of the file."
-#~ msgstr ""
-#~ "B<install-info> crée, met à jour ou supprime des entrées dans le fichier "
-#~ "B<dir> d'Info. Quand, pour la création ou la mise à jour d'une entrée, on "
-#~ "ne donne aucune description sur la ligne de commande ou dans le fichier "
-#~ "Info, B<install-info> essaie d'en deviner une à travers le contenu du "
-#~ "fichier."
-
-#~ msgid ""
-#~ "See the description of the B<--section> option for details of where the "
-#~ "entry will be placed and a description of the expected format of the "
-#~ "B<dir> file."
-#~ msgstr ""
-#~ "Voyez la description de l'option B<--section> pour des précisions sur "
-#~ "l'emplacement choisi pour l'entrée et sur le format attendu du fichier "
-#~ "B<dir.>"
-
-#~ msgid "B<[--] >I<filename>"
-#~ msgstr "B<[--] >I<nom-de-fichier>"
-
-#~ msgid ""
-#~ "Gives the filename of the Info file whose menu entry is to be created, "
-#~ "updated or removed. If B<--remove-exactly> is specified, then I<filename> "
-#~ "should be the exact entry name to be removed (e.g. \"emacs-20/emacs\" or "
-#~ "\"gcc\"), otherwise the basename of this filename is used as the referent "
-#~ "of the menu entry which is created, unless there's an overriding START-"
-#~ "INFO-DIR entry inside the given file. This file must therefore exist (or "
-#~ "be about to be installed, or have previously existed when removing an "
-#~ "entry) in the same directory as the B<dir> file (see the B<--infodir> "
-#~ "option)."
-#~ msgstr ""
-#~ "Donne le nom du fichier Info dont l'entrée de menu doit être créée, mise "
-#~ "à jour ou supprimée. Si l'option B<--remove-exactly> est précisée, "
-#~ "I<fichier> sera le nom exact de l'entrée à supprimer (p. ex. « emacs-20/"
-#~ "emacs » ou « gcc ») ; dans les autres cas, la partie principale de ce nom "
-#~ "sert de référent pour l'entrée de menu qui est créée, à moins qu'il y "
-#~ "ait, dans le fichier donné, une entrée START-INFO-DIR. Ce fichier doit "
-#~ "donc exister (ou bien être sur le point d'être installé, ou bien doit "
-#~ "avoir existé en cas de suppression d'entrée) dans le même répertoire que "
-#~ "le fichier B<dir> (voyez l'option B<--infodir>)."
-
-#~ msgid ""
-#~ "If I<filename> ends in B<.gz>, it is taken to refer to a file compressed "
-#~ "with B<gzip>; if it doesn't exist, but a corresponding I<filename>B<.gz> "
-#~ "does, the latter is used instead."
-#~ msgstr ""
-#~ "Indique que si une entrée doit être créée, elle sera placée dans la "
-#~ "section du un fichier comprimé avec B<gzip> ; s'il n'existe pas, mais "
-#~ "qu'il y a un I<nom-de-fichier>B<.gz>, on utilisera ce dernier."
-
-#~ msgid ""
-#~ "When adding or updating entries, the file must exist at the path "
-#~ "specified (possibly with an additional B<.gz> extension)."
-#~ msgstr ""
-#~ "Quand on ajoute ou on met à jour des entrées, ce fichier doit exister "
-#~ "dans le chemin spécifié (si possible avec l'extension B<.gz> "
-#~ "supplémentaire)."
-
-#~ msgid ""
-#~ "Specifies that the entry for the file I<filename> is to be removed; by "
-#~ "default entries are created or updated."
-#~ msgstr ""
-#~ "Demande que l'entrée pour le fichier I<nom-de-fichier> soit détruite ; "
-#~ "par défaut les entrées sont créées ou mises à jour."
-
-#~ msgid ""
-#~ "If the removal results in a section becoming empty, the section heading "
-#~ "(and the spare blank line) will be removed as well, unless this is the "
-#~ "last section in the file or B<--keep-old> is specified. See the B<--"
-#~ "section> option for details about the expected format of the B<dir> file."
-#~ msgstr ""
-#~ "Quand la suppression d'une entrée vide une section, l'en-tête (et la "
-#~ "ligne blanche détachée) de la section est supprimée aussi, à moins que ce "
-#~ "ne soit la dernière section du fichier ou bien que l'option B<--keep-old> "
-#~ "soit indiquée. Voyez l'option B<--section> pour des précisions sur le "
-#~ "format attendu du fichier B<dir>."
-
-#~ msgid ""
-#~ "If there are several suitable entries in the B<dir> file, only those in "
-#~ "the first matching contiguous group will be removed and the others "
-#~ "silently ignored."
-#~ msgstr ""
-#~ "Quand il y a plusieurs entrées possibles dans le fichier B<dir>, seules "
-#~ "celles qui appartiennent au premier groupe contigu correspondant sont "
-#~ "supprimées ; les autres sont silencieusement ignorées."
-
-#~ msgid ""
-#~ "It is not an error for no suitable entry to be found, though B<install-"
-#~ "info> will issue a warning unless the B<--quiet> option was specified."
-#~ msgstr ""
-#~ "Ne pas trouver d'entrée possible n'est pas une erreur, bien que B<install-"
-#~ "info> avertisse du problème quand l'option B<--quiet> n'a pas été "
-#~ "demandée."
-
-#~ msgid ""
-#~ "When B<--remove> is specified the B<--maxwidth>, B<--align> and B<--"
-#~ "calign> formatting options are silently ignored."
-#~ msgstr ""
-#~ "Quand B<--remove> est spécifié, les options de formatage B<--maxwidth>, "
-#~ "B<--align> et B<--calign> sont silencieusement ignorées."
-
-#~ msgid "B<--remove-exactly>"
-#~ msgstr "B<--remove-exactly>"
-
-#~ msgid ""
-#~ "This option is essentially the same as B<--remove> except that "
-#~ "I<filename> is taken as the exact entry to be removed, rather than as the "
-#~ "name of an existing file. This can be important when trying to remove "
-#~ "entries that refer to info files in subdirectories (e.g. \"emacs-20/emacs"
-#~ "\") because B<--remove> will operate on the basename of the given "
-#~ "I<filename> rather than the exact name given. (i.e.  B<--remove> "
-#~ "\"emacs-20/emacs\" would cause B<install-info> to look for \"emacs\", not "
-#~ "\"emacs-20/emacs\")."
-#~ msgstr ""
-#~ "Cette option est pratiquement identique à B<--remove> mais I<fichier> est "
-#~ "compris comme le nom exact de l'entrée à supprimer plutôt que comme le "
-#~ "nom d'un fichier existant. Cela peut être important quand on essaie de "
-#~ "supprimer des entrées pour des fichiers info dans des sous-répertoires "
-#~ "(p. ex. « emacs-20/emacs ») car B<--remove> opère sur la partie "
-#~ "principale du I<fichier> plutôt que sur le nom exact. (p. ex.  B<--"
-#~ "remove> « emacs-20/emacs » forcerait B<install-info> à chercher "
-#~ "« emacs », pas « emacs-20/emacs »)."
-
-#~ msgid "B<--section >I<regexp title>"
-#~ msgstr "B<--section >I<exp-reg titre>"
-
-#~ msgid ""
-#~ "Specifies that if a new entry is to be made, it should be placed in a "
-#~ "section of the B<dir> file whose title matches I<regexp>.  If no such "
-#~ "section exists, one will be created as the second to last section in the "
-#~ "file (see below) with title I<title>.  A section is a part of the B<dir> "
-#~ "menu delimited by blank lines; the first line is assumed to be the title."
-#~ msgstr ""
-#~ "Indique que l'entrée qui doit être créée sera placée dans la section du "
-#~ "fichier B<dir> dont le titre correspond à I<exp-reg>. Si une telle "
-#~ "section n'existe pas, une nouvelle dernière section (voyez ci-après) est "
-#~ "créée dans le fichier, avec un titre égal à I<titre>. Une section est un "
-#~ "choix possible dans le menu de B<dir> ; les choix sont séparés par des "
-#~ "lignes blanches ; la première ligne est supposée représenter le titre."
-
-#~ msgid ""
-#~ "If a new entry is to be created, B<install-info> will attempt to insert "
-#~ "it within the section in alphabetic order. If the entries in the section "
-#~ "aren't already sorted, the new location within the section will be "
-#~ "unpredictable. The order of existing entries will not be changed."
-#~ msgstr ""
-#~ "Quand une nouvelle entrée doit être créée, B<install-info> essaie de "
-#~ "l'insérer dans la section selon l'ordre alphabétique. Si les entrées de "
-#~ "la section ne sont pas déjà triées, on ne peut prévoir l'emplacement qui "
-#~ "sera choisi. L'ordre existant des entrées n'est pas modifié."
-
-#~ msgid ""
-#~ "If the B<--section> option is not specified, B<install-info> will look "
-#~ "for a title in the Info file itself by looking for an entry of the form"
-#~ msgstr ""
-#~ "Si l'option B<--section> n'est pas spécifiée, B<install-info> recherchera "
-#~ "un titre dans le fichier Info lui-même, en recherchant une entrée de la "
-#~ "forme :"
-
-#~ msgid "B<INFO-DIR-SECTION>I< title>"
-#~ msgstr "B<INFO-DIR-SECTION>I< titre>"
-
-#~ msgid ""
-#~ "If no section title is found, the default is to append new entries to the "
-#~ "end of the file. The last section (even if it only consists of the title "
-#~ "line) should always exist to ensure that new sections are created in the "
-#~ "right place. The final section should be titled to reflect the fact that "
-#~ "Info files with no better specified location are appended to it."
-#~ msgstr ""
-#~ "Par défaut, si aucun titre de section n'est trouvé, les entrées nouvelles "
-#~ "sont ajoutées à la fin du fichier. La dernière section doit toujours "
-#~ "exister (même si elle consiste en une simple ligne de titre) de manière "
-#~ "que les nouvelles sections puissent être créées au bon endroit. Le titre "
-#~ "de la dernière section devrait refléter le fait que des fichiers Info "
-#~ "sans emplacement bien défini sont ajoutés à la fin de cette section."
-
-#~ msgid ""
-#~ "If there is already an entry for the Info file being installed, it is "
-#~ "replaced in situ with the new entry."
-#~ msgstr ""
-#~ "Quand le fichier Info que l'on doit installer possède déjà une entrée, "
-#~ "celle-ci est remplacée in situ par la nouvelle entrée."
-
-#~ msgid ""
-#~ "If a section is specified when removing an entry, the section is ignored "
-#~ "and a warning is issued."
-#~ msgstr ""
-#~ "Quand on supprime une entrée, une section spécifiée est ignorée et un "
-#~ "avertissement est produit."
-
-#~ msgid ""
-#~ "If a section is requested when adding an entry, but the file contains no "
-#~ "section headings at all, then B<install-info> will create both the "
-#~ "requested section and a Miscellaneous section at the end of the file."
-#~ msgstr ""
-#~ "Quand on ajoute une entrée et qu'une section est spécifiée, mais que le "
-#~ "fichier ne contient aucun en-tête de section, B<install-info> crée à la "
-#~ "fois la section demandée et une section « Miscellaneous » à la fin du "
-#~ "fichier."
-
-#~ msgid ""
-#~ "Specifies that the B<dir> file is, and the installed copy of the new Info "
-#~ "file was, is or will be located in I<infodir>.  The default is B</usr/"
-#~ "share/info/>."
-#~ msgstr ""
-#~ "Spécifie que le fichier B<dir> est situé dans I<infodir>, ou que la copie "
-#~ "installée du nouveau fichier Info était, est ou sera située dans "
-#~ "I<infodir>. Par défaut, c'est B</usr/share/info>."
-
-#~ msgid "B<--align=>I<nnn>B< [deprecated]>"
-#~ msgstr "B<--align=>I<nnn>B< [déconseillé]>"
-
-#~ msgid ""
-#~ "Specifies that the first line of the description should be indented at "
-#~ "least I<nnn> characters; extra spaces will be added as required. If "
-#~ "necessary because of the length of the B<dir> menu entry details, it may "
-#~ "be offset more. The default is 27."
-#~ msgstr ""
-#~ "Précise que l'espace d'indentation de la première ligne de la description "
-#~ "sera d'au moins I<nnn> caractères ; des espaces supplémentaires peuvent "
-#~ "être ajoutées. Quand la longueur des éléments de l'entrée du menu B<dir> "
-#~ "le demande, on peut le décaler davantage. Par défaut ce nombre est égal à "
-#~ "27."
-
-#~ msgid "B<--calign=>I<nnn>B< [deprecated]>"
-#~ msgstr "B<--calign=>I<nnn>B< [déconseillé]>"
-
-#~ msgid ""
-#~ "Specifies that the second and subsequent lines of the description should "
-#~ "be indented at least I<nnn> characters. The default is 29."
-#~ msgstr ""
-#~ "Précise que l'espace d'indentation de la deuxième ligne et des lignes "
-#~ "suivantes de la description sera d'au moins I<nnn> caractères. Par défaut "
-#~ "ce nombre est égal à 29."
-
-#~ msgid "B<--maxwidth=>I<nnn>B< [deprecated]>"
-#~ msgstr "B<--maxwidth=>I<nnn>B< [déconseillé]>"
-
-#~ msgid ""
-#~ "Specifies that the maximum width for the Info file is I<nnn>.  This is "
-#~ "used when word-wrapping the descriptive text.  The default is 79."
-#~ msgstr ""
-#~ "Précise que la largeur maximale d'une ligne du fichier Info est de "
-#~ "I<nnn>. Cela sert pour « couper » automatiquement les lignes du texte "
-#~ "descriptif. Par défaut ce nombre est égal à 79."
-
-#~ msgid ""
-#~ "Prevents the usual display of the new menu entry just before it is "
-#~ "inserted and of the messages announcing the replacement and removal of "
-#~ "existing entries and the creation and deletion of sections."
-#~ msgstr ""
-#~ "Empêche l'affichage normal de la nouvelle entrée du menu juste avant "
-#~ "qu'elle soit insérée et l'affichage de messages annonçant le remplacement "
-#~ "ou la suppression d'entrées existantes ou la création ou la suppression "
-#~ "de section."
-
-#~ msgid "Causes B<install-info> to display its usage information and exit."
-#~ msgstr "Option pour afficher une aide sur l'utilisation de B<install-info>"
-
-#~ msgid ""
-#~ "Causes B<install-info> to display its version and copyright information "
-#~ "and exit."
-#~ msgstr "Option pour afficher la version et le copyright de B<install-info>"
-
-#~ msgid ""
-#~ "Specifies that the description to use after the menu entry in new or "
-#~ "updated entries be I<xxx>.  The default is to use the value specified in "
-#~ "the Info file itself; this is found by searching for a section of the form"
-#~ msgstr ""
-#~ "Précise que la description employée après l'entrée du menu pour une "
-#~ "nouvelle entrée ou bien pour une entrée mise à jour sera I<xxx>. Par "
-#~ "défaut, on emploie la valeur indiquée par le fichier Info lui-même ; on "
-#~ "peut la trouver en cherchant une section de la forme suivante :"
-
-#~ msgid "B<START-INFO-DIR-ENTRY>"
-#~ msgstr "B<START-INFO-DIR-ENTRY>"
-
-#~ msgid "B<* Auto-PGP: (auto-pgp). PGP under GNU Emacs.>"
-#~ msgstr "B<* Auto-PGP: (auto-pgp). PGP under GNU Emacs.>"
-
-#~ msgid "B<END-INFO-DIR-ENTRY>"
-#~ msgstr "B<END-INFO-DIR-ENTRY>"
-
-#~ msgid ""
-#~ "If the entry found in the Info file itself extends across several lines, "
-#~ "each giving a menu entry, the text found in the file is used verbatim. In "
-#~ "this case, the alphabetic ordering scheme is turned off, and the entries "
-#~ "are inserted at the top of section in question. In this case, the B<--"
-#~ "menuentry>, B<--maxwidth>, B<--align>, B<--calign> and B<--menuentry> "
-#~ "options are ignored."
-#~ msgstr ""
-#~ "Quand l'entrée trouvée dans le fichier Info lui-même s'étend sur "
-#~ "plusieurs lignes, chacune donnant une entrée du menu, on reprend le texte "
-#~ "trouvé « verbatim ». Dans ce cas, on ne tient pas compte de l'ordre "
-#~ "alphabétique et les entrées sont insérées au début de la section en "
-#~ "question.  Et les options B<--menuentry>, B<--maxwidth>, B<--align>, B<--"
-#~ "calign> sont ignorées."
-
-#~ msgid ""
-#~ "If there is no B<dir> entry in the file, the program will try to find a "
-#~ "paragraph early in the file starting B<this file documents>.  It will "
-#~ "capitalise the first character of the remainder, and use that."
-#~ msgstr ""
-#~ "Quand il n'y a pas d'entrée pour B<dir> dans le fichier, le programme "
-#~ "essaie de trouver un paragraphe au début du fichier qui commence par "
-#~ "B<this file documents>. Il met une capitale au premier caractère de la "
-#~ "suite et l'utilise comme description."
-
-#~ msgid "It is an error for none of these methods to yield a description."
-#~ msgstr ""
-#~ "C'est une erreur si aucune de ces méthodes ne peut donner une description."
-
-#~ msgid ""
-#~ "If a description argument is given when B<--remove> is specified, it is "
-#~ "ignored and a warning is issued."
-#~ msgstr ""
-#~ "Quand l'option B<--remove> est donnée, l'argument pour l'option « "
-#~ "description » est ignoré et un avertissement est produit."
-
-#~ msgid "B<--menuentry=>I<xxx>"
-#~ msgstr "B<--menuentry=>I<xxx>"
-
-#~ msgid ""
-#~ "Specifies that the entry in the menu should be I<xxx>.  The default is to "
-#~ "use the value specified in the Info file itself.  If this is not present, "
-#~ "the basename of the Info file is used (any B<.info >is deleted, and the "
-#~ "entry is made mixed case).  See above for details of the format expected "
-#~ "for the menu entry in the Info file."
-#~ msgstr ""
-#~ "Précise que l'entrée de menu sera I<xxx>. Par défaut, on emploie la "
-#~ "valeur indiquée par le fichier Info lui-même. Quand elle n'est pas "
-#~ "présente, la partie principale du nom du fichier Info est utilisée (tout "
-#~ "fichier B<.info >est supprimé et la première lettre de l'entrée est "
-#~ "capitalisée). Voyez ci-dessus pour des précisions sur le format attendu "
-#~ "pour l'entrée de menu dans le fichier Info."
-
-#~ msgid ""
-#~ "When removing entries, the value of the B<--menuentry> option must match "
-#~ "the actual menu entry field in the menu item to be removed (case not "
-#~ "significant). If B<--menuentry> is omitted, no check on the menu entry is "
-#~ "done."
-#~ msgstr ""
-#~ "Quand on supprime des entrées, la valeur de l'option B<--menuentry> doit "
-#~ "correspondre au champ réel de l'entrée de menu qui doit être supprimée "
-#~ "(peu importe la casse). Quand l'option B<--menuentry> est omise, aucune "
-#~ "vérification sur l'entrée de menu n'est faite."
-
-#~ msgid "B<--keep-old>"
-#~ msgstr "B<--keep-old>"
-
-#~ msgid ""
-#~ "Inhibits the replacement of existing entries and the removal of empty "
-#~ "sections."
-#~ msgstr ""
-#~ "Empêche le remplacement d'entrées existantes et la suppression des "
-#~ "sections vides."
-
-#~ msgid ""
-#~ "If the file being installed already has an entry in the Info B<dir> file, "
-#~ "the old entry will be left alone instead of being replaced; the default "
-#~ "is to overwrite any old entry found with the newly generated one."
-#~ msgstr ""
-#~ "Quand le fichier qu'on doit installer possède déjà une entrée dans le "
-#~ "fichier B<dir> d'Info, l'ancienne entrée est laissée seule plutôt que "
-#~ "remplacée. Par défaut, toute entrée ancienne trouvée est remplacée par la "
-#~ "nouvelle."
-
-#~ msgid ""
-#~ "If B<--remove> is specified, B<--keep-old> will prevent the removal of "
-#~ "the section heading which would otherwise happen if the section is made "
-#~ "empty by the removal."
-#~ msgstr ""
-#~ "Quand l'option B<--remove> est indiquée, B<--keep-old> empêche la "
-#~ "suppression de l'en-tête de section qui sans cela serait supprimé si la "
-#~ "suppression vidait la section."
-
-#~ msgid ""
-#~ "Enables test mode, which inhibits the update of the Info B<dir> file."
-#~ msgstr ""
-#~ "Met en mode test, lequel empêche la mise à jour du fichier B<dir> d'Info."
-
-#~ msgid ""
-#~ "Enables debugging mode, in which the results of some internal processing "
-#~ "steps are shown."
-#~ msgstr ""
-#~ "Met en mode débogage, lequel montre les résultats de certaines étapes du "
-#~ "traitement."
-
-#~ msgid "B<emacs>(1), B<info>(1), B<gzip(1).>"
-#~ msgstr "B<emacs>(1), B<info>(1), B<gzip>(1)."
-
-#~ msgid "Vendor identification"
-#~ msgstr "Identifzierung des Lieferanten"
-
-#~ msgid ""
-#~ "The variable B<DEB_VENDOR> will be set to the name of the current vendor "
-#~ "if I<%PKGCONFDIR%/origins/default> exists and can be used to look up the "
-#~ "vendor name. If the variable already exists, and contains the name of an "
-#~ "existing vendor in I<%PKGCONFDIR%/origins>, it will be kept; otherwise "
-#~ "the variable is unset."
-#~ msgstr ""
-#~ "Die Variable B<DEB_VENDOR> wird auf den Namen des derzeitigen Lieferanten "
-#~ "(englisch: vendor) gesetzt, falls I<%PKGCONFDIR%/origins/default> "
-#~ "existiert und zum Nachschlagen des Lieferanten genutzt werden kann. Falls "
-#~ "die Variable bereits existiert und den Namen eines existierenden "
-#~ "Lieferanten in I<%PKGCONFDIR%/origins> enthlt, wird diese beibehalten; "
-#~ "andernfalls wird die Variable zurckgesetzt (d.h. sie ist im Bauprozess "
-#~ "nicht gesetzt)."
-
-#~ msgid ""
-#~ "This is a variant of the 2.0 format. The differences concern the "
-#~ "management of the patches. This format uses an explicit list of patches "
-#~ "contained in B<debian/patches/debian.series> or B<debian/patches/series>."
-#~ msgstr ""
-#~ "Dies ist eine Variante des 2.0-Formats. Die Unterschiede betreffen die "
-#~ "Verwaltung der Patches. Dieses Format verwendet eine explizite Liste von "
-#~ "Patches, die in B<debian/patches/debian.series> oder B<debian/patches/"
-#~ "series> enthalten sind."
-
-#~ msgid "Unpacking of tarballs is done exactly like in the 2.0 format."
-#~ msgstr "Das Entpacken des Tarballs erfolgt exakt wie im 2.0-Format."
-
-#~ msgid ""
-#~ "The B<.pc> directory used by quilt is ignored during generation of the "
-#~ "automatic patch."
-#~ msgstr ""
-#~ "Das von Quilt verwandte B<.pc>-Verzeichnis wird whrend der Erstellung des "
-#~ "automatischen Patches ignoriert."
-
-#~ msgid "It supports all the options of the 2.0 format."
-#~ msgstr "Es untersttzt alle Optionen des 2.0-Formats."
-
-#~ msgid ""
-#~ "Furthermore, in some cases, this will lead to a non-versioned dependency "
-#~ "on the library that could have been avoided if the binary was only linked "
-#~ "against libraries that it really uses. The exception to this rule is when "
-#~ "several binaries are linked against the same set of libraries but each "
-#~ "binary only uses a subset of those. You will have warnings on individual "
-#~ "binaries, but the set of libraries needed at the package level is the "
-#~ "same whether you fix the binaries or not."
-#~ msgstr ""
-#~ "Desweiteren fhrt dies in einigen Fllen zu einer unversionierten "
-#~ "Abhngigkeit auf diese Bibliothek, die vermieden werden knnte, falls das "
-#~ "Programm nur gegen Bibliotheken gelinkt wre, die es wirklich verwendet. "
-#~ "Die Ausnahme dieser Regel liegt dann vor, wenn mehrere Programme gegen "
-#~ "den gleichen Satz an Bibliotheken gelinkt sind, aber jedes Programm nur "
-#~ "eine Teilmenge davon verwendet. Sie werden fr die einzelnen Programme "
-#~ "individuelle Warnungen erhalten, aber der bentigte Satz an Bibliotheken "
-#~ "ist auf der Paketebene identisch, ob sie die Programme korrigieren oder "
-#~ "nicht."
-
-#~ msgid ""
-#~ "Shared library information generated by the current build process that "
-#~ "also invoked B<dpkg-shlibdeps>."
-#~ msgstr ""
-#~ "Laufzeitbibliotheksinformationen, die vom aktuellen Bauprozess erstellt "
-#~ "werden, der auch B<dpkg-shlibdeps> aufruft."
-
-#~ msgid "I<E<lt>divert-toE<gt>> is the name used by other packages' versions."
-#~ msgstr ""
-#~ "I<E<lt>umzuleitende<gt>> ist der Name der Datei, der von Versionen "
-#~ "anderer Pakete benutzt wird."
-
-#~ msgid "Specifies that all packages' versions are diverted."
-#~ msgstr "Gibt an, dass die Versionen aus allen Paketen umgeleitet sind."
-
-#~ msgid "Do not clean the source tree (implies B<-b>)."
-#~ msgstr "Ne pas nettoyer l'arborescence source (implique l'option B<-b>)."
-
-#~ msgid ""
-#~ "B<Deprecated>. Set an output substitution variable.  See B<deb-"
-#~ "substvars>(5) for a discussion of output substitution."
-#~ msgstr ""
-#~ "B<Deprecated>. Fixe la valeur d'une variable de substitution. Consultez "
-#~ "B<deb-substvars>(5) pour une discussion sur la valeur de substitution."
-
-#~ msgid "generic name"
-#~ msgstr "nom générique"
-
-#~ msgid "symlink"
-#~ msgstr "lien symbolique"
-
-#~ msgid ""
-#~ "Without any further qualification, this means a symbolic link in the "
-#~ "alternatives directory: one which the system administrator is expected to "
-#~ "adjust."
-#~ msgstr ""
-#~ "Sans autre information, c'est un lien symbolique qui se trouve dans le "
-#~ "répertoire alternatives, lien que l'administrateur système est supposé "
-#~ "établir."
-
-#~ msgid "Call B<--config> on all alternatives."
-#~ msgstr "Appelle B<--config> sur toutes les alternatives."
-
-#, fuzzy
-#~ msgid "B<Error:> E<lt>error detailsE<gt>"
-#~ msgstr "B<Priority:> E<lt>prioritéE<gt>"
-
-#, fuzzy
-#~ msgid ""
-#~ "The B<-s>I<x> options control whether the original source archive is "
-#~ "included in the upload if any source is being generated (i.e.  B<-b>, B<-"
-#~ "B> or B<-A> haven't been used)."
-#~ msgstr ""
-#~ "Les options B<-s>I<x> contrôlent si l'archive source originale est "
-#~ "incluse dans l'installation produite si un paquet source est créé (cad. "
-#~ "que les options B<-b> ou B<-B> n'ont pas été utilisées)."
-
-#~ msgid ""
-#~ "By default, or if specified, the original source will be included if the "
-#~ "version number ends in B<-0> or B<-1>, i.e. if the Debian revision part "
-#~ "of the version number is B<0> or B<1>."
-#~ msgstr ""
-#~ "Par défaut, ou si spécifié, les sources originales sont incluses si le "
-#~ "numéro de version se termine par B<-0> ou B<-1>, c'est-à-dire si la "
-#~ "partie « révision Debian » du numéro de version est égal à B<0> ou B<1>."
-
-#~ msgid ""
-#~ "Use changelog information from all versions strictly later than "
-#~ "I<version>."
-#~ msgstr ""
-#~ "Utilise les informations contenues dans le fichier « changelog » et qui "
-#~ "concernent toutes les versions strictement plus récentes que I<version>."
-
-#~ msgid "B<-E>"
-#~ msgstr "B<-E>"
-
-#~ msgid ""
-#~ "Turn certain warnings into errors. Only B<dpkg-source> uses this, but "
-#~ "B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
-#~ msgstr ""
-#~ "Transforme certains avertissements en erreurs. Seul B<dpkg-source> "
-#~ "l'utilise, mais B<dpkg-buildpackage> la reconnaît et la transmet à B<dpkg-"
-#~ "source>."
-
-#~ msgid "B<-W>"
-#~ msgstr "B<-W>"
-
-#~ msgid ""
-#~ "Negates a previously set B<-E>.  Only B<dpkg-source> uses this, but "
-#~ "B<dpkg-buildpackage> recognizes it, and passes it thru to B<dpkg-source>."
-#~ msgstr ""
-#~ "Annule une option B<-E> utilisée précédemment. Seul B<dpkg-source> "
-#~ "l'utilise, mais B<dpkg-buildpackage> la reconnaît et la transmet à B<dpkg-"
-#~ "source>."
-
-#~ msgid ""
-#~ "There is no authentication on B<.deb> files; in fact, there isn't even a "
-#~ "straightforward checksum."
-#~ msgstr ""
-#~ "Il n'y a pas de validation des fichiers B<.deb ;> en fait, il n'y a même "
-#~ "pas de simple somme de contrôle."
-
-#~ msgid ""
-#~ "A simpler one-shot command to retrieve and update the I<available> file "
-#~ "is B<dselect update>."
-#~ msgstr ""
-#~ "Pour récupérer et mettre à jour le fichier I<available>, il existe une "
-#~ "commande plus simple : B<dselect update>."
-
-#~ msgid ""
-#~ "Display details about I<package-name>, as found in I<%ADMINDIR%/"
-#~ "available>."
-#~ msgstr ""
-#~ "Affiche des renseignements détaillés sur I<paquet>, tels qu'ils sont "
-#~ "trouvés dans le fichier I<%ADMINDIR%/available>."
-
-#~ msgid ""
-#~ "Send package status info to file descriptor I<E<lt>nE<gt>>. This can be "
-#~ "given multiple times. Status updates are of the form `status: "
-#~ "E<lt>pkgE<gt>: E<lt>pkg stateE<gt>'.  Errors are reported as `status: "
-#~ "E<lt>pkgE<gt>: error: extend-error-message'.  Configuration file "
-#~ "conflicts are reported as `status: conffile-prompt: conffile : 'current-"
-#~ "conffile' 'new-conffile' useredited distedited'."
-#~ msgstr ""
-#~ "Cette action envoie des informations sur l'état d'un paquet au "
-#~ "descripteur de fichier I<E<lt>nE<gt>>. On peut répéter l'opération "
-#~ "plusieurs fois. La mise à jour d'un état est de la forme : « status: "
-#~ "E<lt>pkgE<gt>: E<lt>pkg stateE<gt> ».  Une erreur est signalée sous la "
-#~ "forme : E<lt>pkgE<gt>: error: extend-error-message.  Un conflit avec un "
-#~ "fichier de configuration est signalé sous la forme : status: conffile-"
-#~ "prompt: conffile : 'current-conffile' 'new-conffile' useredited distedited"
-
-#, fuzzy
-#~ msgid "B<-b> I<directory> [I<orig-directory>|I<orig-targz>|'']"
-#~ msgstr ""
-#~ "B<-b> [I<options>] I<répertoire> [I<répertoire-d'origine>|B<orig-"
-#~ "targz>|'']"
-
-#, fuzzy
-#~ msgid "This option turns certain warnings into errors."
-#~ msgstr "Cette option transforme certaines erreurs en avertissements."
-
-#, fuzzy
-#~ msgid "This option negates a previously set B<-E>."
-#~ msgstr "Cette option annule une option B<-W> utilisée précédemment."
-
-#~ msgid ""
-#~ "The binary package entries in the B<debian/files> file will be passed "
-#~ "through variable substitution twice. This should not matter, since B<$>, "
-#~ "B<{> and B<}> are not legal in package names or version numbers."
-#~ msgstr ""
-#~ "On opère deux fois la substitution de variable sur les entrées d'un "
-#~ "paquet binaire dans le fichier B<debian/files>. Cela ne devrait pas poser "
-#~ "de problème puisque B<$>, B<{> et B<}> ne sont pas permis dans les noms "
-#~ "de paquet et les numéros de version."
-
-#, fuzzy
-#~ msgid "shlibs"
-#~ msgstr "deb-shlibs"
-
-#, fuzzy
-#~ msgid "FIXME not used in the source!?"
-#~ msgstr "Ne pas signer le paquet source."
-
-#, fuzzy
-#~ msgid ""
-#~ "Don't actually do anything, just say what would be done.  This option is "
-#~ "not yet implemented."
-#~ msgstr ""
-#~ "Ne produit pas de commentaire à moins qu'une erreur survienne. Cette "
-#~ "option n'est pas encore implémentée."
-
-#, fuzzy
-#~ msgid ""
-#~ "See I<%PKGDOCDIR%/THANKS> for the list of people who have\n"
-#~ "contributed to B<dpkg>.\n"
-#~ msgstr ""
-#~ "Consultez I<%PKGDOCDIR%/THANKS> pour la liste de ceux qui ont contribué à "
-#~ "B<dpkg>."
-
-#~ msgid ""
-#~ "This is very helpful in cutting out extraneous files that get included in "
-#~ "the .diff.gz, (eg: \"debian/BUGS_TODO/*\" or \"debian/RCS/*,v\"). For "
-#~ "instance, if you maintain a package that you track via remote CVS, where "
-#~ "you don't have access permissions for committing the debian control files "
-#~ "and making tags for I<cvs-buildpackage(1)>, it is necessary to perform an "
-#~ "extra checkout/update into a directory you keep pristine, to generate "
-#~ "the .orig.tar.gz from. That directory will have CVS/Entries files in it "
-#~ "that will contain timestamps that differ from the ones in your working "
-#~ "directory, thus causing them to be unnecessarily included in every .diff."
-#~ "gz, unless you use the B<-i> switch."
-#~ msgstr ""
-#~ "C'est très utile pour supprimer les fichiers superflus qui sont inclus "
-#~ "dans le .diff.gz (p. ex. « debian/BUGS_TODO/* » ou « debian/RCS/*,v »). "
-#~ "Quand on suit avec un CVS distant un paquet que l'on maintient, et qu'on "
-#~ "a pas la possibilité d'enregistrer les fichiers debian de contrôle ou "
-#~ "d'étiqueter I<cvs-buildpackage(1)>, il faut faire un « checkout/update » "
-#~ "supplémentaire dans un répertoire tenu vierge pour créer le fichier orig."
-#~ "tar.gz. Les fichiers « CVS/Entries » de ce répertoire contiennent des "
-#~ "dates qui diffèrent de celles du répertoire de travail ; cela provoque "
-#~ "indûment leur inclusion dans chaque .diff.gz créé, à moins d'utiliser "
-#~ "l'option B<-i>."
-
-#~ msgid "B<--root=>I<dir> | B<--admindir=>I<dir> | B<--instdir=>I<dir>"
-#~ msgstr "B<--root=>I<rep> | B<--admindir=>I<rep> | B<--instdir=>I<rep>"
-
-#, fuzzy
-#~ msgid ""
-#~ "These options control whether the original source archive is included in "
-#~ "the upload generated by B<dpkg-buildpackage> if any source is being "
-#~ "generated (i.e., B<-b> or B<-B> haven't been used)."
-#~ msgstr ""
-#~ "Les options B<-s>I<x> contrôlent si l'archive source originale est "
-#~ "incluse dans l'installation produite si un paquet source est créé (cad. "
-#~ "que les options B<-b> ou B<-B> n'ont pas été utilisées)."
-
-#, fuzzy
-#~ msgid ""
-#~ "Include the original source if the version number ends in B<-0> or B<-1>, "
-#~ "i.e. if the Debian revision part of the version number is B<0> or B<1>.  "
-#~ "B<This is the default.>"
-#~ msgstr ""
-#~ "Par défaut, ou si spécifié, les sources originales sont incluses si le "
-#~ "numéro de version se termine par B<-0> ou B<-1>, c'est-à-dire si la "
-#~ "partie « révision Debian » du numéro de version est égal à B<0> ou B<1>."
-
-#, fuzzy
-#~ msgid ""
-#~ "B<-sa> forces the inclusion of the original source; B<-sd> forces its "
-#~ "exclusion and includes only the diff."
-#~ msgstr ""
-#~ "Force l'exclusion des sources originelles et inclut seulement le « diff »."
-
-#, fuzzy
-#~ msgid ""
-#~ "dpkg-scansources - search for '.dsc' files and build the 'Sources' index"
-#~ msgstr "dpkg-scansources - créer des fichiers d'index de sources"
-
-#~ msgid "I<Standard for the Format of ARPA Internet Text Messages> (RFC822),"
-#~ msgstr ""
-#~ "I<Standard for the Format of ARPA Internet Text Messages> (RFC 822),"
-
-#~ msgid ""
-#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC1123) "
-#~ "section 5.2.14,"
-#~ msgstr ""
-#~ "I<Requirements for Internet Hosts -- Application and Support> (RFC 1123) "
-#~ "section 5.2.14,"
-
-#, fuzzy
-#~ msgid "Output the help screen and exit successfully."
-#~ msgstr "Affiche une aide rapide et se termine normalement."
-
-#, fuzzy
-#~ msgid "Output version and exit successfully."
-#~ msgstr "Affiche la version et se termine normalement."
-
-#~ msgid "Print a usage message."
-#~ msgstr "Affiche un message d'aide."
-
-#, fuzzy
-#~ msgid "Print program version."
-#~ msgstr "Affiche la version du programme et le copyright, puis quitte."
-
-#~ msgid "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
-#~ msgstr "B<dpkg-deb> B<-W>|B<--show> [B<--showformat>=I<format>] I<archive>"
-
-#, fuzzy
-#~ msgid ""
-#~ "B<dpkg-deb> B<-x>|B<--extract>|B<-X>|B<--vextract> I<archive directory>"
-#~ msgstr "B<-X>, B<--vextract> I<archive répertoire>"
-
-#~ msgid ""
-#~ "Prints B<dpkg-deb>'s usage message, giving a summary of its options and "
-#~ "their uses."
-#~ msgstr ""
-#~ "Affiche l'aide de B<dpkg-deb> qui résume la manière d'utiliser ses "
-#~ "options."
-
-#, fuzzy
-#~ msgid "Prints B<dpkg-deb>'s version number."
-#~ msgstr "Affiche la version de B<dpkg>."
-
-#, fuzzy
-#~ msgid "B<dpkg-divert> [I<options>] B<--remove> I<E<lt>fileE<gt>>"
-#~ msgstr "B<dpkg-name> [I<options>] [B<-->] I<fichiers>"
-
-#, fuzzy
-#~ msgid "B<dpkg-divert> [I<options>] B<--list> I<E<lt>glob-patternE<gt>>"
-#~ msgstr "B<dpkg-divert> [I<options>] I<commande>"
-
-#, fuzzy
-#~ msgid "B<dpkg-divert> [I<options>] B<--truename> I<E<lt>fileE<gt>>"
-#~ msgstr "B<dpkg-name> [I<options>] [B<-->] I<fichiers>"
-
-#~ msgid ""
-#~ "B<dpkg-divert> is the utility used to set up and update the list of "
-#~ "diversions. It functions in three basic modes - adding, removing, and "
-#~ "listing diversions.  The options are B<--add>, B<--remove>, and B<--"
-#~ "list>, respectively. Additionally, it can print out the real name for a "
-#~ "diverted file with B<--truename>. Other options (listed below) may also "
-#~ "be specified."
-#~ msgstr ""
-#~ "B<dpkg-divert> sert à créer et à mettre à jour la liste des "
-#~ "détournements. Il possède trois modes élémentaires, l'ajout, la "
-#~ "suppression et le listage d'un détournement. Les options sont "
-#~ "respectivement B<--add>, B<--remove> et B<--list>. De plus, il peut "
-#~ "afficher le vrai nom d'un fichier détourné avec B<--truename>. On peut "
-#~ "indiquer d'autres options (voyez la liste ci-dessous)."
-
-#, fuzzy
-#~ msgid "Output short usage instructions, and exit successfully."
-#~ msgstr "Affiche la version et se termine normalement."
-
-#, fuzzy
-#~ msgid "Output program name and version and exit successfully."
-#~ msgstr "Affiche la version et se termine normalement."
-
-#~ msgid ""
-#~ "B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|"
-#~ "B<--subdir> [I<dir>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|"
-#~ "B<--version>] [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] [I<files>]"
-#~ msgstr ""
-#~ "B<dpkg-name> [B<-a>|B<--no-architecture>] [B<-o>|B<--overwrite>] [B<-s>|"
-#~ "B<--subdir> [I<rep>]] [B<-c>|B<--create-dir>] [B<-h>|B<--help>] [B<-v>|"
-#~ "B<--version> [B<-l>|B<--license>] [B<-k>|B<--symlink>] [B<-->] "
-#~ "[I<fichiers>]"
-
-#, fuzzy
-#~ msgid "Print a usage message and exit successfully."
-#~ msgstr "Affiche une aide rapide et se termine normalement."
-
-#, fuzzy
-#~ msgid ""
-#~ "Print copyright information and (a reference to GNU) license information "
-#~ "and exit successfully."
-#~ msgstr ""
-#~ "Affiche les informations sur le copyright et sur la licence de "
-#~ "B<dselect>, puis se termine normalement."
-
-#, fuzzy
-#~ msgid "Display licence and copyright information."
-#~ msgstr "Affiche la version de B<dpkg>."
-
-#, fuzzy
-#~ msgid "Display version information."
-#~ msgstr "Affiche la version de B<dpkg>."
-
-#, fuzzy
-#~ msgid ""
-#~ "B<dpkg-scanpackages> [B<-u>] [B<-a> I<E<lt>archE<gt>> ] [B<-m>] "
-#~ "I<binarydir> I<overridefile> [I<pathprefix>] B<E<gt>> I<Packages>"
-#~ msgstr ""
-#~ "B<dpkg-scanpackages> [I<options>] I<rep-de-binaires> [I<fichier-override> "
-#~ "[I<chemin-à-préfixer>]] B<E<gt>> I<Packages>"
-
-#~ msgid ""
-#~ "When B<-a>I<E<lt>archE<gt>> is specified, then instead of scanning for "
-#~ "all debs, a pattern consisting of *_all.deb and *_arch.deb is used."
-#~ msgstr ""
-#~ "Quand B<-a>I<E<lt>archE<gt>> est spécifiée, la commande ne recherche pas "
-#~ "tous les fichiers debs ; elle utilise un motif équivalent à *_all.deb et "
-#~ "à *_arch.deb."
-
-#~ msgid "THE OVERRIDE FILE"
-#~ msgstr "LE FICHIER « OVERRIDE »"
-
-#~ msgid ""
-#~ "dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-#~ "buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Debian source "
-#~ "package tools"
-#~ msgstr ""
-#~ "dpkg-source, dpkg-gencontrol, dpkg-shlibdeps, dpkg-genchanges, dpkg-"
-#~ "buildpackage, dpkg-distaddfile, dpkg-parsechangelog - Les outils de "
-#~ "Debian pour les paquets source."
-
-#, fuzzy
-#~ msgid "COMMON OPTIONS"
-#~ msgstr "OPTIONS"
-
-#~ msgid ""
-#~ "Many of these programs share options; these are described here, together "
-#~ "with the programs that accept them."
-#~ msgstr ""
-#~ "Beaucoup de ces programmes partagent les options qui sont décrites ici ; "
-#~ "on décrit en même temps les programmes qui les acceptent."
-
-#~ msgid ""
-#~ "Display the particular program's usage message, including a synopsis of "
-#~ "the options it understands.  This option is understood by all the source "
-#~ "package tools."
-#~ msgstr ""
-#~ "Affiche le message d'aide associé au programme : il comprend un résumé "
-#~ "des options acceptées. Tous les outils pour les paquets source "
-#~ "comprennent cette option."
-
-#~ msgid ""
-#~ "Display the particular program's version, including copyright and license "
-#~ "information.  This option is understood by all the source package tools."
-#~ msgstr ""
-#~ "Affiche la version du programme ; le message comprend des informations "
-#~ "sur la licence et le copyright. Tous les outils pour les paquets source "
-#~ "comprennent cette option."
-
-#, fuzzy
-#~ msgid ""
-#~ "This is free software; see the GNU General Public Licence version 2 or "
-#~ "later for copying conditions. There is NO WARRANTY. See B</usr/share/doc/"
-#~ "dpkg/copyright> and B</usr/share/common-licenses/GPL> for details."
-#~ msgstr ""
-#~ "Ce programme est un logiciel libre ; voyez la « GNU General Public "
-#~ "Licence » version 2 ou supérieure pour le copyright. Il n'y a PAS de "
-#~ "garantie."
-
-#~ msgid ""
-#~ "Prints B<dpkg-split>'s usage message, giving a summary of its options and "
-#~ "their uses."
-#~ msgstr ""
-#~ "Affiche un message de B<dpkg-split> donnant un résumé de ses options et "
-#~ "de leur utilisation."
-
-#~ msgid "Prints B<dpkg-split>'s version number."
-#~ msgstr "Affiche le numéro de version de B<dpkg-split>."
-
-#~ msgid ""
-#~ "B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>userE<gt> "
-#~ "E<lt>groupE<gt> E<lt>modeE<gt> E<lt>fileE<gt>>"
-#~ msgstr ""
-#~ "B<dpkg-statoverride> [I<options>] B<--add>I< E<lt>utilisateurE<gt> "
-#~ "E<lt>groupeE<gt> E<lt>modeE<gt> E<lt>fichierE<gt>>"
-
-#, fuzzy
-#~ msgid "B<dpkg-statoverride> [I<options>] B<--remove>I< E<lt>fileE<gt>>"
-#~ msgstr "B<dpkg-statoverride> [I<options>] I<commande>"
-
-#, fuzzy
-#~ msgid ""
-#~ "B<dpkg-statoverride> [I<options>] B<--list> [I<E<lt>glob-patternE<gt>>]"
-#~ msgstr "B<dpkg-statoverride> [I<options>] I<commande>"
-
-#, fuzzy
-#~ msgid "Print help information; then exit."
-#~ msgstr "Affiche un message d'aide, puis quitte."
-
-#, fuzzy
-#~ msgid "Print version information; then exit."
-#~ msgstr "Affiche la version et se termine normalement."
-
-#, fuzzy
-#~ msgid ""
-#~ "B<update-alternatives> [I<options>] B<--install> I<genname symlink altern "
-#~ "priority> [B<--slave> I<genname symlink> I<altern>]..."
-#~ msgstr ""
-#~ "B<--install> I<genname lien altern priority> [B<--slave> I<genname lien "
-#~ "altern>]..."
-
-#, fuzzy
-#~ msgid "B<update-alternatives> [I<options>] B<--remove> I<name path>"
-#~ msgstr "B<update-alternatives> [I<options>] I<commande>"
-
-#, fuzzy
-#~ msgid "B<update-alternatives> [I<options>] B<--remove-all> I<name>"
-#~ msgstr "B<update-alternatives> [I<options>] I<commande>"
-
-#, fuzzy
-#~ msgid "B<update-alternatives> [I<options>] B<--display> I<name>"
-#~ msgstr "B<update-alternatives> [I<options>] I<commande>"
-
-#, fuzzy
-#~ msgid "B<update-alternatives> [I<options>] B<--list> I<name>"
-#~ msgstr "B<update-alternatives> [I<options>] I<commande>"
-
-#, fuzzy
-#~ msgid "B<update-alternatives> [I<options>] B<--config> I<name>"
-#~ msgstr "B<update-alternatives> [I<options>] I<commande>"
-
-#, fuzzy
-#~ msgid "B<update-alternatives> [I<options>] B<--set> I<name path>"
-#~ msgstr "B<update-alternatives> [I<options>] I<commande>"
-
-#~ msgid ""
-#~ "Exactly one action must be specified if B<update-alternatives> is to "
-#~ "perform any meaningful task.  Any number of the common options may be "
-#~ "specified together with any action."
-#~ msgstr ""
-#~ "Pour toute opération significative, on doit demander une seule action à "
-#~ "B<update-alternatives.> Pour toute action, on peut préciser un certain "
-#~ "nombre d'options."
-
-#, fuzzy
-#~ msgid "Give some usage information."
-#~ msgstr "Affiche un message d'aide, puis quitte."
-
-#, fuzzy
-#~ msgid "Tell which version of B<update-alternatives> this is."
-#~ msgstr ""
-#~ "produit plus de commentaires sur ce que fait B<update-alternatives>."
-
-#, fuzzy
-#~ msgid ""
-#~ "Give some usage information (and say which version of B<update-"
-#~ "alternatives> this is)."
-#~ msgstr ""
-#~ "produit plus de commentaires sur ce que fait B<update-alternatives>."
-
-#~ msgid "COPYRIGHT"
-#~ msgstr "COPYRIGHT"
-
-#~ msgid ""
-#~ "For B<dpkg-genchanges> and B<dpkg-buildpackage> B<-b> and B<-B> specify "
-#~ "that a binary-only build is taking place.  B<-b> indicates that no source "
-#~ "files are to be built and/or distributed, and B<-B> that no architecture-"
-#~ "independent binary package files are to be distributed either.  B<-S> "
-#~ "specifies that only the source should be uploaded and no binary packages "
-#~ "need to be made. The distinction between B<-b> and B<-B> is only used by "
-#~ "B<dpkg-buildpackage>; B<dpkg-genchanges> just produces a B<.changes> file "
-#~ "for whatever files were produced by the B<binary-*> target(s) of the "
-#~ "package being built."
-#~ msgstr ""
-#~ "Avec B<dpkg-genchanges> et B<dpkg-buildpackage> les options B<-b> et B<-"
-#~ "B> indiquent qu'on veut seulement construire un paquet binaire. L'option "
-#~ "B<-b> indique qu'aucun fichier source n'est à construire ou à distribuer, "
-#~ "et l'option B<-B> indique en plus qu'aucun fichier, appartenant à un "
-#~ "paquet binaire ne dépendant pas d'une architecture, n'est à distribuer. "
-#~ "L'option B<-S> indique que seul le source doit être installé et qu'on a "
-#~ "pas besoin de construire un paquet binaire. Seul B<dpkg-buildpackage> se "
-#~ "sert des options B<-b> et B<-B>. B<dpkg-genchanges> crée seulement un "
-#~ "fichier B<.changes> pour tous les fichiers produits par la cible B<binary-"
-#~ "*> du paquet qui est construit."
-
-#~ msgid ""
-#~ "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> with B<-b>"
-#~ msgstr ""
-#~ "B<-sa>,B<-sp>,B<-su>,B<-sk>,B<-sA>,B<-sP>,B<-sU>,B<-sK>,B<-ss> avec B<-b>"
-
-#~ msgid "B<-sp>,B<-su>,B<-sn> with B<-x>"
-#~ msgstr "B<-sp>,B<-su>,B<-sn> avec B<-x>"
-
-#~ msgid ""
-#~ "You can specify the compression level used by adding a B<-z#> option.  "
-#~ "B<dpkg-deb> will pass that option on to gzip."
-#~ msgstr ""
-#~ "On peut préciser le degré de compression en ajoutant une option B<-z#>.  "
-#~ "B<dpkg-deb> passe cette option à gzip."
-
-#~ msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
-#~ msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
-
-#~ msgid ""
-#~ "Prints information about B<dpkg-deb>'s copyright licensing and lack of "
-#~ "warranty. (The American spelling B<--license> is also supported)."
-#~ msgstr ""
-#~ "Affiche des renseignements sur le copyright de B<dpkg-deb> et l'absence "
-#~ "de garantie. (On peut utiliser l'écriture américaine B<--license.>)"
-
-#~ msgid ""
-#~ "Read (or, for B<dpkg-shlibdeps>, write) substitution variables in "
-#~ "I<substvarsfile>; the default is B<debian/substvars>.  This option is "
-#~ "understood by B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-shlibdeps> and "
-#~ "B<dpkg-genchanges>."
-#~ msgstr ""
-#~ "Lit (ou, écrit, pour B<dpkg-shlibdeps),> les variables de substitution "
-#~ "dans le fichier I<fichier/substvars>; Par défaut c'est le fichier "
-#~ "B<debian/substvars.> B<dpkg-source>, B<dpkg-gencontrol>, B<dpkg-"
-#~ "shlibdeps> et dpkg-genchanges acceptent cette option."
-
-#~ msgid ""
-#~ "Override or add an output control file field.  This option is understood "
-#~ "by B<dpkg-source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
-#~ msgstr ""
-#~ "Remplace ou ajoute en sortie un champ dans le fichier de contrôle. B<dpkg-"
-#~ "source>, B<dpkg-gencontrol> et B<dpkg-genchanges> acceptent cette option."
-
-#~ msgid ""
-#~ "Remove an output control file field.  This option is understood by B<dpkg-"
-#~ "source>, B<dpkg-gencontrol> and B<dpkg-genchanges>."
-#~ msgstr ""
-#~ "Supprime en sortie un champ dans le fichier de contrôle. B<dpkg-source>, "
-#~ "B<dpkg-gencontrol> et B<dpkg-genchanges> acceptent cette option."
-
-#~ msgid ""
-#~ "B<-b> tells B<dpkg-source> to build a source package (rather than to "
-#~ "extract one) - see below."
-#~ msgstr ""
-#~ "L'option B<-b> indique à B<dpkg-source> de construire un paquet source "
-#~ "(plutôt que d'en extraire un), voyez ci-dessous."
-
-#~ msgid "dpkg-SOURCE OPTIONS"
-#~ msgstr "LES OPTIONS DE DPKG-SOURCE"
-
-#~ msgid "dpkg-SHLIBDEPS OPTIONS"
-#~ msgstr "LES OPTIONS POUR DPKG-SHLIBDEPS"
-
-#~ msgid "dpkg-BUILDPACKAGE OPTIONS"
-#~ msgstr "LES OPTIONS DE DPKG-BUILDPACKAGE"
-
-#~ msgid "dpkg-DISTADDFILE ARGUMENTS"
-#~ msgstr "LES ARGUMENTS DE DPKG-DISTADDFILE"
-
-#~ msgid "dpkg-PARSECHANGELOG ARGUMENTS"
-#~ msgstr "LES ARGUMENTS DE DPKG-PARSECHANGELOG"
-
-#~ msgid ""
-#~ "Prints information about B<dpkg-split>'s copyright licensing and lack of "
-#~ "warranty. (The American spelling B<--license> is also supported.)"
-#~ msgstr ""
-#~ "Affiche les renseignements sur le copyright et l'absence de garantie.  "
-#~ "(L'orthographe américaine : B<--license> est acceptée.)"
-
-#, fuzzy
-#~ msgid "B<dpkg -C> | B<--audit>"
-#~ msgstr "B<-C>, B<--audit>"
-
-#, fuzzy
-#~ msgid "B<dpkg --help>"
-#~ msgstr "B<--help>"
-
-#, fuzzy
-#~ msgid "B<dpkg -Dh >|B< --debug=help>"
-#~ msgstr "B<-Dh>, B<--debug=help>"
-
-#, fuzzy
-#~ msgid "B<dpkg --licence> | B<dpkg --license>"
-#~ msgstr "B<--licence>|B<--license>"
-
-#, fuzzy
-#~ msgid "B<dpkg --version>"
-#~ msgstr "B<--version>"
-
-#, fuzzy
-#~ msgid "B<date>(1)."
-#~ msgstr "B<dpkg>(1)."
-
-#, fuzzy
-#~ msgid "B<--build>, B<-b>"
-#~ msgstr "B<-b>, B<-B>"
-
-#, fuzzy
-#~ msgid "B<--info>, B<-I>"
-#~ msgstr "B<-z>, B<-Z>"
-
-#, fuzzy
-#~ msgid "B<--show>, B<-W>"
-#~ msgstr "B<-z>, B<-Z>"
-
-#, fuzzy
-#~ msgid "B<--field>, B<-f>"
-#~ msgstr "B<-z>, B<-Z>"
-
-#, fuzzy
-#~ msgid "B<--contents>, B<-c>"
-#~ msgstr "B<--license>, B<--licence>"
-
-#, fuzzy
-#~ msgid "B<--fsys-tarfile>"
-#~ msgstr "B<--fsys-tarfile> I<archive>"
-
-#, fuzzy
-#~ msgid "B<--control>, B<-e>"
-#~ msgstr "B<-t>, B<--test>"
-
-#, fuzzy
-#~ msgid "B<--help>, B<-h>"
-#~ msgstr "B<-h>, B<--help>"
-
-#, fuzzy
-#~ msgid "B<--licence>"
-#~ msgstr "B<-l>, B<--license>"
-
-#, fuzzy
-#~ msgid "OTHER OPTIONS"
-#~ msgstr "OPTIONS"
-
-#, fuzzy
-#~ msgid "B<--debug>, B<-D>"
-#~ msgstr "B<-b>, B<-B>"
-
-#, fuzzy
-#~ msgid "B<-h, --help>"
-#~ msgstr "B<-h>, B<--help>"
-
-#, fuzzy
-#~ msgid "B<dpkg-query> B<-l>|B<--list> I<package-name-pattern> ..."
-#~ msgstr "B<-l>, B<--list> I<motif-de-nom-de-paquet>..."
-
-#, fuzzy
-#~ msgid "B<dpkg-query> B<-W>|B<--show> I<package-name-pattern> ..."
-#~ msgstr "B<-W>, B<--show> I<motif-de-nom-de-paquet>..."
-
-#, fuzzy
-#~ msgid "B<dpkg-query> B<-s>|B<--status> I<package-name> ..."
-#~ msgstr "B<-s>, B<--status> I<nom-paquet> ..."
-
-#, fuzzy
-#~ msgid "B<dpkg-query> B<-L>|B<--listfiles> I<package-name> ..."
-#~ msgstr "B<-L>, B<--listfiles> I<nom-paquet>..."
-
-#, fuzzy
-#~ msgid "B<dpkg-query> B<-S>|B<--search> I<filename-search-pattern> ..."
-#~ msgstr "B<-S>, B<--search> I<motif-de-nom-a-rechercher>..."
-
-#, fuzzy
-#~ msgid "B<dpkg-query> B<-p>|B<--print-avail> I<package-name> ..."
-#~ msgstr "B<-p>, B<--print-avail> I<nom-paquet>..."
-
-#, fuzzy
-#~ msgid "B<dpkg-query> B<--licence>|B<--license>"
-#~ msgstr "B<--licence>|B<--license>"
-
-#, fuzzy
-#~ msgid "B<dpkg-query> B<--version>"
-#~ msgstr "B<-v>, B<--version>"
-
-#, fuzzy
-#~ msgid ""
-#~ "This option negates a previously set B<-W>.  It is currently only "
-#~ "understood by B<dpkg-buildpackage> and B<dpkg-source>."
-#~ msgstr ""
-#~ "Annule une option B<-E> utilisée précédemment. Seul B<dpkg-source> "
-#~ "l'utilise, mais B<dpkg-buildpackage> la reconnaît et la transmet à B<dpkg-"
-#~ "source>."
-
-#, fuzzy
-#~ msgid "B<-x>"
-#~ msgstr "B<-G>"
-
-#, fuzzy
-#~ msgid "B<-IE<lt>filenameE<gt>>"
-#~ msgstr "B<-n>I<nom-de-fichier>"
-
-#, fuzzy
-#~ msgid "B<dpkg-gencontrol> does not take any non-option arguments."
-#~ msgstr "B<822-date> ne prend aucun paramètre ni aucune option."
-
-#, fuzzy
-#~ msgid "dpkg-GENCHANGES OPTIONS"
-#~ msgstr "OPTIONS DE CORRESPONDANCE"
-
-#, fuzzy
-#~ msgid "B<dpkg-genchanges> does not take any non-option arguments."
-#~ msgstr "B<822-date> ne prend aucun paramètre ni aucune option."
-
-#, fuzzy
-#~ msgid "B<dpkg-buildpackage> does not take any non-option arguments."
-#~ msgstr "B<822-date> ne prend aucun paramètre ni aucune option."
-
-#, fuzzy
-#~ msgid ""
-#~ "B<dpkg-parsechangelog> does not take any non-common options or non-option "
-#~ "arguments."
-#~ msgstr "B<822-date> ne prend aucun paramètre ni aucune option."
-
-#, fuzzy
-#~ msgid "VARIABLE SUBSTITUTION"
-#~ msgstr "VARIABLES D'ENVIRONNEMENT"
-
-#, fuzzy
-#~ msgid "B<dpkg-split> B<-l>|B<--listq>"
-#~ msgstr "B<-l>, B<--listq>"
-
-#, fuzzy
-#~ msgid "B<--join>, B<-j>"
-#~ msgstr "B<-z>, B<-Z>"
-
-#, fuzzy
-#~ msgid "B<--auto>, B<-a>"
-#~ msgstr "B<--auto> I<nom>"
-
-#, fuzzy
-#~ msgid "B<--listq>, B<-l>"
-#~ msgstr "B<--list> I<link>"
-
-#, fuzzy
-#~ msgid "B<--discard>, B<-d>"
-#~ msgstr "B<--new>, B<--old>"
-
-#, fuzzy
-#~ msgid "B<--npquiet>, B<-Q>"
-#~ msgstr "B<--new>, B<--old>"
-
-#, fuzzy
-#~ msgid "B<--admindir>"
-#~ msgstr "B<--admindir>=I<dir>"
-
-#, fuzzy
-#~ msgid "B<start-stop-daemon> B<-H>|B<--help>"
-#~ msgstr "start-stop-daemon"
-
-#, fuzzy
-#~ msgid "B<start-stop-daemon> B<-V>|B<--version>"
-#~ msgstr "B<start-stop-daemon> [I<options>] I<commande>"
-
-#, fuzzy
-#~ msgid "B<-H>|B<--help>"
-#~ msgstr "B<-H>, B<--help>"
+#~| msgid "B<DPKG_MAINTSCRIPT_ARCH>"
+#~ msgid "B<DPKG_MAINTSCRIPT_FORCE>"
+#~ msgstr "B<DPKG_MAINTSCRIPT_ARCH>"
diff --git a/man/po/hu.po b/man/po/hu.po
index c7898116e..a6f3a44c6 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -1,13 +1,14 @@
 # Hungarian translation of the manpages in the dpkg package
 # This file is distributed under the same license as the dpkg package.
-# Copyright (C) FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Copyright © 2006 Dpkg Developes
+# SZERVÁC Attila <sas@321.hu>, 2006.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2016-12-17 16:42+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-02-24 18:25+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
 "Language: hu\n"
@@ -615,7 +616,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
 msgid "B<Binary:> I<binary-package-list> (required)"
@@ -822,6 +823,95 @@ msgstr ""
 
 #. type: TP
 #: deb-buildinfo.man
+#, no-wrap
+msgid "B<Build-Tainted-By:>"
+msgstr ""
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+msgid "B<usr-local-has-configs>"
+msgstr "B<--fsys-tarfile>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+msgid "B<usr-local-has-includes>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+msgid "B<usr-local-has-libraries>"
+msgstr "B<--fsys-tarfile>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
 msgid "B<Installed-Build-Depends:> (required)"
@@ -1144,16 +1234,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1314,10 +1404,18 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Package:> E<lt>package nameE<gt>"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Package:> E<lt>csomag névE<gt>"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1435,7 +1533,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1464,7 +1563,7 @@ msgstr "B<--version>"
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 
 #. type: TP
@@ -1558,8 +1657,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr "HIBÁK"
@@ -1568,7 +1667,7 @@ msgstr "HIBÁK"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
@@ -2353,6 +2452,26 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2364,7 +2483,6 @@ msgstr "PÉLDA"
 #: deb-control.man
 #, fuzzy, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2407,9 +2525,18 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
 #, fuzzy
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: TH
@@ -2518,9 +2645,10 @@ msgstr "B<Source:> E<lt>forrás névE<gt>"
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 
 #. type: Plain text
@@ -2681,6 +2809,28 @@ msgstr ""
 #. type: TP
 #: deb-src-control.man dsc.man
 #, fuzzy, no-wrap
+#| msgid "B<Suggests:> E<lt>package listE<gt>"
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<Suggests:> E<lt>csomag listaE<gt>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:> E<lt>package listE<gt>"
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<Suggests:> E<lt>csomag listaE<gt>"
+
+#. type: Plain text
+#: deb-src-control.man
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
 msgid "B<Vcs-Arch:>I< url>"
 msgstr "B<Replaces:> E<lt>csomag listaE<gt>"
 
@@ -3143,8 +3293,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3215,7 +3365,7 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
 msgstr ""
 
 #. type: Plain text
@@ -3231,6 +3381,14 @@ msgid ""
 "archive."
 msgstr ""
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -3332,7 +3490,7 @@ msgstr ""
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -4163,10 +4321,11 @@ msgstr ""
 #: deb-substvars.man
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 
 #. type: Plain text
@@ -5091,8 +5250,18 @@ msgstr ""
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
+"triggers control file."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
 "functionality provided by the trigger is not crucial."
 msgstr ""
 
@@ -5120,9 +5289,17 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
 msgstr ""
 
 #. type: Plain text
@@ -5167,6 +5344,17 @@ msgid ""
 "to errors if used with an older dpkg."
 msgstr ""
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -5220,17 +5408,19 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 #. type: TP
@@ -5322,13 +5512,6 @@ msgid ""
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:> E<lt>package listE<gt>"
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<Suggests:> E<lt>csomag listaE<gt>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -5339,20 +5522,14 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:> E<lt>package listE<gt>"
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<Suggests:> E<lt>csomag listaE<gt>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -5722,6 +5899,20 @@ msgid ""
 "system directories, even configuration files)."
 msgstr ""
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+
 #. type: SS
 #: dpkg.man
 #, no-wrap
@@ -5896,12 +6087,14 @@ msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 
 #. type: Plain text
@@ -5934,9 +6127,10 @@ msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 #: dpkg.man
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 
 #. type: Plain text
@@ -6157,6 +6351,13 @@ msgid ""
 "still haven't been installed."
 msgstr ""
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -6430,7 +6631,7 @@ msgid "Display a brief help message."
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--nocheck>"
@@ -6621,13 +6822,13 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 msgid "B<--force->I<things>"
 msgstr "B<--nocheck>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr ""
@@ -6650,7 +6851,7 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr ""
 
@@ -6701,27 +6902,31 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 
 #. type: Plain text
@@ -6788,6 +6993,28 @@ msgid ""
 msgstr ""
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking (since dpkg "
@@ -6818,7 +7045,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -6866,7 +7093,8 @@ msgstr ""
 #: dpkg.man
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 
 #. type: TP
@@ -6929,9 +7157,9 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 
 #. type: TP
@@ -6943,10 +7171,10 @@ msgstr "B<--showformat=>I<formátum>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 
 #. type: TP
@@ -6958,8 +7186,9 @@ msgstr "B<--field>, B<-f>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
 
 #. type: TP
@@ -7273,6 +7502,18 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+msgid "B<--no-pager>"
+msgstr "B<--new>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
 msgid "B<--no-debsig>"
@@ -7365,8 +7606,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, no-wrap
@@ -7374,7 +7618,7 @@ msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -7420,61 +7664,116 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<SHELL>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-query.man
 #, fuzzy, no-wrap
 msgid "B<PAGER>"
 msgstr "B<--new>"
 
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+msgid "B<DPKG_PAGER>"
+msgstr "B<--new>"
+
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+msgid ""
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, no-wrap
-msgid "B<SHELL>"
+msgid "B<DPKG_COLORS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.man
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
+msgid ""
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 msgstr ""
 
 #. type: TP
-#: dpkg.man dpkg-query.man
-#, no-wrap
-msgid "B<COLUMNS>"
-msgstr ""
+#: dpkg.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+msgid "B<DPKG_FORCE>"
+msgstr "B<--new>"
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
 msgstr ""
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
-#, no-wrap
-msgid "B<DPKG_COLORS>"
-msgstr ""
+#: dpkg.man
+#, fuzzy, no-wrap
+#| msgid "I<%PKGCONFDIR%/dpkg.cfg>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
+msgstr "I<%PKGCONFDIR%/dpkg.cfg>"
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man
 msgid ""
-"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
-"B<auto> (default), B<always> and B<never>."
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
 msgstr ""
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<DPKG_ROOT>"
 msgstr ""
@@ -7507,6 +7806,13 @@ msgid ""
 "is always set to the current B<--admindir> value."
 msgstr ""
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -8317,7 +8623,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr ""
 
 #. type: IP
@@ -8936,6 +9244,31 @@ msgid ""
 "«%PKGDATADIR%»."
 msgstr ""
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, fuzzy, no-wrap
+#| msgid "I<%PKGCONFDIR%/dpkg.cfg>"
+msgid "B<DPKG_NLS>"
+msgstr "I<%PKGCONFDIR%/dpkg.cfg>"
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -9243,7 +9576,7 @@ msgstr ""
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 
@@ -9608,7 +9941,7 @@ msgstr ""
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
 
 #. type: SS
@@ -9883,16 +10216,22 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -10017,6 +10356,29 @@ msgstr ""
 #. type: TP
 #: dpkg-buildflags.man
 #, fuzzy, no-wrap
+msgid "B<fixfilepath>"
+msgstr "B<--debug>, B<-D>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.man
+#, fuzzy, no-wrap
 msgid "B<fixdebugpath>"
 msgstr "B<--debug>, B<-D>"
 
@@ -10223,7 +10585,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr ""
 
 #. type: Plain text
@@ -10576,9 +10938,10 @@ msgstr "B<--nocheck>"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -10943,15 +11306,29 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+msgid "B<--rules-requires-root>"
+msgstr "B<--new>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr "B<--info>, B<-I>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
 
 #. type: TP
@@ -10962,7 +11339,9 @@ msgstr "B<Package:> E<lt>csomag névE<gt>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr ""
 
 #. type: TP
@@ -10981,6 +11360,19 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+msgid "B<--no-post-clean>"
+msgstr "B<--info>, B<-I>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr "B<--show>, B<-W>"
 
@@ -11481,9 +11873,24 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
 #, fuzzy, no-wrap
 #| msgid "I<%PKGCONFDIR%/dpkg.cfg>"
-msgid "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_GAIN_ROOT_CMD>"
 msgstr "I<%PKGCONFDIR%/dpkg.cfg>"
 
 #. type: Plain text
@@ -12427,7 +12834,7 @@ msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<formátum>"
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -12718,7 +13125,9 @@ msgstr "B<--field>, B<-f>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
 msgstr ""
 
 #. type: TP
@@ -12729,7 +13138,9 @@ msgstr "B<--new>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
 msgstr ""
 
 #. type: TP
@@ -12777,7 +13188,35 @@ msgstr "B<Section:> E<lt>szakaszE<gt>"
 #. type: Plain text
 #: dpkg-divert.man
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+msgid "B<--instdir>I< directory>"
+msgstr "B<Section:> E<lt>szakaszE<gt>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+msgid "B<--root>I< directory>"
+msgstr "B<Section:> E<lt>szakaszE<gt>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
 msgstr ""
 
 #. type: TP
@@ -12842,7 +13281,26 @@ msgstr "B<--new>"
 #: dpkg-divert.man
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man
+#, fuzzy, no-wrap
+msgid "B<--no-rename>"
+msgstr "B<--new>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
 msgstr ""
 
 #. type: TP
@@ -12857,10 +13315,17 @@ msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 
 #. type: Plain text
@@ -14154,6 +14619,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, fuzzy, no-wrap
+msgid "B<-l>I<directory>"
+msgstr "B<Section:> E<lt>szakaszE<gt>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
@@ -14759,6 +15246,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 #, fuzzy
 #| msgid "B<dselect>(1)."
 msgid "B<dh_installdeb>(1)."
@@ -14836,8 +15330,8 @@ msgstr "MŰVELETI LEHETŐSÉGEK"
 #: dpkg-mergechangelogs.man
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 
 #. type: SH
@@ -15155,7 +15649,8 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 
 #. type: TP
@@ -15271,6 +15766,19 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, fuzzy, no-wrap
+msgid "B<--reverse>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, fuzzy, no-wrap
 msgid "B<--all>"
@@ -15394,7 +15902,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
 
 #. type: Plain text
@@ -15509,13 +16019,16 @@ msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 
 #. type: Plain text
@@ -15616,16 +16129,18 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
 msgstr "B<dpkg-deb> B<-c>|B<--contents> I<archívum>"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 
 #. type: TP
@@ -15707,7 +16222,7 @@ msgstr "B<dpkg-deb> B<-f>|B<--field> I<archívum> [I<ellenőrző-mező-név> ...
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 
@@ -15732,16 +16247,17 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
 msgstr "B<dpkg-deb> B<-I>|B<--info> I<archívum> [I<ellenőrző-fájl-név> ..]"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
 
 #. type: Plain text
@@ -15781,6 +16297,21 @@ msgstr "B<--showformat=>I<formátum>"
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "This option is used to specify the format of the output B<--show> will "
+#| "produce. The format is a string that will be output for each package "
+#| "listed."
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+"E lehetőség adja meg a B<--show> kimentének formátumát. A formátum egy "
+"szöveg, melyet minden listázott csomag visszaad."
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr ""
 
@@ -15877,12 +16408,24 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
+msgid "B<binary:Synopsis>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+msgid "It contains the package short description (since dpkg 1.19.1)."
+msgstr "Debian Project"
+
+#. type: TP
+#: dpkg-query.man
+#, fuzzy, no-wrap
 msgid "B<binary:Summary>"
 msgstr "B<--version>"
 
 #. type: Plain text
 #: dpkg-query.man
-msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
 msgstr ""
 
 #. type: TP
@@ -15941,6 +16484,34 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
+#| msgid "B<--fsys-tarfile>"
+msgid "B<db-fsys:Files>"
+msgstr "B<--fsys-tarfile>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "Debian Project"
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
+#, fuzzy, no-wrap
 msgid "B<source:Package>"
 msgstr "B<--version>"
 
@@ -15997,8 +16568,34 @@ msgstr ""
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
 msgstr ""
 
 #. type: TH
@@ -16276,8 +16873,8 @@ msgid ""
 "the source override takes precedence for setting the section."
 msgstr ""
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, fuzzy, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>, B<-D>"
@@ -16523,12 +17120,6 @@ msgid ""
 "I<executable>.  This option can be used multiple times."
 msgstr ""
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, fuzzy, no-wrap
-msgid "B<-l>I<directory>"
-msgstr "B<Section:> E<lt>szakaszE<gt>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 msgid ""
@@ -16536,15 +17127,6 @@ msgid ""
 "libraries (since dpkg 1.17.0). This option can be used multiple times."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, fuzzy, no-wrap
@@ -17521,7 +18103,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 
 #. type: TP
@@ -17650,11 +18232,11 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 
 #. type: Plain text
@@ -17672,11 +18254,18 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
@@ -17687,6 +18276,15 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
 "The timestamp of all patched files is reset to the extraction time of the "
 "source package (this avoids timestamp skews leading to problems when "
 "autogenerated files are patched)."
@@ -18387,6 +18985,12 @@ msgstr ""
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
@@ -18395,10 +18999,13 @@ msgstr ""
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -18874,9 +19481,38 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
 msgstr ""
 
 #. type: TP
@@ -18889,7 +19525,8 @@ msgstr "B<--nocheck>"
 #: dpkg-statoverride.man
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 
 #. type: TP
@@ -18915,6 +19552,13 @@ msgid ""
 "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -19036,8 +19680,9 @@ msgstr "B<--new>"
 #. type: Plain text
 #: dpkg-trigger.man
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 
 #. type: TP
@@ -20213,10 +20858,28 @@ msgstr ""
 
 #. type: Plain text
 #: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
@@ -20451,6 +21114,72 @@ msgstr ""
 #. type: TP
 #: start-stop-daemon.man
 #, fuzzy, no-wrap
+msgid "B<--notify-await>"
+msgstr "B<--new>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
+msgid "B<ERRNO=>I<number>"
+msgstr "B<--licence>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<--info>, B<-I>"
 
@@ -21178,6 +21907,11 @@ msgid ""
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
+#. type: Plain text
+#: update-alternatives.man
+msgid "Do not generate any comments unless errors occur."
+msgstr ""
+
 #. type: TP
 #: update-alternatives.man
 #, fuzzy, no-wrap
@@ -21191,7 +21925,9 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
 msgstr ""
 
 #. type: Plain text
@@ -21872,9 +22608,6 @@ msgstr ""
 #~ msgid "B<--extract>, B<-x>, B<--vextract>, B<-X>"
 #~ msgstr "B<--extract>, B<-x>, B<--vextract>, B<-X>"
 
-#~ msgid "B<--fsys-tarfile>"
-#~ msgstr "B<--fsys-tarfile>"
-
 #~ msgid "B<--control>, B<-e>"
 #~ msgstr "B<--control>, B<-e>"
 
diff --git a/man/po/it.po b/man/po/it.po
index 85e3bb31b..0c4f28b37 100644
--- a/man/po/it.po
+++ b/man/po/it.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.16.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2016-12-17 16:42+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-02-24 18:25+0100\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
 "Language: it\n"
@@ -719,7 +719,7 @@ msgstr ""
 
 # solo in file deb-src-control
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<Package:> I<binary-package-name> (required)"
 msgid "B<Binary:> I<binary-package-list> (required)"
@@ -952,6 +952,99 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, fuzzy, no-wrap
+#| msgid "B<Building>"
+msgid "B<Build-Tainted-By:>"
+msgstr "B<Building>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<-L>I<local-shlibs-file>"
+msgid "B<usr-local-has-configs>"
+msgstr "B<-L>I<file-shlibs-locale>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<--single-debian-patch>"
+msgid "B<usr-local-has-includes>"
+msgstr "B<--single-debian-patch>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<-L>I<local-shlibs-file>"
+msgid "B<usr-local-has-libraries>"
+msgstr "B<-L>I<file-shlibs-locale>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
 #| msgid "B<reinst-required>"
 msgid "B<Installed-Build-Depends:> (required)"
 msgstr "B<richiesta-reinstallazione>"
@@ -1281,16 +1374,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1466,10 +1559,19 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
+# solo in file deb-src-control
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Package:> I<binary-package-name> (required)"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Package:> I<nome-pacchetto-binario> (richiesto)"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1592,7 +1694,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1623,7 +1726,7 @@ msgstr "B<binary:Version>"
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 
 # solo in file deb-src-control
@@ -1732,8 +1835,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr "BUG"
@@ -1742,7 +1845,7 @@ msgstr "BUG"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
@@ -2622,6 +2725,27 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+#| msgid "B<Date:>I< date>"
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Date:>I< data>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2631,9 +2755,29 @@ msgstr "ESEMPIO"
 
 #. type: Plain text
 #: deb-control.man
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# Comment\n"
+#| "Package: grep\n"
+#| "Essential: yes\n"
+#| "Priority: required\n"
+#| "Section: base\n"
+#| "Maintainer: Wichert Akkerman E<lt>wakkerma@debian.orgE<gt>\n"
+#| "Architecture: sparc\n"
+#| "Version: 2.4-1\n"
+#| "Pre-Depends: libc6 (E<gt>= 2.0.105)\n"
+#| "Provides: rgrep\n"
+#| "Conflicts: rgrep\n"
+#| "Description: GNU grep, egrep and fgrep.\n"
+#| " The GNU family of grep utilities may be the \"fastest grep in the west\".\n"
+#| " GNU grep is based on a fast lazy-state deterministic matcher (about\n"
+#| " twice as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper\n"
+#| " search for a fixed string that eliminates impossible text from being\n"
+#| " considered by the full regexp matcher without necessarily having to\n"
+#| " look at every character. The result is typically many times faster\n"
+#| " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
+#| " will run more slowly, however).\n"
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2677,11 +2821,20 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
 #, fuzzy
 #| msgid ""
 #| "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 
@@ -2823,12 +2976,20 @@ msgstr "B<Source:> I<nome-pacchetto-sorgente> (richiesto)"
 # solo in file deb-src-control
 #. type: Plain text
 #: deb-src-control.man
+#, fuzzy
+#| msgid ""
+#| "The value of this field is the name of the source package, and should "
+#| "match the name of the source package in the debian/changelog file. A "
+#| "package name must consist only of lower case letters (a-z), digits (0-9), "
+#| "plus (+) and minus (-) signs, and periods (.). Package names must be at "
+#| "least two characters long and must start with an alphanumeric character."
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 "Il valore di questo campo è il nome del pacchetto sorgente e deve "
 "corrispondere al nome del pacchetto sorgente nel file debian/changelog. Un "
@@ -3021,6 +3182,36 @@ msgid ""
 "\"Gain Root API\" in I<rootless-builds.txt>.)"
 msgstr ""
 
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:>I< package-list>"
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<Suggests:>I< elenco-pacchetti>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:>I< package-list>"
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<Suggests:>I< elenco-pacchetti>"
+
+# solo in file deb-src-control
+#. type: Plain text
+#: deb-src-control.man
+#, fuzzy
+#| msgid ""
+#| "These fields are described in the B<deb-control>(5)  manual page, as they "
+#| "are copied literally to the control file of the binary package."
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+"Questi campi sono descritti nella pagina di manuale B<deb-control>(5), dato "
+"che sono copiati in modo letterale nel file di controllo del pacchetto "
+"binario."
+
 # solo in file deb-src-control
 #. type: TP
 #: deb-src-control.man dsc.man
@@ -3643,8 +3834,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3755,8 +3946,10 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
-msgstr ""
+#, fuzzy
+#| msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
+msgstr "I<pacchetto> I<priorità> I<sezione> [I<infomanutentore>]"
 
 #. type: Plain text
 #: deb-src-files.man
@@ -3780,6 +3973,14 @@ msgstr ""
 "disponibili nel file .deb. I valori permessi sono elencati nella Debian "
 "Policy."
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -3887,7 +4088,7 @@ msgstr "B<Building>"
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -4951,12 +5152,20 @@ msgstr ""
 
 #. type: Plain text
 #: deb-substvars.man
+#, fuzzy
+#| msgid ""
+#| "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+#| "names consist of alphanumerics, hyphens and colons and start with an "
+#| "alphanumeric. Variable substitutions are performed repeatedly until none "
+#| "are left; the full text of the field after the substitution is rescanned "
+#| "to look for more substitutions."
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 "Una sostituzione di variabile ha la forma B<${>I<nome-variabile>B<}>. I nomi "
 "di variabile sono formati da caratteri alfanumerici, trattini («-») e due "
@@ -6029,8 +6238,18 @@ msgstr "B<interest-noawait> I<nome-trigger>"
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
+"triggers control file."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
 "functionality provided by the trigger is not crucial."
 msgstr ""
 
@@ -6058,9 +6277,17 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
 msgstr ""
 
 #. type: Plain text
@@ -6127,6 +6354,17 @@ msgstr ""
 "aggiungere un «Pre-Depends: dpkg (E<gt>= 1.17.21)» a qualsiasi pacchetto che "
 "desideri usare tali direttive."
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -6197,17 +6435,19 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 # solo in file deb-src-control
@@ -6311,13 +6551,6 @@ msgid ""
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<Suggests:>I< elenco-pacchetti>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -6328,20 +6561,14 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<Suggests:>I< elenco-pacchetti>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -6757,6 +6984,20 @@ msgstr ""
 "Il pacchetto è selezionato per essere eliminato (cioè si desidera rimuovere "
 "tutto dalle directory di sistema, compresi i file di configurazione)."
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+
 #. type: SS
 #: dpkg.man
 #, no-wrap
@@ -6981,13 +7222,23 @@ msgstr "B<-r>, B<--remove> I<pacchetto>B<...|-a|--pending>"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Remove an installed package. This removes everything except conffiles, "
+#| "which may avoid having to reconfigure the package if it is reinstalled "
+#| "later (conffiles are configuration files that are listed in the I<DEBIAN/"
+#| "conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
+#| "package name, then all packages unpacked, but marked to be removed in "
+#| "file I<%ADMINDIR%/status>, are removed."
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 "Rimuove un pacchetto installato. Questo rimuove tutto tranne i file di "
 "configurazione e ciò può evitare il dover riconfigurare il pacchetto se "
@@ -7026,11 +7277,18 @@ msgstr "B<-P>, B<--purge >I<pacchetto>...|B<-a>|B<--pending>"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Purge an installed or already removed package. This removes everything, "
+#| "including conffiles.  If B<-a> or B<--pending> is given instead of a "
+#| "package name, then all packages unpacked or removed, but marked to be "
+#| "purged in file I<%ADMINDIR%/status>, are purged."
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 "Elimina completamente un pacchetto installato o già rimosso. Ciò elimina "
 "tutto, inclusi i file di configurazione. Se viene utilizzata B<-a> o B<--"
@@ -7374,6 +7632,13 @@ msgstr ""
 "Cerca i pacchetti selezionati per l'installazione ma che per una qualche "
 "ragione non sono ancora stati installati."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -7718,7 +7983,7 @@ msgid "Display a brief help message."
 msgstr "Visualizza un breve messaggio di aiuto."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
@@ -7994,14 +8259,14 @@ msgstr ""
 "      2000   Una quantità irragionevole di ciance\n"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force-sign>"
 msgid "B<--force->I<things>"
 msgstr "B<--force-sign>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
@@ -8033,7 +8298,7 @@ msgstr ""
 "può danneggiare l'intero sistema.>"
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: abilita (o disabilita) tutte le opzioni di forzatura."
 
@@ -8104,13 +8369,21 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+#, fuzzy
+#| msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends>: trasforma tutti i problemi di dipendenza in avvertimenti."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<depends-version>: Don't care about versions when checking dependencies."
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 "B<depends-version>: non si preoccupa delle versioni quando controlla le "
 "dipendenze."
@@ -8121,14 +8394,19 @@ msgstr ""
 #| msgid "B<breaks>: Install, even if this would break another package."
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr "B<breaks>: installa un pacchetto anche se ne rende difettoso un altro."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<conflicts>: Install, even if it conflicts with another package. This is "
+#| "dangerous, for it will usually cause overwriting of some files."
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 "B<conflicts>: installa, anche se va in conflitto con un altro pacchetto. "
 "Questo è pericoloso, perché di solito comporta la sovrascrittura di alcuni "
@@ -8242,6 +8520,28 @@ msgstr ""
 "una che non è stata diversificata."
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
 #, fuzzy
 #| msgid ""
@@ -8294,7 +8594,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -8350,9 +8650,14 @@ msgstr "B<--ignore-depends>=I<pacchetto>,..."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Ignore dependency-checking for specified packages (actually, checking is "
+#| "performed, but only warnings about conflicts are given, nothing else)."
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "Ignora il controllo delle dipendenze per i pacchetti specificati (in realtà "
 "il controllo viene effettuato ma vengono forniti solo gli avvertimenti sui "
@@ -8442,9 +8747,9 @@ msgstr "B<--admindir=>I<dir>"
 #| "give information about status of installed or uninstalled packages, etc.  "
 #| "(Defaults to I<%ADMINDIR%>)"
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "Cambia la directory amministrativa predefinita, che contiene molti file che "
 "forniscono informazioni sullo stato dei pacchetti installati o non "
@@ -8465,10 +8770,10 @@ msgstr "B<--instdir=>I<dir>"
 #| "B<chroot>(2) before running package's installation scripts, which means "
 #| "that the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 "Cambia la directory di installazione predefinita che corrisponde alla "
 "directory in cui devono essere installati i pacchetti. B<instdir> è anche la "
@@ -8489,8 +8794,9 @@ msgstr "B<--root=>I<dir>"
 #| "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 #| "var/lib/dpkg>."
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
 "Cambiare B<root> cambia B<instdir> in I<dir> e B<admindir> in I<dir>B</var/"
 "lib/dpkg>."
@@ -8924,6 +9230,22 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<--no-triggers>"
+msgid "B<--no-pager>"
+msgstr "B<--no-triggers>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+#, fuzzy
+#| msgid "The Debian system name of the host machine (since dpkg 1.13.2)."
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr ""
+"Il nome di sistema Debian della macchina ospite (a partire da dpkg 1.13.2)."
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -9035,8 +9357,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, no-wrap
@@ -9044,7 +9369,7 @@ msgid "ENVIRONMENT"
 msgstr "AMBIENTE"
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -9095,19 +9420,7 @@ msgstr ""
 "directory temporanee."
 
 #. type: TP
-#: dpkg.man
-#, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
-
-#. type: Plain text
-#: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
-msgstr ""
-"Il programma che B<dpkg> eseguirà per visualizzare i file di configurazione."
-
-#. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
@@ -9116,50 +9429,112 @@ msgstr "B<SHELL>"
 #: dpkg.man
 #, fuzzy
 #| msgid "The program B<dpkg> will execute when starting a new shell."
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr "Il programma che B<dpkg> eseguirà per avviare una nuova shell."
 
 #. type: TP
 #: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<PAGER>"
+msgstr "B<PAGER>"
+
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<PAGER>"
+msgid "B<DPKG_PAGER>"
+msgstr "B<PAGER>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
-"Imposta il numero di colonne che B<dpkg> userà per visualizzare il testo "
-"formattato. Attualmente è usata solo da -l."
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
 msgid "B<DPKG_COLORS>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 msgid ""
 "Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
 "B<auto> (default), B<always> and B<never>."
 msgstr ""
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
+msgstr ""
+
+#. type: TP
+#: dpkg.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
+msgstr ""
+
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_SHELL_REASON>"
 msgid "B<DPKG_ROOT>"
@@ -9199,6 +9574,19 @@ msgstr ""
 "Definita da B<dpkg> nell'ambiente dello script del manutentore e impostata "
 "all'architettura per la quale è stato compilato il pacchetto."
 
+#. type: Plain text
+#: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the "
+#| "architecture the package got built for."
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+"Definita da B<dpkg> nell'ambiente dello script del manutentore e impostata "
+"all'architettura per la quale è stato compilato il pacchetto."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -10214,7 +10602,11 @@ msgstr "VARIABILI"
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+#, fuzzy
+#| msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr "B<dpkg-architecture> imposta le seguenti variabili:"
 
 #. type: IP
@@ -10758,7 +11150,7 @@ msgid ""
 "Makefile snippet that properly sets and exports all the variables that "
 "B<dpkg-architecture> outputs (since dpkg 1.16.1)."
 msgstr ""
-"Frammento di makefile che imposta ed esporta in modo corretto tutte le "
+"Frammento di Makefile che imposta ed esporta in modo corretto tutte le "
 "variabili prodotte in output da B<dpkg-architecture> (a partire da dpkg "
 "1.16.1)."
 
@@ -10946,6 +11338,31 @@ msgid ""
 "«%PKGDATADIR%»."
 msgstr ""
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_NLS>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -11267,7 +11684,7 @@ msgstr "B<make>"
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 
@@ -11643,7 +12060,7 @@ msgstr ""
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
 
 #. type: SS
@@ -11921,16 +12338,22 @@ msgstr "B<pie>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -12059,6 +12482,30 @@ msgstr ""
 #: dpkg-buildflags.man
 #, fuzzy, no-wrap
 #| msgid "B<--debug>"
+msgid "B<fixfilepath>"
+msgstr "B<--debug>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.man
+#, fuzzy, no-wrap
+#| msgid "B<--debug>"
 msgid "B<fixdebugpath>"
 msgstr "B<--debug>"
 
@@ -12265,7 +12712,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr ""
 
 #. type: Plain text
@@ -12718,9 +13165,10 @@ msgstr "B<--force>"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -13218,6 +13666,20 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<--as-root>"
+msgid "B<--rules-requires-root>"
+msgstr "B<--as-root>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<-C>, B<--no-close>"
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr "B<-C>, B<--no-close>"
@@ -13229,9 +13691,10 @@ msgstr "B<-C>, B<--no-close>"
 #| "Do not clean the source tree (implies B<-b> if nothing else has been "
 #| "selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or B<-S>)."
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
 "Non pulisce l'albero dei sorgenti (implica B<-b> se non è stata selezionata "
 "un'altra opzione tra B<-F>, B<-g>, B<-G>, B<-B>, B<-A> o B<-S>)."
@@ -13249,7 +13712,9 @@ msgstr "B<-p>I<pacchetto>"
 #| msgid ""
 #| "It contains the source package name for this binary package (since dpkg "
 #| "1.16.2)."
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr ""
 "Contiene il nome del pacchetto sorgente per questo pacchetto binario (a "
 "partire da dpkg 1.16.2)."
@@ -13277,6 +13742,26 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<-C>, B<--no-close>"
+msgid "B<--no-post-clean>"
+msgstr "B<-C>, B<--no-close>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+#, fuzzy
+#| msgid ""
+#| "This option does the inverse of B<--no-await>. It is currently the "
+#| "default behavior."
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+"Questa opzione fa l'opposto di B<--no-await>. È attualmente il comportamento "
+"predefinito."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<-c>, B<--command> I<command>"
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr "B<-c>, B<--command> I<comando>"
@@ -13942,9 +14427,24 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_SHELL_REASON>"
-msgid "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_GAIN_ROOT_CMD>"
 msgstr "B<DPKG_SHELL_REASON>"
 
 #. type: Plain text
@@ -15022,7 +15522,7 @@ msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<formato>"
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -15377,7 +15877,9 @@ msgstr "[B<--add>] I<file>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
 msgstr ""
 
 #. type: TP
@@ -15388,7 +15890,9 @@ msgstr "B<--remove>I< file>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
 msgstr ""
 
 #. type: TP
@@ -15435,13 +15939,46 @@ msgstr "B<--admindir>I< directory>"
 
 #. type: Plain text
 #: dpkg-divert.man
+#, fuzzy
+#| msgid ""
+#| "Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
 msgstr ""
 "Imposta la directory dei dati di B<dpkg> a I<directory> (valore predefinito: "
 "I<%ADMINDIR%>)."
 
 #. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--admindir>I< directory>"
+msgid "B<--instdir>I< directory>"
+msgstr "B<--admindir>I< directory>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--depotdir>I< directory>"
+msgid "B<--root>I< directory>"
+msgstr "B<--depotdir>I< directory>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: TP
 #: dpkg-divert.man
 #, no-wrap
 msgid "B<--divert>I< divert-to>"
@@ -15503,7 +16040,27 @@ msgstr "B<--rename>"
 #: dpkg-divert.man
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man
+#, fuzzy, no-wrap
+#| msgid "B<--rename>"
+msgid "B<--no-rename>"
+msgstr "B<--rename>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
 msgstr ""
 
 #. type: TP
@@ -15520,10 +16077,27 @@ msgstr ""
 "dimostrazione."
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the base administrative directory."
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+"Se impostata e l'opzione B<--admindir> non è stata specificata, verrà usata "
+"come directory di amministrazione di base."
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the B<dpkg> data directory."
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 "Se impostata e l'opzione B<--admindir> non è stata specificata, verrà usata "
 "come directory dei dati di B<dpkg>."
@@ -16915,6 +17489,34 @@ msgstr ""
 "e>)."
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, no-wrap
+msgid "B<-l>I<directory>"
+msgstr "B<-l>I<directory>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+#, fuzzy
+#| msgid ""
+#| "Include dependencies appropriate for the shared libraries required by "
+#| "I<executable>.  This option can be used multiple times."
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+"Include le dipendenze appropriate per le librerie condivise richieste da "
+"I<eseguibile>. Questa opzione può essere usata più volte."
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<-I>I<filename>"
@@ -17686,6 +18288,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 msgid "B<dh_installdeb>(1)."
 msgstr "B<dh_installdeb>(1)."
 
@@ -17767,8 +18376,8 @@ msgstr "LIMITAZIONI"
 #: dpkg-mergechangelogs.man
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 
 #. type: SH
@@ -18193,7 +18802,8 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 "Imposta il formato di output. I valori attualmente supportati sono I<dpkg> e "
 "I<rfc822>. I<dpkg> è il formato di output classico (che esisteva prima di "
@@ -18328,6 +18938,20 @@ msgstr ""
 "tutti i metadati di ciascuna voce."
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, fuzzy, no-wrap
+#| msgid "B<--verbose>"
+msgid "B<--reverse>"
+msgstr "B<--verbose>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, no-wrap
 msgid "B<--all>"
@@ -18492,7 +19116,11 @@ msgstr "       @@@ changelog-format: I<altroformato> @@@\n"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+#, fuzzy
+#| msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
 "I nomi dei formati dei changelog sono stringhe non vuote di caratteri "
 "alfanumerici."
@@ -18667,13 +19295,16 @@ msgstr "B<-l>, B<--list> [I<modello-nome-pacchetti>...]"
 #| "the shell from performing filename expansion. For example this will list "
 #| "all package names starting with ``libc6'':"
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 "Elenca i pacchetti che corrispondono al modello indicato. Se non viene "
 "specificato alcun I<modello-nome-pacchetti>, elenca tutti i pacchetti in I</"
@@ -18814,17 +19445,26 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
+#, fuzzy, no-wrap
+#| msgid "B<-s>, B<--status> I<package-name>..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
 msgstr "B<-s>, B<--status> I<nome-pacchetto>..."
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Report status of specified package. This just displays the entry in the "
+#| "installed package status database. When multiple I<package-name> are "
+#| "listed, the requested status entries are separated by an empty line, with "
+#| "the same order as specified on the argument list."
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 "Segnala lo stato dei pacchetti specificati. Si limita a visualizzare la voce "
 "nel database di stato dei pacchetti installati. Quando sono elencati più "
@@ -18949,7 +19589,7 @@ msgstr "B<-S>, B<--search> I<modello-ricerca-nomefile>..."
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 "Cerca pacchetti a cui appartengono dei file che corrispondono al modello "
@@ -18987,17 +19627,25 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
+#, fuzzy, no-wrap
+#| msgid "B<-p>, B<--print-avail> I<package-name>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
 msgstr "B<-p>, B<--print-avail> I<nome-pacchetto>..."
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I<%ADMINDIR%/"
+#| "available>. When multiple I<package-name> are listed, the requested "
+#| "I<available> entries are separated by an empty line, with the same order "
+#| "as specified on the argument list."
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
 "Visualizza i dettagli su I<nome-pacchetto>, come trovati in I<%ADMINDIR%/"
 "available>. Quando vengono elencati più I<nome-pacchetto>, le voci richieste "
@@ -19056,6 +19704,22 @@ msgstr "B<-f>, B<--showformat=>I<formato>"
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "This option is used to specify the format of the output B<--show> will "
+#| "produce. The format is a string that will be output for each package "
+#| "listed."
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+"Questa opzione viene usata per specificare il formato dell'output che verrà "
+"prodotto da B<--show>. Il formato è una stringa che verrà prodotta in output "
+"per ciascun pacchetto elencato."
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr "Nella stringa di formato, “B<\\e>” introduce caratteri escape:"
 
@@ -19209,15 +19873,29 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<source:Version>"
+msgid "B<binary:Synopsis>"
+msgstr "B<source:Version>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid "It contains the package short description (since dpkg 1.19.1)."
+msgstr ""
+"Contiene la descrizione breve del pacchetto (a partire da dpkg 1.16.2)."
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<binary:Summary>"
 msgstr "B<binary:Summary>"
 
 #. type: Plain text
 #: dpkg-query.man
-msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
 msgstr ""
-"Contiene la descrizione breve del pacchetto (a partire da dpkg 1.16.2)."
 
 #. type: TP
 #: dpkg-query.man
@@ -19286,6 +19964,36 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<debian/files>"
+msgid "B<db-fsys:Files>"
+msgstr "B<debian/files>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr ""
+"Contiene la descrizione breve del pacchetto (a partire da dpkg 1.16.2)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<source:Package>"
 msgstr "B<source:Package>"
@@ -19358,12 +20066,40 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid "Sets the output format for the B<--verify> command."
+msgid ""
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr "Imposta il formato di output per il comando B<--verify>."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+"Se impostata e l'opzione B<--admindir> non è stata specificata, verrà usata "
+"come directory dei dati di B<dpkg>."
+
+#. type: Plain text
+#: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
 msgstr ""
-"Questa impostazione influenza l'output dell'opzione B<--list> modificando la "
-"larghezza del suo output."
 
 #. type: TH
 #: dpkg-scanpackages.man
@@ -19774,8 +20510,8 @@ msgstr ""
 "presente in entrambi i file, il file override dei sorgenti ha la precedenza "
 "per ciò che riguarda l'impostazione della sezione."
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
@@ -20023,12 +20759,6 @@ msgstr ""
 "Include le dipendenze appropriate per le librerie condivise richieste da "
 "I<eseguibile>. Questa opzione può essere usata più volte."
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, no-wrap
-msgid "B<-l>I<directory>"
-msgstr "B<-l>I<directory>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 #, fuzzy
@@ -20042,15 +20772,6 @@ msgstr ""
 "Include le dipendenze appropriate per le librerie condivise richieste da "
 "I<eseguibile>. Questa opzione può essere usata più volte."
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
@@ -21367,7 +22088,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 
 #. type: TP
@@ -21544,11 +22265,11 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 "Un pacchetto sorgente in questo formato contiene almeno un archivio tar "
 "originale (B<.orig.tar.>I<ext> dove I<ext> può essere B<gz>, B<bz2>, B<lzma> "
@@ -21579,12 +22300,31 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-source.man
-msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+#, fuzzy
+#| msgid ""
+#| "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
+#| "series> are then applied.  If the former file is used and the latter one "
+#| "doesn't exist (or is a symlink), then the latter is replaced with a "
+#| "symlink to the former. This is meant to simplify usage of B<quilt> to "
+#| "manage the set of patches. Note however that while B<dpkg-source> parses "
+#| "correctly series files with explicit options used for patch application "
+#| "(stored on each line after the patch filename and one or more spaces), it "
+#| "does ignore those options and always expect patches that can be applied "
+#| "with the B<-p1> option of B<patch>. It will thus emit a warning when it "
+#| "encounters such options, and the build is likely to fail."
+msgid ""
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
@@ -21606,6 +22346,15 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
 "The timestamp of all patched files is reset to the extraction time of the "
 "source package (this avoids timestamp skews leading to problems when "
 "autogenerated files are patched)."
@@ -22535,6 +23284,13 @@ msgstr ""
 
 #. type: SS
 #: dpkg-source.man
+#, fuzzy, no-wrap
+#| msgid "debian/patches/series"
+msgid "debian/patches/I<vendor>.series"
+msgstr "debian/patches/series"
+
+#. type: SS
+#: dpkg-source.man
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
@@ -22554,10 +23310,13 @@ msgstr "debian/patches/series"
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -23177,13 +23936,67 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
+#, fuzzy
+#| msgid "Give help about the B<--force->I<thing> options."
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr "Mostra un aiuto sulle opzioni B<--force->I<cosa>."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Change the I<directory> of the B<dpkg> database where the statoverride "
+#| "file is also stored. Defaults to I<%ADMINDIR%>."
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "Cambia la I<directory> del database di B<dpkg> dove viene memorizzato anche "
 "il file statoverride. La posizione predefinita è I<%ADMINDIR%>."
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do "
+#| "some things. I<things> is a comma separated list of things specified "
+#| "below. B<--force-help> displays a message describing them.  Things marked "
+#| "with (*) are forced by default."
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
+msgstr ""
+"Forza o rifiuta (B<no-force> e B<refuse> hanno lo stesso significato) "
+"l'esecuzione di alcune operazioni. I<operazioni> è una lista separata da "
+"virgole di operazioni specificate in seguito. B<--force-help> visualizza un "
+"messaggio che le descrive. Le operazioni contrassegnate da (*) vengono "
+"forzate in modo predefinito."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "I<Warning: These options are mostly intended to be used by experts only. "
+#| "Using them without fully understanding their effects may break your whole "
+#| "system.>"
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Attenzione: queste opzioni sono pensate principalmente per essere usate "
+"solamente da esperti. Usarle senza aver pienamente compreso il loro effetto "
+"può danneggiare l'intero sistema.>"
+
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -23192,9 +24005,14 @@ msgstr "B<--force>"
 
 #. type: Plain text
 #: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force an action, even if a sanity check would otherwise prohibit it.  "
+#| "This is necessary to override an existing override."
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 "Forza un'azione, anche se verrebbe proibita da un controllo di correttezza. "
 "Non è necessario per sovrascrivere una sovrascrittura esistente."
@@ -23224,6 +24042,19 @@ msgid ""
 "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the base administrative directory."
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+"Se impostata e l'opzione B<--admindir> non è stata specificata, verrà usata "
+"come directory di amministrazione di base."
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -23360,8 +24191,9 @@ msgstr "B<--await>"
 #| "This option does the inverse of B<--no-await>. It is currently the "
 #| "default behavior."
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 "Questa opzione fa l'opposto di B<--no-await>. È attualmente il comportamento "
 "predefinito."
@@ -25075,16 +25907,40 @@ msgstr "B<-p>, B<--pidfile> I<file-pid>"
 
 #. type: Plain text
 #: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+#, fuzzy
+#| msgid ""
+#| "Check whether a process has created the file I<pid-file>. Note: using "
+#| "this matching option alone might cause unintended processes to be acted "
+#| "on, if the old process terminated without being able to remove the I<pid-"
+#| "file>."
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
 msgstr ""
 "Controlla se un processo ha creato il file I<file-pid>. Nota: usare questa "
 "opzione di corrispondenza da sola può causare effetti su processi non "
 "desiderati, se il vecchio processo è stato terminato senza aver potuto "
 "rimuovere il I<file-pid>."
 
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -25399,6 +26255,74 @@ msgstr ""
 
 #. type: TP
 #: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<--no-await>"
+msgid "B<--notify-await>"
+msgstr "B<--no-await>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<-n>I<filename>"
+msgid "B<ERRNO=>I<number>"
+msgstr "B<-n>I<nomefile>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
 #, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<-C>, B<--no-close>"
@@ -26427,6 +27351,13 @@ msgstr ""
 "configurate in modo corretto in modalità automatica. Questa opzione è "
 "rilevante solo con B<--config> o B<--all>."
 
+#. type: Plain text
+#: update-alternatives.man
+#, fuzzy
+#| msgid "Don't generate any comments unless errors occur."
+msgid "Do not generate any comments unless errors occur."
+msgstr "Non genera alcun commento a meno che non si verifichi un errore."
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -26443,8 +27374,13 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
-msgstr "Non genera alcun commento a meno che non si verifichi un errore."
+#, fuzzy
+#| msgid "Generate more comments about what B<update-alternatives> is doing."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr ""
+"Genera più commenti riguardo a ciò che B<update-alternatives> sta facendo."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -26795,6 +27731,32 @@ msgstr "B<update-alternatives --auto vi>"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS: lo standard per la gerarchia del file system."
 
+#~ msgid "The program B<dpkg> will execute when displaying the conffiles."
+#~ msgstr ""
+#~ "Il programma che B<dpkg> eseguirà per visualizzare i file di "
+#~ "configurazione."
+
+#~ msgid "B<COLUMNS>"
+#~ msgstr "B<COLUMNS>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~| "text. Currently only used by -l."
+#~ msgid ""
+#~ "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~ "text.  Currently only used by B<--list>."
+#~ msgstr ""
+#~ "Imposta il numero di colonne che B<dpkg> userà per visualizzare il testo "
+#~ "formattato. Attualmente è usata solo da -l."
+
+#~ msgid ""
+#~ "This setting influences the output of the B<--list> option by changing "
+#~ "the width of its output."
+#~ msgstr ""
+#~ "Questa impostazione influenza l'output dell'opzione B<--list> modificando "
+#~ "la larghezza del suo output."
+
 # solo in file deb-src-control
 #, fuzzy
 #~| msgid ""
diff --git a/man/po/ja.po b/man/po/ja.po
index c59f83899..5de83ec39 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2016-12-17 16:42+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-02-24 18:26+0100\n"
 "Last-Translator: TAKAHASHI Motonobu <monyo@monyo.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
 "Language: ja\n"
@@ -704,7 +704,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<Package:> I<binary-package-name> (required)"
 msgid "B<Binary:> I<binary-package-list> (required)"
@@ -932,6 +932,99 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, fuzzy, no-wrap
+#| msgid "B<Building>"
+msgid "B<Build-Tainted-By:>"
+msgstr "B<ビルド>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<-L>I<local-shlibs-file>"
+msgid "B<usr-local-has-configs>"
+msgstr "B<-L>I<local-shlibs-file>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<--single-debian-patch>"
+msgid "B<usr-local-has-includes>"
+msgstr "B<--single-debian-patch>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<-L>I<local-shlibs-file>"
+msgid "B<usr-local-has-libraries>"
+msgstr "B<-L>I<local-shlibs-file>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
 #| msgid "B<reinst-required>"
 msgid "B<Installed-Build-Depends:> (required)"
 msgstr "B<reinst-required>"
@@ -1258,16 +1351,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1441,10 +1534,18 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Package:> I<binary-package-name> (required)"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Package:> I<バイナリパッケージ名> (必須)"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1562,7 +1663,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1593,7 +1695,7 @@ msgstr "B<binary:Version>"
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 
 #. type: TP
@@ -1699,8 +1801,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr "バグ"
@@ -1709,7 +1811,7 @@ msgstr "バグ"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
@@ -2554,6 +2656,27 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+#| msgid "B<Date:>I< date>"
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Date:>I< date>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2563,9 +2686,29 @@ msgstr "例"
 
 #. type: Plain text
 #: deb-control.man
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# Comment\n"
+#| "Package: grep\n"
+#| "Essential: yes\n"
+#| "Priority: required\n"
+#| "Section: base\n"
+#| "Maintainer: Wichert Akkerman E<lt>wakkerma@debian.orgE<gt>\n"
+#| "Architecture: sparc\n"
+#| "Version: 2.4-1\n"
+#| "Pre-Depends: libc6 (E<gt>= 2.0.105)\n"
+#| "Provides: rgrep\n"
+#| "Conflicts: rgrep\n"
+#| "Description: GNU grep, egrep and fgrep.\n"
+#| " The GNU family of grep utilities may be the \"fastest grep in the west\".\n"
+#| " GNU grep is based on a fast lazy-state deterministic matcher (about\n"
+#| " twice as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper\n"
+#| " search for a fixed string that eliminates impossible text from being\n"
+#| " considered by the full regexp matcher without necessarily having to\n"
+#| " look at every character. The result is typically many times faster\n"
+#| " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
+#| " will run more slowly, however).\n"
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2609,11 +2752,20 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
 #, fuzzy
 #| msgid ""
 #| "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 
@@ -2756,12 +2908,20 @@ msgstr "B<Source:> I<ソースパッケージ名> (必須)"
 
 #. type: Plain text
 #: deb-src-control.man
+#, fuzzy
+#| msgid ""
+#| "The value of this field is the name of the source package, and should "
+#| "match the name of the source package in the debian/changelog file. A "
+#| "package name must consist only of lower case letters (a-z), digits (0-9), "
+#| "plus (+) and minus (-) signs, and periods (.). Package names must be at "
+#| "least two characters long and must start with an alphanumeric character."
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 "このフィールドの値がソースパッケージ名となる。これは debian/changelog ファイ"
 "ル内のソースパッケージ名と合致させるべきである。パッケージ名には、小文字(a-"
@@ -2944,6 +3104,34 @@ msgstr ""
 #. type: TP
 #: deb-src-control.man dsc.man
 #, fuzzy, no-wrap
+#| msgid "B<Suggests:>I< package-list>"
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<Suggests:>I< パッケージのリスト>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:>I< package-list>"
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<Suggests:>I< パッケージのリスト>"
+
+#. type: Plain text
+#: deb-src-control.man
+#, fuzzy
+#| msgid ""
+#| "These fields are described in the B<deb-control>(5)  manual page, as they "
+#| "are copied literally to the control file of the binary package."
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+"これらのフィールドは、バイナリパッケージの control ファイルにそのままコピーさ"
+"れるため、B<deb-control>(5) のマニュアルページで解説されている。"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
 #| msgid "B<Vcs-*:>I< url>"
 msgid "B<Vcs-Arch:>I< url>"
 msgstr "B<Vcs-*:>I< url>"
@@ -3526,8 +3714,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3636,8 +3824,10 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
-msgstr ""
+#, fuzzy
+#| msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
+msgstr "I<package> I<priority> I<section> [I<maintainerinfo>]"
 
 #. type: Plain text
 #: deb-src-files.man
@@ -3660,6 +3850,14 @@ msgstr ""
 "I<priority> と I<section> は、.deb ファイルの対応する制御フィールドに各々対応"
 "づけられる。指定可能な値については Debian policy を参照のこと。"
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -3765,7 +3963,7 @@ msgstr "B<ビルド>"
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -4806,12 +5004,20 @@ msgstr ""
 
 #. type: Plain text
 #: deb-substvars.man
+#, fuzzy
+#| msgid ""
+#| "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+#| "names consist of alphanumerics, hyphens and colons and start with an "
+#| "alphanumeric. Variable substitutions are performed repeatedly until none "
+#| "are left; the full text of the field after the substitution is rescanned "
+#| "to look for more substitutions."
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 "変数が置換される箇所は B<${>I<変数名>B<}> という形式になっている。変数名には"
 "英数字、ハイフン、コロンを使用できるが、先頭文字は英数字である必要がある。変"
@@ -5956,9 +6162,7 @@ msgstr "B<interest-noawait> I<trigger-name>"
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
-"functionality provided by the trigger is not crucial."
+"triggers control file."
 msgstr ""
 "パッケージが、指定されたトリガをウォッチすることを示す。パッケージがウォッチ"
 "するすべてのトリガは、トリガ制御ファイル内で本ディレクティブを用いて列挙して"
@@ -5966,6 +6170,18 @@ msgstr ""
 "あっても、パッケージがトリガされなくなる。これは、トリガによって提供される機"
 "能が重要でない場合に使用すべきである。"
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
+"functionality provided by the trigger is not crucial."
+msgstr ""
+
 #. type: TP
 #: deb-triggers.man
 #, no-wrap
@@ -6000,9 +6216,7 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
 msgstr ""
 "本パッケージの状態が変化した際に、指定したトリガを有効化するように設定する。"
 "トリガは次の操作の開始により有効化される: unpack, configure, remove(競合状態"
@@ -6013,6 +6227,28 @@ msgstr ""
 
 #. type: Plain text
 #: deb-triggers.man
+#, fuzzy
+#| msgid ""
+#| "Specifies that the package is interested in the named trigger. All "
+#| "triggers in which a package is interested must be listed using this "
+#| "directive in the triggers control file. The \"noawait\" variant does not "
+#| "put the triggering packages in triggers-awaited state. This should be "
+#| "used when the functionality provided by the trigger is not crucial."
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
+msgstr ""
+"パッケージが、指定されたトリガをウォッチすることを示す。パッケージがウォッチ"
+"するすべてのトリガは、トリガ制御ファイル内で本ディレクティブを用いて列挙して"
+"おく必要がある。\"noawait\" をつけることで、ステータスが trigger-awaitedで"
+"あっても、パッケージがトリガされなくなる。これは、トリガによって提供される機"
+"能が重要でない場合に使用すべきである。"
+
+#. type: Plain text
+#: deb-triggers.man
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -6078,6 +6314,17 @@ msgstr ""
 "るとエラーとなる。そのため、これらのディレクティブを使用するパッケージ"
 "は、\"Pre-Depends: dpkg (E<gt>= 1.16.1)\" を付加することが推奨される。"
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -6145,17 +6392,19 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 #. type: TP
@@ -6254,13 +6503,6 @@ msgid ""
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<Suggests:>I< パッケージのリスト>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -6271,20 +6513,14 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<Suggests:>I< パッケージのリスト>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -6697,6 +6933,20 @@ msgstr ""
 "パッケージは完全削除 (設定ファイルも含めたすべてのファイルを削除) するように"
 "選択されている。"
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+
 #. type: SS
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -6917,12 +7167,14 @@ msgstr "B<-r>, B<--remove>, B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 
 #. type: Plain text
@@ -6956,9 +7208,10 @@ msgstr "B<--configure >I<package>...|B<-a>|B<--pending>"
 #: dpkg.man
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 
 #. type: Plain text
@@ -7277,6 +7530,13 @@ msgstr ""
 "インストールするために選択されたが、何らかの理由でまだインストールされていな"
 "いパッケージを検索する。"
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -7615,7 +7875,7 @@ msgid "Display a brief help message."
 msgstr "オプションに関する簡単なヘルプを表示する。"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
@@ -7884,14 +8144,14 @@ msgstr ""
 "      2000   信じられないほど大量のあまり意味のない情報\n"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force>"
 msgid "B<--force->I<things>"
 msgstr "B<--force>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
@@ -7922,7 +8182,7 @@ msgstr ""
 "能性がある。>"
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: 全ての強制オプションを指定する(または指定しない)。"
 
@@ -7999,13 +8259,21 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+#, fuzzy
+#| msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends>: すべての依存関係の問題を警告として扱う。"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<depends-version>: Don't care about versions when checking dependencies."
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends-version>: 依存関係の確認の際に、バージョンを無視する。"
 
 #. type: Plain text
@@ -8014,15 +8282,20 @@ msgstr "B<depends-version>: 依存関係の確認の際に、バージョンを�
 #| msgid "B<breaks>: Install, even if this would break another package."
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr ""
 "B<breaks>: 別のパッケージの機能不全を引き起こす場合でもインストールする。"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<conflicts>: Install, even if it conflicts with another package. This is "
+#| "dangerous, for it will usually cause overwriting of some files."
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 "B<conflicts>: 他のパッケージと競合してもインストールする。たいていはいくつか"
 "ファイルを上書きすることになるため、危険である。"
@@ -8132,6 +8405,28 @@ msgstr ""
 "する。"
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
 #, fuzzy
 #| msgid ""
@@ -8183,7 +8478,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -8236,9 +8531,14 @@ msgstr "B<--ignore-depends>=I<package>,..."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Ignore dependency-checking for specified packages (actually, checking is "
+#| "performed, but only warnings about conflicts are given, nothing else)."
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "指定したパッケージに関する依存関係の確認を行わない (実際は、依存関係の確認は"
 "行われるが、競合が発生しても警告メッセージのみで処理を続行する)。"
@@ -8326,9 +8626,9 @@ msgstr "B<--admindir=>I<dir>"
 #| "give information about status of installed or uninstalled packages, etc.  "
 #| "(Defaults to I<%ADMINDIR%>)"
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "デフォルトの管理ディレクトリを変更する (デフォルトは I<%ADMINDIR%>)。管理ディ"
 "レクトリには、パッケージのインストール状況に関する情報が格納された多種多様な"
@@ -8349,10 +8649,10 @@ msgstr "B<--instdir=>I<dir>"
 #| "B<chroot>(2) before running package's installation scripts, which means "
 #| "that the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 "デフォルトのインストールディレクトリを変更する。インストールディレクトリは、"
 "パッケージのインストール先となるディレクトリである。B<instdir> は、パッケージ"
@@ -8373,8 +8673,9 @@ msgstr "B<--root=>I<dir>"
 #| "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 #| "var/lib/dpkg>."
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
 "B<root> を変更すると、B<instdir> が I<dir> に変更され、B<admindir> が "
 "I<dir>B<%ADMINDIR%> に変更される。"
@@ -8776,6 +9077,21 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<--no-triggers>"
+msgid "B<--no-pager>"
+msgstr "B<--no-triggers>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+#, fuzzy
+#| msgid "The Debian system name of the host machine."
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr "ホストマシンの Debian システム名"
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -8886,8 +9202,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, no-wrap
@@ -8895,7 +9214,7 @@ msgid "ENVIRONMENT"
 msgstr "環境変数"
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -8946,19 +9265,7 @@ msgstr ""
 "成するディレクトリとして使用する。"
 
 #. type: TP
-#: dpkg.man
-#, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
-
-#. type: Plain text
-#: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
-msgstr ""
-"B<dpkg> が設定ファイルの内容を表示するときに、実際に起動するプログラム。"
-
-#. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
@@ -8967,50 +9274,112 @@ msgstr "B<SHELL>"
 #: dpkg.man
 #, fuzzy
 #| msgid "The program B<dpkg> will execute when starting a new shell."
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr "B<dpkg> が新しいシェルを起動するときに、実際に起動するプログラム。"
 
 #. type: TP
 #: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<PAGER>"
+msgstr "B<PAGER>"
+
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<PAGER>"
+msgid "B<DPKG_PAGER>"
+msgstr "B<PAGER>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
-"B<dpkg> が整形済テキストを表示する時に使用するコラム数。現在は -l オプション"
-"でのみ参照されている。"
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
 msgid "B<DPKG_COLORS>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 msgid ""
 "Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
 "B<auto> (default), B<always> and B<never>."
 msgstr ""
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
+msgstr ""
+
+#. type: TP
+#: dpkg.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
+msgstr ""
+
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_SHELL_REASON>"
 msgid "B<DPKG_ROOT>"
@@ -9050,6 +9419,19 @@ msgstr ""
 "メンテナスクリプトの環境に対して、B<dpkg> によりパッケージのビルド対象となっ"
 "たアーキテクチャの情報が設定される。"
 
+#. type: Plain text
+#: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the "
+#| "architecture the package got built for."
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+"メンテナスクリプトの環境に対して、B<dpkg> によりパッケージのビルド対象となっ"
+"たアーキテクチャの情報が設定される。"
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -10074,7 +10456,11 @@ msgstr "変数"
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+#, fuzzy
+#| msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr "B<dpkg-architecture> により設定される変数を以下に示す。"
 
 #. type: IP
@@ -10873,6 +11259,31 @@ msgid ""
 "«%PKGDATADIR%»."
 msgstr ""
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_NLS>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -11239,7 +11650,7 @@ msgstr ""
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 
@@ -11680,7 +12091,7 @@ msgstr ""
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
 
 #. type: SS
@@ -12055,16 +12466,22 @@ msgstr "B<pie>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -12238,6 +12655,43 @@ msgstr ""
 #: dpkg-buildflags.man
 #, fuzzy, no-wrap
 #| msgid "B<--debug>"
+msgid "B<fixfilepath>"
+msgstr "B<--debug>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+#, fuzzy
+#| msgid ""
+#| "This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+#| "buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks "
+#| "against stack overwrites. This renders many potential code injection "
+#| "attacks into aborting situations. In the best case this turns code "
+#| "injection vulnerabilities into denial of service or into non-issues "
+#| "(depending on the application)."
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+"この設定 (デフォルト有効) により、B<CFLAGS> および B<CXXFLAGS> に B<-fstack-"
+"protector --param=ssp-buffer-size=4> が追加される。これにより、スタックの上書"
+"きに対する安全性チェックが追加され、多くの潜在的なコードインジェクション攻撃"
+"が抑止される。(アプリケーションにもよるが) 最良のケースでは、コードインジェク"
+"ションの脆弱性を単なるサービス拒否に留めたり、無力化したりすることができる。"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.man
+#, fuzzy, no-wrap
+#| msgid "B<--debug>"
 msgid "B<fixdebugpath>"
 msgstr "B<--debug>"
 
@@ -12476,7 +12930,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr ""
 
 #. type: Plain text
@@ -12910,9 +13364,10 @@ msgstr "B<--force>"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -13383,6 +13838,20 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<--as-root>"
+msgid "B<--rules-requires-root>"
+msgstr "B<--as-root>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<-C>, B<--no-close>"
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr "B<-C>, B<--no-close>"
@@ -13394,9 +13863,10 @@ msgstr "B<-C>, B<--no-close>"
 #| "Do not clean the source tree (implies B<-b> if nothing else has been "
 #| "selected among B<-B>, B<-A> or B<-S>)."
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
 "ソースツリーを消去しない (B<-B>, B<-A>, B<-S> いずれもが指定されない場合は、"
 "B<-b> が指定されたと見なされる)。"
@@ -13412,7 +13882,9 @@ msgstr "B<-p>I<package>"
 #: dpkg-buildpackage.man
 #, fuzzy
 #| msgid "The Debian cpu name of the build machine."
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr "ビルドマシンの Debian CPU 名"
 
 #. type: TP
@@ -13438,6 +13910,20 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<-C>, B<--no-close>"
+msgid "B<--no-post-clean>"
+msgstr "B<-C>, B<--no-close>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<--pre-invoke=>I<command>"
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr "B<--pre-invoke=>I<command>"
@@ -14047,9 +14533,24 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_SHELL_REASON>"
-msgid "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_GAIN_ROOT_CMD>"
 msgstr "B<DPKG_SHELL_REASON>"
 
 #. type: Plain text
@@ -15149,7 +15650,7 @@ msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -15500,8 +16001,10 @@ msgstr "[B<--add>] I<file>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
-msgstr "I<file> を退避ファイルに追加する。"
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
 
 #. type: TP
 #: dpkg-divert.man
@@ -15511,8 +16014,10 @@ msgstr "B<--remove>I< file>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
-msgstr "I<file> を退避ファイルから削除する。"
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
 
 #. type: TP
 #: dpkg-divert.man
@@ -15569,12 +16074,42 @@ msgstr "B<--admindir>I< directory>"
 #| msgid ""
 #| "Set the dpkg data directory to I<directory> (default: I<%ADMINDIR%>)."
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
 msgstr ""
 "dpkg データディレクトリを I<directory> (デフォルトは I<%ADMINDIR%>) に設定す"
 "る。"
 
 #. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--admindir>I< directory>"
+msgid "B<--instdir>I< directory>"
+msgstr "B<--admindir>I< directory>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--depotdir>I< directory>"
+msgid "B<--root>I< directory>"
+msgstr "B<--depotdir>I< directory>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: TP
 #: dpkg-divert.man
 #, no-wrap
 msgid "B<--divert>I< divert-to>"
@@ -15641,15 +16176,39 @@ msgstr "B<--rename>"
 
 #. type: Plain text
 #: dpkg-divert.man
+#, fuzzy
+#| msgid ""
+#| "Actually move the file aside (or back). B<dpkg-divert> will abort "
+#| "operation in case the destination file already exists."
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
 msgstr ""
 "実際にファイルを退避 (もしくは復帰) させる。B<dpkg-divert> は、退避 (復帰) 先"
 "のファイルが既に存在していると動作を中断する。"
 
 #. type: TP
 #: dpkg-divert.man
+#, fuzzy, no-wrap
+#| msgid "B<--rename>"
+msgid "B<--no-rename>"
+msgstr "B<--rename>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man
 #, no-wrap
 msgid "B<--test>"
 msgstr "B<--test>"
@@ -15661,14 +16220,27 @@ msgstr ""
 "テストモード。実際にはなにも実行せず、なにを実行するかを表示するだけである。"
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the base administrative directory."
+msgid ""
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+"B<--admindir> オプションが指定されていない場合に、この変数が設定されている"
+"と、この値が administrative ディレクトリの起点として使用される。"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
 #, fuzzy
 #| msgid ""
 #| "If set and the B<--admindir> option has not been specified, it will be "
 #| "used as the dpkg data directory."
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 "B<--admindir> オプションが設定されておらず、この変数が設定されている場合、こ"
 "の変数の値が dpkg データディレクトリとして用いられる。"
@@ -17496,6 +18068,33 @@ msgstr ""
 "B<-e> を複数回指定する必要がある)。"
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, fuzzy, no-wrap
+#| msgid "B<--altdir>I< directory>"
+msgid "B<-l>I<directory>"
+msgstr "B<--altdir> I<directory>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+#, fuzzy
+#| msgid ""
+#| "Include dependencies appropriate for the shared libraries required by "
+#| "I<executable>."
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr "I<executable> が必要とする共有ライブラリのための依存関係を含める。"
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<-I>I<filename>"
@@ -18393,6 +18992,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 #, fuzzy
 #| msgid "B<installed>"
 msgid "B<dh_installdeb>(1)."
@@ -18493,8 +19099,8 @@ msgstr "制限事項"
 #| "supposed to be there, etc."
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 "Dpkg::Changelog で解析できない内容は、マージの際に消失する。これには vim の"
 "モードライン、存在しているとは見なされないコメントなどが挙げられる。"
@@ -18924,7 +19530,8 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 "出力形式を指定する。現在サポートされている値は I<dpkg> および I<rfc822> であ"
 "る。I<dpkg> は従来からの (このオプションが存在する前からの) 出力形式であり、"
@@ -19056,6 +19663,20 @@ msgstr ""
 "エントリ毎に別の段落に分割され、各エントリのメタデータが保持される。"
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, fuzzy, no-wrap
+#| msgid "B<--verbose>"
+msgid "B<--reverse>"
+msgstr "B<--verbose>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, no-wrap
 msgid "B<--all>"
@@ -19219,7 +19840,11 @@ msgstr "       @@@ changelog-format: I<otherformat> @@@\n"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+#, fuzzy
+#| msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr "changelog のフォーマット名は、英数字の文字列である必要がある。"
 
 #. type: Plain text
@@ -19383,13 +20008,16 @@ msgstr "B<-l>, B<--list> [I<package-name-pattern>...]"
 #| "the shell from performing filename expansion. For example this will list "
 #| "all package names starting with ``libc6'':"
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 "指定したパターンにマッチする名前のパッケージを表示する。 I<package-name-"
 "pattern> が指定されなかった場合は、not-installed とマークされているもの (完全"
@@ -19532,17 +20160,26 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
+#, fuzzy, no-wrap
+#| msgid "B<-s>, B<--status> I<package-name>..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
 msgstr "B<-s>, B<--status> I<package-name>..."
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Report status of specified package. This just displays the entry in the "
+#| "installed package status database. When multiple I<package-name> are "
+#| "listed, the requested status entries are separated by an empty line, with "
+#| "the same order as specified on the argument list."
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 "指定したパッケージの状況を表示する。実際は、インストールされたパッケージの状"
 "況データベースの内容が表示される。I<package-name> が複数指定された場合、各"
@@ -19660,7 +20297,7 @@ msgstr "B<-S>, B<--search> I<filename-search-pattern>..."
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 "指定したパターンにマッチするファイルをインストールしたパッケージを検索する。"
@@ -19698,17 +20335,25 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
+#, fuzzy, no-wrap
+#| msgid "B<-p>, B<--print-avail> I<package-name>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
 msgstr "B<-p>, B<--print-avail> I<package-name>..."
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I<%ADMINDIR%/"
+#| "available>. When multiple I<package-name> are listed, the requested "
+#| "I<available> entries are separated by an empty line, with the same order "
+#| "as specified on the argument list."
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
 "I<%ADMINDIR%/available> にある I<package-name> の詳細を表示する。I<package-"
 "name> が複数指定された場合、各 I<available> のエントリは、引数のリストで指定"
@@ -19766,6 +20411,21 @@ msgstr "B<-f>, B<--showformat=>I<format>"
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "This option is used to specify the format of the output B<--show> will "
+#| "produce. The format is a string that will be output for each package "
+#| "listed."
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+"このオプションは、B<--show> の出力の書式を指定するものである。書式は、一覧表"
+"示される各パッケージの出力を制御する文字列である。"
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr "フォーマット文字列中の “B<\\e>” はエスケープ文字である:"
 
@@ -19909,19 +20569,31 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
-#| msgid "B<binary:Version>"
-msgid "B<binary:Summary>"
-msgstr "B<binary:Version>"
+#| msgid "B<source:Version>"
+msgid "B<binary:Synopsis>"
+msgstr "B<source:Version>"
 
 #. type: Plain text
 #: dpkg-query.man
 #, fuzzy
 #| msgid "The package architecture (since dpkg 1.16.1)."
-msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid "It contains the package short description (since dpkg 1.19.1)."
 msgstr "パッケージのアーキテクチャ (dpkg 1.16.1 以降)"
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<binary:Version>"
+msgid "B<binary:Summary>"
+msgstr "B<binary:Version>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<db:Status-Abbrev>"
 msgstr ""
@@ -19977,6 +20649,35 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
+#| msgid "B<debian/files>"
+msgid "B<db-fsys:Files>"
+msgstr "B<debian/files>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid "The package architecture (since dpkg 1.16.1)."
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "パッケージのアーキテクチャ (dpkg 1.16.1 以降)"
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
+#, fuzzy, no-wrap
 #| msgid "B<source:Version>"
 msgid "B<source:Package>"
 msgstr "B<source:Version>"
@@ -20055,10 +20756,44 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid "The Debian cpu name of the build machine."
+msgid ""
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr "ビルドマシンの Debian CPU 名"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the dpkg data directory."
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+"B<--admindir> オプションが設定されておらず、この変数が設定されている場合、こ"
+"の変数の値が dpkg データディレクトリとして用いられる。"
+
+#. type: Plain text
+#: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
-msgstr "この設定により、B<--list> オプションによる出力の横幅が設定される。"
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
 
 #. type: TH
 #: dpkg-scanpackages.man
@@ -20457,8 +21192,8 @@ msgstr ""
 "無視される。あるパッケージが両方のファイルに現れた場合、セクションの設定にお"
 "いては、ソース override ファイルが優先される。"
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
@@ -20767,13 +21502,6 @@ msgid ""
 "I<executable>.  This option can be used multiple times."
 msgstr "I<executable> が必要とする共有ライブラリのための依存関係を含める。"
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, fuzzy, no-wrap
-#| msgid "B<--altdir>I< directory>"
-msgid "B<-l>I<directory>"
-msgstr "B<--altdir> I<directory>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 #, fuzzy
@@ -20785,15 +21513,6 @@ msgid ""
 "libraries (since dpkg 1.17.0). This option can be used multiple times."
 msgstr "I<executable> が必要とする共有ライブラリのための依存関係を含める。"
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
@@ -22320,6 +23039,20 @@ msgstr "B<-sa> もしくは B<-sA>"
 
 #. type: Plain text
 #: dpkg-source.man
+#, fuzzy
+#| msgid ""
+#| "Specifies to look for the original source archive as a tarfile or as a "
+#| "directory - the second argument, if any, may be either, or the empty "
+#| "string (this is equivalent to using B<-sn>).  If a tarfile is found it "
+#| "will unpack it to create the diff and remove it afterwards (this is "
+#| "equivalent to B<-sp>); if a directory is found it will pack it to create "
+#| "the original source and remove it afterwards (this is equivalent to B<-"
+#| "sr>); if neither is found it will assume that the package has no "
+#| "debianization diffs, only a straightforward source archive (this is "
+#| "equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
+#| "the directory, overwriting it, if B<-sA> was specified (this is "
+#| "equivalent to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> "
+#| "is the default."
 msgid ""
 "Specifies to look for the original source archive as a tarfile or as a "
 "directory - the second argument, if any, may be either, or the empty string "
@@ -22331,7 +23064,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 "オリジナルのソースアーカイブが tar ファイルもしくはディレクトリであることを指"
 "示する。2 番目の引数が指定されている場合、それは上記のいずれであってもよい"
@@ -22529,11 +23262,11 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 "この形式のソースパッケージには、オリジナルの tar アーカイブ (B<.orig.tar."
 ">I<ext>。I<ext> は B<gz>, B<bz2>, B<lzma>, B<xz> のいずれか)  および debian "
@@ -22575,11 +23308,18 @@ msgstr ""
 #| "with the B<-p1> option of B<patch>. It will thus emit a warning when it "
 #| "encounters such options, and the build is likely to fail."
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
@@ -22600,6 +23340,15 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
 "The timestamp of all patched files is reset to the extraction time of the "
 "source package (this avoids timestamp skews leading to problems when "
 "autogenerated files are patched)."
@@ -23665,6 +24414,13 @@ msgstr ""
 
 #. type: SS
 #: dpkg-source.man
+#, fuzzy, no-wrap
+#| msgid "debian/patches/series"
+msgid "debian/patches/I<vendor>.series"
+msgstr "debian/patches/series"
+
+#. type: SS
+#: dpkg-source.man
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
@@ -23684,10 +24440,13 @@ msgstr "debian/patches/series"
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -24295,16 +25054,65 @@ msgstr ""
 #. type: Plain text
 #: dpkg-statoverride.man
 #, fuzzy
+#| msgid "Give help about the B<--force->I<thing> options."
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr "B<--force->I<thing> オプションに関するヘルプを表示する。"
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
 #| msgid ""
 #| "Change the I<directory> of the dpkg database where the statoverride file "
 #| "is also stored. Defaults to I<%ADMINDIR%>."
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "dpkg データベースのディレクトリを変更する。statoverride ファイルもここに保存"
 "される。デフォルトは I<%ADMINDIR%> である。"
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do "
+#| "some things. I<things> is a comma separated list of things specified "
+#| "below. B<--force-help> displays a message describing them.  Things marked "
+#| "with (*) are forced by default."
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
+msgstr ""
+"指定した I<things> を強制実行 (force) もしくは拒否 (refuse) する (B<no-force>"
+"と B<refuse> は同じ意味) 。I<things> には、以下の項目をコンマで区切って列挙す"
+"る。これらの項目は B<--force-help> オプションで表示される。(*) マークのあるも"
+"のは、デフォルトで強制実行される。"
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "I<Warning: These options are mostly intended to be used by experts only. "
+#| "Using them without fully understanding their effects may break your whole "
+#| "system.>"
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<警告: 以下のオプションは、熟練ユーザ以外による使用を基本的に想定していな"
+"い。影響を完全に理解しないままに使用した場合、システム全体が機能不全に陥る可"
+"能性がある。>"
+
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -24313,9 +25121,14 @@ msgstr "B<--force>"
 
 #. type: Plain text
 #: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force an action, even if a sanity check would otherwise prohibit it.  "
+#| "This is necessary to override an existing override."
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 "sanity チェック (正気度チェック) が禁止するような場合でも、強制的に処理を行"
 "う。既存の override を変更する場合には、これを指定する必要がある。"
@@ -24348,6 +25161,19 @@ msgid ""
 "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the base administrative directory."
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+"B<--admindir> オプションが指定されていない場合に、この変数が設定されている"
+"と、この値が administrative ディレクトリの起点として使用される。"
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -24501,8 +25327,9 @@ msgstr "B<--no-await>"
 #. type: Plain text
 #: dpkg-trigger.man
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 
 #. type: TP
@@ -26119,16 +26946,40 @@ msgstr "B<-p>, B<--pidfile> I<pid-file>"
 
 #. type: Plain text
 #: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+#, fuzzy
+#| msgid ""
+#| "Check whether a process has created the file I<pid-file>. Note: using "
+#| "this matching option alone might cause unintended processes to be acted "
+#| "on, if the old process terminated without being able to remove the I<pid-"
+#| "file>."
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
 msgstr ""
 "プロセスが I<pid-file> を作成したかどうかをチェックする。このオプションを単体"
 "で使用した場合、以前のプロセスが I<pid-file> を削除できないまま終了してしまっ"
 "た際に、意図しないプロセスが動作中であると判断される場合があるため留意するこ"
 "と。"
 
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -26444,6 +27295,74 @@ msgstr ""
 
 #. type: TP
 #: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<--no-await>"
+msgid "B<--notify-await>"
+msgstr "B<--no-await>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<-n>I<filename>"
+msgid "B<ERRNO=>I<number>"
+msgstr "B<-n>I<filename>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
 #, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<-C>, B<--no-close>"
@@ -27427,6 +28346,13 @@ msgstr ""
 "このオプションは B<--config> および B<--all> とともに指定した場合のみ有効であ"
 "る。"
 
+#. type: Plain text
+#: update-alternatives.man
+#, fuzzy
+#| msgid "Don't generate any comments unless errors occur."
+msgid "Do not generate any comments unless errors occur."
+msgstr "エラー以外のコメントを出力しない。"
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -27443,8 +28369,13 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
-msgstr "エラー以外のコメントを出力しない。"
+#, fuzzy
+#| msgid "Generate more comments about what B<update-alternatives> is doing."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr ""
+"B<update-alternatives> の実行内容に付いて、より詳細なコメントを生成する。"
 
 #. type: Plain text
 #: update-alternatives.man
@@ -27789,6 +28720,35 @@ msgstr "B<update-alternatives --auto vi>"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 
+#~ msgid "The program B<dpkg> will execute when displaying the conffiles."
+#~ msgstr ""
+#~ "B<dpkg> が設定ファイルの内容を表示するときに、実際に起動するプログラム。"
+
+#~ msgid "B<COLUMNS>"
+#~ msgstr "B<COLUMNS>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~| "text. Currently only used by -l."
+#~ msgid ""
+#~ "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~ "text.  Currently only used by B<--list>."
+#~ msgstr ""
+#~ "B<dpkg> が整形済テキストを表示する時に使用するコラム数。現在は -l オプショ"
+#~ "ンでのみ参照されている。"
+
+#~ msgid "Add a diversion for I<file>."
+#~ msgstr "I<file> を退避ファイルに追加する。"
+
+#~ msgid "Remove a diversion for I<file>."
+#~ msgstr "I<file> を退避ファイルから削除する。"
+
+#~ msgid ""
+#~ "This setting influences the output of the B<--list> option by changing "
+#~ "the width of its output."
+#~ msgstr "この設定により、B<--list> オプションによる出力の横幅が設定される。"
+
 #, fuzzy
 #~| msgid ""
 #~| "These fields declare relationships between packages. They are discussed "
diff --git a/man/po/nl.po b/man/po/nl.po
index 3bea64427..04a1848ca 100644
--- a/man/po/nl.po
+++ b/man/po/nl.po
@@ -1,14 +1,14 @@
 # Translation of dpkg-man to Dutch
 # Copyright © 1994-2016 Dpkg Developers
 # This file is distributed under the same license as the dpkg-man package.
-# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2016, 2017.
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2016, 2017, 2018, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg-man 1.18.23\n"
+"Project-Id-Version: dpkg-man 1.19.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2017-04-30 22:07+0200\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-09-30 04:35+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #. type: TH
 #: deb.man
@@ -193,15 +193,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb.man
-#, fuzzy
-#| msgid ""
-#| "The B<tar> archives currently allowed are, the old-style (v7) format, the "
-#| "pre-POSIX ustar format, a subset of the GNU format (only the new style "
-#| "long pathnames and long linknames, supported since dpkg 1.4.1.17), and "
-#| "the POSIX ustar format (long names supported since dpkg 1.15.0).  "
-#| "Unrecognized tar typeflags are considered an error.  Each tar entry size "
-#| "inside a tar archive is limited to 11 ASCII octal digits, allowing for up "
-#| "to 8 GiB tar entries."
 msgid ""
 "The B<tar> archives currently allowed are, the old-style (v7) format, the "
 "pre-POSIX ustar format, a subset of the GNU format (new style long pathnames "
@@ -214,13 +205,16 @@ msgid ""
 "and device numbers."
 msgstr ""
 "De B<tar>-archieven die momenteel toegelaten zijn, zijn de indeling in oude "
-"stijl (v7), de pre-POSIX ustar-indeling, een subset van de GNU-indeling "
-"(enkel de lange padnamen en lange koppelingsnamen in nieuwe stijl, die sinds "
-"dpkg 1.4.1.17 ondersteund worden) en de POSIX ustar-indeling (lange namen, "
-"ondersteund sinds dpkg 1.15.0). Niet-herkende tar-typevlaggen worden als een "
-"fout beschouwd. Binnen een tar-archief is de grootte van elk item beperkt "
-"tot 11 ASCII octale cijfers, hetgeen tot maximaal 8 GiB aan tar-items "
-"mogelijk maakt."
+"stijl (v7), de pre-POSIX ustar-indeling, een subset van de GNU-indeling (de "
+"lange padnamen en lange koppelingsnamen in nieuwe stijl, die sinds dpkg "
+"1.4.1.17 ondersteund worden; uitgebreide bestandsmetadata sinds 1.18.24) en "
+"de POSIX ustar-indeling (lange namen, ondersteund sinds dpkg 1.15.0). Niet-"
+"herkende tar-typevlaggen worden als een fout beschouwd. Binnen een tar-"
+"archief is de grootte van elk item beperkt tot 11 ASCII octale cijfers, "
+"hetgeen tot maximaal 8 GiB aan tar-items mogelijk maakt. De ondersteuning "
+"voor uitgebreide bestandsmetadata in de GNU-indeling maakt een grootte "
+"mogelijk van 95 bits voor een tar-item, negatieve tijdstempels en UID-, GID- "
+"en apparaatnummers van 63 bits."
 
 #. type: Plain text
 #: deb.man
@@ -713,15 +707,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-buildinfo.man
-#, fuzzy
-#| msgid ""
-#| "The name of the B<.buildinfo> file will depend on the type of build and "
-#| "will be as specific as necessary but not more; for a build that includes "
-#| "B<any> the name will be I<source-name>B<_>I<source-version>B<_>I<arch>B<."
-#| "buildinfo>, or otherwise for a build that includes B<all> the name will "
-#| "be I<source-name>B<_>I<source-version>B<_>B<all.buildinfo>, or otherwise "
-#| "for a build that includes B<source> the name will be I<source-"
-#| "name>B<_>I<source-version>B<_>B<source.buildinfo>."
 msgid ""
 "The name of the B<.buildinfo> file will depend on the type of build and will "
 "be as specific as necessary but not more; for a build that includes B<any> "
@@ -732,11 +717,11 @@ msgid ""
 "version>B<_>B<source.buildinfo>."
 msgstr ""
 "De naam van het B<.buildinfo>-bestand is afhankelijk van het type bouw en is "
-"zo specifiek als nodig, maar niet meer. Voor een bouw die B<any> vermeldt, "
-"is de naam I<broncode-naam>B<_>I<broncode-versie>B<_>I<arch>B<.buildinfo>. "
-"In geval het een bouw betreft die B<all> vermeldt, is de naam I<broncode-"
-"naam>B<_>I<broncode-versie>B<_>B<all.buildinfo>. En in geval het een bouw "
-"betreft die B<source> vermeldt, is de naam I<broncode-naam>B<_>I<broncode-"
+"zo specifiek als nodig, maar niet meer. Voor een bouw die B<any> bevat, is "
+"de naam I<broncode-naam>B<_>I<binaire-versie>B<_>I<arch>B<.buildinfo>. In "
+"geval het een bouw betreft die B<all> bevat, is de naam I<broncode-"
+"naam>B<_>I<binaire-versie>B<_>B<all.buildinfo>. En in geval het een bouw "
+"betreft die B<source> bevat, is de naam I<broncode-naam>B<_>I<broncode-"
 "versie>B<_>B<source.buildinfo>."
 
 #. type: SH
@@ -788,7 +773,7 @@ msgstr ""
 "de onderhouder uitgevoerd wordt."
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, no-wrap
 msgid "B<Binary:> I<binary-package-list> (required)"
 msgstr "B<Binary:> I<lijst-binaire-pakketten> (verplicht)"
@@ -831,12 +816,6 @@ msgstr "B<Version:> I<versie-tekenreeks> (verplicht)"
 
 #. type: Plain text
 #: deb-buildinfo.man deb-changes.man dsc.man
-#, fuzzy
-#| msgid ""
-#| "Typically, this is the original package's version number in whatever form "
-#| "the program's author uses.  It may also include a Debian revision number "
-#| "(for non-native packages).  The exact format and sorting algorithm are "
-#| "described in B<deb-version>(5)."
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses.  It may also include a Debian revision number "
@@ -846,7 +825,7 @@ msgstr ""
 "Gewoonlijk is dit het originele versienummer van het pakket, welke vorm de "
 "auteur van het programma er ook voor gebruikt. Het kan ook een Debian-"
 "revisienummer bevatten (voor niet uit Debian stammende pakketten). De exacte "
-"indeling en het sorteringsalgoritme worden beschreven in B<deb-version>(5)."
+"indeling en het sorteringsalgoritme worden beschreven in B<deb-version>(7)."
 
 #. type: TP
 #: deb-buildinfo.man
@@ -977,26 +956,20 @@ msgstr ""
 
 #. type: TP
 #: deb-buildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<Kernel-Version:>I< value>"
+#, no-wrap
 msgid "B<Build-Kernel-Version:> I<build-kernel-version>"
-msgstr "B<Kernel-Version:>I< waarde>"
+msgstr "B<Build-Kernel-Version:> I<bouwkernel-versie>"
 
 #. type: Plain text
 #: deb-buildinfo.man
-#, fuzzy
-#| msgid ""
-#| "The absolute build path, which correspond to the unpacked source tree.  "
-#| "This field is only going to be present if the vendor has whitelisted it "
-#| "via some pattern match to avoid leaking possibly sensitive information."
 msgid ""
 "The release and version (in an unspecified format) of the kernel running on "
 "the build system.  This field is only going to be present if the builder has "
 "explicitly requested it, to avoid leaking possibly sensitive information."
 msgstr ""
-"Het absoluut bouwpad, wat overeenkomt met de uitgepakte broncodeboom. Dit "
-"veld is enkel aanwezig als de leverancier het op de witte lijst geplaatst "
-"heeft aan de hand van een patroonvergelijking, om zo het eventueel weglekken "
+"De uitgave en de versie (in een niet-gespecificeerde indeling) van de kernel "
+"die op het bouwsysteem functioneert. Dit veld zal enkel aanwezig zijn als "
+"het bouwprogramma er expliciet om gevraagd heeft, om het eventueel weglekken "
 "van gevoelige informatie te voorkomen."
 
 #. type: TP
@@ -1019,10 +992,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-buildinfo.man
-#, fuzzy
-#| msgid ""
-#| "On Debian and derivaties only build paths starting with I</build/> will "
-#| "emit this field."
 msgid ""
 "On Debian and derivatives only build paths starting with I</build/> will "
 "emit this field."
@@ -1033,6 +1002,113 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, no-wrap
+msgid "B<Build-Tainted-By:>"
+msgstr "B<Build-Tainted-By:>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr "I<lijst-met-bezoedelingsredenen>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+"Dit gevouwen veld bevat een niet-exhaustieve lijst, met spatie als "
+"scheidingsteken, van labels (samengesteld uit alfanumerieke tekens en "
+"gedachtestreepjes) met redenen die aanduiden waarom de huidige bouw "
+"bezoedeld werd (sinds dpkg 1.19.5)."
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+"Op Debian en zijn derivaten kunnen de volgende reden-labels gegeven worden:"
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr "B<merged-usr-via-symlinks>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+"Het systeem heeft een via symbolische koppelingen samengevoegde map I</usr>. "
+"Dit sticht verwarring bij B<dpkg-query>, B<dpkg-statoverride>, B<dpkg-"
+"trigger>, B<update-alternatives> en elk ander hulpmiddel dat in zijn "
+"databank gebruik maakt van padnamen als sleutel, omdat het zorgt voor "
+"problemen met aliassen in het bestandssysteem en knoeit met het overzicht "
+"van het bestandssysteem dat B<dpkg> in zijn databank opgeslagen heeft. Met "
+"bouwsystemen die in de door hen gemaakte objecten gebruik maken van vaste "
+"padnamen naar specifieke uitvoerbare bestanden of bibliotheken, kan dit ook "
+"leiden tot pakketten die niet compatibel zijn met bestandssystemen zonder "
+"samengevoegde /usr-map."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-configs>"
+msgstr "B<usr-local-has-configs>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr "Het systeem bevat configuratiebestanden onder I</usr/local/etc>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-includes>"
+msgstr "B<usr-local-has-includes>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr "Het systeem bevat kopbestanden onder I</usr/local/include>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr "B<usr-local-has-programs>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+"Op het systeem staan programma's onder I</usr/local/bin> of I</usr/local/"
+"sbin>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-libraries>"
+msgstr "B<usr-local-has-libraries>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+"Het systeem bevat statische of gedeelde bibliotheken onder I</usr/local/lib>."
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
 msgid "B<Installed-Build-Depends:> (required)"
 msgstr "B<Installed-Build-Depends:> (verplicht)"
 
@@ -1116,10 +1192,8 @@ msgstr ""
 
 #. type: Plain text
 #: deb-buildinfo.man
-#, fuzzy
-#| msgid "B<deb-changes>(5), B<deb-version>(5), B<dpkg-genbuildinfo>(1)."
 msgid "B<deb-changes>(5), B<deb-version>(7), B<dpkg-genbuildinfo>(1)."
-msgstr "B<deb-changes>(5), B<deb-version>(5), B<dpkg-genbuildinfo>(1)."
+msgstr "B<deb-changes>(5), B<deb-version>(7), B<dpkg-genbuildinfo>(1)."
 
 #. type: TH
 #: deb-changelog.man
@@ -1443,22 +1517,28 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
+"Elke regel die volledig (d.w.z. zonder voorafgaande witruimte) bestaat uit "
+"commentaar in de vorm van B<#>- of B</* */> of RCS-trefwoorden."
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
+"Modusregels van Vim of lokale variabelen van Emacs en oudere changelog-"
+"elementen met een andere indeling aan het einde van het bestand, moeten "
+"aanvaard worden en in de uitvoer behouden blijven, maar de inhoud ervan kan "
+"verder genegeerd worden en het ontleden kan op dat punt gestopt worden."
 
 #. type: Plain text
 #: deb-changelog.man
 msgid "The entire changelog must be encoded in UTF-8."
-msgstr "Het volledige changelog-bestand moet in UTF-8 op gemaakt zijn."
+msgstr "Het volledige changelog-bestand moet in UTF-8 opgemaakt zijn."
 
 #. type: SH
 #: deb-changelog.man deb-substvars.man dpkg.man dpkg-architecture.man
@@ -1534,10 +1614,8 @@ msgstr " -- Guillem Jover E<lt>guillem@debian.orgE<gt>  Sun, 12 Oct 2014 15:47:4
 
 #. type: Plain text
 #: deb-changelog.man
-#, fuzzy
-#| msgid "B<deb-version>(5), B<deb-changes>(5), B<dpkg-parsechangelog>(1)."
 msgid "B<deb-version>(7), B<deb-changes>(5), B<dpkg-parsechangelog>(1)."
-msgstr "B<deb-version>(5), B<deb-changes>(5), B<dpkg-parsechangelog>(1)."
+msgstr "B<deb-version>(7), B<deb-changes>(5), B<dpkg-parsechangelog>(1)."
 
 #. type: TH
 #: deb-changes.man
@@ -1632,13 +1710,21 @@ msgstr ""
 "zijn als de upload een uitsluitend binaire upload is die niet door de "
 "onderhouder uitgevoerd wordt."
 
+#. type: TP
+#: deb-changes.man
+#, no-wrap
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Binary:> I<lijst-binaire-pakketten> (vereist in de context)"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 "Dit gevouwen veld is een lijst, met spatie als scheidingsteken, van binaire "
-"pakketten die geüpload moeten worden."
+"pakketten die geüpload moeten worden. Indien het een upload is van enkel "
+"broncode, dan wordt het veld weggelaten (sinds dpkg 1.19.3)."
 
 #. type: TP
 #: deb-changes.man
@@ -1743,11 +1829,13 @@ msgstr " I<naam-binaire-pakket> B<-> I<samenvatting-binaire-pakket>"
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
-"Dit multiregel-veld bevat een lijst met de namen van de binaire pakketten, "
+"Dit multiregel-veld bevat een lijst met de naam van de binaire pakketten, "
 "gevolgd door een spatie, een koppelteken (‘B<->’) en hun eventueel afgekapte "
-"korte beschrijving."
+"korte beschrijving. Indien het een upload is van enkel broncode, dan wordt "
+"het veld weggelaten (sinds dpkg 1.19.3)."
 
 #. type: TP
 #: deb-changes.man
@@ -1779,7 +1867,7 @@ msgstr "B<Binary-Only: yes>"
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 "Dit veld geeft aan dat deze upload gebeurt na de niet door de "
 "pakketonderhouder uitgevoerde bouw van uitsluitend het binaire pakket. Het "
@@ -1901,8 +1989,8 @@ msgstr ""
 "in het veld B<Files> en in de andere gerelateerde B<Checksums>-velden."
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
@@ -1911,21 +1999,19 @@ msgstr "BUGS"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
 "Het veld B<Files> is niet consistent met de andere B<Checksums>-velden. De "
-"velden B<Change-By> en B<Maintainer> hebben namen die verwarrend zijn. Het "
+"velden B<Changed-By> en B<Maintainer> hebben namen die verwarrend zijn. Het "
 "veld B<Distribution> bevat informatie over waar gewoonlijk met de term suite "
 "naar verwezen wordt."
 
 #. type: Plain text
 #: deb-changes.man
-#, fuzzy
-#| msgid "B<deb-src-control>(5), B<deb-version>(5)."
 msgid "B<deb-src-control>(5), B<deb-version>(7)."
-msgstr "B<deb-src-control>(5), B<deb-version>(5)."
+msgstr "B<deb-src-control>(5), B<deb-version>(7)."
 
 #. type: TH
 #: deb-control.man
@@ -1982,10 +2068,9 @@ msgstr ""
 
 #. type: TP
 #: deb-control.man deb-src-control.man
-#, fuzzy, no-wrap
-#| msgid "B<Package-Type:> B<deb>|B<udeb>"
+#, no-wrap
 msgid "B<Package-Type:> B<deb>|B<udeb>|I<type>"
-msgstr "B<Package-Type:> B<deb>|B<udeb>"
+msgstr "B<Package-Type:> B<deb>|B<udeb>|I<type>"
 
 #. type: Plain text
 #: deb-control.man deb-src-control.man
@@ -2002,12 +2087,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "Typically, this is the original package's version number in whatever form "
-#| "the program's author uses. It may also include a Debian revision number "
-#| "(for non-native packages). The exact format and sorting algorithm are "
-#| "described in B<deb-version>(5)."
 msgid ""
 "Typically, this is the original package's version number in whatever form "
 "the program's author uses. It may also include a Debian revision number (for "
@@ -2017,7 +2096,7 @@ msgstr ""
 "Gewoonlijk is dit het originele versienummer van het pakket, welke vorm de "
 "auteur van het programma er ook aan geeft. Het kan ook een Debian-"
 "revisienummer bevatten (voor niet uit Debian stammende pakketten). De exacte "
-"indeling en het sorteringsalgoritme worden beschreven in B<deb-version>(5)."
+"indeling en het sorteringsalgoritme worden beschreven in B<deb-version>(7)."
 
 #. type: TP
 #: deb-control.man deb-src-control.man dsc.man
@@ -2600,6 +2679,8 @@ msgid ""
 "This is a list of packages that this one enhances.  It is similar to "
 "B<Suggests> but in the opposite direction."
 msgstr ""
+"Dit is een lijst met pakketten waarvoor dit pakket uitbreidingen biedt. Het "
+"is vergelijkbaar met B<Suggests>, maar in de omgekeerde richting."
 
 #. type: TQ
 #: deb-control.man deb-src-control.man
@@ -2714,6 +2795,31 @@ msgstr ""
 "hoofdcontrolebestand I<debian/control> van de broncode. De enige reden die "
 "momenteel gebruikt wordt, is B<debug-symbols>."
 
+#. type: TP
+#: deb-control.man
+#, no-wrap
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Build-Ids:>I< lijst met elf-bouw-id's>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+"Dit veld geeft een lijst op van door witruimte van elkaar gescheiden ELF-"
+"bouw-id's. Dit zijn unieke identificatiesymbolen voor semantisch identieke "
+"ELF-objecten, voor elk ervan in het pakket."
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+"De indeling of de berekeningswijze voor elke bouw-id ligt niet vast bij "
+"ontwerp."
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2725,7 +2831,6 @@ msgstr "VOORBEELD"
 #: deb-control.man
 #, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2746,18 +2851,17 @@ msgid ""
 " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
 " will run more slowly, however).\n"
 msgstr ""
-"# Commentaar\n"
-"Package: grep\n"
-"Essential: yes\n"
-"Priority: required\n"
-"Section: base\n"
-"Maintainer: Wichert Akkerman E<lt>wakkerma@debian.orgE<gt>\n"
-"Architecture: sparc\n"
-"Version: 2.4-1\n"
-"Pre-Depends: libc6 (E<gt>= 2.0.105)\n"
-"Provides: rgrep\n"
-"Conflicts: rgrep\n"
-"Description: GNU grep, egrep en fgrep.\n"
+"Pakket: grep\n"
+"Essentieel: ja\n"
+"Prioriteit: vereist\n"
+"Sectie: base\n"
+"Onderhouder: Wichert Akkerman E<lt>wakkerma@debian.orgE<gt>\n"
+"Architectuur: sparc\n"
+"Versie: 2.4-1\n"
+"Voorvereiste: libc6 (E<gt>= 2.0.105)\n"
+"Voorziet in: rgrep\n"
+"Conflicteert met: rgrep\n"
+"Beschrijving: GNU grep, egrep en fgrep.\n"
 " De GNU familie van grep-hulpprogramma's is misschien wel de \"fastest grep in\n"
 " the west\". GNU grep is gebaseerd op een snel `lazy-state deterministic\n"
 " matcher' (ongeveer twee keer zo snel als een gewone Unix grep), gekruist met\n"
@@ -2769,13 +2873,23 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
-#, fuzzy
-#| msgid ""
-#| "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
 msgstr ""
-"B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"Voor het veld B<Build-Ids> wordt een eerder generieke naam gebruikt vanuit "
+"zijn originele context binnen een ELF-object, welke een zeer specifieke "
+"functie en uitvoerbaar formaat heeft."
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
+msgstr ""
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: TH
 #: deb-conffiles.man
@@ -2904,15 +3018,17 @@ msgstr "B<Source:> I<broncodepakket-naam> (verplicht)"
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 "De waarde van dit veld is de naam van het broncodepakket en moet "
 "overeenkomen met de naam van het broncodepakket in het bestand debian/"
 "changelog. Een pakketnaam mag enkel bestaan uit kleine letters (a-z), "
 "cijfers (0-9), plussen (+) en minnen (-) en punten (.). Pakketnamen moeten "
-"minstens twee tekens lang zijn en moeten met een alfanumeriek teken beginnen."
+"minstens twee tekens lang zijn en moeten met een alfanumeriek teken (a-z0-9) "
+"in kleine letter beginnen."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -2959,20 +3075,12 @@ msgstr ""
 
 #. type: TP
 #: deb-src-control.man dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Description:> I<short-description> (recommended)"
+#, no-wrap
 msgid "B<Description>I< short-description>"
-msgstr "B<Description:> I<korte-beschrijving> (aanbevolen)"
+msgstr "B<Description:> I<korte-beschrijving>"
 
 #. type: Plain text
 #: deb-src-control.man dsc.man
-#, fuzzy
-#| msgid ""
-#| "The format for the package description is a short brief summary on the "
-#| "first line (after the B<Description> field). The following lines should "
-#| "be used as a longer, more detailed description. Each line of the long "
-#| "description must be preceded by a space, and blank lines in the long "
-#| "description must contain a single ‘B<.>’ following the preceding space."
 msgid ""
 "The format for the source package description is a short brief summary on "
 "the first line (after the B<Description> field).  The following lines should "
@@ -2981,11 +3089,12 @@ msgid ""
 "description must contain a single ‘B<.>’ following the preceding space."
 msgstr ""
 "De indeling van een pakketbeschrijving bestaat uit een beknopte korte "
-"samenvatting op de eerste regel (na de veldmarkering B<Description>) en een "
-"langere meer gedetailleerde beschrijving op de volgende regels. Elke regel "
-"van de uitgebreide beschrijving moet voorafgegaan worden door een spatie, en "
-"lege regels in de uitgebreide beschrijving moeten één enkele ‘B<.>’ bevatten "
-"die volgt op de eraan voorafgaande spatie."
+"samenvatting op de eerste regel (na de veldmarkering B<Description>). De "
+"daaropvolgende regels moeten gebruikt worden voor een langere, meer "
+"gedetailleerde beschrijving. Elke regel van de uitgebreide beschrijving moet "
+"voorafgegaan worden door een spatie, en lege regels in de uitgebreide "
+"beschrijving moeten één enkele ‘B<.>’ bevatten die volgt op de eraan "
+"voorafgaande spatie."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3007,7 +3116,7 @@ msgstr ""
 #: deb-src-control.man
 #, no-wrap
 msgid "B<Rules-Requires-Root:> B<no>|B<binary-targets>|I<impl-keywords>"
-msgstr ""
+msgstr "B<Rules-Requires-Root:> B<no>|B<binary-targets>|I<impl-trefwoorden>"
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3015,18 +3124,20 @@ msgid ""
 "This field is used to indicate whether the B<debian/rules> file requires "
 "(fake)root privileges to run some of its targets, and if so when."
 msgstr ""
+"Dit veld wordt gebruikt om aan te geven of het bestand B<debian/rules> "
+"voorrechten van (fake)root nodig heeft om sommige van zijn targets uit te "
+"voeren, en zo ja wanneer."
 
 #. type: Plain text
 #: deb-src-control.man
 msgid "The binary targets will not require (fake)root at all."
-msgstr ""
+msgstr "De binaire targets zullen (fake)root helemaal niet nodig hebben."
 
 #. type: TP
 #: deb-src-control.man
-#, fuzzy, no-wrap
-#| msgid "B<binary:Package>"
+#, no-wrap
 msgid "B<binary-targets>"
-msgstr "B<binary:Package>"
+msgstr "B<binary-targets>"
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3036,12 +3147,16 @@ msgid ""
 "B<binary-targets> while not strictly needed, marks it as having been "
 "analyzed for this requirement."
 msgstr ""
+"De binaire targets moeten altijd onder (fake)root uitgevoerd worden. Dit is "
+"de standaardwaarde als dit veld ontbreekt. Als dit veld toegevoegd wordt met "
+"een expliciete B<binary-targets>, terwijl dit strikt genomen niet nodig is, "
+"geeft dit aan dat de noodzaak ervan onderzocht werd."
 
 #. type: TP
 #: deb-src-control.man
 #, no-wrap
 msgid "I<impl-keywords>"
-msgstr ""
+msgstr "I<impl-trefwoorden>"
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3049,6 +3164,8 @@ msgid ""
 "This is a space-separated list of keywords which define when (fake)root is "
 "required."
 msgstr ""
+"Dit is een door witruimte gescheiden lijst van trefwoorden die omschrijven "
+"wanneer (fake)root vereist is."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3057,6 +3174,10 @@ msgid ""
 "contain \"/\" or whitespace.  The I<cases> part cannot contain whitespace.  "
 "Furthermore, both parts must consist entirely of printable ASCII characters."
 msgstr ""
+"Een trefwoord bestaat uit I<naamruimte>/I<gevallen>. Het onderdeel "
+"I<naamruimte> mag geen \"/\" en geen witruimte bevatten. Het onderdeel "
+"I<gevallen> mag geen witruimte bevatten. Voorts moeten beide delen volledig "
+"uit afdrukbare ASCII-tekens bestaan."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3065,6 +3186,9 @@ msgid ""
 "number of cases where (fake)root is required.  (See \"Implementation "
 "provided keywords\" in I<rootless-builds.txt>)."
 msgstr ""
+"Elk gereedschap/pakket zal een naamruimte definiëren die vernoemd wordt naar "
+"zichzelf en een aantal gevallen waarin (fake)root vereist is. (Zie "
+"\"Implementation provided keywords\" in I<rootless-builds.txt>)."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3073,6 +3197,34 @@ msgid ""
 "expose an interface that is used to run a command under (fake)root.  (See "
 "\"Gain Root API\" in I<rootless-builds.txt>.)"
 msgstr ""
+"Wanneer het veld ingesteld is op een van de I<impl-trefwoorden>, zal het "
+"bouwprogramma een interface ontsluiten die gebruikt wordt om een commando "
+"onder (fake)root uit te voeren. (Zie \"Gain Root API\" in I<rootless-builds."
+"txt>.)"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, no-wrap
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<Testsuite:>I< namenlijst>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, no-wrap
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<Testsuite-Triggers:>I< pakketlijst>"
+
+#. type: Plain text
+#: deb-src-control.man
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+"Deze velden worden beschreven in de man-pagina B<dsc>(5), aangezien zij "
+"gegenereerd worden op basis van informatie, afgeleid uit B<debian/tests/"
+"control>, of letterlijk naar het controlebestand van de broncode gekopieerd "
+"worden."
 
 #. type: TP
 #: deb-src-control.man dsc.man
@@ -3280,18 +3432,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "The syntax of the B<Build-Depends>, B<Build-Depends-Arch> and B<Build-"
-#| "Depends-Indep> fields is a list of groups of alternative packages.  Each "
-#| "group is a list of packages separated by vertical bar (or “pipe”)  "
-#| "symbols, ‘B<|>’.  The groups are separated by commas.  Commas are to be "
-#| "read as “AND”, and pipes as “OR”, with pipes binding more tightly.  Each "
-#| "package name is optionally followed by an architecture qualifier appended "
-#| "after a colon ‘B<:>’, optionally followed by a version number "
-#| "specification in parentheses, an architecture specification in square "
-#| "brackets, and a restriction formula consisting of one or more lists of "
-#| "profile names in angle brackets."
 msgid ""
 "The syntax of the B<Build-Depends>, B<Build-Depends-Arch> and B<Build-"
 "Depends-Indep> fields is a list of groups of alternative packages.  Each "
@@ -3310,25 +3450,19 @@ msgstr ""
 "Depends-Indep> is een lijst van groepen van alternatieve pakketten. Elke "
 "groep is een lijst van pakketten die onderling gescheiden worden door het "
 "symbool verticale streep (of “pijp”), ‘B<|>’. De groepen worden onderling "
-"gescheiden door komma's. Een komma moet geïnterpreteerd worden als een “AND” "
-"en een pijp als een “OR”, waarbij pijpen de sterkste binding hebben. Elke "
-"pakketnaam kan facultatief gevolgd worden door een architectuurkwalificatie, "
-"die toegevoegd wordt na een dubbele punt ‘B<:>’, facultatief gevolgd door de "
-"vermelding van een versienummer tussen haakjes, een architectuurspecificatie "
-"tussen vierkante haakjes en een restrictieve formule die bestaat uit één of "
-"meer lijsten van profielnamen tussen accolades."
+"gescheiden door komma's ‘B<,>’ en de lijst kan eindigen met een afsluitende "
+"komma, die bij het genereren van de velden voor B<deb-control>(5) weggelaten "
+"zal worden (sinds dpkg 1.10.14). Een komma moet geïnterpreteerd worden als "
+"een “AND” en een pijp als een “OR”, waarbij pijpen de sterkste binding "
+"hebben. Elke pakketnaam kan facultatief gevolgd worden door een "
+"architectuurkwalificatie, die toegevoegd wordt na een dubbele punt ‘B<:>’, "
+"facultatief gevolgd door de vermelding van een versienummer tussen ronde "
+"haakjes ‘B<(>’ en ‘B<)>’, een architectuurspecificatie tussen vierkante "
+"haakjes ‘B<[>’ en ‘B<]>’ en een restrictieformule die bestaat uit één of "
+"meer lijsten van profielnamen tussen punthaakjes ‘B<E<lt>>’ en ‘B<E<gt>>’."
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "The syntax of the B<Build-Conflicts>, B<Build-Conflicts-Arch> and B<Build-"
-#| "Conflicts-Indep> fields is a list of comma-separated package names, where "
-#| "the comma is read as an “AND”.  Specifying alternative packages using a "
-#| "“pipe” is not supported.  Each package name is optionally followed by a "
-#| "version number specification in parentheses, an architecture "
-#| "specification in square brackets, and a restriction formula consisting of "
-#| "one or more lists of profile names in angle brackets."
 msgid ""
 "The syntax of the B<Build-Conflicts>, B<Build-Conflicts-Arch> and B<Build-"
 "Conflicts-Indep> fields is a list of comma-separated package names, where "
@@ -3343,12 +3477,14 @@ msgstr ""
 "De syntaxis van de velden B<Build-Conflicts>, B<Build-Conflicts-Arch> en "
 "B<Build-Conflicts-Indep> is een lijst van pakketnamen die onderling "
 "gescheiden zijn door een komma, waarbij de komma geïnterpreteerd moet worden "
-"als een “AND”. Het specificeren van alternatieve pakketten met behulp van "
-"een “pijp” wordt niet ondersteund. Elke pakketnaam kan facultatief gevolgd "
-"worden door de vermelding van een versienummer tussen haakjes, een "
-"architectuurspecificatie tussen vierkante haakjes en een restrictieve "
-"formule die bestaat uit één of meer lijsten van profielnamen tussen "
-"accolades."
+"als een “AND” en waarbij de lijst kan eindigen met een afsluitende komma, "
+"die bij het genereren van de velden voor B<deb-control>(5) weggelaten zal "
+"worden (sinds dpkg 1.10.14).. Het specificeren van alternatieve pakketten "
+"met behulp van een “pijp” wordt niet ondersteund. Elke pakketnaam kan "
+"facultatief gevolgd worden door de vermelding van een versienummer tussen "
+"ronde haakjes, een architectuurspecificatie tussen vierkante haakjes en een "
+"restrictieformule die bestaat uit één of meer lijsten van profielnamen "
+"tussen punthaakjes."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3394,13 +3530,12 @@ msgid ""
 "can be prefixed with an exclamation mark, meaning “NOT”.  A restriction "
 "formula represents a disjunctive normal form expression."
 msgstr ""
-"Een restrictieve formule bestaat uit één of meer restrictieve lijsten, "
-"onderling gescheiden door witruimte. Elke restrictieve lijst staat tussen "
-"accolades. De items in de restrictieve lijst zijn bouwprofielnamen, "
-"onderling gescheiden door witruimte, en kunnen voorafgegaan worden door een "
-"uitroepteken, hetgeen de betekenis heeft van “NOT” (niet). Een restrictieve "
-"formule heeft de verschijningsvorm van een expressie in disjunctieve "
-"normaalvorm."
+"Een restrictieformule bestaat uit één of meer restrictielijsten, onderling "
+"gescheiden door witruimte. Elke restrictielijst staat tussen punthaakjes. De "
+"items in de restrictielijst zijn bouwprofielnamen, onderling gescheiden door "
+"witruimte, en kunnen voorafgegaan worden door een uitroepteken, hetgeen de "
+"betekenis heeft van “NOT” (niet). Een restrictieformule heeft de "
+"verschijningsvorm van een expressie in disjunctieve normaalvorm."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3537,22 +3672,24 @@ msgid ""
 "architecture specifications and restriction formulas which will all get "
 "reduced when generating the fields for B<deb-control>(5)."
 msgstr ""
+"Deze velden benoemen relaties tussen pakketten. Ze worden besproken in de "
+"man-pagina B<deb-control>(5). Wanneer deze velden in I<debian/control> "
+"voorkomen, kunnen ze ook eindigen met een afsluitende komma (sinds dpkg "
+"1.10.14), kunnen ze architectuurspecificaties bevatten en restrictieformules "
+"bevatten, wat bij het genereren van de velden voor B<deb-control>(5) "
+"allemaal teruggebracht zal worden."
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "These fields are used by the debian-installer and are usually not "
-#| "needed.  See /usr/share/doc/debian-installer/devel/modules.txt from the "
-#| "B<debian-installer> package for more details about them."
 msgid ""
 "These fields are used by the debian-installer in B<udeb>s and are usually "
 "not needed.  See /usr/share/doc/debian-installer/devel/modules.txt from the "
 "B<debian-installer> package for more details about them."
 msgstr ""
-"Deze velden worden door het installatieprogramma van Debian gebruikt en zijn "
-"meestal niet nodig. Zie voor meer details over deze velden /usr/share/doc/"
-"debian-installer/devel/modules.txt uit het pakket B<debian-installer>."
+"Deze velden worden door het installatieprogramma van Debian in B<udeb>'s "
+"gebruikt en zijn meestal niet nodig. Zie voor meer details over deze velden /"
+"usr/share/doc/debian-installer/devel/modules.txt uit het pakket B<debian-"
+"installer>."
 
 #. type: SH
 #: deb-src-control.man
@@ -3562,13 +3699,6 @@ msgstr "DOOR DE GEBRUIKER GEDEFINIEERDE VELDEN"
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "It is allowed to add additional user-defined fields to the control file. "
-#| "The tools will ignore these fields. If you want the fields to be copied "
-#| "over to the output files, such as the binary packages, you need to use a "
-#| "custom naming scheme: the fields should start with an B<X>, followed by "
-#| "zero or more of the letters B<BCS> and a hyphen."
 msgid ""
 "It is allowed to add additional user-defined fields to the control file. The "
 "tools will ignore these fields. If you want the fields to be copied over to "
@@ -3577,10 +3707,11 @@ msgid ""
 "more of the letters B<SBC> and a hyphen."
 msgstr ""
 "Het is toegelaten om aan het bestand control bijkomende door de gebruiker "
-"gedefinieerde velden toe te voegen. Indien u wilt dat de velden mee "
-"gekopieerd worden naar de uitvoerbestanden, zoals de binaire pakketten, moet "
-"u een aangepast naamgevingsschema hanteren: de velden moeten beginnen met "
-"een B<X>, gevolgd door nul of meer van de tekens B<BCS> en een koppelteken."
+"gedefinieerde velden toe te voegen. De gereedschappen zullen deze velden "
+"negeren. Indien u wilt dat de velden mee gekopieerd worden naar de "
+"uitvoerbestanden, zoals de binaire pakketten, moet u een aangepast "
+"naamgevingsschema hanteren: de velden moeten beginnen met een B<X>, gevolgd "
+"door nul of meer van de tekens B<SBC> en een koppelteken."
 
 #. type: TP
 #: deb-src-control.man
@@ -3628,22 +3759,16 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid ""
-#| "Note that the B<X>[B<BCS>]B<-> prefixes are stripped when the fields are "
-#| "copied over to the output files. A field B<XC-Approved-By> will appear as "
-#| "B<Approved-By> in the changes file and will not appear in the binary or "
-#| "source package control files."
 msgid ""
 "Note that the B<X>[B<SBC>]B<-> prefixes are stripped when the fields are "
 "copied over to the output files. A field B<XC-Approved-By> will appear as "
 "B<Approved-By> in the changes file and will not appear in the binary or "
 "source package control files."
 msgstr ""
-"Merk op dat de voorvoegsels B<X>[B<BCS>]B<-> weggelaten worden wanneer de "
+"Merk op dat de voorvoegsels B<X>[B<SBC>]B<-> weggelaten worden wanneer de "
 "velden gekopieerd worden naar de uitvoerbestanden. Een veld B<XC-Approved-"
 "By> zal als B<Approved-By> in het changes-bestand vermeld staan en niet "
-"opgenomen zijn in het control-bestand van het binair en het broncodepakket."
+"opgenomen zijn in het control-bestand van het binair en het bronpakket."
 
 #. type: Plain text
 #: deb-src-control.man
@@ -3671,8 +3796,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3685,8 +3810,8 @@ msgstr ""
 "# dit veld wordt gekopieerd naar het binaire en het broncodepakket\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3737,10 +3862,8 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-control.man
-#, fuzzy
-#| msgid "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
 msgid "B<deb-control>(5), B<deb-version>(7), B<dpkg-source>(1)"
-msgstr "B<deb-control>(5), B<deb-version>(5), B<dpkg-source>(1)"
+msgstr "B<deb-control>(5), B<deb-version>(7), B<dpkg-source>(1)"
 
 #. type: TH
 #: deb-src-files.man
@@ -3776,8 +3899,9 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
-msgstr "I<bestandsnaam> I<sectie> I<prioriteit>"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
+msgstr ""
+"I<bestandsnaam> I<sectie> I<prioriteit> [ I<trefwoord=waarde\\&...\\&> ]"
 
 #. type: Plain text
 #: deb-src-files.man
@@ -3795,6 +3919,18 @@ msgstr ""
 "uit het .deb-bestand. Welke waarden mogelijk zijn, is specifiek voor het "
 "archief van elke distributie."
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+"I<trefwoord=waarde\\&...\\&> komt overeen met een facultatieve door "
+"witruimte afgebakende lijst van attributen voor dit element. Momenteel is "
+"het enige ondersteunde trefwoord B<automatic> met als waarde B<yes>, om "
+"automatisch gegenereerde bestanden te markeren."
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -3819,16 +3955,15 @@ msgstr "B<dpkg-genchanges>(1), B<dpkg-distaddfile>(1)."
 
 #. type: TH
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "deb-src-files"
+#, no-wrap
 msgid "deb-src-rules"
-msgstr "deb-src-files"
+msgstr "deb-src-rules"
 
 #. type: TH
 #: deb-src-rules.man
 #, no-wrap
 msgid "2017-09-05"
-msgstr ""
+msgstr "05-09-2017"
 
 #. type: TH
 #: deb-src-rules.man
@@ -3844,32 +3979,22 @@ msgstr "dpkg-hulpprogramma's"
 
 #. type: Plain text
 #: deb-src-rules.man
-#, fuzzy
-#| msgid "deb-src-control - Debian source packages' master control file format"
 msgid "deb-src-rules - Debian source package rules file"
-msgstr ""
-"deb-src-control - Indeling van het hoofdcontrolebestand van Debian-"
-"broncodepakketten"
+msgstr "deb-src-rules - Aanwijzingenbestand van Debian-bronpakketten"
 
 #. type: Plain text
 #: deb-src-rules.man
-#, fuzzy
-#| msgid "debian/files"
 msgid "debian/rules"
-msgstr "debian/files"
+msgstr "debian/rules"
 
 #. type: Plain text
 #: deb-src-rules.man
-#, fuzzy
-#| msgid ""
-#| "This multiline field contains a list of binary packages generated by this "
-#| "source package."
 msgid ""
 "This file contains the instructions necessary to build the binary packages "
 "from the source package."
 msgstr ""
-"Dit multiregel-veld bevat een lijst van binaire pakketten die door dit "
-"broncodepakket gegenereerd worden."
+"Dit bestand bevat de noodzakelijke instructies om op basis van het "
+"bronpakket de binaire pakketten te bouwen."
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3877,18 +4002,19 @@ msgid ""
 "The I<debian/rules> file is an executable Makefile, with a shebang that is "
 "usually set to \"#!/usr/bin/make -f\"."
 msgstr ""
+"Het bestand I<debian/rules> is een uitvoerbare Makefile met een shebang die "
+"gewoonlijk ingesteld staat op \"#!/usr/bin/make -f\"."
 
 #. type: Plain text
 #: deb-src-rules.man
 msgid "It must support the following make targets:"
-msgstr ""
+msgstr "De volgende targets van 'make' moeten erdoor ondersteund worden:"
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<--pre-clean>"
+#, no-wrap
 msgid "B<clean>"
-msgstr "B<--pre-clean>"
+msgstr "B<clean>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3896,29 +4022,35 @@ msgid ""
 "Clean up the source tree, by undoing any change done by any of the build and "
 "binary targets.  This target will be called with root privileges."
 msgstr ""
+"De broncodeboom opschonen door elke wijziging ongedaan te maken die door een "
+"van de targets van het type 'build' of 'binary' doorgevoerd werden. Dit "
+"target wordt aanroepen met systeembeheerderprivileges."
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<Building>"
+#, no-wrap
 msgid "B<build-indep>"
-msgstr "B<Bouwen>"
+msgstr "B<build-indep>"
 
 #. type: Plain text
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
+"Bouwen van de architectuuronafhankelijke bestanden die nodig zijn om een "
+"architectuuronafhankelijk binair pakket te bouwen. Indien er geen "
+"architectuuronafhankelijke binaire pakketten gegenereerd moeten worden, moet "
+"dit target toch aanwezig zijn, maar niets doen. Dit target mag geen "
+"systeembeheerderprivileges vereisen."
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<multi-arch>"
+#, no-wrap
 msgid "B<build-arch>"
-msgstr "B<multi-arch>"
+msgstr "B<build-arch>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3928,13 +4060,17 @@ msgid ""
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
+"Bouwen van de architectuurafhankelijke bestanden die nodig zijn om een "
+"architectuurafhankelijk binair pakket te bouwen. Indien er geen "
+"architectuurafhankelijke binaire pakketten gegenereerd moeten worden, moet "
+"dit target toch aanwezig zijn, maar niets doen. Dit target mag geen "
+"systeembeheerderprivileges vereisen."
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<Building>"
+#, no-wrap
 msgid "B<build>"
-msgstr "B<Bouwen>"
+msgstr "B<build>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3943,13 +4079,16 @@ msgid ""
 "least transitively) on B<build-indep> and/or B<build-arch> or by inlining "
 "what those targets would do.  This target must not require root privileges."
 msgstr ""
+"Bouwen van architectuuronafhankelijke en architectuurafhankelijke bestanden "
+"door ofwel te steunen (minstens transitief) op B<build-indep> en/of B<build-"
+"arch>, of door zelf de taken op te nemen die deze targets anders zouden "
+"uitvoeren. Dit target mag geen systeembeheerderprivileges vereisen."
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<binary>"
+#, no-wrap
 msgid "B<binary-indep>"
-msgstr "B<binary>"
+msgstr "B<binary-indep>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3958,13 +4097,15 @@ msgid ""
 "least transitively) on either B<build-indep> or B<build>.  This target will "
 "be called with root privileges."
 msgstr ""
+"Bouwen van architectuuronafhankelijke binaire pakketten. Dit target moet "
+"steunen (minstens transitief) op B<build-indep> of op B<build>. Dit target "
+"wordt aanroepen met systeembeheerderprivileges."
 
 #. type: TP
 #: deb-src-rules.man
-#, fuzzy, no-wrap
-#| msgid "B<binary>"
+#, no-wrap
 msgid "B<binary-arch>"
-msgstr "B<binary>"
+msgstr "B<binary-arch>"
 
 #. type: Plain text
 #: deb-src-rules.man
@@ -3973,6 +4114,9 @@ msgid ""
 "least transitively) on either B<build-arch> or B<build>.  This target will "
 "be called with root privileges."
 msgstr ""
+"Bouwen van architectuurafhankelijke binaire pakketten. Dit target moet "
+"steunen (minstens transitief) op B<build-arch> of op B<build>. Dit target "
+"wordt aanroepen met systeembeheerderprivileges."
 
 #. type: TP
 #: deb-src-rules.man dpkg-buildpackage.man dpkg-genbuildinfo.man
@@ -3989,22 +4133,21 @@ msgid ""
 "or by inlining what those targets would do.  This target will be called with "
 "root privileges."
 msgstr ""
+"Bouwen van architectuuronafhankelijke en architectuurafhankelijke binaire "
+"pakketten door ofwel te steunen (minstens transitief) op B<binary-indep> en/"
+"of B<binary-arch>, of door zelf de taken op te nemen die deze targets anders "
+"zouden uitvoeren. Dit target wordt aanroepen met systeembeheerderprivileges."
 
 #. type: Plain text
 #: deb-src-rules.man
-#, fuzzy
-#| msgid ""
-#| "B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
-#| "genbuildinfo>(1), B<dpkg-genchanges>(1), B<fakeroot>(1), B<lintian>(1), "
-#| "B<gpg2>(1), B<gpg>(1)."
 msgid ""
 "B<dpkg-architecture>(1), B<dpkg-vendor>(1), B<dpkg-buildflags>(1), B<dpkg-"
 "parsechangelog>(1), B<dpkg-shlibdeps>(1), B<dpkg-gencontrol>(1), B<dpkg-"
 "deb>(1), B<dpkg-distaddfile>(1)."
 msgstr ""
-"B<dpkg-source>(1), B<dpkg-architecture>(1), B<dpkg-buildflags>(1), B<dpkg-"
-"genbuildinfo>(1), B<dpkg-genchanges>(1), B<fakeroot>(1), B<lintian>(1), "
-"B<gpg2>(1), B<gpg>(1)."
+"B<dpkg-architecture>(1), B<dpkg-vendor>(1), B<dpkg-buildflags>(1), B<dpkg-"
+"parsechangelog>(1), B<dpkg-shlibdeps>(1), B<dpkg-gencontrol>(1), B<dpkg-"
+"deb>(1), B<dpkg-distaddfile>(1)."
 
 #. type: TH
 #: deb-split.man
@@ -4275,13 +4418,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-version.man
-#, fuzzy
-#| msgid ""
-#| "It is optional; if it isn't present then the I<upstream-version> may not "
-#| "contain a hyphen.  This format represents the case where a piece of "
-#| "software was written specifically to be turned into a Debian package, and "
-#| "so there is only one “debianisation” of it and therefore no revision "
-#| "indication is required."
 msgid ""
 "It is optional; if it isn't present then the I<upstream-version> may not "
 "contain a hyphen.  This format represents the case where a piece of software "
@@ -4292,8 +4428,8 @@ msgstr ""
 "Het is facultatief. Als het ontbreekt, mag de I<toeleveraarsversie> geen "
 "verbindingsteken bevatten. Deze indeling komt voor in het geval een stuk "
 "software geschreven werd met de specifieke bedoeling er een Debian pakket "
-"van te maken, zodat er slechts één enkele “debianisatie” van is en er daarom "
-"geen revisieaanduiding nodig is."
+"van te maken, zodat er slechts één enkele “debianisering” van bestaat en er "
+"daarom geen revisieaanduiding nodig is."
 
 #. type: Plain text
 #: deb-version.man
@@ -4926,17 +5062,20 @@ msgstr ""
 #: deb-substvars.man
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 "Een variabelesubstitutie heeft als vorm B<${>I<variabelenaam>B<}>. "
-"Variabelenamen bestaan uit alfanumerieke tekens, koppeltekens en dubbele "
-"punten en beginnen met een alfanumeriek teken. Variabelesubstituties worden "
-"bij herhaling uitgevoerd tot er geen meer overblijven. Na een substitutie "
-"wordt de volledige tekst van het veld opnieuw doorzocht op nog meer uit te "
-"voeren substituties."
+"Variabelenamen bestaan uit alfanumerieke tekens (a-zA-Z0-9), koppeltekens "
+"(-) en dubbele punten (:) en beginnen met een alfanumeriek teken. Ze zijn "
+"ook hoofdlettergevoelig, ook al kunnen ze verwijzen naar andere entiteiten "
+"die hoofdletterbehoudend zijn. Variabelesubstituties worden bij herhaling "
+"uitgevoerd tot er geen meer overblijven. Na een substitutie wordt de "
+"volledige tekst van het veld opnieuw doorzocht op nog meer uit te voeren "
+"substituties."
 
 #. type: Plain text
 #: deb-substvars.man
@@ -5083,16 +5222,12 @@ msgstr "B<binary:Version>"
 
 #. type: Plain text
 #: deb-substvars.man
-#, fuzzy
-#| msgid ""
-#| "The binary package version (which may differ from source:Version in a "
-#| "binNMU for example; since dpkg 1.13.19)."
 msgid ""
 "The binary package version (which may differ from B<source:Version> in a "
 "binNMU for example; since dpkg 1.13.19)."
 msgstr ""
-"De versie van het binaire pakket (dat verschillend kan zijn van source:"
-"Version in geval van een binNMU bijvoorbeeld; sinds dpkg 1.13.19)."
+"De versie van het binaire pakket (dat verschillend kan zijn van B<source:"
+"Version>, in geval van een binNMU bijvoorbeeld; sinds dpkg 1.13.19)."
 
 #. type: TP
 #: deb-substvars.man
@@ -5115,10 +5250,9 @@ msgstr ""
 
 #. type: TP
 #: deb-substvars.man
-#, fuzzy, no-wrap
-#| msgid "B<source:Version>"
+#, no-wrap
 msgid "B<source:Synopsis>"
-msgstr "B<source:Version>"
+msgstr "B<source:Synopsis>"
 
 #. type: Plain text
 #: deb-substvars.man
@@ -5126,13 +5260,14 @@ msgid ""
 "The source package synopsis, extracted from the source stanza B<Description> "
 "field, if it exists (since dpkg 1.19.0)."
 msgstr ""
+"De synopsis van het bronpakket, gehaald uit het veld B<Description> van het "
+"broncode-element, als het bestaat (sinds dpkg 1.19.0)."
 
 #. type: TP
 #: deb-substvars.man
-#, fuzzy, no-wrap
-#| msgid "B<source:Upstream-Version>"
+#, no-wrap
 msgid "B<source:Extended-Description>"
-msgstr "B<source:Upstream-Version>"
+msgstr "B<source:Extended-Description>"
 
 #. type: Plain text
 #: deb-substvars.man
@@ -5140,6 +5275,8 @@ msgid ""
 "The source package extended description, extracted from the source stanza "
 "B<Description> field, if it exists (since dpkg 1.19.0)."
 msgstr ""
+"De uitgebreide beschrijving van het bronpakket, gehaald uit het veld "
+"B<Description> van het broncode-element, als het bestaat (sinds dpkg 1.19.0)."
 
 #. type: TP
 #: deb-substvars.man
@@ -6014,16 +6151,32 @@ msgstr "B<interest-noawait> I<triggernaam>"
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
-"functionality provided by the trigger is not crucial."
+"triggers control file."
 msgstr ""
 "Specificeert dat het pakket geïnteresseerd is in de genoemde trigger. Alle "
 "triggers waarin een pakket geïnteresseerd is, moeten met behulp van deze "
-"instructie vermeld worden in het trigger-controlebestand. De variant "
-"“noawait” plaatst de triggerende pakketten niet in de toestand triggers-"
-"awaited (wachten op triggerafhandeling). Dit zou gebruikt moeten worden als "
-"de functionaliteit die door de trigger geleverd wordt, niet cruciaal is."
+"instructie vermeld worden in het controlebestand triggers."
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
+"functionality provided by the trigger is not crucial."
+msgstr ""
+"De varianten “await” plaatsen het triggerende pakket in een toestand van "
+"wachten op triggerafhandeling (triggers-awaited), afhankelijk van hoe de "
+"trigger geactiveerd werd. De variant “noawait” plaatst het triggerende "
+"pakket niet in een toestand van wachten op triggerafhandeling (triggers-"
+"awaited), zelfs indien het triggerende pakket een “await”-activering aangaf "
+"(met een stuurcommando B<activate-await> of B<activate>, of via de "
+"commandoregeloptie B<dpkg-trigger> B<--no-await>). De variant “noawait” zou "
+"gebruikt moeten worden als de door de trigger geboden functionaliteit niet "
+"essentieel is."
 
 #. type: TP
 #: deb-triggers.man
@@ -6049,18 +6202,29 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
 msgstr ""
 "Regelt dat wijzigingen aan de toestand van dit pakket de opgegeven trigger "
 "zullen activeren. De trigger zal geactiveerd worden bij het begin van de "
 "volgende operaties: unpack (uitpakken), configure (configureren), remove "
 "(verwijderen) (inclusief ten voordele van een tegenstrijdig pakket), purge "
-"(wissen) en deconfigure (deconfigureren). De variant “noawait” plaatst de "
-"triggerende pakketten niet in de toestand triggers-awaited (wachten op "
-"triggerafhandeling). Dit zou gebruikt moeten worden als de functionaliteit "
-"die door de trigger geleverd wordt, niet cruciaal is."
+"(wissen) en deconfigure (deconfigureren)."
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
+msgstr ""
+"De varianten “await” plaatsen het triggerende pakket enkel in een toestand "
+"van wachten op triggerafhandeling (triggers-awaited), indien het "
+"stuurcommando interest eveneens “await” is. De variant “noawait” plaatst de "
+"triggerende pakketten niet in een toestand van wachten op triggerafhandeling "
+"(triggers-awaited). De variant “noawait” zou gebruikt moeten worden als de "
+"door de trigger geboden functionaliteit niet essentieel is."
 
 #. type: Plain text
 #: deb-triggers.man
@@ -6109,37 +6273,38 @@ msgstr ""
 
 #. type: Plain text
 #: deb-triggers.man
-#, fuzzy
-#| msgid ""
-#| "The “-noawait” variants are only supported since dpkg 1.16.1, and will "
-#| "lead to errors if used with an older dpkg. It is thus recommended to add "
-#| "a “Pre-Depends: dpkg (E<gt>= 1.16.1)” to any package that wish to use "
-#| "those directives."
 msgid ""
 "The “-noawait” variants are supported since dpkg 1.16.1, and will lead to "
 "errors if used with an older dpkg."
 msgstr ""
-"De varianten “-noawait” worden slechts vanaf dpkg 1.16.1 ondersteund en "
-"zullen tot fouten leiden als zij met een oudere versie van dpkg gebruikt "
-"worden. Het wordt dus aangeraden om bij elk pakket dat gebruik wil maken van "
-"deze stuurcommando's, een “Pre-Depends: dpkg (E<gt>= 1.16.1)” toe te voegen."
+"De varianten “-noawait” worden vanaf dpkg 1.16.1 ondersteund en zullen tot "
+"fouten leiden als zij met een oudere versie van dpkg gebruikt worden."
 
 #. type: Plain text
 #: deb-triggers.man
-#, fuzzy
-#| msgid ""
-#| "The “-await” alias variants are only supported since dpkg 1.17.21, and "
-#| "will lead to errors if used with an older dpkg. It is thus recommended to "
-#| "add a “Pre-Depends: dpkg (E<gt>= 1.17.21)” to any package that wish to "
-#| "use those directives."
 msgid ""
 "The “-await” alias variants are supported since dpkg 1.17.21, and will lead "
 "to errors if used with an older dpkg."
 msgstr ""
-"De aliasvarianten “-await” worden slechts vanaf dpkg 1.17.21 ondersteund en "
-"zullen tot fouten leiden als zij met een oudere versie van dpkg gebruikt "
-"worden. Het wordt dus aangeraden om bij elk pakket dat gebruik wil maken van "
-"deze stuurcommando's, een “Pre-Depends: dpkg (E<gt>= 1.17.21)” toe te voegen."
+"De aliasvarianten “-await” worden vanaf dpkg 1.17.21 ondersteund en zullen "
+"tot fouten leiden als zij met een oudere versie van dpkg gebruikt worden."
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+"Wanneer een pakket voorziet in een stuurcommando B<interest-noawait>, zal "
+"elke activering het triggerende pakket in een modus “noawait” plaatsen, "
+"ongeacht welke wachtmodus (“await” of “noawait”) via de activering gevraagd "
+"wordt. Wanneer een pakket voorziet in een stuurcommando B<interest> of "
+"B<interest-await>, zal elke activering het triggerende pakket in een "
+"toestand “await” of “noawait“ plaatsen, afhankelijk van de activeringswijze."
 
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
@@ -6193,36 +6358,40 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 "De waarde van dit veld declareert de indelingsversie van het broncodepakket. "
 "De veldwaarde wordt door programma's die met een broncodepakket werken, "
-"gebruikt om de bestandslijst in het broncodepakket te interpreteren en te "
+"gebruikt om de bestandenlijst in het broncodepakket te interpreteren en te "
 "bepalen hoe het uitgepakt moet worden. De syntaxis van de veldwaarde is: een "
-"numerieke hoofdversie, een punt, een numerieke onderversie, en dan eventueel "
-"na witruimte een subtype dat, als het opgegeven wordt, bestaat uit een "
-"alfanumeriek woord tussen haakjes. Vanuit het oogpunt van syntaxis is het "
-"subtype optioneel, maar voor specifieke revisies van de indeling van "
-"broncodepakketten kan het een verplicht onderdeel zijn."
+"numerieke hoofdversie (“0-9”), een punt (“.”), een numerieke onderversie "
+"(“0-9”), en dan eventueel na witruimte (“\\ \\et”) een subtype dat, als het "
+"opgegeven wordt, bestaat uit een alfanumeriek (“a-z0-9”) woord tussen "
+"haakjes (“()”). Vanuit het oogpunt van syntaxis is het subtype optioneel, "
+"maar voor specifieke revisies van de indeling van broncodepakketten kan het "
+"een verplicht onderdeel zijn."
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
-"De indelingen van broncodepakketten die momenteel ondersteund worden door "
-"B<dpkg> zijn B<1.0>, B<2.0>, B<3.0 (native)>, B<3.0 (quilt)>, B<3.0 (git)>, "
-"B<3.0 (bzr)> en B<3.0 (custom)>."
+"De indelingen van de broncode die momenteel ondersteund worden door B<dpkg> "
+"zijn B<1.0>, B<2.0>, B<3.0 (native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 "
+"(bzr)> en B<3.0 (custom)>. Raadpleeg B<dpkg-source>(1) voor de beschrijving "
+"ervan."
 
 #. type: TP
 #: dsc.man
 #, no-wrap
 msgid "B<Source:> I<source-name> (required)"
-msgstr "B<Source:> I<broncodepakket-naam> (verplicht)"
+msgstr "B<Source:> I<broncode-naam> (verplicht)"
 
 #. type: TP
 #: dsc.man
@@ -6328,21 +6497,8 @@ msgstr ""
 "versiecontrolesysteem dat gebruikt wordt om dit pakket te onderhouden. Zie "
 "B<deb-src-control>(5) voor verdere informatie."
 
-#. type: TP
-#: dsc.man
-#, no-wrap
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<Testsuite:>I< namenlijst>"
-
 #. type: Plain text
 #: dsc.man
-#, fuzzy
-#| msgid ""
-#| "This field declares that the source package contains the specified test "
-#| "suites.  The value is a space-separated list of test suites.  If the "
-#| "B<autopkgtest> value is present, a I<debian/tests/control> is expected to "
-#| "be present, if the file is present but not the value, then B<dpkg-source> "
-#| "will automatically add it, preserving previous values."
 msgid ""
 "This field declares that the source package contains the specified test "
 "suites.  The value is a comma-separated list of test suites.  If the "
@@ -6351,31 +6507,27 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 "Dit veld declareert dat het broncodepakket de opgegeven testsuites bevat. De "
-"waarde is een lijst van onderling door spaties gescheiden testsuites. Indien "
+"waarde is een lijst van onderling door komma's gescheiden testsuites. Indien "
 "de waarde B<autopkgtest> bestaat, wordt verondersteld dat het bestand "
 "I<debian/tests/control> bestaat. Indien het bestand bestaat, maar de waarde "
 "niet, dan zal B<dpkg-source> die automatisch toevoegen met behoud van de "
 "vroegere waarden."
 
-#. type: TP
-#: dsc.man
-#, no-wrap
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<Testsuite-Triggers:>I< pakketlijst>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 "Dit veld declareert de door komma's gescheiden unie van alle testvereisten "
 "(de velden B<Depends> uit het bestand I<debian/tests/control>), waaruit alle "
-"restricties verwijderd en alle OR-vereisten uitgevlakt werden, met "
-"uitzondering van die welke gelden voor de binaire pakketten die dit "
-"broncodepakket genereert en van meta-vereisten zoals B<@> of B<@builddeps@>."
+"restricties verwijderd en alle OR-vereisten uitgevlakt werden (dit betekent "
+"omgezet naar aparte AND-relaties), uitgezonderd voor de binaire pakketten, "
+"gegenereerd door dit broncodepakket en het equivalent van zijn meta-vereiste "
+"B<@>."
 
 #. type: Plain text
 #: dsc.man
@@ -6546,10 +6698,8 @@ msgstr ""
 
 #. type: Plain text
 #: dsc.man
-#, fuzzy
-#| msgid "B<deb-src-control>(5), B<deb-version>(5), B<dpkg-source>(1)."
 msgid "B<deb-src-control>(5), B<deb-version>(7), B<dpkg-source>(1)."
-msgstr "B<deb-src-control>(5), B<deb-version>(5), B<dpkg-source>(1)."
+msgstr "B<deb-src-control>(5), B<deb-version>(7), B<dpkg-source>(1)."
 
 #. type: TH
 #: dpkg.man
@@ -6814,6 +6964,24 @@ msgstr ""
 "Het pakket werd geselecteerd om gewist te worden (d.w.z. dat we alles uit de "
 "systeemmappen wensen te verwijderen, zelfs de configuratiebestanden)."
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr "B<unknown>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+"Het betreft een onbekende pakketselectie. Een pakket dat zich eveneens in de "
+"toestand B<not-installed> (niet-geïnstalleerd) bevindt en een B<ok>-vlag "
+"heeft, zal de volgende keer weggelaten worden bij het opslaan van de "
+"databank."
+
 #. type: SS
 #: dpkg.man
 #, no-wrap
@@ -7027,21 +7195,26 @@ msgstr "B<-r>, B<--remove> I<pakket>...|B<-a>|B<--pending>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
-"Verwijder een geïnstalleerd pakket. Dit verwijdert alles behalve de "
-"conffiles (configuratiebestanden), waardoor vermeden kan worden dat het "
-"pakket opnieuw geconfigureerd moet worden als het opnieuw geïnstalleerd "
-"wordt (conffiles zijn configuratiebestanden die vermeld worden in het "
-"controlebestand I<DEBIAN/conffiles>). Indien B<-a> of B<--pending> opgegeven "
-"werd in plaats van een pakketnaam, zullen alle pakketten die uitgepakt zijn "
-"maar in het bestand I<%ADMINDIR%/status> gemarkeerd staan om verwijderd te "
-"worden, verwijderd worden."
+"Een geïnstalleerd pakket verwijderen. Dit verwijdert alles behalve de "
+"conffiles (configuratiebestanden) en andere gegevens die opgeruimd worden "
+"door het script I<postrm>, waardoor vermeden kan worden dat het pakket "
+"opnieuw geconfigureerd moet worden als het opnieuw geïnstalleerd wordt "
+"(conffiles zijn configuratiebestanden die vermeld worden in het "
+"controlebestand I<DEBIAN/conffiles>). Indien er geen controlebestand "
+"I<DEBIAN/conffiles> en geen script I<DEBIAN/postrm> bestaat, is dit commando "
+"equivalent met het aanroepen van B<--purge>. Indien B<-a> of B<--pending> "
+"opgegeven werd in plaats van een pakketnaam, zullen alle pakketten die "
+"uitgepakt zijn maar in het bestand I<%ADMINDIR%/status> gemarkeerd staan om "
+"verwijderd te worden, verwijderd worden."
 
 #. type: Plain text
 #: dpkg.man
@@ -7073,15 +7246,17 @@ msgstr "B<-P>, B<--purge> I<pakket>...|B<-a>|B<--pending>"
 #: dpkg.man
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
-"Wis een geïnstalleerd of een reeds verwijderd pakket. Dit verwijdert alles, "
-"inclusief conffiles (configuratiebestanden). Indien B<-a> of B<--pending> "
-"opgegeven werd in plaats van een pakketnaam, dan zullen alle uitgepakte of "
-"verwijderde pakketten die echter in het bestand I<%ADMINDIR%/status> "
-"gemarkeerd zijn om gewist te worden, gewist worden."
+"Een geïnstalleerd of een reeds verwijderd pakket wissen. Dit verwijdert "
+"alles, inclusief conffiles (configuratiebestanden) en alles wat anders "
+"opgeruimd wordt vanuit I<postrm>. Indien B<-a> of B<--pending> opgegeven "
+"werd in plaats van een pakketnaam, dan zullen alle uitgepakte of verwijderde "
+"pakketten die echter in het bestand I<%ADMINDIR%/status> gemarkeerd zijn om "
+"gewist te worden, gewist worden."
 
 #. type: Plain text
 #: dpkg.man
@@ -7377,6 +7552,15 @@ msgstr ""
 "Zoekt pakketten op die geselecteerd werden om geïnstalleerd te worden, maar "
 "die om één of andere reden nog niet geïnstalleerd werden."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+"Merk op: dit commando maakt zowel gebruik van het bestand available als van "
+"de pakketselectie."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -7389,7 +7573,7 @@ msgid ""
 "Print a single package which is the target of one or more relevant pre-"
 "dependencies and has itself no unsatisfied pre-dependencies."
 msgstr ""
-"Toon een enkel pakket dat het doel is van een of meer relevante voorafgaande "
+"Toon één enkel pakket dat het doel is van een of meer relevante voorafgaande "
 "vereisten en dat zelf geen niet-voldane voorafgaande vereisten heeft."
 
 #. type: Plain text
@@ -7621,10 +7805,9 @@ msgstr "Valideert de opgegeven triggernaam (sinds dpkg 1.18.16)."
 
 #. type: TP
 #: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<arch>"
+#, no-wrap
 msgid "B<archname>"
-msgstr "B<arch>"
+msgstr "B<archname>"
 
 #. type: Plain text
 #: dpkg.man
@@ -7698,7 +7881,7 @@ msgid "Display a brief help message."
 msgstr "Geef een korte hulptekst weer."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
@@ -7907,18 +8090,13 @@ msgstr "B<-D>I<octaal>B<, --debug=>I<octaal>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Switch debugging on. I<octal> is formed by bitwise-orring desired values "
-#| "together from the list below (note that these values may change in future "
-#| "releases). B<-Dh> or B<--debug=help> display these debugging values."
 msgid ""
 "Switch debugging on. I<octal> is formed by bitwise-oring desired values "
 "together from the list below (note that these values may change in future "
 "releases). B<-Dh> or B<--debug=help> display these debugging values."
 msgstr ""
-"Schakel debuggen in. I<octaal> wordt gevormd door op de gewenste waarden uit "
-"de onderstaande lijst de bitwise OR-bewerking uit te voeren (merk op dat "
+"Schakel debuggen in. I<octaal> wordt gevormd door de gewenste waarden uit de "
+"onderstaande lijst in een bitwise OR-bewerking samen te nemen (merk op dat "
 "deze waarden in toekomstige uitgaven kunnen veranderen). B<-Dh> of B<--"
 "debug=help> geeft deze debugwaarden weer."
 
@@ -7957,13 +8135,13 @@ msgstr ""
 "      2000   Belachelijk veel geleuter\n"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force->I<things>"
 msgstr "B<--force->I<dingen>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--no-force->I<dingen>, B<--refuse->I<dingen>"
@@ -7994,7 +8172,7 @@ msgstr ""
 "effecten kan uw volledig systeem defect maken.>"
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Schakelt alle forceer-opties aan (of uit)."
 
@@ -8004,7 +8182,7 @@ msgid ""
 "B<downgrade>(*): Install a package, even if newer version of it is already "
 "installed."
 msgstr ""
-"B<downgrade>(*): Installeer een pakket, zelfs als reeds een nieuwere versie "
+"B<downgrade>(*): Een pakket installeren, zelfs als reeds een nieuwere versie "
 "ervan geïnstalleerd is."
 
 #. type: Plain text
@@ -8028,14 +8206,14 @@ msgid ""
 "B<configure-any>: Configure also any unpacked but unconfigured packages on "
 "which the current package depends."
 msgstr ""
-"B<configure-any>: Configureer ook elk uitgepakt maar niet-geconfigureerd "
-"pakket waarvan het huidige pakket afhankelijk is."
+"B<configure-any>: Ook elk uitgepakt maar niet-geconfigureerd pakket waarvan "
+"het huidige pakket afhankelijk is, configureren."
 
 #. type: Plain text
 #: dpkg.man
 msgid "B<hold>: Process packages even when marked “hold”."
 msgstr ""
-"B<hold>: Behandel ook pakketten die met “hold” (te handhaven) gemarkeerd "
+"B<hold>: Ook pakketten verwerken die met “hold” (te handhaven) gemarkeerd "
 "zijn."
 
 #. type: Plain text
@@ -8045,7 +8223,7 @@ msgid ""
 "require reinstallation. This may, for example, cause parts of the package to "
 "remain on the system, which will then be forgotten by B<dpkg>."
 msgstr ""
-"B<remove-reinstreq>: Verwijder een pakket, zelfs als het defect is en er "
+"B<remove-reinstreq>: Een pakket verwijderen, zelfs als het defect is en er "
 "aangegeven staat dat een herinstallatie nodig is. Dit kan bijvoorbeeld tot "
 "gevolg hebben dat delen van het pakket op het systeem achterblijven, maar "
 "B<dpkg> zal er dan niet meer van op de hoogte zijn."
@@ -8057,41 +8235,49 @@ msgid ""
 "Essential packages contain mostly very basic Unix commands. Removing them "
 "might cause the whole system to stop working, so use with caution."
 msgstr ""
-"B<remove-essential>: Verwijder het pakket, zelfs al wordt het als essentieel "
-"beschouwd. Essentiële pakketten bevatten meestal hele basale Unix "
+"B<remove-essential>: Het pakket verwijderen, zelfs al wordt het als "
+"essentieel beschouwd. Essentiële pakketten bevatten meestal hele basale Unix "
 "commando's. Ze verwijderen kan tot gevolg hebben dat het hele systeem stopt "
 "met werken. Gebruik dit dus met voorzichtigheid."
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
-msgstr "B<depends>: Verander alle vereistenproblemen in waarschuwingen."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
+msgstr ""
+"B<depends>: Alle vereistenproblemen omzetten in waarschuwingen. Dit heeft "
+"invloed op de velden B<Pre-Depends> en B<Depends>."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
-"B<depends-version>: Bekommer u niet om versies bij het toetsen van vereisten."
+"B<depends-version>: Zich niet om versies bekommeren bij het toetsen van "
+"vereisten. Dit heeft invloed op de velden B<Pre-Depends> en B<Depends>."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr ""
-"B<breaks>: Installeer, zelfs als dit een ander pakket defect zou maken "
-"(sinds dpkg 1.14.6)."
+"B<breaks>: Installeren, zelfs als dit een ander pakket defect zou maken "
+"(sinds dpkg 1.14.6). Dit heeft invloed op het veld B<Breaks>."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
-"B<conflicts>: Installeer, zelfs als er een tegenstelling is met een ander "
+"B<conflicts>: Installeren, zelfs als er een tegenstelling is met een ander "
 "pakket. Dit is gevaarlijk, want gewoonlijk zal dit het overschrijven van "
-"bepaalde bestanden tot gevolg hebben."
+"bepaalde bestanden tot gevolg hebben. Dit heeft invloed op het veld "
+"B<Conflicts>."
 
 #. type: Plain text
 #: dpkg.man
@@ -8100,10 +8286,10 @@ msgid ""
 "dangerous, since it means not preserving a change (removing) made to the "
 "file."
 msgstr ""
-"B<confmiss>: Installeer zonder vragen steeds de ontbrekende conffile "
-"(configuratiebestand). Dit is gevaarlijk, aangezien het betekent dat een "
-"verandering die aan een bestand aangebracht werd (het verwijderen ervan), "
-"niet behouden wordt."
+"B<confmiss>: Zonder vragen steeds het ontbrekende conffile "
+"(configuratiebestand) installeren. Dit is gevaarlijk, aangezien het betekent "
+"dat een verandering die aan een bestand aangebracht werd (het verwijderen "
+"ervan), niet behouden wordt."
 
 #. type: Plain text
 #: dpkg.man
@@ -8114,9 +8300,9 @@ msgid ""
 "preferred."
 msgstr ""
 "B<confnew>: Als een conffile (configuratiebestand) aangepast werd en de "
-"versie uit het pakket gewijzigd werd, installeer dan steeds zonder vragen de "
-"nieuwe versie, tenzij ook B<--force-confdef> opgegeven werd. In dat geval "
-"wordt de voorkeur gegeven aan de standaardactie."
+"versie uit het pakket gewijzigd werd, dan steeds zonder vragen de nieuwe "
+"versie installeren, tenzij ook B<--force-confdef> opgegeven werd. In dat "
+"geval wordt de voorkeur gegeven aan de standaardactie."
 
 #. type: Plain text
 #: dpkg.man
@@ -8127,8 +8313,8 @@ msgid ""
 "preferred."
 msgstr ""
 "B<confold>: Als een conffile (configuratiebestand) aangepast werd en de "
-"versie uit het pakket gewijzigd werd, behoud dan steeds zonder vragen de "
-"oude versie, tenzij ook B<--force-confdef> opgegeven werd. In dat geval "
+"versie uit het pakket gewijzigd werd, dan steeds zonder vragen de oude "
+"versie behouden, tenzij ook B<--force-confdef> opgegeven werd. In dat geval "
 "wordt de voorkeur gegeven aan de standaardactie."
 
 #. type: Plain text
@@ -8141,11 +8327,11 @@ msgid ""
 "decide the final action."
 msgstr ""
 "B<confdef>: Als een conffile (configuratiebestand) aangepast werd en de "
-"versie uit het pakket gewijzigd werd, kies dan steeds zonder vragen voor de "
-"standaardactie. Indien er geen standaardactie is, zal het programma stoppen "
-"en de gebruiker een vraag stellen, tenzij ook B<--force-confnew> of B<--"
-"force-confold> opgegeven werd. In dat geval zal het dit gebruiken om over de "
-"uiteindelijke actie te beslissen."
+"versie uit het pakket gewijzigd werd, dan steeds zonder vragen voor de "
+"standaardactie kiezen. Indien er geen standaardactie is, zal het programma "
+"stoppen en de gebruiker een vraag stellen, tenzij ook B<--force-confnew> of "
+"B<--force-confold> opgegeven werd. In dat geval zal het dit gebruiken om "
+"over de uiteindelijke actie te beslissen."
 
 #. type: Plain text
 #: dpkg.man
@@ -8167,26 +8353,56 @@ msgstr ""
 #: dpkg.man
 msgid "B<overwrite>: Overwrite one package's file with another's file."
 msgstr ""
-"B<overwrite>: Overschrijf een bestand van een pakket met het bestand van een "
-"ander pakket."
+"B<overwrite>: Een bestand van een pakket overschrijven met het bestand van "
+"een ander pakket."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<overwrite-dir>: Overwrite one package's directory with another's file."
 msgstr ""
-"B<overwrite-dir>: Overschrijf een map van een pakket met het bestand van een "
-"ander pakket."
+"B<overwrite-dir>: Een map van een pakket overschrijven met het bestand van "
+"een ander pakket."
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 msgstr ""
-"B<overwrite-diverted>: Overschrijf een omgeleid bestand met een niet-"
+"B<overwrite-diverted>: Een omgeleid bestand overschrijven met een niet-"
 "omgeleide versie."
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+"B<statoverride-add>: Bij het toevoegen ervan een bestaande statusmodificatie "
+"overschrijven (sinds dpkg 1.19.5)."
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+"B<statoverride-remove>: Bij het verwijderen ervan een ontbrekende "
+"statusmodificatie negeren (sinds dpkg 1.19.5)."
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+"B<security-mac>(*): Bij het installeren van bestanden op het bestandssysteem "
+"gebruik maken van platformspecifieke beveiliging, gebaseerd op Mandatory "
+"Access Controls (MAC) (since dpkg 1.19.5). Op Linux-systemen gebruikt de "
+"implementatie SELinux."
+
+#. type: Plain text
 #: dpkg.man
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking (since dpkg "
@@ -8196,7 +8412,7 @@ msgid ""
 "first place due to their unreliable behaviour causing zero-length files on "
 "abrupt system crashes."
 msgstr ""
-"B<unsafe-io>: Voer bij het uitpakken geen veilige I/O-operaties uit (sinds "
+"B<unsafe-io>: Bij het uitpakken geen veilige I/O-operaties uitvoeren (sinds "
 "dpkg 1.15.8.6). Momenteel houdt dit in dat geen "
 "bestandssysteemsynchronisatie gebeurt vooraleer bestanden hernoemd worden. "
 "Daarvan is geweten dat dit op sommige bestandssystemen tot aanzienlijk "
@@ -8234,12 +8450,12 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
-"B<script-chrootless>: Voer de scripts van de pakketonderhouder uit zonder te "
-"B<chroot>(2)en naar B<instdir>, zelfs als het pakket deze werkwijze niet "
+"B<script-chrootless>: De scripts van de pakketonderhouder uitvoeren zonder "
+"te B<chroot>(2)en naar B<instdir>, zelfs als het pakket deze werkwijze niet "
 "ondersteunt (sinds dpkg 1.18.5)."
 
 #. type: Plain text
@@ -8253,7 +8469,7 @@ msgstr ""
 #: dpkg.man
 msgid "B<architecture>: Process even packages with wrong or no architecture."
 msgstr ""
-"B<architecture>: Verwerk pakketten zelfs als ze de verkeerde of geen "
+"B<architecture>: Pakketten verwerken, zelfs als ze de verkeerde of geen "
 "architectuur hebben."
 
 #. type: Plain text
@@ -8262,8 +8478,8 @@ msgid ""
 "B<bad-version>: Process even packages with wrong versions (since dpkg "
 "1.16.1)."
 msgstr ""
-"B<bad-version>: Verwerk pakketten zelfs als ze een verkeerde versie hebben "
-"(sinds dpkg 1.16.1)."
+"B<bad-version>: Pakketten verwerken, zelfs als ze een verkeerde versie "
+"hebben (sinds dpkg 1.16.1)."
 
 #. type: Plain text
 #: dpkg.man
@@ -8277,14 +8493,14 @@ msgstr ""
 #: dpkg.man
 msgid "B<not-root>: Try to (de)install things even when not root."
 msgstr ""
-"B<not-root>: Tracht zaken te (de-)installeren, zelfs als niet-"
-"systeembeheerder."
+"B<not-root>: Proberen om zaken te (de-)installeren, zelfs in opdracht van "
+"een niet-systeembeheerder."
 
 #. type: Plain text
 #: dpkg.man
 msgid "B<bad-verify>: Install a package even if it fails authenticity check."
 msgstr ""
-"B<bad-verify>: Installeer een pakket zelfs als de authenticiteitscontrole "
+"B<bad-verify>: Een pakket installeren, zelfs als de authenticiteitscontrole "
 "mislukt."
 
 #. type: TP
@@ -8297,11 +8513,13 @@ msgstr "B<--ignore-depends>=I<pakket>,..."
 #: dpkg.man
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
-"Negeer het toetsen van afhankelijkheden voor de opgegeven pakketten "
+"Voor de opgegeven pakketten het toetsen van afhankelijkheden negeren "
 "(eigenlijk wordt de controle wel uitgevoerd, maar er worden enkel "
-"waarschuwingen in verband met tegenstrijdigheden gegeven en verder niets)."
+"waarschuwingen in verband met tegenstrijdigheden gegeven en verder niets). "
+"Dit heeft invloed op de velden B<Pre-Depends>, B<Depends> en B<Breaks>."
 
 #. type: TP
 #: dpkg.man
@@ -8316,9 +8534,9 @@ msgid ""
 "This is used to see what would happen with the specified action, without "
 "actually modifying anything."
 msgstr ""
-"Voer alles wat gedaan moet worden, uit, maar schrijf geen veranderingen weg. "
-"Dit wordt gebruikt om te zien wat er bij de opgegeven actie zou gebeuren, "
-"zonder dat er effectief iets gewijzigd wordt."
+"Alles wat gedaan moet worden, uitvoeren, maar geen veranderingen "
+"wegschrijven. Dit wordt gebruikt om te zien wat er bij de opgegeven actie "
+"zou gebeuren, zonder dat er effectief iets gewijzigd wordt."
 
 #. type: Plain text
 #: dpkg.man
@@ -8346,8 +8564,8 @@ msgid ""
 "specified directories and all of its subdirectories. This can be used with "
 "B<-i>, B<-A>, B<--install>, B<--unpack> and B<--record-avail> actions."
 msgstr ""
-"Behandel alle gewone bestanden die beantwoorden aan het patroon B<*.deb> "
-"recursief in de opgegeven mappen en al hun onderliggende mappen. Dit kan "
+"Alle gewone bestanden die beantwoorden aan het patroon B<*.deb>, recursief "
+"behandelen in de opgegeven mappen en al hun onderliggende mappen. Dit kan "
 "gebruikt worden samen met de acties B<-i>, B<-A>, B<--install>, B<--unpack> "
 "en B<--record-avail>."
 
@@ -8363,7 +8581,7 @@ msgid ""
 "Don't install a package if a newer version of the same package is already "
 "installed. This is an alias of B<--refuse-downgrade>."
 msgstr ""
-"Installeer een pakket niet als reeds een nieuwere versie van dat pakket "
+"Een pakket niet installeren als reeds een nieuwere versie van dat pakket "
 "geïnstalleerd is. Dit is een alias voor B<--refuse-downgrade>."
 
 #. type: TP
@@ -8376,13 +8594,13 @@ msgstr "B<--admindir=>I<map>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
-"Wijzig de standaard administratieve map waarin veel bestanden zitten met "
-"informatie over de status van geïnstalleerde of gede-installeerde pakketten, "
-"enz. (Standaard is dat «I<%ADMINDIR%>»)"
+"De administratieve map instellen op I<directory>. In deze map zitten veel "
+"bestanden met informatie over de status van geïnstalleerde of gede-"
+"installeerde pakketten, enz. Standaard is dat «I<%ADMINDIR%>»"
 
 #. type: TP
 #: dpkg.man
@@ -8393,16 +8611,16 @@ msgstr "B<--instdir=>I<map>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
-"Wijzig de standaard installatiemap, wat een aanduiding is voor de map waarin "
-"pakketten geïnstalleerd zullen worden. B<instdir> is ook de map die aan "
-"B<chroot>(2) doorgegeven wordt vooraleer de installatiescripts van een "
-"pakket uitgevoerd worden, waardoor de scripts B<instdir> als de hoofdmap "
-"beschouwen. (Standaard is dat «I</>»)"
+"Instellen van de installatiemap, welke de map aangeeft waarin pakketten "
+"geïnstalleerd zullen worden. B<instdir> is ook de map die aan B<chroot>(2) "
+"doorgegeven wordt vooraleer de installatiescripts van een pakket uitgevoerd "
+"worden, waardoor de scripts B<instdir> als de hoofdmap beschouwen. Standaard "
+"is dat «I</>»"
 
 #. type: TP
 #: dpkg.man
@@ -8413,11 +8631,12 @@ msgstr "B<--root=>I<map>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
-"Het wijzigen van B<root> verandert B<instdir> naar «I<map>» en B<admindir> "
-"naar «I<dir>B<%ADMINDIR%>»."
+"De hoofdmap instellen op B<directory>, hetgeen de installatiemap instelt op "
+"«I<map>» en de administratieve map op «I<map>B<%ADMINDIR%>»."
 
 #. type: TP
 #: dpkg.man
@@ -8433,7 +8652,7 @@ msgid ""
 "example, when a package is removed, it will be marked selected for "
 "deinstallation."
 msgstr ""
-"Verwerk enkel de pakketten die geselecteerd werden om geïnstalleerd te "
+"Enkel de pakketten verwerken welke geselecteerd werden om geïnstalleerd te "
 "worden. Het eigenlijke markeren gebeurt door B<dselect> of door B<dpkg> als "
 "het de pakketten behandelt. Als bijvoorbeeld een pakket verwijderd wordt, "
 "zal het als geselecteerd om verwijderd te worden gemarkeerd worden."
@@ -8450,7 +8669,7 @@ msgid ""
 "Don't install the package if the same version of the package is already "
 "installed."
 msgstr ""
-"Installeer het pakket niet als dezelfde versie van dat pakket reeds "
+"Het pakket niet installeren als dezelfde versie van dat pakket reeds "
 "geïnstalleerd is."
 
 #. type: TP
@@ -8479,17 +8698,18 @@ msgid ""
 "Note: front-ends might call B<dpkg> several times per invocation, which "
 "might run the hooks more times than expected."
 msgstr ""
-"Stel in dat een uitbreiding (hook) I<commando> via ``sh -c'' moet uitgevoerd "
-"worden voor of na het uitvoeren van B<dpkg> bij de acties I<unpack>, "
-"I<configure>, I<install>, I<triggers-only>, I<remove>, I<purge>, I<add-"
-"architecture> en I<remove-architecture> van B<dpkg> (sinds dpkg 1.15.4 en de "
-"acties I<add-architecture> en I<remove-architecture> sinds dpkg 1.17.19). "
-"Deze optie kan meermaals opgegeven worden. De volgorde waarin de opties "
-"opgegeven worden, wordt behouden, waarbij die uit de configuratiebestanden "
-"voorrang hebben. De omgevingsvariabele B<DPKG_HOOK_ACTION> wordt ingesteld "
-"voor de uitbreidingen (hooks) bij de huidige actie van B<dpkg>. Merk op dat "
-"frontends die uitgevoerd worden, B<dpkg> meermaals kunnen activeren, "
-"waardoor de uitbreidingen meer keren dan verwacht uitgevoerd kunnen worden."
+"Instellen dat een uitbreiding (hook) I<commando> via ``sh -c'' moet "
+"uitgevoerd worden voor of na het uitvoeren van B<dpkg> bij de acties "
+"I<unpack>, I<configure>, I<install>, I<triggers-only>, I<remove>, I<purge>, "
+"I<add-architecture> en I<remove-architecture> van B<dpkg> (sinds dpkg 1.15.4 "
+"en de acties I<add-architecture> en I<remove-architecture> (sinds dpkg "
+"1.17.19). Deze optie kan meermaals opgegeven worden. De volgorde waarin de "
+"opties opgegeven worden, wordt behouden, waarbij deze uit de "
+"configuratiebestanden voorrang hebben. De omgevingsvariabele "
+"B<DPKG_HOOK_ACTION> wordt ingesteld voor de uitbreidingen (hooks) bij de "
+"huidige actie van B<dpkg>. Merk op dat frontends die uitgevoerd worden, "
+"B<dpkg> meermaals kunnen activeren, waardoor de uitbreidingen meer keren dan "
+"verwacht uitgevoerd kunnen worden."
 
 #. type: TP
 #: dpkg.man
@@ -8510,9 +8730,10 @@ msgid ""
 "previously excluded paths matching the specified patterns during install "
 "(since dpkg 1.15.8)."
 msgstr ""
-"Stel I<glob-patroon> bij het installeren in als een filter voor paden, ofwel "
-"door paden die aan het opgegeven patroon beantwoorden, uit te sluiten ofwel "
-"door eerder uitgesloten paden opnieuw toe te voegen (sinds dpkg 1.15.8)."
+"Het I<glob-patroon> bij het installeren instellen als een filter voor paden, "
+"ofwel door paden die aan het opgegeven patroon beantwoorden, uit te sluiten "
+"ofwel door eerder uitgesloten paden opnieuw toe te voegen (sinds dpkg "
+"1.15.8)."
 
 #. type: Plain text
 #: dpkg.man
@@ -8669,9 +8890,9 @@ msgid ""
 "descriptor I<n>. This option can be specified multiple times. The "
 "information is generally one record per line, in one of the following forms:"
 msgstr ""
-"Stuur status- en voortgangsinformatie die leesbaar is voor machines naar "
-"bestandsindicator I<n>. Deze optie kan meermaals opgegeven worden. Meestal "
-"wordt de informatie met één item per regel weergegeven in een van de "
+"Status- en voortgangsinformatie die leesbaar is voor machines naar "
+"bestandsindicator I<n> sturen. Deze optie kan meermaals opgegeven worden. "
+"Meestal wordt de informatie met één item per regel weergegeven in een van de "
 "volgende vormen:"
 
 #. type: TP
@@ -8745,11 +8966,11 @@ msgid ""
 "This option can be specified multiple times.  The output format used is the "
 "same as in B<--status-fd>."
 msgstr ""
-"Verstuur door een machine te lezen informatie over pakketstatus en voortgang "
-"naar de standaardinvoer van het shell-commando I<commando> dat via ``sh -c'' "
-"moet uitgevoerd worden (sinds dpkg 1.16.0). Deze optie kan meermaals "
-"opgegeven worden. De indeling van de uitvoer is dezelfde als bij B<--status-"
-"fd>."
+"Door een machine te lezen informatie over pakketstatus en voortgang "
+"versturen naar de standaardinvoer van het shell-commando I<commando> dat via "
+"``sh -c'' moet uitgevoerd worden (sinds dpkg 1.16.0). Deze optie kan "
+"meermaals opgegeven worden. De indeling van de uitvoer is dezelfde als bij "
+"B<--status-fd>."
 
 #. type: TP
 #: dpkg.man
@@ -8764,9 +8985,9 @@ msgid ""
 "I<%LOGDIR%/dpkg.log>. If this option is given multiple times, the last "
 "filename is used. Log messages are of the form:"
 msgstr ""
-"Log updates van toestandswijzigingen en acties in I<bestandsnaam> in plaats "
-"van in het standaardlogbestand I<%LOGDIR%/dpkg.log>. Indien deze optie "
-"meerdere keren opgegeven wordt, wordt de laatst opgegeven bestandsnaam "
+"Updates van toestandswijzigingen en acties loggen in I<bestandsnaam> in "
+"plaats van in het standaardlogbestand I<%LOGDIR%/dpkg.log>. Indien deze "
+"optie meerdere keren opgegeven wordt, wordt de laatst opgegeven bestandsnaam "
 "gebruikt. Log-berichten zijn in de volgende vorm:"
 
 #. type: TP
@@ -8826,6 +9047,20 @@ msgstr ""
 "I<beslissing> ofwel B<install> ofwel B<keep> is."
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<--no-pager>"
+msgstr "B<--no-pager>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr ""
+"Schakelt het gebruik van een pagineringsprogramma uit bij het weergeven van "
+"informatie (sinds dpkg 1.19.2)."
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -8834,7 +9069,7 @@ msgstr "B<--no-debsig>"
 #. type: Plain text
 #: dpkg.man
 msgid "Do not try to verify package signatures."
-msgstr "Tracht pakket-ondertekeningen niet te verifiëren."
+msgstr "Niet proberen pakket-ondertekeningen te verifiëren."
 
 #. type: TP
 #: dpkg.man
@@ -8852,7 +9087,7 @@ msgid ""
 "in the improper B<triggers-awaited> and B<triggers-pending> states. This can "
 "be fixed later by running: B<dpkg --configure --pending>."
 msgstr ""
-"Voer in deze doorloop geen triggers uit (sinds dpkg 1.14.17), maar "
+"In deze doorloop geen triggers uitvoeren (sinds dpkg 1.14.17), maar "
 "activeringen blijven wel opgetekend worden. Indien het gebruikt wordt in "
 "combinatie met B<--configure> I<pakket> of B<--triggers-only> I<pakket>, dan "
 "zullen de postinst-scripts van het vermelde pakket nog steeds uitgevoerd "
@@ -8933,8 +9168,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, no-wrap
@@ -8942,7 +9180,7 @@ msgid "ENVIRONMENT"
 msgstr "OMGEVING"
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr "Externe omgeving"
@@ -8996,54 +9234,66 @@ msgstr ""
 "waarin tijdelijke bestanden en mappen kunnen aangemaakt worden."
 
 #. type: TP
-#: dpkg.man
-#, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
-
-#. type: Plain text
-#: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
-msgstr ""
-"Het programma dat door B<dpkg> zal uitgevoerd worden bij het tonen van de "
-"conffiles (configuratiebestanden)."
-
-#. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
 
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr ""
 "Het programma dat B<dpkg> zal uitvoeren bij het starten van een nieuwe "
-"interactieve shell."
+"interactieve shell of bij het voortbrengen van een commando via een shell."
 
 #. type: TP
 #: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<PAGER>"
+msgstr "B<PAGER>"
+
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<DPKG_PAGER>"
+msgstr "B<DPKG_PAGER>"
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
-"Stelt het aantal kolommen in dat B<dpkg> moet gebruiken bij het laten zien "
-"van opgemaakte tekst. Wordt momenteel enkel gebruikt door B<--list>."
+"Het programma dat B<dpkg> zal uitvoeren als het een pagineringsprogramma "
+"gebruikt, bijvoorbeeld voor het tonen van de verschillen tussen de "
+"configuratiebestanden. Indien B<SHELL> niet ingesteld is, dan zal «B<sh>» "
+"gebruikt worden. B<DPKG_PAGER> overschrijft de omgevingsvariabele B<PAGER> "
+"(sinds dpkg 1.19.2)."
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, no-wrap
 msgid "B<DPKG_COLORS>"
 msgstr "B<DPKG_COLORS>"
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 msgid ""
 "Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
 "B<auto> (default), B<always> and B<never>."
@@ -9051,14 +9301,70 @@ msgstr ""
 "Stelt de kleurmodus in (sinds dpkg 1.18.5). Waarden die momenteel gebruikt "
 "mogen worden zijn: B<auto> (standaard), B<always> en B<never>."
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_FORCE>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
+msgstr ""
+"Stelt de forceer-vlaggen in (sinds dpkg 1.19.5). Indien deze variabele "
+"aanwezig is, zullen geen ingebouwde forceer-standaardwaarden toegepast "
+"worden. Indien de variabele aanwezig, maar leeg is, zullen alle forceer-"
+"vlaggen gedeactiveerd worden."
+
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<DPKG_FRONTEND_LOCKED>"
+msgstr "B<DPKG_FRONTEND_LOCKED>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
+msgstr ""
+"Ingesteld door een frontend voor pakketbeheer om dpkg te informeren dat het "
+"de frontendgrendel niet mag bemachtigen (since dpkg 1.19.1)."
+
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr "Interne omgeving"
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr "B<LESS>"
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+"Ingeval dit niet reeds ingesteld is, wordt dit door B<dpkg> als “B<-FRSXMQ>” "
+"gedefinieerd bij het voortbrengen van een pagineringsprogramma (sinds dpkg "
+"1.19.2). Om dit standaardgedrag aan te passen kan deze variabele vooraf "
+"ingesteld worden op een andere waarde, met inbegrip van een lege tekenreeks, "
+"of kunnen de variabelen B<PAGER> of B<DPKG_PAGER> ingesteld worden om "
+"specifieke opties uit te schakelen met «B<-+>», bijvoorbeeld B<DPKG_PAGER="
+"\"less -+F\">."
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<DPKG_ROOT>"
 msgstr "B<DPKG_ROOT>"
@@ -9105,6 +9411,16 @@ msgstr ""
 "te beheren (sinds dpkg 1.16.0). Deze variabele wordt steeds ingesteld op de "
 "huidige waarde van B<--admindir>."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+"Gedefinieerd door B<dpkg> binnen de omgeving van de subprocessen voor alle "
+"momenteel geactiveerde forceer-optienamen, gescheiden door komma's (sinds "
+"dpkg 1.19.5)."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -9729,23 +10045,18 @@ msgstr ""
 
 #. type: TP
 #: dpkg-architecture.man
-#, fuzzy, no-wrap
-#| msgid "B<-c>, B<--command> I<command>"
+#, no-wrap
 msgid "B<-c>, B<--command> I<command-string>"
-msgstr "B<-c>, B<--command> I<commando>"
+msgstr "B<-c>, B<--command> I<commando-tekenreeks>"
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid ""
-#| "Execute a I<command> in an environment which has all variables set to the "
-#| "determined value."
 msgid ""
 "Execute a I<command-string> in an environment which has all variables set to "
 "the determined value."
 msgstr ""
-"Voer een I<commando> uit in een omgeving waarin alle variabelen ingesteld "
-"zijn op de vastgelegde waarde."
+"Voer een I<commando-tekenreeks> uit in een omgeving waarin alle variabelen "
+"ingesteld zijn op de vastgelegde waarde."
 
 #. type: TP
 #: dpkg-architecture.man
@@ -10073,8 +10384,12 @@ msgstr "VARIABELEN"
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
-msgstr "De volgende variabelen worden door B<dpkg-architecture> ingesteld:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
+msgstr ""
+"De volgende variabelen worden door B<dpkg-architecture> ingesteld (zie de "
+"sectie B<TERMS> voor een beschrijving van het naamgevingsschema):"
 
 #. type: IP
 #: dpkg-architecture.man
@@ -10745,6 +11060,34 @@ msgstr ""
 "map van B<dpkg> waarin zich de architectuurtabellen bevinden (sinds dpkg "
 "1.14.17). Staat standaard ingesteld op «%PKGDATADIR%»."
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, no-wrap
+msgid "B<DPKG_NLS>"
+msgstr "B<DPKG_NLS>"
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+"Indien dit ingesteld is, zal het gebruikt worden om te beslissen over het "
+"activeren van moedertaalondersteuning, ook gekend als "
+"internationaliseringsondersteuning (of i18n) (sinds dpkg 1.19.0). Geldige "
+"waarden zijn: B<0> and B<1> (standaard)."
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -10754,10 +11097,8 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-architecture.man
-#, fuzzy
-#| msgid "dpkg-buildpackage"
 msgid "B<dpkg-buildpackage>(1)."
-msgstr "dpkg-buildpackage"
+msgstr "B<dpkg-buildpackage>(1)."
 
 #. type: TH
 #: dpkg.cfg.man
@@ -10987,8 +11328,8 @@ msgid ""
 "the B<SUPPORTED FLAGS> section for more information about them."
 msgstr ""
 "Geeft een lijst weer van vlaggen die door de huidige leverancier ondersteund "
-"wordt (één per regel). Zie het onderdeel B<ONDERSTEUNDE VLAGGEN> voor meer "
-"informatie daarover."
+"wordt (één per regel). Zie het onderdeel B<SUPPORTED FLAGS> (ondersteunde "
+"vlaggen) voor meer informatie daarover."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11097,11 +11438,11 @@ msgstr "B<make>"
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 "Make-opdrachten om alle compilatievlaggen in de omgeving in te stellen en te "
-"exporteren. De uitvoer kan naar een makefile-fragment geschreven worden en "
+"exporteren. De uitvoer kan naar een Makefile-fragment geschreven worden en "
 "geëvalueerd met behulp van een B<include>-opdracht."
 
 #. type: TP
@@ -11185,36 +11526,27 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildflags.man
-#, fuzzy, no-wrap
-#| msgid "B<query>"
+#, no-wrap
 msgid "B<--query>"
-msgstr "B<query>"
+msgstr "B<--query>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Display any information that can be useful to explain the behaviour of "
-#| "B<dpkg-buildflags> (since dpkg 1.16.5): relevant environment variables, "
-#| "current vendor, state of all feature flags.  Also print the resulting "
-#| "compiler flags with their origin."
 msgid ""
 "Print any information that can be useful to explain the behaviour of the "
 "program: current vendor, relevant environment variables, feature areas, "
 "state of all feature flags, and the compiler flags with their origin (since "
 "dpkg 1.19.0)."
 msgstr ""
-"Laat eventuele informatie zien die nuttig kan zijn om het gedrag te "
-"verklaren van B<dpkg-buildflags> (sinds dpkg 1.16.5): relevante "
-"omgevingsvariabelen, huidige leverancier, toestand van alle functievlaggen. "
-"Geef ook de resulterende compileervlaggen met hun oorsprong weer."
+"Laat alle informatie zien die nuttig kan zijn om het gedrag van het "
+"programma te verklaren: huidige leverancier, relevante omgevingsvariabelen, "
+"functiegebieden, toestand van alle functievlaggen en de compileervlaggen met "
+"hun oorsprong (sinds dpkg 1.19.0)."
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid "Example"
 msgid "For example:"
-msgstr "Voorbeeld"
+msgstr "Bijvoorbeeld:"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11224,6 +11556,9 @@ msgid ""
 "  Environment:\n"
 "   DEB_CFLAGS_SET=-O0 -Wall\n"
 msgstr ""
+"  Vendor: Debian\n"
+"  Environment:\n"
+"   DEB_CFLAGS_SET=-O0 -Wall\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11234,6 +11569,10 @@ msgid ""
 "   bug=no\n"
 "   canary=no\n"
 msgstr ""
+"  Area: qa\n"
+"  Features:\n"
+"   bug=no\n"
+"   canary=no\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11243,6 +11582,9 @@ msgid ""
 "  Features:\n"
 "   timeless=no\n"
 msgstr ""
+"  Area: reproducible\n"
+"  Features:\n"
+"   timeless=no\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11252,6 +11594,9 @@ msgid ""
 "  Value: -O0 -Wall\n"
 "  Origin: env\n"
 msgstr ""
+"  Flag: CFLAGS\n"
+"  Value: -O0 -Wall\n"
+"  Origin: env\n"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11261,6 +11606,9 @@ msgid ""
 "  Value: -D_FORTIFY_SOURCE=2\n"
 "  Origin: vendor\n"
 msgstr ""
+"  Flag: CPPFLAGS\n"
+"  Value: -D_FORTIFY_SOURCE=2\n"
+"  Origin: vendor\n"
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11270,13 +11618,6 @@ msgstr "B<--query-features>I< gebied>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Print the features enabled for a given area (since dpkg 1.16.2).  The "
-#| "only currently recognized areas on Debian and derivatives are B<qa>, "
-#| "B<reproducible>, B<sanitize> and B<hardening>, see the B<FEATURE AREAS> "
-#| "section for more details.  Exits with 0 if the area is known otherwise "
-#| "exits with 1."
 msgid ""
 "Print the features enabled for a given area (since dpkg 1.16.2).  The only "
 "currently recognized areas on Debian and derivatives are B<future>, B<qa>, "
@@ -11284,11 +11625,11 @@ msgid ""
 "section for more details.  Exits with 0 if the area is known otherwise exits "
 "with 1."
 msgstr ""
-"Geef de functionaliteit weer die voor een opgegeven gebied geactiveerd is "
-"(sinds dpkg 1.16.2). Momenteel worden door Debian en zijn derivaten enkel de "
-"gebieden B<qa>, B<reproducible>, B<sanitize> en B<hardening> erkend. Zie het "
-"onderdeel B<FUNCTIONALITEITSGEBIEDEN> voor meer details. Sluit af met 0 als "
-"het gebied gekend is, anders met 1."
+"Geef de functies weer die voor een opgegeven gebied geactiveerd zijn (sinds "
+"dpkg 1.16.2). Momenteel worden door Debian en zijn derivaten enkel de "
+"gebieden B<future>, B<qa>, B<reproducible>, B<sanitize> en B<hardening> "
+"herkend. Zie het onderdeel B<FUNCTIEGEBIEDEN> voor meer details. Sluit af "
+"met 0 als het gebied gekend is, anders met 1."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11456,7 +11797,7 @@ msgstr ""
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "FEATURE AREAS"
-msgstr "FUNCTIONALITEITSGEBIEDEN"
+msgstr "FUNCTIEGEBIEDEN"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11466,12 +11807,11 @@ msgid ""
 "+>’ and ‘B<->’ modifier.  For example, to enable the B<hardening> “pie” "
 "feature and disable the “fortify” feature you can do this in B<debian/rules>:"
 msgstr ""
-"Elke gebiedsfunctionaliteit kan in de gebiedswaarde van de "
-"omgevingsvariabelen B<DEB_BUILD_OPTIONS> en B<DEB_BUILD_MAINT_OPTIONS> "
-"ingeschakeld en uitgeschakeld worden met de schakelaars ‘B<+>’ en ‘B<->’. Om "
-"bijvoorbeeld de B<hardening>-functionaliteit “pie” te activeren en de "
-"functionaliteit “fortify” uit te schakelen, kunt u in B<debian/rules> het "
-"volgende doen:"
+"Elke gebiedsfunctie kan in de gebiedswaarde van de omgevingsvariabelen "
+"B<DEB_BUILD_OPTIONS> en B<DEB_BUILD_MAINT_OPTIONS> ingeschakeld en "
+"uitgeschakeld worden met de schakelaars ‘B<+>’ en ‘B<->’. Om bijvoorbeeld de "
+"B<hardening>-functionaliteit “pie” te activeren en de functionaliteit "
+"“fortify” uit te schakelen, kunt u in B<debian/rules> het volgende doen:"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11487,10 +11827,10 @@ msgid ""
 "the B<hardening> area and enabling only “format” and “fortify” can be "
 "achieved with:"
 msgstr ""
-"De bijzondere functionaliteit B<all> (geldig in elk gebied) kan gebruikt "
-"worden om gelijktijdig alle gebiedsfunctionaliteit te activeren of uit te "
-"schakelen. Alles uitschakelen in het gebied B<hardening> en enkel “format” "
-"en “fortify” activeren kunt u dus doen met:"
+"De bijzondere functie B<all> (geldig in elk gebied) kan gebruikt worden om "
+"gelijktijdig alle gebiedsfunctionaliteit te activeren of uit te schakelen. "
+"Alles uitschakelen in het gebied B<hardening> en enkel “format” en “fortify” "
+"activeren kunt u dus doen met:"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -11502,36 +11842,36 @@ msgstr "  export DEB_BUILD_MAINT_OPTIONS=hardening=-all,+format,+fortify\n"
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "future"
-msgstr ""
+msgstr "future"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Several compile-time options (detailed below) can be used to help detect "
-#| "problems in the source code or build system."
 msgid ""
 "Several compile-time options (detailed below) can be used to enable features "
 "that should be enabled by default, but cannot due to backwards compatibility "
 "reasons."
 msgstr ""
 "Er kunnen verschillende compilatieopties (die hierna beschreven worden) "
-"gebruikt worden om problemen in de broncode of het bouwsysteem te helpen "
-"detecteren."
+"gebruikt worden om functies te activeren die standaard geactiveerd zouden "
+"moeten zijn, maar dat niet zijn om redenen van terugwaartse compatibiliteit."
 
 #. type: TP
 #: dpkg-buildflags.man
 #, no-wrap
 msgid "B<lfs>"
-msgstr ""
+msgstr "B<lfs>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
+"Deze instelling (standaard uitgezet) activeert ondersteuning voor grote "
+"bestanden (Large File Support) op 32-bits architecturen waarvan de ABI "
+"standaard geen LFS-ondersteuning biedt, door B<-D_LARGEFILE_SOURCE -"
+"D_FILE_OFFSET_BITS=64> toe te voegen aan B<CPPFLAGS>."
 
 #. type: SS
 #: dpkg-buildflags.man
@@ -11605,11 +11945,6 @@ msgstr "sanitize (saneren)"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#, fuzzy
-#| msgid ""
-#| "Several compile-time options (detailed below) can be used to help "
-#| "sanitize a resulting binary against memory corruptions, memory leaks, use "
-#| "after free, threading data races and undefined behavior bugs."
 msgid ""
 "Several compile-time options (detailed below) can be used to help sanitize a "
 "resulting binary against memory corruptions, memory leaks, use after free, "
@@ -11621,7 +11956,10 @@ msgstr ""
 "gebruikt worden om te helpen bij het gezond houden van een resulterend "
 "binair pakket op het vlak van geheugenvervuiling, geheugenlekkage, "
 "geheugengebruik na vrijgave, dataraces bij threads en bugs door "
-"ongedefinieerd gedrag."
+"ongedefinieerd gedrag. B<Noot>: deze opties zouden B<niet> gebruikt mogen "
+"worden voor een bouw voor productiedoeleinden, aangezien ze een verminderde "
+"betrouwbaarheid bieden inzake codeconformiteit en de beveiliging en zelfs de "
+"functionaliteit reduceren."
 
 #. type: TP
 #: dpkg-buildflags.man
@@ -11905,29 +12243,40 @@ msgstr "B<pie>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
-msgstr ""
-"Deze instelling (zonder standaardinstelling sinds dpkg 1.18.23 en door gcc "
-"standaard geïnjecteerd bij de Debian architecturen amd64, arm64, armel, "
-"armhf, i386, kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, ppc64el, "
-"s390x, sparc en sparc64) voegt zo nodig de vereiste opties toe om PIE te "
-"activeren of te deactiveren. In geval van activering en door gcc "
-"geïnjecteerd, wordt er niets toegevoegd, In geval van activering en niet "
-"geïnjecteerd door gcc, wordt B<-fPIE> toegevoegd bij B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> en B<FCFLAGS>, en B<-"
-"fPIE -pie> bij B<LDFLAGS>. In geval van deactivering en geïnjecteerd door "
-"gcc wordt B<-fno-PIE> toegevoegd bij B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, "
-"B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> en B<FCFLAGS>, en B<-fno-PIE -no-pie> "
-"bij B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
+msgstr ""
+"Deze instelling (zonder standaardinstelling sinds dpkg 1.18.23, aangezien "
+"het nu standaard geactiveerd wordt door gcc op de Debian-architecturen "
+"amd64, arm64, armel, armhf, hurd-i386, i386, kfreebsd-amd64, kfreebsd-i386, "
+"mips, mipsel, mips64el, powerpc, ppc64, ppc64el, riscv64, s390x, sparc en "
+"sparc64) voegt zo nodig de vereiste opties toe om PIE te activeren of te "
+"deactiveren via gcc specs-bestanden, afhankelijk van het feit of gcc op die "
+"architectuur de vlaggen zelf injecteert of niet. Indien de instelling "
+"geactiveerd is en gcc de vlaggen injecteert, voegt ze niets toe. Indien de "
+"instelling geactiveerd is en gcc de vlaggen niet injecteert, voegt ze B<-"
+"fPIE> toe (via I<%PKGDATADIR%/pie-compiler.specs>) aan B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> en "
+"B<FCFLAGS>, en B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) aan "
+"B<LDFLAGS>. Indien de instelling gedeactiveerd is en gcc de vlaggen "
+"injecteert, voegt ze B<-fno-PIE> toe (via I<%PKGDATADIR%/no-pie-compile."
+"specs>) aan B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, "
+"B<GCJFLAGS>, B<FFLAGS> en B<FCFLAGS>, en B<-fno-PIE -no-pie> (via I<"
+"%PKGDATADIR%/no-pie-link.specs>) aan B<LDFLAGS>."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -12103,6 +12452,37 @@ msgstr ""
 #. type: TP
 #: dpkg-buildflags.man
 #, no-wrap
+msgid "B<fixfilepath>"
+msgstr "B<fixfilepath>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+"Deze instelling (standaard gedeactiveerd) voegt B<-ffile-prefix-"
+"map=>I<BUILDPATH>B<=.> toe aan B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, "
+"B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> en B<FCFLAGS>, waarbij B<BUILDPATH> "
+"ingesteld wordt op de basismap van het pakket dat gebouwd wordt. Dit heeft "
+"als effect dat het bouwpad verwijderd wordt van eventueel gegenereerde "
+"bestanden."
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+"Indien zowel B<fixdebugpath> als B<fixfilepath> ingesteld zijn, heeft deze "
+"laatste optie voorrang, omdat het een superset is van de eerste."
+
+#. type: TP
+#: dpkg-buildflags.man
+#, no-wrap
 msgid "B<fixdebugpath>"
 msgstr "B<fixdebugpath>"
 
@@ -12336,8 +12716,8 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
-msgstr "Om in een makefile bouwvlaggen door te geven aan een bouwcommando:"
+msgid "To pass build flags to a build command in a Makefile:"
+msgstr "Om in een Makefile bouwvlaggen door te geven aan een bouwcommando:"
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -12618,22 +12998,14 @@ msgstr "B<6.>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "Unless a source-only build has been requested, it runs the B<buildinfo> "
-#| "hook and calls B<dpkg-genbuildinfo> to generate a B<.buildinfo> file.  "
-#| "Several B<dpkg-buildpackage> options are forwarded to B<dpkg-"
-#| "genbuildinfo>."
 msgid ""
 "It runs the B<buildinfo> hook and calls B<dpkg-genbuildinfo> to generate a "
 "B<.buildinfo> file.  Several B<dpkg-buildpackage> options are forwarded to "
 "B<dpkg-genbuildinfo>."
 msgstr ""
-"Tenzij een source-only build (enkel een bouw van het broncodepakket) "
-"gevraagd werd, voert het de uitbreiding (hook) B<buildinfo> uit en roept "
-"B<dpkg-genbuildinfo> aan om een bestand B<.buildinfo> aan te maken. "
-"Verschillende opties van B<dpkg-buildpackage> worden aan B<dpkg-"
-"genbuildinfo> overgemaakt."
+"Het voert de uitbreiding (hook) B<buildinfo> uit en roept B<dpkg-"
+"genbuildinfo> aan om een bestand B<.buildinfo> aan te maken. Verschillende "
+"opties van B<dpkg-buildpackage> worden aan B<dpkg-genbuildinfo> overgemaakt."
 
 #. type: IP
 #: dpkg-buildpackage.man
@@ -12643,17 +13015,6 @@ msgstr "B<7.>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "It runs the B<changes> hook and calls B<dpkg-genchanges> to generate a B<."
-#| "changes> file.  The name of the B<.changes> file will depend on the type "
-#| "of build and will be as specific as necessary but not more; for a build "
-#| "that includes B<any> the name will be I<source-name>B<_>I<source-"
-#| "version>B<_>I<arch>B<.changes>, or otherwise for a build that includes "
-#| "B<all> the name will be I<source-name>B<_>I<source-version>B<_>B<all."
-#| "changes>, or otherwise for a build that includes B<source> the name will "
-#| "be I<source-name>B<_>I<source-version>B<_>B<source.changes>.  Many B<dpkg-"
-#| "buildpackage> options are forwarded to B<dpkg-genchanges>."
 msgid ""
 "It runs the B<changes> hook and calls B<dpkg-genchanges> to generate a B<."
 "changes> file.  The name of the B<.changes> file will depend on the type of "
@@ -12669,12 +13030,11 @@ msgstr ""
 "aan om een bestand B<.changes> aan te maken. De naam van het B<.changes>-"
 "bestand is afhankelijk van het bouwtype en zal zo specifiek als nodig zijn, "
 "maar niet meer dan dat. Voor een bouw die B<any> bevat, zal de naam "
-"I<broncodenaam>B<_>I<broncodeversie>B<_>I<arch>B<.changes> zijn. Voor een "
-"bouw die B<all> bevat, zal de naam "
-"I<broncodenaam>B<_>I<broncodeversie>B<_>B<all.changes> zijn. En voor een "
-"bouw die B<source> bevat, zal de naam "
-"I<broncodenaam>B<_>I<broncodeversie>B<_>B<source.changes> zijn. Veel opties "
-"van B<dpkg-buildpackage> worden aan B<dpkg-genchanges> overgemaakt."
+"I<broncode-naam>B<_>I<binaire-versie>B<_>I<arch>B<.changes> zijn. Voor een "
+"bouw die B<all> bevat, zal de naam I<broncode-naam>B<_>I<binaire-"
+"versie>B<_>B<all.changes> zijn. En voor een bouw die B<source> bevat, zal de "
+"naam I<broncode-naam>B<_>I<broncode-versie>B<_>B<source.changes> zijn. Veel "
+"opties van B<dpkg-buildpackage> worden aan B<dpkg-genchanges> overgemaakt."
 
 #. type: IP
 #: dpkg-buildpackage.man
@@ -12801,15 +13161,17 @@ msgstr "B<source>"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 "Bouwt het broncodepakket. Opmerking: Indien u deze waarde op zichzelf staand "
-"gebruikt en indien het gewoon (opnieuw) bouwen van het bronpakket het enige "
-"is wat u wilt doen, dan is het altijd beter om B<dpkg-source> te gebruiken, "
-"aangezien dat niet vereist dat eventuele bouwvereisten geïnstalleerd worden "
-"om het doel B<clean> te aanroepen."
+"gebruikt en indien uw enige bedoeling is om het bronpakket gewoon (opnieuw) "
+"te bouwen vanuit een zuivere broncodeboom, dan is het altijd beter om "
+"rechtstreeks B<dpkg-source> te gebruiken, aangezien dat niet vereist dat "
+"eventuele bouwvereisten geïnstalleerd worden, welke anders nodig zijn om in "
+"staat te zijn het doelwit B<clean> te aanroepen."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-genbuildinfo.man dpkg-genchanges.man
@@ -12936,7 +13298,7 @@ msgstr ""
 #: dpkg-buildpackage.man
 #, no-wrap
 msgid "B<--target=>I<target>[,...]"
-msgstr "B<--target=>I<doel>[,...]"
+msgstr "B<--target=>I<target>[,...]"
 
 #. type: TQ
 #: dpkg-buildpackage.man
@@ -12948,7 +13310,7 @@ msgstr "B<--target >I<doel>[,...]"
 #: dpkg-buildpackage.man
 #, no-wrap
 msgid "B<-T>, B<--rules-target=>I<target>[,...]"
-msgstr "B<-T>, B<--rules-target=>I<doel>[,...]"
+msgstr "B<-T>, B<--rules-target=>I<target>[,...]"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -12962,14 +13324,14 @@ msgid ""
 "not need this option (i.e. the B<clean>, B<binary>, B<binary-arch> and "
 "B<binary-indep> targets)."
 msgstr ""
-"Roept na het opzetten van de bouwomgeving per opgegeven doel eenmaal "
+"Roept na het opzetten van de bouwomgeving per opgegeven target eenmaal "
 "B<debian/rules> I<doel> aan en stopt het proces van het bouwen van het "
 "pakket hier (sinds dpkg 1.15.0, de lange optie sinds dpkg 1.18.8, de "
-"ondersteuning voor meerdere doelen sinds dpkg 1.18.16). Indien ook B<--as-"
+"ondersteuning voor meerdere targets sinds dpkg 1.18.16). Indien ook B<--as-"
 "root> opgegeven werd, dan wordt het commando als systeembeheerder uitgevoerd "
-"(zie B<--root-command>). Merk op dat gekende doelen die verplicht als "
+"(zie B<--root-command>). Merk op dat gekende targets die verplicht als "
 "systeembeheerder moeten uitgevoerd worden, deze optie niet nodig hebben (d.w."
-"z. de doelen B<clean>, B<binary>, B<binary-arch> en B<binary-indep>)."
+"z. de targets B<clean>, B<binary>, B<binary-arch> en B<binary-indep>)."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13246,20 +13608,36 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, no-wrap
+msgid "B<--rules-requires-root>"
+msgstr "B<--rules-requires-root>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+"Honoreer het veld B<Rules-Requires-Root> niet; er wordt teruggevallen op "
+"zijn verouderde standaardwaarde (since dpkg 1.19.1)."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr "B<-nc>, B<--no-pre-clean>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
-"Schoon de broncodeboom niet op (de lange optie sinds dpkg 1.18.8). "
-"Impliceert B<-b> indien geen van de opties B<-F>, B<-g>, B<-G>, B<-B>, B<-A> "
-"of B<-S> gekozen werd. Gecombineerd met B<-S> impliceert dit B<-d> (sinds "
-"dpkg 1.18.0)."
+"Schoon voor het bouwen de broncodeboom niet op (de lange optie sinds dpkg "
+"1.18.8). Impliceert B<-b> indien geen van de opties B<-F>, B<-g>, B<-G>, B<-"
+"B>, B<-A> of B<-S> gekozen werd. Gecombineerd met B<-S> impliceert dit B<-d> "
+"(sinds dpkg 1.18.0)."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13269,8 +13647,12 @@ msgstr "B<--pre-clean>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
-msgstr "Schoon voor het bouwen de broncodeboom op (sinds dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
+msgstr ""
+"Schoon voor het bouwen de broncodeboom op (sinds dpkg 1.18.8). Dit is het "
+"standaardgedrag."
 
 #. type: TP
 #: dpkg-buildpackage.man
@@ -13290,6 +13672,21 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, no-wrap
+msgid "B<--no-post-clean>"
+msgstr "B<--no-post-clean>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+"Schoon de broncodeboom niet op na het bouwen van het pakket (sinds dpkg "
+"1.19.1). Dit is het standaardgedrag."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr "B<-r>, B<--root-command=>I<commando-om-root-te-worden>"
 
@@ -13425,13 +13822,12 @@ msgstr "Momenteel worden de volgende I<hook-namen> ondersteund"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#, fuzzy
-#| msgid ""
-#| "B<init preclean source build binary changes postclean check sign done>"
 msgid ""
 "B<init preclean source build binary buildinfo changes postclean check sign "
 "done>"
-msgstr "B<init preclean source build binary changes postclean check sign done>"
+msgstr ""
+"B<init preclean source build binary buildinfo changes postclean check sign "
+"done>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -13883,10 +14279,29 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
-#, fuzzy, no-wrap
-#| msgid "B<DPKG_ROOT>"
-msgid "B<DPKG_GAIN_ROOT_CMD>"
-msgstr "B<DPKG_ROOT>"
+#, no-wrap
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr "B<DEB_RULES_REQUIRES_ROOT>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+"Deze variabele wordt ingesteld op de waarde die verkregen wordt uit het veld "
+"B<Rules-Requires-Root> of vanuit de commandoregel. Indien ze ingesteld is, "
+"zal ze een geldige waarde zijn voor het veld B<Rules-Requires-Root>. Ze "
+"wordt gebruikt om B<debian/rules> te informeren of de specificatie "
+"B<rootless-builds.txt> ondersteund wordt."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_GAIN_ROOT_CMD>"
+msgstr "B<DEB_GAIN_ROOT_CMD>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -13894,6 +14309,9 @@ msgid ""
 "This variable is set to I<gain-root-command> when the field B<Rules-Requires-"
 "Root> is set to a value different to B<no> and B<binary-targets>."
 msgstr ""
+"Deze variabele wordt ingesteld op I<gain-root-command> wanneer het veld "
+"B<Rules-Requires-Root> ingesteld staat op een andere waarde dan B<no> of "
+"B<binary-targets>."
 
 #. type: TP
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-source.man dpkg-split.man
@@ -13956,7 +14374,7 @@ msgstr ""
 #: dpkg-buildpackage.man
 #, no-wrap
 msgid "Default build targets"
-msgstr "Standaard bouwdoelen"
+msgstr "Standaard bouwtargets"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -13968,13 +14386,13 @@ msgid ""
 "dpkg 1.18.8) it will fallback to use the B<build> target if B<make -f debian/"
 "rules -qn> I<build-target> returns 2 as exit code."
 msgstr ""
-"B<dpkg-buildpackage> gebruikt sinds dpkg 1.16.2 de doelen B<build-arch> en "
-"B<build-indep>. Deze doelen zijn dus verplicht. Maar om te vermijden dat "
+"B<dpkg-buildpackage> gebruikt sinds dpkg 1.16.2 de targets B<build-arch> en "
+"B<build-indep>. Deze targets zijn dus verplicht. Maar om te vermijden dat "
 "bestaande pakketten defect raken en om de overgang te vergemakkelijken, zal "
 "het, indien het broncodepakket niet zowel architectuuronafhankelijke als "
 "architectuurspecifieke binaire pakketten bouwt (sinds dpkg 1.18.8), "
-"terugvallen op het gebruik van het doel B<build> indien B<make -f debian/"
-"rules -qn> I<bouwdoel> 2 teruggeeft als afsluitwaarde."
+"terugvallen op het gebruik van het target B<build> indien B<make -f debian/"
+"rules -qn> I<bouwtarget> 2 teruggeeft als afsluitwaarde."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
@@ -14162,12 +14580,6 @@ msgstr "B<-O>[I<bestandsnaam>]"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "Print the buildinfo file to standard output (or I<filename> if "
-#| "specified)  rather than to I<dir>B</>I<source-name>B<_>I<source-"
-#| "version>B<_>I<arch>B<.buildinfo> (where I<dir> is B<..> by default or "
-#| "I<upload-files-dir> if B<-u> was used)."
 msgid ""
 "Print the buildinfo file to standard output (or I<filename> if specified)  "
 "rather than to I<dir>B</>I<source-name>B<_>I<binary-version>B<_>I<arch>B<."
@@ -14175,8 +14587,8 @@ msgid ""
 "was used)."
 msgstr ""
 "Geef het bestand buildinfo weer op de standaarduitvoer (of in "
-"I<bestandsnaam> als dit opgegeven werd), eerder dan in I<map>B</"
-">I<broncodenaam>B<_>I<broncodeversie>B<_>I<arch>B<.buildinfo> (waarbij "
+"I<bestandsnaam> als dit opgegeven werd), in plaats van in I<map>B</"
+">I<broncode-naam>B<_>I<binaire-versie>B<_>I<arch>B<.buildinfo> (waarbij "
 "I<map> standaard B<..> is of I<map-upload-bestanden> indien B<-u> gebruikt "
 "werd)."
 
@@ -14200,28 +14612,23 @@ msgstr ""
 
 #. type: TP
 #: dpkg-genbuildinfo.man
-#, fuzzy, no-wrap
-#| msgid "B<--always-include-path>"
+#, no-wrap
 msgid "B<--always-include-kernel>"
-msgstr "B<--always-include-path>"
+msgstr "B<--always-include-kernel>"
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
 msgid "By default, the B<Build-Kernel-Version> field will not be written out."
-msgstr ""
+msgstr "Standaard wordt het veld B<Build-Kernel-Version> niet opgeschreven."
 
 #. type: Plain text
 #: dpkg-genbuildinfo.man
-#, fuzzy
-#| msgid ""
-#| "Specify this option to always write a B<Build-Path> field when generating "
-#| "the B<.buildinfo>."
 msgid ""
 "Specify this option (since dpkg 1.19.0) to always write a B<Build-Kernel-"
 "Version> field when generating the B<.buildinfo>."
 msgstr ""
-"Geef deze optie op om steeds een veld B<Build-Path> op te schrijven als B<."
-"buildinfo> gegenereerd wordt."
+"Geef deze optie op (sinds dpkg 1.19.0) om steeds een veld B<Build-Kernel-"
+"Version> aan te maken als B<.buildinfo> gegenereerd wordt."
 
 #. type: TP
 #: dpkg-genbuildinfo.man
@@ -14253,7 +14660,7 @@ msgid ""
 "Specify this option to always write a B<Build-Path> field when generating "
 "the B<.buildinfo>."
 msgstr ""
-"Geef deze optie op om steeds een veld B<Build-Path> op te schrijven als B<."
+"Geef deze optie op om steeds een veld B<Build-Path> aan te maken als B<."
 "buildinfo> gegenereerd wordt."
 
 #. type: Plain text
@@ -14927,7 +15334,7 @@ msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<indeling>"
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -15016,20 +15423,12 @@ msgstr ""
 
 #. type: TP
 #: dpkg-deb.man
-#, fuzzy, no-wrap
-#| msgid "B<--uniform-compression>"
+#, no-wrap
 msgid "B<--[no-]uniform-compression>"
-msgstr "B<--uniform-compression>"
+msgstr "B<--[no-]uniform-compression>"
 
 #. type: Plain text
 #: dpkg-deb.man
-#, fuzzy
-#| msgid ""
-#| "Specify that the same compression parameters should be used for all "
-#| "archive members (i.e. B<control.tar> and B<data.tar>; since dpkg "
-#| "1.17.6).  Otherwise only the B<data.tar> member will use those "
-#| "parameters. The only supported compression types allowed to be uniformly "
-#| "used are B<none>, B<gzip> and B<xz>."
 msgid ""
 "Specify that the same compression parameters should be used for all archive "
 "members (i.e. B<control.tar> and B<data.tar>; since dpkg 1.17.6).  Otherwise "
@@ -15041,14 +15440,16 @@ msgstr ""
 "Geef aan dat dezelfde compressieparameters gebruikt moeten worden voor alle "
 "archiefonderdelen (d.w.z. B<control.tar> en B<data.tar>; sinds dpkg 1.17.6). "
 "Anders zullen die parameters enkel voor het onderdeel B<data.tar> gebruikt "
-"worden. De enige compressietypes waarvan het eenvormig gebruik toegelaten "
-"is, zijn B<none>, B<gzip> en B<xz>."
+"worden. De enige ondersteunde compressietypes waarvan het eenvormig gebruik "
+"toegelaten is, zijn B<none>, B<gzip> en B<xz>. De optie B<--no-uniform-"
+"compression> schakelt uniforme compressie uit (sinds dpkg 1.19.0). Uniforme "
+"compressie is de standaard (sinds dpkg 1.19.0)."
 
 #. type: TP
 #: dpkg-deb.man
 #, no-wrap
 msgid "B<--root-owner-group>"
-msgstr ""
+msgstr "B<--root-owner-group>"
 
 #. type: Plain text
 #: dpkg-deb.man
@@ -15056,6 +15457,8 @@ msgid ""
 "Set the owner and group for each entry in the filesystem tree data to root "
 "with id 0 (since dpkg 1.19.0)."
 msgstr ""
+"Stel voor elk gegevensitem van de bestandssysteemboom de eigenaar en de "
+"groep in op 'root' met het id 0 (sinds dpkg 1.19.0)."
 
 #. type: Plain text
 #: dpkg-deb.man
@@ -15065,6 +15468,10 @@ msgid ""
 "group that is not root.  Support for these will be added later in the form "
 "of a meta manifest."
 msgstr ""
+"B<Noot>: Deze optie kan nuttig zijn voor een root-loze bouw (zie I<rootless-"
+"builds.txt>), maar zou B<niet> gebruikt mogen worden wanneer de eigenaar of "
+"de groep van de items niet 'root' is. Daarvoor zal later ondersteuning "
+"toegevoegd worden in de vorm van een meta-manifest."
 
 #. type: TP
 #: dpkg-deb.man
@@ -15260,25 +15667,33 @@ msgstr "[B<--add>] I<bestand>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
-msgstr "Voeg voor I<bestand> een omlegging toe."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
+"Voeg een omlegging toe voor I<bestand>. Het bestand wordt momenteel niet "
+"hernoemd, zie B<--rename>."
 
 #. type: TP
 #: dpkg-divert.man
 #, no-wrap
 msgid "B<--remove>I< file>"
-msgstr "B<--remove> I<bestand>"
+msgstr "B<--remove>I< bestand>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
-msgstr "Verwijder een omlegging voor I<bestand>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
+"Verwijder een omlegging voor I<bestand>. Het bestand wordt momenteel niet "
+"hernoemd, zie B<--rename>."
 
 #. type: TP
 #: dpkg-divert.man
 #, no-wrap
 msgid "B<--list>I< glob-pattern>"
-msgstr "B<--list> I<glob-patroon>"
+msgstr "B<--list>I< glob-patroon>"
 
 #. type: Plain text
 #: dpkg-divert.man
@@ -15289,7 +15704,7 @@ msgstr "Som de omleggingen op die aan I<glob-patroon> beantwoorden."
 #: dpkg-divert.man
 #, no-wrap
 msgid "B<--listpackage>I< file>"
-msgstr "B<--listpackage> I<bestand>"
+msgstr "B<--listpackage>I< bestand>"
 
 #. type: Plain text
 #: dpkg-divert.man
@@ -15306,7 +15721,7 @@ msgstr ""
 #: dpkg-divert.man
 #, no-wrap
 msgid "B<--truename>I< file>"
-msgstr "B<--truename> I<bestand>"
+msgstr "B<--truename>I< bestand>"
 
 #. type: Plain text
 #: dpkg-divert.man
@@ -15317,13 +15732,48 @@ msgstr "Vermeld de echte naam van een omgeleid bestand."
 #: dpkg-divert.man dpkg-statoverride.man dselect.man update-alternatives.man
 #, no-wrap
 msgid "B<--admindir>I< directory>"
-msgstr "B<--admindir> I<map>"
+msgstr "B<--admindir>I< map>"
 
 #. type: Plain text
 #: dpkg-divert.man
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
-msgstr "Stel de datamap van B<dpkg> in op I<map> (standaard: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
+msgstr ""
+"Stel de  administratieve map in op I<map>. Standaard is dit «I<%ADMINDIR%>»."
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<--instdir>I< directory>"
+msgstr "B<--instdir>I< map>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+"Stel de installatiemap in, welke verwijst naar de map waar pakketten "
+"geïnstalleerd worden (sinds dpkg 1.19.2). Staat standaard ingesteld op «I</"
+">»."
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<--root>I< directory>"
+msgstr "B<--root>I< map>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
+msgstr ""
+"Stel de hoofdmap in op B<map>, hetgeen de installatiemap instelt op  "
+"«I<map>» en de administratieve map op «I<map>B<%ADMINDIR%>» (sinds dpkg "
+"1.19.2)."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15396,10 +15846,38 @@ msgstr "B<--rename>"
 #: dpkg-divert.man
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
 msgstr ""
 "Zet het bestand effectief uit de weg (of terug). B<dpkg-divert> zal de "
-"bewerking afbreken indien het doelbestand reeds bestaat."
+"bewerking afbreken indien het doelbestand reeds bestaat. Dit is het gangbare "
+"gedrag dat gebruikt wordt voor het omleggen van bestanden uit het geheel van "
+"niet-B<Essential> pakketten (zie B<--no-rename> voor meer details)."
+
+#. type: TP
+#: dpkg-divert.man
+#, no-wrap
+msgid "B<--no-rename>"
+msgstr "B<--no-rename>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
+msgstr ""
+"Geeft aan dat het bestand niet hernoemd mag worden als de omlegging "
+"toegevoegd wordt aan of verwijderd wordt uit de databank van omleggingen "
+"(sinds dpkg 1.19.1). Dit is bedoeld voor omleggingen van bestanden uit het "
+"geheel van B<Essential> pakketten, waarvoor het tijdelijk verdwijnen van het "
+"originele bestand onaanvaardbaar is, aangezien dit het systeem onbruikbaar "
+"kan maken. Dit is het standaardgedrag, maar dat zal veranderen in de cyclus "
+"1.20.x van dpkg."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15415,13 +15893,23 @@ msgstr ""
 "demonstratie."
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
 msgstr ""
-"Indien dit ingesteld werd en de optie B<--admindir> niet gebruikt werd, zal "
-"dit gebruikt worden als de datamap voor B<dpkg>."
+"Indien dit ingesteld is en de opties B<--instdir> of B<--root> niet "
+"opgegeven werden, zal dit gebruikt worden als de hoofdmap voor het "
+"bestandssysteem (sinds dpkg 1.19.2)."
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
+msgstr ""
+"Indien dit ingesteld is en de opties B<--admindir> of B<--root> niet "
+"opgegeven werden, zal dit gebruikt worden als de datamap voor B<dpkg>."
 
 #. type: Plain text
 #: dpkg-divert.man
@@ -15724,13 +16212,6 @@ msgstr "B<-T>I<substvars-bestand>"
 
 #. type: Plain text
 #: dpkg-genchanges.man
-#, fuzzy
-#| msgid ""
-#| "Read substitution variables in I<substvars-file>; the default is B<debian/"
-#| "substvars>.  No variable substitution is done on any of the fields that "
-#| "are output, however the special variable I<Format> will override the "
-#| "field of the same name. This option can be used multiple times to read "
-#| "substitution variables from multiple files (since dpkg 1.15.6)."
 msgid ""
 "Read substitution variables in I<substvars-file>; the default is B<debian/"
 "substvars>.  No variable substitution is done on any of the fields that are "
@@ -15742,10 +16223,11 @@ msgid ""
 msgstr ""
 "Lees de substitutievariabelen uit I<substvars-bestand>. Standaard is dat "
 "B<debian/substvars>. Er wordt geen variabelesubstitutie toegepast op de "
-"velden uit de uitvoer. Nochtans zal de bijzondere variabele I<Format> het "
-"veld met dezelfde naam vervangen. Deze optie kan meermaals gebruikt worden "
-"om substitutievariabelen uit verschillende bestanden te lezen (sinds dpkg "
-"1.15.6)."
+"velden uit de uitvoer, behalve voor de inhoud die geëxtraheerd werd uit het "
+"veld B<Description> van elk binair pakket (sinds dpkg 1.19.0). Nochtans zal "
+"de bijzondere variabele I<Format> het veld met dezelfde naam vervangen. Deze "
+"optie kan meermaals gebruikt worden om substitutievariabelen uit "
+"verschillende bestanden te lezen (sinds dpkg 1.15.6)."
 
 #. type: TP
 #: dpkg-genchanges.man dpkg-gencontrol.man dpkg-source.man
@@ -17202,6 +17684,36 @@ msgstr ""
 "bibliotheken aan te duiden (anders heeft u meerdere malen B<-e> nodig)."
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, no-wrap
+msgid "B<-l>I<directory>"
+msgstr "B<-l>I<map>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+"Voeg I<map> vooraan toe aan de lijst van mappen waarin naar private gedeelde "
+"bibliotheken gezocht moet worden (sinds dpkg 1.19.1). Deze optie kan "
+"meermaals gebruikt worden."
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+"Opmerking: gebruik deze optie in de plaats van het instellen van "
+"B<LD_LIBRARY_PATH>, aangezien die omgevingsvariabele gebruikt wordt om de "
+"runtime linker aan te sturen. Daarvan misbruik maken om de paden van "
+"gedeelde bibliotheken in te stellen tijdens het bouwen van het programma, "
+"kan problematisch zijn, bijvoorbeeld bij het cross-compileren."
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<-I>I<filename>"
@@ -17568,16 +18080,6 @@ msgstr "I<pakket>"
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
-#, fuzzy
-#| msgid ""
-#| "The package name. When the package is “Multi-Arch: same” this parameter "
-#| "must include the architecture qualifier, otherwise it should B<not> "
-#| "usually include the architecture qualifier (as it would disallow cross-"
-#| "grades, or switching from being architecture specific to architecture "
-#| "B<all> or vice versa).  If the parameter is empty or omitted, the "
-#| "B<DPKG_MAINTSCRIPT_PACKAGE> and B<DPKG_MAINTSCRIPT_ARCH> environment "
-#| "variables (as set by B<dpkg>)  will be used to generate an arch-qualified "
-#| "package name."
 msgid ""
 "The package name owning the pathname(s).  When the package is “Multi-Arch: "
 "same” this parameter must include the architecture qualifier, otherwise it "
@@ -17588,14 +18090,16 @@ msgid ""
 "variables (as set by B<dpkg> when running the maintainer scripts) will be "
 "used to generate an arch-qualified package name."
 msgstr ""
-"De pakketnaam. Als het pakket “Multi-Arch: same” is, moet deze parameter de "
-"architectuurkwalificatie bevatten, anders zou er gewoonlijk B<geen> "
-"architectuurkwalificatie in moeten voorkomen (aangezien dit geen cross-"
-"grades zou toelaten, of de omschakeling van architectuurspecifiek naar "
-"architectuur B<all> en vice versa). Indien de parameter leeg is of "
-"weggelaten werd, zullen de omgevingsvariabelen B<DPKG_MAINTSCRIPT_PACKAGE> "
-"en B<DPKG_MAINTSCRIPT_ARCH> (zoals die door B<dpkg> ingesteld werden) "
-"gebruikt worden om een pakketnaam met architectuurkwalificatie te genereren."
+"De pakketnaam met die padnaam/namen. Als het pakket “Multi-Arch: same” is, "
+"moet deze parameter de architectuurkwalificatie bevatten, anders zou er "
+"gewoonlijk B<geen> architectuurkwalificatie in moeten voorkomen (aangezien "
+"dit geen cross-grades zou toelaten, of de omschakeling van "
+"architectuurspecifiek naar architectuur B<all> en vice versa). Indien de "
+"parameter leeg is of weggelaten werd, zullen de omgevingsvariabelen "
+"B<DPKG_MAINTSCRIPT_PACKAGE> en B<DPKG_MAINTSCRIPT_ARCH> (zoals die door "
+"B<dpkg> ingesteld werden bij het uitvoeren van de scripts van de "
+"onderhouder) gebruikt worden om een pakketnaam met architectuurkwalificatie "
+"te genereren."
 
 #. type: TP
 #: dpkg-maintscript-helper.man
@@ -18052,6 +18556,15 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+"Stelt de kleurmodus in (sinds dpkg 1.19.1). Waarden die momenteel gebruikt "
+"mogen worden zijn: B<auto> (standaard), B<always> en B<never>."
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 msgid "B<dh_installdeb>(1)."
 msgstr "B<dh_installdeb>(1)."
 
@@ -18150,19 +18663,14 @@ msgstr "BEPERKINGEN"
 
 #. type: Plain text
 #: dpkg-mergechangelogs.man
-#, fuzzy
-#| msgid ""
-#| "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-#| "This might include stuff like vim modelines, comments which were not "
-#| "supposed to be there, etc."
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 "Alles wat niet door Dpkg::Changelog ontleed wordt, geraakt tijdens het "
-"samenvoegen verloren. Dit kan gaan om zaken zoals modus-regels van vim, "
-"commentaar die daar niet hoort te staan, enz."
+"samenvoegen verloren. Dit kan gaan om zaken zoals commentaar die daar niet "
+"hoort te staan, enz."
 
 #. type: SH
 #: dpkg-mergechangelogs.man
@@ -18544,14 +19052,16 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 "Stel de indeling van de uitvoer in. Momenteel ondersteunde waarden zijn "
 "B<dpkg> en B<rfc822>. B<dpkg> is de klassieke indeling van de uitvoer (van "
 "voor het bestaan van deze optie) en ook de standaard. Het bestaat uit één "
-"paragraaf volgens het systeem van Debian control (zie B<deb-control>(5)). "
-"Indien meer dan één item opgevraagd wordt, dan worden de meeste velden "
-"genomen uit het meest recente item, tenzij anders vermeld:"
+"paragraaf volgens het indelingssysteem van Debian control (zie B<deb-"
+"control>(5)). Indien meer dan één item opgevraagd wordt, dan worden de "
+"meeste velden genomen uit het eerste item (gewoonlijk het meest recente "
+"item), tenzij anders vermeld:"
 
 #. type: TP
 #: dpkg-parsechangelog.man
@@ -18691,6 +19201,21 @@ msgstr ""
 "alle metadata van elk item behouden blijven."
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, no-wrap
+msgid "B<--reverse>"
+msgstr "B<--reverse>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+"Voeg alle wijzigingen in omgekeerde volgorde in (sinds dpkg 1.19.1). "
+"Opmerking: voor de indeling B<dpkg> zal het eerste item het oudste item zijn."
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, no-wrap
 msgid "B<--all>"
@@ -18827,10 +19352,12 @@ msgstr "       @@@ changelog-format: I<andere-indeling> @@@\n"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
-"Namen voor changelog-indelingen moeten niet-lege alfanumerieke tekenreeksen "
-"zijn."
+"Een naam voor een changelog-indelingen moet een niet-lege alfanumerieke "
+"tekenreeks (“a-z0-9”) zijn."
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
@@ -18974,23 +19501,28 @@ msgstr "B<-l>, B<--list> [I<pakketnaampatroon>...]"
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
-msgstr ""
-"Geef de pakketten weer die beantwoorden aan het opgegeven patroon. Indien "
-"geen I<pakketnaampatroon> opgegeven werd, som dan alle pakketten uit I<"
-"%ADMINDIR%/status> op, met uitzondering van diegene die als niet-"
-"geïnstalleerd gemarkeerd staan (d.w.z. die welke eerder gewist werden). De "
-"normale shell-jokertekens mogen in I<pakketnaampatroon> gebruikt worden. "
-"Merk op dat u I<pakketnaampatroon> wellicht tussen aanhalingstekens zult "
-"moeten plaatsen om te voorkomen dat de shell aan bestandsnaamexpansie zou "
-"doen. Het volgende zal bijvoorbeeld een opsomming geven van alle pakketnamen "
-"die beginnen met ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
+msgstr ""
+"Alle gekende pakketten opsommen die beantwoorden aan één of meer patronen, "
+"ongeacht hun toestand, met daarbij inbegrepen elk reëel of virtueel pakket "
+"dat in om het even welk veld over vereistenrelaties (zoals B<Breaks>, "
+"B<Enhances>, enz.) vermeld wordt. Indien geen I<pakketnaampatroon> opgegeven "
+"werd, som dan alle pakketten uit I<%ADMINDIR%/status> op, met uitzondering "
+"van die welke als niet-geïnstalleerd gemarkeerd staan (d.w.z. die welke "
+"eerder gewist werden). De normale shell-jokertekens mogen in "
+"I<pakketnaampatroon> gebruikt worden. Merk op dat u I<pakketnaampatroon> "
+"wellicht tussen aanhalingstekens zult moeten plaatsen om te voorkomen dat de "
+"shell aan bestandsnaamexpansie zou doen. Het volgende zal bijvoorbeeld een "
+"opsomming geven van alle pakketnamen die beginnen met ``libc6'':"
 
 #. type: Plain text
 #: dpkg-query.man
@@ -19123,22 +19655,26 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
-msgstr "B<-s>, B<--status> I<pakketnaam>..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
+msgstr "B<-s>, B<--status> [I<pakketnaam>...]"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 "Rapporteert over de status van het opgegeven pakket. Dit geeft gewoon het "
-"item weer uit de database met de toestand van geïnstalleerde bestanden. Als "
-"meerdere I<pakketnamen> vermeld werden, worden de opgevraagde items met "
+"item weer uit de databank van de toestand van de geïnstalleerde bestanden. "
+"Indien geen I<pakketnaam> vermeld werd, worden alle items uit de databank "
+"met toestandsinformatie weergegeven (sinds dpkg 1.19.1). Als meerdere "
+"I<pakketnamen> vermeld werden, worden de opgevraagde items met "
 "toestandsinformatie van elkaar gescheiden door een lege regel en weergegeven "
-"in dezelfde volgorde als die van de lijst met argumenten."
+"in dezelfde volgorde als die van de argumentenlijst."
 
 #. type: TP
 #: dpkg-query.man
@@ -19242,7 +19778,7 @@ msgstr "B<-S>, B<--search> I<zoekpatroon-bestandsnaam>..."
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 "Zoek pakketten die bestanden hebben die overeenkomen met het opgegeven "
@@ -19281,22 +19817,24 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
-msgstr "B<-p>, B<--print-avail> I<pakketnaam>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
+msgstr "B<-p>, B<--print-avail> [I<pakketnaam>...]"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
-"Toon de details in verband met I<pakketnaam> zoals die te vinden zijn in I</"
-"var/lib/dpkg/available>. Als meerdere I<pakketnamen> opgegeven worden, "
-"worden de gevraagde items uit I<available> onderling gescheiden door een "
-"lege regel en weergegeven in dezelfde volgorde als die waarin de lijst "
-"argumenten opgegeven werd."
+"Toon detailinformatie over pakketten, zoals die in I<%ADMINDIR%/available> "
+"te vinden is. Als geen I<pakketnaam> opgegeven werd, worden alle items uit "
+"de databank I<available> weergegeven (sinds dpkg 1.19.1). Als meerdere "
+"I<pakketnamen> opgegeven worden, worden de gevraagde items uit I<available> "
+"onderling gescheiden door een lege regel en weergegeven in dezelfde volgorde "
+"als die van de argumentenlijst."
 
 #. type: Plain text
 #: dpkg-query.man
@@ -19343,6 +19881,18 @@ msgstr "B<-f>, B<--showformat=>I<indeling>"
 
 #. type: Plain text
 #: dpkg-query.man
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+"Deze optie wordt gebruikt om op te geven in welke indeling B<--show> zijn "
+"uitvoer moet produceren (de korte optie sinds dpkg 1.13.1). De indeling is "
+"een tekenreeks die vorm geeft aan de uitvoer die voor elk opgesomd pakket "
+"gegenereerd wordt."
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr "In de indelingstekenreeks markeert “B<\\e>” een stuurcode:"
 
@@ -19494,13 +20044,24 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
+msgid "B<binary:Synopsis>"
+msgstr "B<binary:Synopsis>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid "It contains the package short description (since dpkg 1.19.1)."
+msgstr "Het bevat de korte beschrijving van het pakket (sinds dpkg 1.19.1)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
 msgid "B<binary:Summary>"
 msgstr "B<binary:Summary>"
 
 #. type: Plain text
 #: dpkg-query.man
-msgid "It contains the package short description (since dpkg 1.16.2)."
-msgstr "Het bevat de korte beschrijving van het pakket (sinds dpkg 1.16.2)."
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
+msgstr "Dit is een alias voor B<binary:Synopsis> (sinds dpkg 1.16.2)."
 
 #. type: TP
 #: dpkg-query.man
@@ -19567,6 +20128,36 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
+msgid "B<db-fsys:Files>"
+msgstr "B<db-fsys:Files>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr ""
+"Het bevat de door regeleinden gescheiden lijst van de elementen van het "
+"pakketbestandssysteem (sinds dpkg 1.19.3)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr "B<db-fsys:Last-Modified>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+"Het bevat de tijdsaanduiding in seconden van het laatste moment waarop de "
+"elementen van het pakketbestandssysteem gewijzigd werden (sinds dpkg 1.19.3)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
 msgid "B<source:Package>"
 msgstr "B<source:Package>"
 
@@ -19639,11 +20230,50 @@ msgstr ""
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
 msgstr ""
-"Deze instelling wijzigt de uitvoer van de optie B<--list> door de breedte "
-"van de uitvoer ervan aan te passen."
+"Stelt het uit te voeren programma in wanneer een commando via een shell "
+"voortgebracht wordt (sinds dpkg 1.19.2)."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+"Stelt het te gebruiken pagineringscommando in (sinds dpkg 1.19.1), hetwelk "
+"uitgevoerd zal worden met «B<$SHELL -c>». Indien B<SHELL> niet ingesteld is, "
+"zal «B<sh>» gebruikt worden. B<DPKG_PAGER> overschrijft de "
+"omgevingsvariabele B<PAGER> (sinds dpkg 1.19.2)."
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+"Indien dit ingesteld werd en de optie B<--admindir> niet gebruikt werd, zal "
+"dit gebruikt worden als de datamap voor B<dpkg>."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+"Indien niet reeds ingesteld, wordt het als “B<-FRSXMQ>” gedefinieerd door "
+"B<dpkg-query> bij het voortbrengen van een pagineringsprogramma (sinds dpkg "
+"1.19.2). Om het standaardgedrag te wijzigen, kan deze variabele vooraf "
+"ingesteld worden op een andere waarde, inclusief op een lege tekenreeks, "
+"ofwel kunnen de variabelen B<PAGER> of B<DPKG_PAGER> ingesteld worden om "
+"specifieke opties uit te schakelen met «B<-+>», bijvoorbeeld B<DPKG_PAGER="
+"\"less -+F\">."
 
 #. type: TH
 #: dpkg-scanpackages.man
@@ -20007,8 +20637,8 @@ msgstr ""
 "pakket in beide bestanden voorkomt, heeft het override-bestand van de "
 "broncode voorrang bij het instellen van de sectie."
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
@@ -20326,12 +20956,6 @@ msgstr ""
 "Voeg de gepaste afhankelijkheidsrelaties tot gedeelde bibliotheken toe die "
 "nodig zijn voor I<programma>. Deze optie kan meermaals gebruikt worden."
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, no-wrap
-msgid "B<-l>I<directory>"
-msgstr "B<-l>I<map>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 msgid ""
@@ -20342,20 +20966,6 @@ msgstr ""
 "gedeelde bibliotheken gezocht moet worden (sinds dpkg 1.17.0). Deze optie "
 "kan meermaals gebruikt worden."
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-"Opmerking: gebruik deze optie in plaats van B<LD_LIBRARY_PATH> in te "
-"stellen, aangezien die omgevingsvariabele gebruikt wordt om de linker "
-"tijdens de programma-uitvoering aan te sturen. Daarvan misbruik maken om de "
-"paden van gedeelde bibliotheken in te stellen tijdens het bouwen van het "
-"programma, kan problematisch zijn, bijvoorbeeld bij het cross-compileren."
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
@@ -21581,15 +22191,6 @@ msgstr "B<Bouwopties (met --build):>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "If a second non-option argument is supplied it should be the name of the "
-#| "original source directory or tarfile or the empty string if the package "
-#| "is a Debian-specific one and so has no debianisation diffs. If no second "
-#| "argument is supplied then B<dpkg-source> will look for the original "
-#| "source tarfile I<package>B<_>I<upstream-version>B<.orig.tar.gz> or the "
-#| "original source directory I<directory>B<.orig> depending on the B<-sX> "
-#| "arguments."
 msgid ""
 "If a second non-option argument is supplied it should be the name of the "
 "original source directory or tarfile or the empty string if the package is a "
@@ -21677,12 +22278,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Specifies to not look for any original source, and to not generate a "
-#| "diff.  The second argument, if supplied, must be the empty string. This "
-#| "is used for Debian-specific packages which do not have a separate "
-#| "upstream source and therefore have no debianisation diffs."
 msgid ""
 "Specifies to not look for any original source, and to not generate a diff.  "
 "The second argument, if supplied, must be the empty string. This is used for "
@@ -21693,7 +22288,7 @@ msgstr ""
 "er geen diff-bestand aangemaakt moet worden. Als er een tweede argument "
 "opgegeven wordt, moet het de lege tekenreeks zijn. Dit wordt gebruikt voor "
 "Debian-specifieke pakketten die geen afzonderlijke toeleveraarsbroncode "
-"hebben en om die reden ook geen debianisatie-diffs."
+"hebben en om die reden ook geen debianiserings-diffs."
 
 #. type: TP
 #: dpkg-source.man
@@ -21703,20 +22298,6 @@ msgstr "B<-sa> of B<-sA>"
 
 #. type: Plain text
 #: dpkg-source.man
-#, fuzzy
-#| msgid ""
-#| "Specifies to look for the original source archive as a tarfile or as a "
-#| "directory - the second argument, if any, may be either, or the empty "
-#| "string (this is equivalent to using B<-sn>).  If a tarfile is found it "
-#| "will unpack it to create the diff and remove it afterwards (this is "
-#| "equivalent to B<-sp>); if a directory is found it will pack it to create "
-#| "the original source and remove it afterwards (this is equivalent to B<-"
-#| "sr>); if neither is found it will assume that the package has no "
-#| "debianisation diffs, only a straightforward source archive (this is "
-#| "equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
-#| "the directory, overwriting it, if B<-sA> was specified (this is "
-#| "equivalent to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> "
-#| "is the default."
 msgid ""
 "Specifies to look for the original source archive as a tarfile or as a "
 "directory - the second argument, if any, may be either, or the empty string "
@@ -21728,7 +22309,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 "Geeft aan dat naar de originele broncode gezocht moet worden in de vorm van "
 "een tar-bestand of een map. Als er een tweede argument opgegeven wordt, mag "
@@ -21738,12 +22319,12 @@ msgstr ""
 "(dit is het equivalent voor B<-sp>). Indien een map aangetroffen wordt, zal "
 "het die inpakken om de originele broncode te creëren en ze vervolgens "
 "verwijderen (dit is het equivalent voor B<-sr>). Indien geen van beide "
-"gevonden wordt, zal het aannemen dat het pakket geen debianisatie-diffs "
+"gevonden wordt, zal het aannemen dat het pakket geen debianiserings-diffs "
 "heeft, maar enkel een eenvoudig broncodearchief (dit is het equivalent voor "
 "B<-sn>). Indien beide aangetroffen worden, dan zal B<dpkg-source> de map "
 "negeren, en ze overschrijven als B<-sA> opgegeven werd (dit is het "
 "equivalent voor B<-sP>) of een foutmelding geven als B<-sa> opgegeven werd. "
-"B<-sA> is de standaard."
+"B<-sa> is de standaard."
 
 #. type: TP
 #: dpkg-source.man
@@ -21907,22 +22488,22 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 "Wordt ondersteund sinds dpkg 1.14.17. Een broncodepakket volgens deze "
 "indeling bevat minstens een origineel tar-archief (B<.orig.tar.>I<ext> "
 "waarbij I<ext> B<gz>, B<bz2>, B<lzma> en B<xz> kan zijn) en een debian tar-"
 "archief (B<.debian.tar.>I<ext>). Het kan ook bijkomende originele tar-"
 "archieven bevatten (B<.orig->I<component>B<.tar.>I<ext>). I<component> mag "
-"enkel alfanumerieke tekens en koppeltekens (‘-’) bevatten. Optioneel mag bij "
-"elk originele tar-archief een afzonderlijke handtekening van de toeleveraar "
-"(B<.orig.tar.>I<ext>B<.asc> en B<.orig->I<component>B<.tar.>I<ext>B<.asc>), "
-"gevoegd zijn. De extractie ervan wordt ondersteund sinds dpkg 1.17.20 en het "
-"bouwen sinds dpkg 1.18.5."
+"enkel alfanumerieke tekens (‘a-zA-Z0-9’) en koppeltekens (‘-’) bevatten. "
+"Optioneel mag bij elk origineel tar-archief een afzonderlijke handtekening "
+"van de toeleveraar (B<.orig.tar.>I<ext>B<.asc> en B<.orig->I<component>B<."
+"tar.>I<ext>B<.asc>), gevoegd worden. De extractie ervan wordt ondersteund "
+"sinds dpkg 1.17.20 en het bouwen sinds dpkg 1.18.5."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -21948,29 +22529,60 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
 "of B<patch>. It will thus emit a warning when it encounters such options, "
 "and the build is likely to fail."
 msgstr ""
-"Vervolgens worden alle patches toegepast die opgesomd zijn in B<debian/"
-"patches/debian.series> of B<debian/patches/series>. Indien het eerste "
-"bestand gebruikt wordt en het laatste niet bestaat (of een symbolische "
-"koppeling is), dan zal het laatste vervangen worden door een symbolische "
-"koppeling naar het eerste. Dit is bedoeld om het gebruik van B<quilt> bij "
-"het beheer van de set patches te vereenvoudigen. Merk nochtans op dat hoewel "
-"B<dpkg-source> op correcte wijze series-bestanden ontleedt met expliciete "
-"opties die gebruikt worden voor het toepassen van patches (op elke regel "
-"opgeslagen na de bestandsnaam van de patch en één of meer spaties), het deze "
-"opties negeert en steeds patches verwacht die kunnen toegepast worden met de "
-"optie B<-p1> van B<patch>. Het zal dus een waarschuwing geven als het "
-"dergelijke opties tegenkomt en het bouwen zal waarschijnlijk mislukken."
+"Vervolgens worden alle patches toegepast die vermeld zijn in B<debian/"
+"patches/>I<leverancier>B<.series> of B<debian/patches/series>, waarbij "
+"I<leverancier> de naam is in kleine letters van de huidige leverancier, of "
+"B<debian> als geen leverancier gedefinieerd is. Indien het eerste bestand "
+"gebruikt wordt en het laatste niet bestaat (of een symbolische koppeling "
+"is), dan zal het laatste vervangen worden door een symbolische koppeling "
+"naar het eerste. Dit is bedoeld om het gebruik van B<quilt> bij het beheer "
+"van het geheel van patches te vereenvoudigen. Leveranciersspecifieke series-"
+"bestanden hebben tot doel het serialiseren van meerdere leveranciersgebonden "
+"ontwikkelingstakken op een declaratieve manier mogelijk te maken, wat "
+"verkieslijker is boven een open codering van deze manipulatie in B<debian/"
+"rules>. Dit is in het bijzonder nuttig wanneer de broncode voorwaardelijk "
+"gepatched moet worden omdat de betrokken bestanden geen ingebouwde "
+"ondersteuning hebben voor conditionele occlusie. Merk nochtans op dat hoewel "
+"B<dpkg-source> op correcte wijze de ontleding uitvoert van series-bestanden "
+"met expliciete opties die gebruikt worden voor het toepassen van patches (op "
+"elke regel opgeslagen na de bestandsnaam van de patch en één of meer "
+"spaties), het deze opties negeert en steeds patches verwacht die kunnen "
+"toegepast worden met de optie B<-p1> van B<patch>. Het zal dus een "
+"waarschuwing geven als het dergelijke opties tegenkomt en het bouwen zal "
+"waarschijnlijk mislukken."
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+"Opmerking: indien leveranciers-series-bestanden gebruikt worden, geeft "
+"B<lintian>(1) onvoorwaardelijke waarschuwingen als gevolg van een "
+"controversieel Debian-specifiek besluit. Extern gebruik zou hierdoor niet "
+"getroffen mogen worden. Om dergelijke waarschuwingen het zwijgen op te "
+"leggen kunt u het dpkg-profiel van lintian gebruiken door aan B<lintian>(1) "
+"de optie «B<--profile dpkg>» mee te geven."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -22900,6 +23512,12 @@ msgstr ""
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr "debian/patches/I<leverancier>.series"
+
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
 
@@ -22908,23 +23526,29 @@ msgstr "debian/patches/series"
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
 "Dit bestand somt alle patches op die toegepast moeten worden (in de "
 "opgegeven volgorde) bovenop het broncodepakket van de toeleveraar. Spaties "
-"vooraan en achteraan worden weggehaald. Regels die beginnen met ‘B<#>’ zijn "
-"commentaar en worden overgeslagen. Lege regels worden genegeerd. De overige "
-"regels beginnen met de bestandsnaam van een patch (relatief ten opzichte van "
-"de map B<debian/patches/>) tot aan de eerste spatie of het einde van de "
-"regel. Facultatieve B<quilt>-opties kunnen daarna komen tot aan het einde "
-"van de regel of tot aan het eerste ‘B<#>’-teken dat voorafgegaan wordt door "
-"één of meer spaties (hetgeen het begin van een commentaarstuk aangeeft dat "
-"doorloopt tot het einde van de regel)."
+"vooraan en achteraan worden weggehaald. I<leverancier> is de naam in kleine "
+"letters van de huidige leverancier of B<debian> als geen leverancier "
+"gedefinieerd werd. Indien het leveranciersspecifieke series-bestand niet "
+"bestaat, zal het leveranciersloze series-bestand gebruikt worden. Regels die "
+"beginnen met ‘B<#>’ zijn commentaar en worden overgeslagen. Lege regels "
+"worden genegeerd. De overige regels beginnen met de bestandsnaam van een "
+"patch (relatief ten opzichte van de map B<debian/patches/>) tot aan de "
+"eerste spatie of het einde van de regel. Facultatieve B<quilt>-opties kunnen "
+"daarna komen tot aan het einde van de regel of tot aan het eerste ‘B<#>’-"
+"teken dat voorafgegaan wordt door één of meer spaties (hetgeen het begin van "
+"een commentaarstuk aangeeft dat doorloopt tot het einde van de regel)."
 
 #. type: Plain text
 #: dpkg-source.man
@@ -23459,8 +24083,8 @@ msgid ""
 "has three basic functions: adding, removing and listing overrides."
 msgstr ""
 "B<dpkg-statoverride> is een hulpmiddel voor het beheren van de lijst met "
-"statusaanpassingen (stat overrides). Het heeft drie basisfuncties: "
-"toevoegen, verwijderen en opsommen van aanpassingen."
+"statusmodificaties (stat overrides). Het heeft drie basisfuncties: "
+"toevoegen, verwijderen en opsommen van modificaties."
 
 #. type: TP
 #: dpkg-statoverride.man
@@ -23477,12 +24101,13 @@ msgid ""
 "by their number by prepending the number with a ‘B<#>’ (for example B<#0> or "
 "B<#65534>).  The I<mode> needs to be specified in octal."
 msgstr ""
-"Voeg een statusaanpassing toe voor I<pad>. Het is niet nodig dat I<pad> "
-"reeds bestaat op het ogenblik dat dit commando gebruikt wordt. De aanpassing "
-"zal opgeslagen worden en later gebruikt worden. Gebruikers en groepen kunnen "
-"bij hun naam opgegeven worden (bijvoorbeeld B<root> of B<nobody>), of met "
-"hun nummer door voor dat nummer een ‘B<#>’ te plaatsen (bijvoorbeeld B<#0> "
-"of B<#65534>). De I<modus> moet als octaal getal opgegeven worden."
+"Een statusmodificatie toevoegen voor I<pad>. Het is niet nodig dat I<pad> "
+"reeds bestaat op het ogenblik dat dit commando gebruikt wordt. De "
+"modificatie zal opgeslagen worden en later gebruikt worden. Gebruikers en "
+"groepen kunnen bij hun naam opgegeven worden (bijvoorbeeld B<root> of "
+"B<nobody>), of met hun nummer door voor dat nummer een ‘B<#>’ te plaatsen "
+"(bijvoorbeeld B<#0> of B<#65534>). De I<modus> moet als octaal getal "
+"opgegeven worden."
 
 #. type: Plain text
 #: dpkg-statoverride.man
@@ -23505,8 +24130,8 @@ msgid ""
 "Remove an override for I<path>, the status of I<path> is left unchanged by "
 "this command."
 msgstr ""
-"Verwijder een statusaanpassing voor I<pad>. De status zelf van I<pad> wordt "
-"door dit commando niet gewijzigd."
+"Een statusmodificatie verwijderen voor I<pad>. De status zelf van I<pad> "
+"wordt door dit commando niet gewijzigd."
 
 #. type: TP
 #: dpkg-statoverride.man
@@ -23520,17 +24145,57 @@ msgid ""
 "List all overrides. If a glob pattern is specified restrict the output to "
 "overrides which match the glob."
 msgstr ""
-"Som alle modificaties (overrides) op. Beperk de uitvoer tot modificaties die "
-"overeenkomen met het glob-patroon, indien een glob-patroon opgegeven werd."
+"Alle modificaties (overrides) opsommen. Beperk de uitvoer tot modificaties "
+"die overeenkomen met het glob-patroon, indien een glob-patroon opgegeven "
+"werd."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr "Hulp bieden over de opties B<--force->I<iets> (sinds dpkg 1.19.5)."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
+msgstr ""
+"De administratieve map instellen op I<map>. Dit is waar het "
+"I<statusmodificatie>-bestand opgeslagen is. Standaard is dat «I<%ADMINDIR%>»."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+"Instellen van de installatiemap, welke verwijst naar de map waar pakketten "
+"geïnstalleerd worden (sinds dpkg 1.19.2). Standaard is dat «I</>»."
 
 #. type: Plain text
 #: dpkg-statoverride.man
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
 msgstr ""
-"Wijzig de I<map> voor de B<dpkg>-database waar ook het bestand met "
-"statusaanpassingen opgeslagen wordt. Standaard is dat I<%ADMINDIR%>."
+"Het uitvoeren van sommige dingen opleggen of weigeren (B<no-force> en "
+"B<refuse> betekenen hetzelfde) (sinds dpkg 1.19.5). I<dingen> is een door "
+"komma's gescheiden lijst van hierna gespecificeerde zaken. B<--force-help> "
+"geeft er een beschrijving van weer. Zaken die met een (*) gemarkeerd zijn, "
+"worden standaard opgelegd."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Waarschuwing: Deze opties zijn vooral bedoeld om enkel door experts "
+"gebruikt te worden. Er gebruik van maken zonder een volkomen begrip van hun "
+"effecten kan uw volledig systeem defect maken.>"
 
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
@@ -23542,10 +24207,11 @@ msgstr "B<--force>"
 #: dpkg-statoverride.man
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
-"Verplicht een actie, zelfs als een redelijkheidstoets die anders zou "
-"verbieden. Dit is noodzakelijk om een bestaande aanpassing (override) te "
+"Een actie verplicht maken, zelfs als een redelijkheidstoets deze anders zou "
+"verbieden. Dit is noodzakelijk om een bestaande modificatie (override) te "
 "wijzigen."
 
 #. type: TP
@@ -23559,13 +24225,13 @@ msgstr "B<--update>"
 msgid ""
 "Immediately try to change the I<path> to the new owner and mode if it exists."
 msgstr ""
-"Tracht onmiddellijk het I<pad>, als dat bestaat, in te stellen op de nieuwe "
-"eigenaar en modus."
+"Proberen om onmiddellijk het I<pad>, als dat bestaat, in te stellen op de "
+"nieuwe eigenaar en modus."
 
 #. type: Plain text
 #: dpkg-statoverride.man
 msgid "Be less verbose about what we do."
-msgstr "Wees minder breedsprakig over wat er gedaan wordt."
+msgstr "Minder breedsprakig zijn over wat er gedaan wordt."
 
 #. type: Plain text
 #: dpkg-statoverride.man
@@ -23575,6 +24241,16 @@ msgstr ""
 "Voor B<--list>, indien er geen modificaties (overrides) zijn of geen enkele "
 "beantwoordt aan het opgegeven glob-patroon."
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+"Indien dit ingesteld is en geen enkele van de opties B<--force->I<...> "
+"opgegeven werd, zal dit gebruikt worden als de te gebruiken forceer-opties "
+"(sinds dpkg 1.19.5)."
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -23588,9 +24264,9 @@ msgid ""
 "located in the B<dpkg> administration directory, along with other files "
 "important to B<dpkg>, such as I<status> or I<available>."
 msgstr ""
-"Bestand dat de huidige lijst van statusaanpassingen van het systeem bevat. "
-"Het bevindt zich in de beheersmap van B<dpkg> samen met andere bestanden die "
-"van belang zijn voor B<dpkg>, zoals I<status> en I<available>."
+"Bestand dat de huidige lijst van statusmodificaties van het systeem bevat. "
+"Het bevindt zich in de administratieve map van B<dpkg> samen met andere "
+"bestanden die van belang zijn voor B<dpkg>, zoals I<status> en I<available>."
 
 #. type: Plain text
 #: dpkg-statoverride.man
@@ -23724,11 +24400,14 @@ msgstr "B<--await>"
 #. type: Plain text
 #: dpkg-trigger.man
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 "Deze optie doet het tegenovergestelde van B<--no-await> (sinds dpkg "
-"1.17.21). Dit is momenteel het standaardgedrag."
+"1.17.21). Indien het belanghebbende pakket een “noawait”-opdracht "
+"gedeclareerd heeft, zal deze optie geen effect hebben. Dit is momenteel het "
+"standaardgedrag."
 
 #. type: TP
 #: dpkg-trigger.man
@@ -23990,8 +24669,14 @@ msgstr ""
 #. type: TP
 #: dselect.man
 #, no-wrap
-msgid "B<--colour>|B<--color> I<screenpart>:[I<foreground>],[I<background>][:I<attr>[I<+attr>]...]"
-msgstr "B<--colour>|B<--color> I<schermdeel>:[I<voorgrond>],[I<achtergrond>][:I<attr>[I<+attr>]...]"
+msgid "B<--color> I<screenpart>:[I<foreground>],[I<background>][:I<attr>[I<+attr>]...]"
+msgstr "B<--color> I<schermdeel>:[I<voorgrond>],[I<achtergrond>][:I<attr>[I<+attr>]...]"
+
+#. type: TP
+#: dselect.man
+#, no-wrap
+msgid "B<--colour> I<screenpart>:[I<foreground>],[I<background>][:I<attr>[I<+attr>]...]"
+msgstr "B<--colour> I<schermdeel>:[I<voorgrond>],[I<achtergrond>][:I<attr>[I<+attr>]...]"
 
 #. type: Plain text
 #: dselect.man
@@ -24212,13 +24897,6 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.man
-#, fuzzy
-#| msgid ""
-#| "By default, B<dselect> provides several methods such as I<cdrom>, "
-#| "I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, "
-#| "I<multi_mount>, I<floppy> or I<ftp>, but other packages may provide "
-#| "additional methods, eg. the I<apt> access method provided by the B<apt> "
-#| "package."
 msgid ""
 "By default, B<dselect> provides several methods such as I<cdrom>, "
 "I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount> "
@@ -24226,10 +24904,9 @@ msgid ""
 "access method provided by the B<apt> package."
 msgstr ""
 "Standaard biedt B<dselect> diverse benaderingsmethodes, zoals I<cdrom>, "
-"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount>, "
-"I<floppy> of I<ftp>, maar andere pakketten kunnen andere methodes aanbieden, "
-"zoals bijvoorbeeld het pakket B<apt> dat de benaderingsmethode I<apt> "
-"aanbiedt."
+"I<multi_cd>, I<nfs>, I<multi_nfs>, I<harddisk>, I<mounted>, I<multi_mount> "
+"of I<ftp>, maar andere pakketten kunnen andere methodes aanbieden, zoals "
+"bijvoorbeeld het pakket B<apt> dat de benaderingsmethode I<apt> aanbiedt."
 
 #. type: Plain text
 #: dselect.man
@@ -25255,15 +25932,43 @@ msgstr "B<-p>, B<--pidfile> I<pid-bestand>"
 
 #. type: Plain text
 #: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr "Ga na of een proces het bestand I<pid-bestand> aangemaakt heeft."
+
+#. type: Plain text
+#: start-stop-daemon.man
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
 msgstr ""
-"Ga na of een proces het bestand I<pid-bestand> aangemaakt heeft. Opmerking: "
-"enkel deze vergelijkingsoptie gebruiken, kan ertoe leiden dat geageerd wordt "
-"op niet-bedoelde processen in het geval het oude proces eindigde zonder dat "
-"het in staat was het I<pid-bestand> te verwijderen."
+"Opmerking: deze vergelijkingsoptie alleen gebruiken, kan ertoe leiden dat "
+"geageerd wordt op niet-bedoelde processen in het geval het oude proces "
+"eindigde zonder dat het in staat was het I<pid-bestand> te verwijderen."
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
+msgstr ""
+"B<Waarschuwing:> deze vergelijkingsoptie gebruiken met een pid-bestand dat "
+"door iedereen beschreven kan worden, of deze enkel gebruiken met een "
+"achtergronddienst die het pid-bestand wegschrijft als gebruiker zonder "
+"bijzondere rechten, zal met een foutmelding geweigerd worden (sinds versie "
+"1.19.3) omdat het een veiligheidsrisico inhoudt. Dit is omdat elke gebruiker "
+"er naartoe kan schrijven, of omdat de inhoud van het pid-bestand niet "
+"vertrouwd kan worden als de achtergronddienst aangetast raakt, met als "
+"resultaat dat een programmauitvoerder met bijzondere rechten (zoals een init-"
+"script dat als systeembeheerder uitgevoerd wordt) op gelijk welk "
+"systeemproces kan inwerken. Het gebruik van I</dev/null> is vrijgesteld van "
+"deze controles."
 
 #. type: TP
 #: start-stop-daemon.man
@@ -25568,6 +26273,88 @@ msgstr ""
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
+msgid "B<--notify-await>"
+msgstr "B<--notify-await>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+"Wachten tot het achtergrondproces een kennisgeving zendt dat het gereed is, "
+"vooraleer de dienst als opgestart beschouwd wordt (sinds versie 1.19.3). Dit "
+"past elementen van het 'readiness protocol' van systemd toe, zoals dit in de "
+"man-pagina B<sd_notify>(3) gespecificeerd wordt. De volgende variabelen "
+"worden ondersteund:"
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr "B<READY=1>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+"Het programma is gereed om zijn dienstverlening aan te bieden en dus kunnen "
+"we veilig afsluiten."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr "B<EXTEND_TIMEOUT_USEC=>I<aantal>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+"Het programma vraagt om de wachttijd uit te breiden met I<aantal> "
+"microseconden. Dit stelt de huidige wachttijd opnieuw in op de opgegeven "
+"waarde."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<ERRNO=>I<number>"
+msgstr "B<ERRNO=>I<nummer>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+"Het programma sluit af met een foutmelding. Hetzelfde doen en van de "
+"B<errno>-waarde de gebruikersvriendelijke tekenreeks tonen."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr "B<--notify-timeout>I<wachttijd>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+"Een wachttijd instellen voor de optie B<--notify-await> (sinds versie "
+"1.19.3). Wanneer de wachttijd verlopen is, zal B<start-stop-daemon> "
+"afsluiten met een foutmelding en zal niet gewacht worden op de kennisgeving "
+"van gereedheid. Standaard is dit B<60> seconden."
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<-C>, B<--no-close>"
 
@@ -26521,10 +27308,15 @@ msgid ""
 "Skip configuration prompt for alternatives which are properly configured in "
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
-"Sla de configuratievraag over voor alternatieven in automatische modus die "
-"behoorlijk geconfigureerd zijn. Deze optie is enkel relevant in combinatie "
+"Voor alternatieven die in automatische modus behoorlijk geconfigureerd zijn, "
+"de configuratievraag overslaan. Deze optie is enkel relevant in combinatie "
 "met B<--config> of B<--all>."
 
+#. type: Plain text
+#: update-alternatives.man
+msgid "Do not generate any comments unless errors occur."
+msgstr "Geen commentaar genereren tenzij er zich fouten voordoen."
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -26538,8 +27330,12 @@ msgstr "Genereer meer commentaar bij wat er gedaan wordt."
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
-msgstr "Genereer geen commentaar tenzij er zich fouten voordoen."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr ""
+"Zelfs nog meer commentaar genereren bij wat er gedaan wordt, nuttig bij het "
+"debuggen (sinds versie 1.19.3)."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -26888,6 +27684,34 @@ msgstr ""
 "B<ln>(1), FHS, the Filesystem Hierarchy Standard. (Standaardisatie van "
 "bestandsorganisatie en mappenstructuur op unix-achtige systemen)"
 
+#~ msgid "The program B<dpkg> will execute when displaying the conffiles."
+#~ msgstr ""
+#~ "Het programma dat door B<dpkg> zal uitgevoerd worden bij het tonen van de "
+#~ "conffiles (configuratiebestanden)."
+
+#~ msgid "B<COLUMNS>"
+#~ msgstr "B<COLUMNS>"
+
+#~ msgid ""
+#~ "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~ "text.  Currently only used by B<--list>."
+#~ msgstr ""
+#~ "Stelt het aantal kolommen in dat B<dpkg> moet gebruiken bij het laten "
+#~ "zien van opgemaakte tekst. Wordt momenteel enkel gebruikt door B<--list>."
+
+#~ msgid ""
+#~ "This setting influences the output of the B<--list> option by changing "
+#~ "the width of its output."
+#~ msgstr ""
+#~ "Deze instelling wijzigt de uitvoer van de optie B<--list> door de breedte "
+#~ "van de uitvoer ervan aan te passen."
+
+#~ msgid "Add a diversion for I<file>."
+#~ msgstr "Voeg voor I<bestand> een omlegging toe."
+
+#~ msgid "Remove a diversion for I<file>."
+#~ msgstr "Verwijder een omlegging voor I<bestand>."
+
 #~ msgid ""
 #~ "These fields declare relationships between packages. They are discussed "
 #~ "in the B<deb-control>(5)  manpage."
diff --git a/man/po/pl.po b/man/po/pl.po
index 5d4de879d..b479ae6c0 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2016-12-17 16:42+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-02-24 18:25+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
 "Language: pl\n"
@@ -715,7 +715,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<Package:> I<binary-package-name> (required)"
 msgid "B<Binary:> I<binary-package-list> (required)"
@@ -945,6 +945,99 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, fuzzy, no-wrap
+#| msgid "B<Building>"
+msgid "B<Build-Tainted-By:>"
+msgstr "B<Budowanie>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<-L>I<local-shlibs-file>"
+msgid "B<usr-local-has-configs>"
+msgstr "B<-L>I<lokalny-plik-shlibs>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<--single-debian-patch>"
+msgid "B<usr-local-has-includes>"
+msgstr "B<--single-debian-patch>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<-L>I<local-shlibs-file>"
+msgid "B<usr-local-has-libraries>"
+msgstr "B<-L>I<lokalny-plik-shlibs>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
 #| msgid "B<reinst-required>"
 msgid "B<Installed-Build-Depends:> (required)"
 msgstr "B<reinst-required (konieczna-reinstalacja)>"
@@ -1272,16 +1365,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1455,10 +1548,18 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Package:> I<binary-package-name> (required)"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Package:> I<nazwa-pakietu-binarnego> (wymagane)"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1579,7 +1680,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1610,7 +1712,7 @@ msgstr "B<binary:Version>"
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 
 #. type: TP
@@ -1717,8 +1819,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr "BŁĘDY"
@@ -1727,7 +1829,7 @@ msgstr "BŁĘDY"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
@@ -2582,6 +2684,27 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+#| msgid "B<Date:>I< date>"
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Date:>I< data>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2591,9 +2714,29 @@ msgstr "PRZYKŁAD"
 
 #. type: Plain text
 #: deb-control.man
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# Comment\n"
+#| "Package: grep\n"
+#| "Essential: yes\n"
+#| "Priority: required\n"
+#| "Section: base\n"
+#| "Maintainer: Wichert Akkerman E<lt>wakkerma@debian.orgE<gt>\n"
+#| "Architecture: sparc\n"
+#| "Version: 2.4-1\n"
+#| "Pre-Depends: libc6 (E<gt>= 2.0.105)\n"
+#| "Provides: rgrep\n"
+#| "Conflicts: rgrep\n"
+#| "Description: GNU grep, egrep and fgrep.\n"
+#| " The GNU family of grep utilities may be the \"fastest grep in the west\".\n"
+#| " GNU grep is based on a fast lazy-state deterministic matcher (about\n"
+#| " twice as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper\n"
+#| " search for a fixed string that eliminates impossible text from being\n"
+#| " considered by the full regexp matcher without necessarily having to\n"
+#| " look at every character. The result is typically many times faster\n"
+#| " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
+#| " will run more slowly, however).\n"
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2637,11 +2780,20 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
 #, fuzzy
 #| msgid ""
 #| "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 
@@ -2788,12 +2940,20 @@ msgstr "B<Source:> I<nazwa-pakietu-źródłowego> (wymagane)"
 
 #. type: Plain text
 #: deb-src-control.man
+#, fuzzy
+#| msgid ""
+#| "The value of this field is the name of the source package, and should "
+#| "match the name of the source package in the debian/changelog file. A "
+#| "package name must consist only of lower case letters (a-z), digits (0-9), "
+#| "plus (+) and minus (-) signs, and periods (.). Package names must be at "
+#| "least two characters long and must start with an alphanumeric character."
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 "Wartość tego pola jest nazwą pakietu źródłowego i powinna pasować do nazwy "
 "pakietu źródłowego w pliku debian/changelog. Nazwa pakietu może składać się "
@@ -2979,6 +3139,34 @@ msgstr ""
 #. type: TP
 #: deb-src-control.man dsc.man
 #, fuzzy, no-wrap
+#| msgid "B<Suggests:>I< package-list>"
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<Suggests:>I< lista-pakietów>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:>I< package-list>"
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<Suggests:>I< lista-pakietów>"
+
+#. type: Plain text
+#: deb-src-control.man
+#, fuzzy
+#| msgid ""
+#| "These fields are described in the B<deb-control>(5)  manual page, as they "
+#| "are copied literally to the control file of the binary package."
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+"Pola te są opisane na stronie podręcznika B<deb-control>(5), ponieważ są one "
+"dokładnie kopiowane do pliku kontrolnego pakietu binarnego."
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
 #| msgid "B<Vcs-*:>I< url>"
 msgid "B<Vcs-Arch:>I< url>"
 msgstr "B<Vcs-*:>I< URL>"
@@ -3567,8 +3755,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3677,8 +3865,10 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
-msgstr ""
+#, fuzzy
+#| msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
+msgstr "I<pakiet> I<priorytet> I<sekcja> [I<informacje-o-opiekunie>]"
 
 #. type: Plain text
 #: deb-src-files.man
@@ -3701,6 +3891,14 @@ msgstr ""
 "I<priorytet> i I<sekcja> odnoszą się do odpowiednich pól kontrolnych plików ."
 "deb. Dozwolone wartości są wypisane w zasadach Debiana."
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -3807,7 +4005,7 @@ msgstr "B<Budowanie>"
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -4868,12 +5066,20 @@ msgstr ""
 
 #. type: Plain text
 #: deb-substvars.man
+#, fuzzy
+#| msgid ""
+#| "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+#| "names consist of alphanumerics, hyphens and colons and start with an "
+#| "alphanumeric. Variable substitutions are performed repeatedly until none "
+#| "are left; the full text of the field after the substitution is rescanned "
+#| "to look for more substitutions."
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 "Podstawienie zmiennej ma postać B<${>I<nazwa-zmiennej>B<}>. Nazwy zmiennych "
 "składają się ze znaków alfanumerycznych, myślników oraz dwukropków i "
@@ -6032,9 +6238,7 @@ msgstr "B<interest-noawait> I<nazwa-wyzwalacza>"
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
-"functionality provided by the trigger is not crucial."
+"triggers control file."
 msgstr ""
 "Określa, że pakiet będzie uruchamiał nazwany wyzwalacz. Wszystkie wyzwalacze "
 "interesujące dla pakietu muszą być wymienione z użyciem tej dyrektywy w "
@@ -6042,6 +6246,18 @@ msgstr ""
 "pakietów w stanie oczekiwania na wyzwalacze (trigger-awaited). Powinien być "
 "on używany, gdy funkcja udostępniana przez wyzwalacz nie jest kluczowa."
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
+"functionality provided by the trigger is not crucial."
+msgstr ""
+
 #. type: TP
 #: deb-triggers.man
 #, no-wrap
@@ -6076,9 +6292,7 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
 msgstr ""
 "Powoduje, że zmiany stanu pakietu aktywują określony wyzwalacz. Aktywacja "
 "wyzwalacza nastąpi na początku następujących operacji: unpack, configure, "
@@ -6089,6 +6303,28 @@ msgstr ""
 
 #. type: Plain text
 #: deb-triggers.man
+#, fuzzy
+#| msgid ""
+#| "Specifies that the package is interested in the named trigger. All "
+#| "triggers in which a package is interested must be listed using this "
+#| "directive in the triggers control file. The \"noawait\" variant does not "
+#| "put the triggering packages in triggers-awaited state. This should be "
+#| "used when the functionality provided by the trigger is not crucial."
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
+msgstr ""
+"Określa, że pakiet będzie uruchamiał nazwany wyzwalacz. Wszystkie wyzwalacze "
+"interesujące dla pakietu muszą być wymienione z użyciem tej dyrektywy w "
+"pliku kontrolnym triggers. Wariant \"noawait\" nie umieszcza wyzwalanych "
+"pakietów w stanie oczekiwania na wyzwalacze (trigger-awaited). Powinien być "
+"on używany, gdy funkcja udostępniana przez wyzwalacz nie jest kluczowa."
+
+#. type: Plain text
+#: deb-triggers.man
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -6155,6 +6391,17 @@ msgstr ""
 "się ustawienie \"Pre-Depends: dpkg (E<gt>= 1.16.1)\" do pakietów, które chcą "
 "używać tych dyrektyw."
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -6223,17 +6470,19 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 #. type: TP
@@ -6331,13 +6580,6 @@ msgid ""
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<Suggests:>I< lista-pakietów>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -6348,20 +6590,14 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<Suggests:>I< lista-pakietów>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -6788,6 +7024,20 @@ msgstr ""
 "Pakiet został wybrany do wyczyszczenia (to znaczy, że chcemy skasować "
 "wszystko z katalogów systemowych, włącznie z plikami konfiguracyjnymi)."
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+
 #. type: SS
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -7018,12 +7268,14 @@ msgstr "B<-r>, B<--remove>, B<-P>, B<--purge >I<pakiet>...|B<-a>|B<--pending>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 
 #
@@ -7061,9 +7313,10 @@ msgstr "B<--configure >I<pakiet>...|B<-a>|B<--pending>"
 #: dpkg.man
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 
 #. type: Plain text
@@ -7393,6 +7646,13 @@ msgstr ""
 "Wyszukanie pakietów przeznaczonych do zainstalowania, które z pewnych "
 "powodów nie mogły zostać zainstalowane."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -7736,7 +7996,7 @@ msgid "Display a brief help message."
 msgstr "Wyświetlenie krótkiego komunikatu pomocy."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
@@ -8022,14 +8282,14 @@ msgstr ""
 "      2000   Reszta szczegółowych informacji\n"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force>"
 msgid "B<--force->I<things>"
 msgstr "B<--force>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
@@ -8063,7 +8323,7 @@ msgstr ""
 
 #
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Włącza (lub wyłącza) wszystkie opcje typu \"force\"."
 
@@ -8148,15 +8408,23 @@ msgstr ""
 #
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+#, fuzzy
+#| msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 "B<depends>: Zamiana wszystkich problemów z zależnościami na ostrzeżenia."
 
 #
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<depends-version>: Don't care about versions when checking dependencies."
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 "B<depends-version>: Zignorowanie problemów z numerami wersji przy "
 "sprawdzaniu zależności."
@@ -8167,15 +8435,20 @@ msgstr ""
 #| msgid "B<breaks>: Install, even if this would break another package."
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr "B<breaks>: Instalacja, nawet jeśliby to popsuło inny pakiet."
 
 #
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<conflicts>: Install, even if it conflicts with another package. This is "
+#| "dangerous, for it will usually cause overwriting of some files."
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 "B<conflicts>: Instalacja, nawet gdy pakiet powoduje konflikt z innym. "
 "Powstać może niebezpieczeństwo nadpisania plików z innego pakietu, dlatego "
@@ -8289,6 +8562,28 @@ msgstr ""
 "B<overwrite-diverted>: Nadpisanie plików ominiętych plikami nieominiętymi."
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
 #, fuzzy
 #| msgid ""
@@ -8342,7 +8637,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -8399,9 +8694,14 @@ msgstr "B<--ignore-depends>=I<pakiet>,..."
 #
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Ignore dependency-checking for specified packages (actually, checking is "
+#| "performed, but only warnings about conflicts are given, nothing else)."
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "Zignorowanie sprawdzania zależności od podanych pakietów (a ściślej rzecz "
 "biorąc, sprawdzanie się odbywa, ale w przypadku konfliktów wyświetlane jest "
@@ -8493,9 +8793,9 @@ msgstr "B<--admindir=>I<katalog>"
 #| "give information about status of installed or uninstalled packages, etc.  "
 #| "(Defaults to I<%ADMINDIR%>)"
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "Zmiana domyślnego katalogu administracyjnego, zawierającego wiele plików "
 "dostarczających informacji o stanie zainstalowanych i niezainstalowanych "
@@ -8517,10 +8817,10 @@ msgstr "B<--instdir=>I<katalog>"
 #| "B<chroot>(2) before running package's installation scripts, which means "
 #| "that the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 "Zmiana domyślnego katalogu instalacyjnego, czyli katalogu, w którym pakiety "
 "są instalowane. B<instdir> jest także katalogiem przekazywanym do "
@@ -8541,8 +8841,9 @@ msgstr "B<--root=>I<katalog>"
 #| "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 #| "var/lib/dpkg>."
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
 "Zmiana B<root> zmienia B<instdir> na I<katalog> i B<admindir> na I<katalog>B<"
 "%ADMINDIR%>."
@@ -8954,6 +9255,21 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<--no-triggers>"
+msgid "B<--no-pager>"
+msgstr "B<--no-triggers>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+#, fuzzy
+#| msgid "The Debian system name of the host machine."
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr "Nazwa systemu wg Debiana dla maszyny docelowej."
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -9065,8 +9381,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, no-wrap
@@ -9074,7 +9393,7 @@ msgid "ENVIRONMENT"
 msgstr "ŚRODOWISKO"
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -9125,20 +9444,7 @@ msgstr ""
 "plików i katalogów tymczasowych."
 
 #. type: TP
-#: dpkg.man
-#, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
-
-#. type: Plain text
-#: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
-msgstr ""
-"Program uruchamiany przez B<dpkg> do wyświetlania plików konfiguracyjnych "
-"(conffiles)."
-
-#. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
@@ -9148,52 +9454,113 @@ msgstr "B<SHELL>"
 #: dpkg.man
 #, fuzzy
 #| msgid "The program B<dpkg> will execute when starting a new shell."
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr ""
 "Program uruchamiany przez B<dpkg>, gdy trzeba uruchomić nową sesję powłoki."
 
 #. type: TP
 #: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<PAGER>"
+msgstr "B<PAGER>"
+
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<PAGER>"
+msgid "B<DPKG_PAGER>"
+msgstr "B<PAGER>"
 
-#
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
-"Ustawia liczbę kolumn używanych przez B<dpkg> w czasie wyświetlania "
-"sformatowanego tekstu. Obecnie używane tylko przez opcję -l."
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
 msgid "B<DPKG_COLORS>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 msgid ""
 "Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
 "B<auto> (default), B<always> and B<never>."
 msgstr ""
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
+msgstr ""
+
+#. type: TP
+#: dpkg.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
+msgstr ""
+
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_ROOT>"
@@ -9233,6 +9600,19 @@ msgstr ""
 "Zdefiniowana przez B<dpkg> w środowisku skryptu opiekuna pakietu, jako "
 "wersja aktualnie uruchomionej instancji programu B<dpkg>."
 
+#. type: Plain text
+#: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the "
+#| "architecture the package got built for."
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+"Zdefiniowana przez B<dpkg> w środowisku skryptu opiekuna pakietu, jako "
+"architektura dla której budowano pakiet."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -10286,7 +10666,11 @@ msgstr "ZMIENNE"
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+#, fuzzy
+#| msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr "B<dpkg-architecture> ustawia następujące zmienne:"
 
 #. type: IP
@@ -11087,6 +11471,31 @@ msgid ""
 "«%PKGDATADIR%»."
 msgstr ""
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_NLS>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -11457,7 +11866,7 @@ msgstr ""
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 
@@ -11904,7 +12313,7 @@ msgstr ""
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
 
 #. type: SS
@@ -12286,16 +12695,22 @@ msgstr "B<pie>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -12470,6 +12885,45 @@ msgstr ""
 #: dpkg-buildflags.man
 #, fuzzy, no-wrap
 #| msgid "B<--debug>"
+msgid "B<fixfilepath>"
+msgstr "B<--debug>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+#, fuzzy
+#| msgid ""
+#| "This setting (enabled by default) adds B<-fstack-protector --param=ssp-"
+#| "buffer-size=4> to B<CFLAGS> and B<CXXFLAGS>. This adds safety checks "
+#| "against stack overwrites. This renders many potential code injection "
+#| "attacks into aborting situations. In the best case this turns code "
+#| "injection vulnerabilities into denial of service or into non-issues "
+#| "(depending on the application)."
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+"To ustawienie (domyślnie włączone) dodaje B<-fstack-protector --param=ssp-"
+"buffer-size=4> do B<CFLAGS> i B<CXXFLAGS>. W ten sposób dodawane są "
+"sprawdzenia dotyczące nadpisania stosu. Dzięki temu, zapobiega się wielu "
+"potencjalnym atakom polegającym na wstrzyknięciu kodu, prowadzącym do "
+"przerwania pracy. W najlepszym razie, ataki polegające na wstrzyknięciu kodu "
+"są zmieniane na odmowę pracy (DoS) lub na brak błędu (w zależności od "
+"aplikacji)."
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.man
+#, fuzzy, no-wrap
+#| msgid "B<--debug>"
 msgid "B<fixdebugpath>"
 msgstr "B<--debug>"
 
@@ -12715,7 +13169,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr ""
 
 #. type: Plain text
@@ -13150,9 +13604,10 @@ msgstr "B<--force>"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -13628,6 +14083,20 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<--as-root>"
+msgid "B<--rules-requires-root>"
+msgstr "B<--as-root>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<-C>, B<--no-close>"
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr "B<-C>, B<--no-close>"
@@ -13639,9 +14108,10 @@ msgstr "B<-C>, B<--no-close>"
 #| "Do not clean the source tree (implies B<-b> if nothing else has been "
 #| "selected among B<-B>, B<-A> or B<-S>)."
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
 "Pomija czyszczenie drzewa źródeł pakietu (implikuje B<-b>, jeśli nic innego "
 "nie zostało wybrane spośród B<-B>, B<-A> oraz B<-S>)."
@@ -13657,7 +14127,9 @@ msgstr "B<-p>I<pakiet>"
 #: dpkg-buildpackage.man
 #, fuzzy
 #| msgid "The Debian cpu name of the build machine."
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr "Nazwa procesora wg Debiana komputera, na którym budowany jest pakiet."
 
 #. type: TP
@@ -13683,6 +14155,20 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<-C>, B<--no-close>"
+msgid "B<--no-post-clean>"
+msgstr "B<-C>, B<--no-close>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<--pre-invoke=>I<command>"
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr "B<--pre-invoke=>I<polecenie>"
@@ -14300,9 +14786,24 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
-msgid "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_GAIN_ROOT_CMD>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
@@ -15436,7 +15937,7 @@ msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -15796,8 +16297,10 @@ msgstr "[B<--add>] I<plik>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
-msgstr "Dodaje nadpisanie I<pliku>."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
 
 #. type: TP
 #: dpkg-divert.man
@@ -15807,8 +16310,10 @@ msgstr "B<--remove> I<plik>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
-msgstr "Usuwa nadpisanie I<pliku>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
 
 #. type: TP
 #: dpkg-divert.man
@@ -15865,11 +16370,41 @@ msgstr "B<--admindir>I< katalog>"
 #| msgid ""
 #| "Set the dpkg data directory to I<directory> (default: I<%ADMINDIR%>)."
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
 msgstr ""
 "Ustawia katalog bazy danych dpkg na I<katalog> (domyślnie I<%ADMINDIR%>)."
 
 #. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--admindir>I< directory>"
+msgid "B<--instdir>I< directory>"
+msgstr "B<--admindir>I< katalog>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--depotdir>I< directory>"
+msgid "B<--root>I< directory>"
+msgstr "B<--depotdir>I< katalog>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: TP
 #: dpkg-divert.man
 #, no-wrap
 msgid "B<--divert>I< divert-to>"
@@ -15938,15 +16473,39 @@ msgstr "B<--rename>"
 
 #. type: Plain text
 #: dpkg-divert.man
+#, fuzzy
+#| msgid ""
+#| "Actually move the file aside (or back). B<dpkg-divert> will abort "
+#| "operation in case the destination file already exists."
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
 msgstr ""
 "Przenosi plik w jedną lub drugą stronę. B<dpkg-divert> przerwie działanie, "
 "jeżeli plik docelowy już istnieje."
 
 #. type: TP
 #: dpkg-divert.man
+#, fuzzy, no-wrap
+#| msgid "B<--rename>"
+msgid "B<--no-rename>"
+msgstr "B<--rename>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man
 #, no-wrap
 msgid "B<--test>"
 msgstr "B<--test>"
@@ -15959,14 +16518,27 @@ msgstr ""
 "zrobione."
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the base administrative directory."
+msgid ""
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+"Jeśli ustawione oraz nie podano opcji B<--admindir>, to będzie użyte jako "
+"bazowy katalog administracyjny."
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
 #, fuzzy
 #| msgid ""
 #| "If set and the B<--admindir> option has not been specified, it will be "
 #| "used as the dpkg data directory."
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 "Jeśli jest ustawiona i nie użyto opcji B<--admindir>, będzie używana jako "
 "katalog danych dpkg."
@@ -17834,6 +18406,35 @@ msgstr ""
 "pojedynczego argumentu (w przeciwnym wypadku potrzebne będzie wiele B<-e>)."
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, fuzzy, no-wrap
+#| msgid "B<--altdir>I< directory>"
+msgid "B<-l>I<directory>"
+msgstr "B<--altdir>I< katalog>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+#, fuzzy
+#| msgid ""
+#| "Include dependencies appropriate for the shared libraries required by "
+#| "I<executable>."
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+"Włączenie zależności odpowiadających bibliotekom współdzielonym wymaganym "
+"przez I<plik-wykonywalny>."
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<-I>I<filename>"
@@ -18748,6 +19349,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 #, fuzzy
 #| msgid "B<installed>"
 msgid "B<dh_installdeb>(1)."
@@ -18850,8 +19458,8 @@ msgstr "OGRANICZENIA"
 #| "supposed to be there, etc."
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 "Wszystko co nie jest przetwarzane przez Dpkg::Changelog jest tracone przy "
 "łączeniu. Może to dotyczyć następujących rzeczy: modeline vima, komentarze, "
@@ -19291,7 +19899,8 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 "Ustawia format wyjścia. Obecnie wspieranymi wartościami są I<dpkg> oraz "
 "I<rfc822>. I<dpkg> jest klasycznym formatem wyjścia (z czasów sprzed "
@@ -19427,6 +20036,20 @@ msgstr ""
 "metadane z każdego wpisu."
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, fuzzy, no-wrap
+#| msgid "B<--verbose>"
+msgid "B<--reverse>"
+msgstr "B<--verbose>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, no-wrap
 msgid "B<--all>"
@@ -19591,7 +20214,11 @@ msgstr "       @@@ changelog-format: I<inny-format> @@@\n"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+#, fuzzy
+#| msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
 "Nazwy formatu dziennika zmian są niepustymi łańcuchami składającymi się z "
 "liter i cyfr."
@@ -19763,13 +20390,16 @@ msgstr "B<-l>, B<--list> [I<wzorzec-nazwy-pakietu>...]"
 #| "the shell from performing filename expansion. For example this will list "
 #| "all package names starting with ``libc6'':"
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 "Wypisuje listę pakietów odpowiadających podanemu wzorcu nazwy. Jeśli nie "
 "podano I<wzorca-nazwy-pakietu>, wypisuje listę wszystkich pakietów z pliku I<"
@@ -19918,17 +20548,26 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
+#, fuzzy, no-wrap
+#| msgid "B<-s>, B<--status> I<package-name>..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
 msgstr "B<-s>, B<--status> I<nazwa-pakietu>..."
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Report status of specified package. This just displays the entry in the "
+#| "installed package status database. When multiple I<package-name> are "
+#| "listed, the requested status entries are separated by an empty line, with "
+#| "the same order as specified on the argument list."
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 "Podanie stanu pakietu o podanej nazwie. Polecenie po prostu wyświetli "
 "informacje, które znajdują się w bazie danych pakietów. Gdy wypisane jest "
@@ -20049,7 +20688,7 @@ msgstr "B<-S>, B<--search> I<wzorzec-wyszukiwania-nazwy-pliku>..."
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 "Szukanie pliku, którego własnością są pliki odnoszące się do podanego "
@@ -20087,17 +20726,25 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
+#, fuzzy, no-wrap
+#| msgid "B<-p>, B<--print-avail> I<package-name>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
 msgstr "B<-p>, B<--print-avail> I<nazwa-pakietu>..."
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I<%ADMINDIR%/"
+#| "available>. When multiple I<package-name> are listed, the requested "
+#| "I<available> entries are separated by an empty line, with the same order "
+#| "as specified on the argument list."
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
 "Wyświetla szczegółowe informacje na temat pakietu I<nazwa-pakietu>, "
 "pochodzące z pliku I<%ADMINDIR%/available>. Gdy wypisane jest wiele I<nazw-"
@@ -20156,6 +20803,22 @@ msgstr "B<-f>, B<--showformat=>I<format>"
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "This option is used to specify the format of the output B<--show> will "
+#| "produce. The format is a string that will be output for each package "
+#| "listed."
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+"Opcja jest używana do podania formatu wyjścia produkowanego przez B<--show>. "
+"Format jest łańcuchem znaków, który będzie wyświetlony dla każdego "
+"wypisanego pakietu."
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr "W łańcuchu formatu, “B<\\e>” jest znakiem cytowania:"
 
@@ -20300,19 +20963,31 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
-#| msgid "B<binary:Version>"
-msgid "B<binary:Summary>"
-msgstr "B<binary:Version>"
+#| msgid "B<source:Version>"
+msgid "B<binary:Synopsis>"
+msgstr "B<source:Version>"
 
 #. type: Plain text
 #: dpkg-query.man
 #, fuzzy
 #| msgid "The package architecture (since dpkg 1.16.1)."
-msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid "It contains the package short description (since dpkg 1.19.1)."
 msgstr "Architektura pakietu (od dpkg 1.16.1)."
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<binary:Version>"
+msgid "B<binary:Summary>"
+msgstr "B<binary:Version>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<db:Status-Abbrev>"
 msgstr ""
@@ -20368,6 +21043,35 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
+#| msgid "B<debian/files>"
+msgid "B<db-fsys:Files>"
+msgstr "B<debian/files>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid "The package architecture (since dpkg 1.16.1)."
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "Architektura pakietu (od dpkg 1.16.1)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
+#, fuzzy, no-wrap
 #| msgid "B<source:Version>"
 msgid "B<source:Package>"
 msgstr "B<source:Version>"
@@ -20447,11 +21151,44 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid "The Debian cpu name of the build machine."
+msgid ""
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr "Nazwa procesora wg Debiana komputera, na którym budowany jest pakiet."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the dpkg data directory."
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+"Jeśli jest ustawiona i nie użyto opcji B<--admindir>, będzie używana jako "
+"katalog danych dpkg."
+
+#. type: Plain text
+#: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
 msgstr ""
-"Zmienna ta wpływa na wyjście polecenia B<--list>, zmieniając jego szerokość."
 
 #. type: TH
 #: dpkg-scanpackages.man
@@ -20855,8 +21592,8 @@ msgstr ""
 "komentarza są ignorowane. Jeśli pakiet pojawia się w obu plikach, to podczas "
 "ustawiania sekcji nadpisanie źródeł ma większy priorytet."
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
@@ -21183,13 +21920,6 @@ msgstr ""
 "Włączenie zależności odpowiadających bibliotekom współdzielonym wymaganym "
 "przez I<plik-wykonywalny>."
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, fuzzy, no-wrap
-#| msgid "B<--altdir>I< directory>"
-msgid "B<-l>I<directory>"
-msgstr "B<--altdir>I< katalog>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 #, fuzzy
@@ -21203,15 +21933,6 @@ msgstr ""
 "Włączenie zależności odpowiadających bibliotekom współdzielonym wymaganym "
 "przez I<plik-wykonywalny>."
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
@@ -22780,6 +23501,20 @@ msgstr "B<-sa> lub B<-sA>"
 
 #. type: Plain text
 #: dpkg-source.man
+#, fuzzy
+#| msgid ""
+#| "Specifies to look for the original source archive as a tarfile or as a "
+#| "directory - the second argument, if any, may be either, or the empty "
+#| "string (this is equivalent to using B<-sn>).  If a tarfile is found it "
+#| "will unpack it to create the diff and remove it afterwards (this is "
+#| "equivalent to B<-sp>); if a directory is found it will pack it to create "
+#| "the original source and remove it afterwards (this is equivalent to B<-"
+#| "sr>); if neither is found it will assume that the package has no "
+#| "debianization diffs, only a straightforward source archive (this is "
+#| "equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
+#| "the directory, overwriting it, if B<-sA> was specified (this is "
+#| "equivalent to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> "
+#| "is the default."
 msgid ""
 "Specifies to look for the original source archive as a tarfile or as a "
 "directory - the second argument, if any, may be either, or the empty string "
@@ -22791,7 +23526,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 "Określa, że należy szukać oryginalnych źródeł w postaci archiwum tar lub "
 "katalogu. Jeśli podano drugi argument może wskazywać on plik lub katalog, "
@@ -22992,11 +23727,11 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 "Pakiet źródłowy w tym formacie zawiera co najmniej oryginalne archiwum tar "
 "(B<.orig.tar.>I<rozszerzenie>, gdzie I<rozszerzeniem> może być B<gz>, "
@@ -23040,11 +23775,18 @@ msgstr ""
 #| "with the B<-p1> option of B<patch>. It will thus emit a warning when it "
 #| "encounters such options, and the build is likely to fail."
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
@@ -23066,6 +23808,15 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
 "The timestamp of all patched files is reset to the extraction time of the "
 "source package (this avoids timestamp skews leading to problems when "
 "autogenerated files are patched)."
@@ -24153,6 +24904,13 @@ msgstr ""
 
 #. type: SS
 #: dpkg-source.man
+#, fuzzy, no-wrap
+#| msgid "debian/patches/series"
+msgid "debian/patches/I<vendor>.series"
+msgstr "debian/patches/series"
+
+#. type: SS
+#: dpkg-source.man
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
@@ -24172,10 +24930,13 @@ msgstr "debian/patches/series"
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -24822,6 +25583,14 @@ msgstr ""
 "ma żadnych nadpisań lub żadne nadpisanie nie pasuje do wzorca, to B<dpkg-"
 "statoverride> zakończy działanie z kodem błędu 1."
 
+#
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid "Give help about the B<--force->I<thing> options."
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr "Wyświetlenie opisu opcji B<--force->I<działanie>."
+
 #. type: Plain text
 #: dpkg-statoverride.man
 #, fuzzy
@@ -24829,12 +25598,56 @@ msgstr ""
 #| "Change the I<directory> of the dpkg database where the statoverride file "
 #| "is also stored. Defaults to I<%ADMINDIR%>."
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "Zmienia I<katalog> bazy danych dpkg, w którym także jest przechowywany plik "
 "statoverride. Domyślnie jest to I<%ADMINDIR%>."
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+
+#
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do "
+#| "some things. I<things> is a comma separated list of things specified "
+#| "below. B<--force-help> displays a message describing them.  Things marked "
+#| "with (*) are forced by default."
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
+msgstr ""
+"Wymuś (B<--force->) wykonanie pewnych działań lub pozostaw domyślny sposób "
+"(B<no-force> i B<refuse> oznaczają to samo) wykonania działań. I<działania> "
+"to rozdzielona przecinkami lista działań. B<--force-help> wyświetla opis "
+"tych działań. Działania oznaczone przez (*) są domyślnie wymuszone."
+
+#
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "I<Warning: These options are mostly intended to be used by experts only. "
+#| "Using them without fully understanding their effects may break your whole "
+#| "system.>"
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Ostrzeżenie: Te opcje są zwykle przeznaczone wyłącznie dla doświadczonych "
+"użytkowników. Użycie ich bez pełnego zrozumienia efektu działania może "
+"spowodować uszkodzenie systemu.>"
+
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -24843,9 +25656,14 @@ msgstr "B<--force>"
 
 #. type: Plain text
 #: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force an action, even if a sanity check would otherwise prohibit it.  "
+#| "This is necessary to override an existing override."
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 "Wymusza podaną akcję, nawet jeżeli sprawdzenia dokonywane przez program by "
 "tego zabroniły. Jest to potrzebne, aby nadpisać istniejące nadpisanie."
@@ -24877,6 +25695,19 @@ msgid ""
 "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the base administrative directory."
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+"Jeśli ustawione oraz nie podano opcji B<--admindir>, to będzie użyte jako "
+"bazowy katalog administracyjny."
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -25033,8 +25864,9 @@ msgstr "B<--no-await>"
 #. type: Plain text
 #: dpkg-trigger.man
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 
 #. type: TP
@@ -26766,17 +27598,42 @@ msgstr ""
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 msgstr "B<-p>, B<--pidfile> I<plik-pid>"
 
+#
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr "Sprawdzanie procesów, których pid jest podany w pliku I<plik-pid>."
+
 #. type: Plain text
 #: start-stop-daemon.man
+#, fuzzy
+#| msgid ""
+#| "Check whether a process has created the file I<pid-file>. Note: using "
+#| "this matching option alone might cause unintended processes to be acted "
+#| "on, if the old process terminated without being able to remove the I<pid-"
+#| "file>."
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
 msgstr ""
 "Sprawdza, czy proces utworzył plik I<plik-pid>. Uwaga: używając wyłącznie "
 "tej opcji dopasowania można wywołać działanie na niewłaściwym procesie, "
 "jeśli stary proces zakończył się bez możliwości usunięcia I<pliku-pid>."
 
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -27113,6 +27970,74 @@ msgstr ""
 
 #. type: TP
 #: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<--no-await>"
+msgid "B<--notify-await>"
+msgstr "B<--no-await>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<-n>I<filename>"
+msgid "B<ERRNO=>I<number>"
+msgstr "B<-n>I<nazwa_pliku>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
 #, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<-C>, B<--no-close>"
@@ -28115,6 +29040,13 @@ msgstr ""
 "w trybie automatycznym. Ta opcja ma znaczenie tylko przy B<--config> lub B<--"
 "all>."
 
+#. type: Plain text
+#: update-alternatives.man
+#, fuzzy
+#| msgid "Don't generate any comments unless errors occur."
+msgid "Do not generate any comments unless errors occur."
+msgstr "Nie wyświetla żadnych komentarzy, chyba że wystąpi błąd."
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -28131,8 +29063,13 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
-msgstr "Nie wyświetla żadnych komentarzy, chyba że wystąpi błąd."
+#, fuzzy
+#| msgid "Generate more comments about what B<update-alternatives> is doing."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr ""
+"Podaje więcej informacji o przebiegu wykonywania B<update-alternatives>."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -28484,6 +29421,39 @@ msgstr "B<update-alternatives --auto vi>"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS - standard hierarchii systemu plików."
 
+#~ msgid "The program B<dpkg> will execute when displaying the conffiles."
+#~ msgstr ""
+#~ "Program uruchamiany przez B<dpkg> do wyświetlania plików konfiguracyjnych "
+#~ "(conffiles)."
+
+#~ msgid "B<COLUMNS>"
+#~ msgstr "B<COLUMNS>"
+
+#
+#, fuzzy
+#~| msgid ""
+#~| "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~| "text. Currently only used by -l."
+#~ msgid ""
+#~ "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~ "text.  Currently only used by B<--list>."
+#~ msgstr ""
+#~ "Ustawia liczbę kolumn używanych przez B<dpkg> w czasie wyświetlania "
+#~ "sformatowanego tekstu. Obecnie używane tylko przez opcję -l."
+
+#~ msgid "Add a diversion for I<file>."
+#~ msgstr "Dodaje nadpisanie I<pliku>."
+
+#~ msgid "Remove a diversion for I<file>."
+#~ msgstr "Usuwa nadpisanie I<pliku>."
+
+#~ msgid ""
+#~ "This setting influences the output of the B<--list> option by changing "
+#~ "the width of its output."
+#~ msgstr ""
+#~ "Zmienna ta wpływa na wyjście polecenia B<--list>, zmieniając jego "
+#~ "szerokość."
+
 #, fuzzy
 #~| msgid ""
 #~| "These fields declare relationships between packages. They are discussed "
@@ -29619,10 +30589,6 @@ msgstr "B<ln>(1), FHS - standard hierarchii systemu plików."
 #~ "Rodin i Joost kooij."
 
 #
-#~ msgid "Check whether a process has created the file I<pid-file>."
-#~ msgstr "Sprawdzanie procesów, których pid jest podany w pliku I<plik-pid>."
-
-#
 #~ msgid ""
 #~ "Check for processes that are instances of this executable (according to "
 #~ "B</proc/>I<pid>B</exe>)."
diff --git a/man/po/po4a.cfg b/man/po/po4a.cfg
index 142b95c23..f95f5ef33 100644
--- a/man/po/po4a.cfg
+++ b/man/po/po4a.cfg
@@ -34,6 +34,9 @@
 [type:man] deb-src-rules.man $lang:$lang/deb-src-rules.man \
            add_$lang:po/$lang.add
 
+[type:man] deb-src-symbols.man $lang:$lang/deb-src-symbols.man \
+           add_$lang:po/$lang.add
+
 [type:man] deb-split.man $lang:$lang/deb-split.man \
            add_$lang:po/$lang.add
 
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index d949bbeab..81e25071a 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -1,13 +1,14 @@
 # Brazilian Portuguese translation of the manpages in the dpkg package
 # This file is distributed under the same license as the dpkg package.
-# Copyright (C) FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Copyright © 2016 Dpkg Developers
+# Andre Luis Lopes  <andrelop@debian.org>, 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2016-12-17 16:42+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-02-24 18:25+0100\n"
 "Last-Translator: Andre Luis Lopes  <andrelop@debian.org>\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
 "Language: pt_BR\n"
@@ -602,7 +603,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 msgid "B<Binary:> I<binary-package-list> (required)"
 msgstr "B<--log=>I<filename>"
@@ -789,6 +790,95 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, fuzzy, no-wrap
+msgid "B<Build-Tainted-By:>"
+msgstr "B<dpkg> [I<opções>] I<ação>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+msgid "B<usr-local-has-configs>"
+msgstr "I<control>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+msgid "B<usr-local-has-includes>"
+msgstr "B<dpkg-deb-actions>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+msgid "B<usr-local-has-libraries>"
+msgstr "I<control>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
 #| msgid "B<reinst-required>"
 msgid "B<Installed-Build-Depends:> (required)"
 msgstr "B<reinst-required>"
@@ -1110,16 +1200,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1266,10 +1356,17 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<--log=>I<filename>"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1357,7 +1454,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1386,7 +1484,7 @@ msgstr "B<--version>"
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 
 #. type: TP
@@ -1479,8 +1577,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, fuzzy, no-wrap
 msgid "BUGS"
 msgstr "BUGS"
@@ -1489,7 +1587,7 @@ msgstr "BUGS"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
@@ -2092,6 +2190,26 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2103,7 +2221,6 @@ msgstr "EXEMPLOS"
 #: deb-control.man
 #, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2127,9 +2244,18 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
 #, fuzzy
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
 "B<dselect>(8), B<dpkg-deb>(1), B<deb>(5), B<deb-control>(5), e B<dpkg-"
 "reconfigure>(8)"
@@ -2239,9 +2365,10 @@ msgstr "B<--log=>I<filename>"
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 
 #. type: Plain text
@@ -2381,6 +2508,26 @@ msgstr ""
 #. type: TP
 #: deb-src-control.man dsc.man
 #, fuzzy, no-wrap
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
+#. type: Plain text
+#: deb-src-control.man
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
 msgid "B<Vcs-Arch:>I< url>"
 msgstr "B<--log=>I<filename>"
 
@@ -2806,8 +2953,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -2877,7 +3024,7 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
 msgstr ""
 
 #. type: Plain text
@@ -2893,6 +3040,14 @@ msgid ""
 "archive."
 msgstr ""
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -2991,7 +3146,7 @@ msgstr "B<dpkg> [I<opções>] I<ação>"
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -3808,10 +3963,11 @@ msgstr ""
 #: deb-substvars.man
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 
 #. type: Plain text
@@ -4760,8 +4916,18 @@ msgstr "B<--log=>I<filename>"
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
+"triggers control file."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
 "functionality provided by the trigger is not crucial."
 msgstr ""
 
@@ -4789,9 +4955,17 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
 msgstr ""
 
 #. type: Plain text
@@ -4836,6 +5010,17 @@ msgid ""
 "to errors if used with an older dpkg."
 msgstr ""
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -4880,17 +5065,19 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 #. type: TP
@@ -4978,12 +5165,6 @@ msgid ""
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -4994,19 +5175,14 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -5420,6 +5596,20 @@ msgstr ""
 "O pacote está selecionado para ser eliminado (i.e. queremos excluir tudo, "
 "até os arquivos de configuração)."
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+
 #. type: SS
 #: dpkg.man
 #, no-wrap
@@ -5629,12 +5819,14 @@ msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<pacote> ... | B<-a> | B<
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 
 #. type: Plain text
@@ -5669,9 +5861,10 @@ msgstr "B<dpkg --configure >I<pacote> ... | B<-a> | B<--pending>"
 #: dpkg.man
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 
 #. type: Plain text
@@ -5927,6 +6120,13 @@ msgstr ""
 "Procura pacotes que foram selecionados para instalação, mas por alguma razão "
 "ainda não foram instalados."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -6210,7 +6410,7 @@ msgid "Display a brief help message."
 msgstr "Exibe uma breve mensagem de ajuda."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
@@ -6451,13 +6651,13 @@ msgstr ""
 " 2000   Quantidades insanas de saída.\n"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 msgid "B<--force->I<things>"
 msgstr "B<--nocheck>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<coisas> | B<--no-force->I<coisas> | B<--refuse->I<coisas>"
@@ -6489,7 +6689,7 @@ msgstr ""
 "sistema.>"
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Liga (ou desliga) todas as opções de força."
@@ -6558,13 +6758,21 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+#, fuzzy
+#| msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends>: Converte todos os problemas de dependência em avisos."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<depends-version>: Don't care about versions when checking dependencies."
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 "B<depends-version>: Não verifica versões quando verificando dependências."
 
@@ -6572,14 +6780,19 @@ msgstr ""
 #: dpkg.man
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<conflicts>: Install, even if it conflicts with another package. This is "
+#| "dangerous, for it will usually cause overwriting of some files."
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 "B<conflicts>: Instala, mesmo se conflita com outro pacote. Isso é perigoso, "
 "pois geralmente causará a regravação de alguns arquivos."
@@ -6677,6 +6890,28 @@ msgstr ""
 "desviada."
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking (since dpkg "
@@ -6707,7 +6942,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -6762,7 +6997,8 @@ msgstr "B<--ignore-depends>=I<pacote>,..."
 #, fuzzy
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "Ignora a verificação de dependência dos pacotes especificados (atualmente, a "
 "verificação é feita, mas são apenas dados avisos sobre os conflitos, nada "
@@ -6844,9 +7080,9 @@ msgstr "B<--admindir> I<diretório>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 
 #. type: TP
@@ -6859,10 +7095,10 @@ msgstr "B<--admindir> I<diretório>"
 #: dpkg.man
 #, fuzzy
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 "Muda os diretórios padrões.  O B<admindir> padrão é I<%ADMINDIR%> e contém "
 "muitos arquivos que dão informações sobre o estado dos pacotes instalados ou "
@@ -6882,8 +7118,9 @@ msgstr "B<--admindir> I<diretório>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
 
 #. type: TP
@@ -7202,6 +7439,19 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+msgid "B<--no-pager>"
+msgstr "B<--nocheck>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+#, fuzzy
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr "O pacote está selecionado para instalação."
+
+#. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
 msgid "B<--no-debsig>"
@@ -7295,8 +7545,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, fuzzy, no-wrap
@@ -7304,7 +7557,7 @@ msgid "ENVIRONMENT"
 msgstr "VARIÁVEIS DE AMBIENTE"
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -7352,70 +7605,122 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
+
+#. type: Plain text
 #: dpkg.man
+#, fuzzy
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
+msgstr ""
+"O programa que o B<dpkg> executará quando estiver iniciando um novo shell."
+
+#. type: TP
+#: dpkg.man dpkg-query.man
 #, fuzzy, no-wrap
 #| msgid "B<-G>"
 msgid "B<PAGER>"
 msgstr "B<-G>"
 
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<-G>"
+msgid "B<DPKG_PAGER>"
+msgstr "B<-G>"
+
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+msgid ""
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
-"O programa que o B<dpkg> executará quando estiver iniciando um novo shell."
 
 #. type: TP
-#: dpkg.man
-#, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_OLD_CONFFILE>"
+msgid "B<DPKG_COLORS>"
+msgstr "B<DPKG_OLD_CONFFILE>"
 
 #. type: Plain text
-#: dpkg.man
-#, fuzzy
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
+msgid ""
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 msgstr ""
-"O programa que o B<dpkg> executará quando estiver iniciando um novo shell."
 
 #. type: TP
-#: dpkg.man dpkg-query.man
-#, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+#: dpkg.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_OLD_CONFFILE>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_OLD_CONFFILE>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
 msgstr ""
-"Ajusta o número de colunas que o B<dpkg> deve usar quando estiver exibindo "
-"texto formatado. Atualmente só usado por -l."
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_OLD_CONFFILE>"
-msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
 msgstr "B<DPKG_OLD_CONFFILE>"
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man
 msgid ""
-"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
-"B<auto> (default), B<always> and B<never>."
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
 msgstr ""
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_ROOT>"
@@ -7450,6 +7755,13 @@ msgid ""
 "is always set to the current B<--admindir> value."
 msgstr ""
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -8291,7 +8603,9 @@ msgstr "VARIÁVEIS DE AMBIENTE"
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr ""
 
 #. type: IP
@@ -8921,6 +9235,31 @@ msgid ""
 "«%PKGDATADIR%»."
 msgstr ""
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_OLD_CONFFILE>"
+msgid "B<DPKG_NLS>"
+msgstr "B<DPKG_OLD_CONFFILE>"
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -9219,7 +9558,7 @@ msgstr ""
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 
@@ -9584,7 +9923,7 @@ msgstr ""
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
 
 #. type: SS
@@ -9861,16 +10200,22 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -9995,6 +10340,29 @@ msgstr ""
 #. type: TP
 #: dpkg-buildflags.man
 #, fuzzy, no-wrap
+msgid "B<fixfilepath>"
+msgstr "B<--nocheck>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.man
+#, fuzzy, no-wrap
 msgid "B<fixdebugpath>"
 msgstr "B<--nocheck>"
 
@@ -10198,7 +10566,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr ""
 
 #. type: Plain text
@@ -10554,9 +10922,10 @@ msgstr "B<--nocheck>"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -10921,15 +11290,29 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+msgid "B<--rules-requires-root>"
+msgstr "B<--test>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr "B<--new> | B<--old>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
 
 #. type: TP
@@ -10941,7 +11324,9 @@ msgstr "B<unpacked>"
 #. type: Plain text
 #: dpkg-buildpackage.man
 #, fuzzy
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr "O pacote está selecionado para instalação."
 
 #. type: TP
@@ -10960,6 +11345,19 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+msgid "B<--no-post-clean>"
+msgstr "B<--new> | B<--old>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr "B<--new> | B<--old>"
 
@@ -11462,9 +11860,24 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
-msgid "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_GAIN_ROOT_CMD>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
@@ -12306,7 +12719,7 @@ msgid "B<--showformat=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -12564,7 +12977,9 @@ msgstr "B<--log=>I<filename>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
 msgstr ""
 
 #. type: TP
@@ -12575,7 +12990,9 @@ msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
 msgstr ""
 
 #. type: TP
@@ -12623,7 +13040,35 @@ msgstr "B<--admindir> I<diretório>"
 #. type: Plain text
 #: dpkg-divert.man
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+msgid "B<--instdir>I< directory>"
+msgstr "B<--admindir> I<diretório>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+msgid "B<--root>I< directory>"
+msgstr "B<--altdir> I<diretório>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
 msgstr ""
 
 #. type: TP
@@ -12688,7 +13133,26 @@ msgstr "B<--log=>I<filename>"
 #: dpkg-divert.man
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man
+#, fuzzy, no-wrap
+msgid "B<--no-rename>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
 msgstr ""
 
 #. type: TP
@@ -12703,10 +13167,17 @@ msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 
 #. type: Plain text
@@ -14005,6 +14476,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, fuzzy, no-wrap
+msgid "B<-l>I<directory>"
+msgstr "B<--altdir> I<diretório>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
@@ -14611,6 +15104,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 #, fuzzy
 #| msgid "B<installed>"
 msgid "B<dh_installdeb>(1)."
@@ -14689,8 +15189,8 @@ msgstr "AÇÕES"
 #: dpkg-mergechangelogs.man
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 
 #. type: SH
@@ -15010,7 +15510,8 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 
 #. type: TP
@@ -15126,6 +15627,19 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, fuzzy, no-wrap
+msgid "B<--reverse>"
+msgstr "B<--verbose>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, fuzzy, no-wrap
 msgid "B<--all>"
@@ -15249,7 +15763,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
 
 #. type: Plain text
@@ -15365,13 +15881,16 @@ msgstr "B<dpkg --get-selections> [I<padrão>...]"
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 
 #. type: Plain text
@@ -15472,16 +15991,18 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 
 #. type: TP
@@ -15563,7 +16084,7 @@ msgstr "B<dpkg --get-selections> [I<padrão>...]"
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 
@@ -15588,16 +16109,17 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
 msgstr "B<dpkg -i> | B<--install> I<arquivo_do_pacote>..."
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
 
 #. type: Plain text
@@ -15637,6 +16159,14 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr ""
 
@@ -15733,17 +16263,28 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
-msgid "B<binary:Summary>"
+msgid "B<binary:Synopsis>"
 msgstr "B<--version>"
 
 #. type: Plain text
 #: dpkg-query.man
 #, fuzzy
-msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid "It contains the package short description (since dpkg 1.19.1)."
 msgstr "O pacote está selecionado para instalação."
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+msgid "B<binary:Summary>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: dpkg-query.man
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<db:Status-Abbrev>"
 msgstr ""
@@ -15798,6 +16339,33 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
+msgid "B<db-fsys:Files>"
+msgstr "B<config-files>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "O pacote está selecionado para instalação."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
+#, fuzzy, no-wrap
 msgid "B<source:Package>"
 msgstr "B<--version>"
 
@@ -15856,8 +16424,34 @@ msgstr ""
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
 msgstr ""
 
 #. type: TH
@@ -16134,8 +16728,8 @@ msgid ""
 "the source override takes precedence for setting the section."
 msgstr ""
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, fuzzy, no-wrap
 msgid "B<--debug>"
 msgstr "B<--nocheck>"
@@ -16383,12 +16977,6 @@ msgid ""
 "I<executable>.  This option can be used multiple times."
 msgstr ""
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, fuzzy, no-wrap
-msgid "B<-l>I<directory>"
-msgstr "B<--altdir> I<diretório>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 msgid ""
@@ -16396,15 +16984,6 @@ msgid ""
 "libraries (since dpkg 1.17.0). This option can be used multiple times."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, fuzzy, no-wrap
@@ -17377,7 +17956,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 
 #. type: TP
@@ -17506,11 +18085,11 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 
 #. type: Plain text
@@ -17528,11 +18107,18 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
@@ -17543,6 +18129,15 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
 "The timestamp of all patched files is reset to the extraction time of the "
 "source package (this avoids timestamp skews leading to problems when "
 "autogenerated files are patched)."
@@ -18247,6 +18842,12 @@ msgstr ""
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
@@ -18255,10 +18856,13 @@ msgstr ""
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -18734,10 +19338,50 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
+#, fuzzy
+#| msgid "Give help about the B<--force->I<thing> options."
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr "Ajuda com as opções B<--force->I<coisa>."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
+msgstr ""
+"Força ou rejeita (B<no-force> e B<refuse> são a mesma coisa)  a fazer "
+"algumas coisas.  I<coisas> é uma lista separada por vírgulas de coisas "
+"especificadas abaixo.  B<--force-help> exibe uma mensagem descrevendo-as.  "
+"Coisas marcadas com (*) são forçadas por padrão."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
 msgstr ""
+"I<Atenção: A maior parte dessas opções devem ser usadas apenas por experts. "
+"Usá-las sem o completo conhecimento de seus efeitos pode quebrar todo seu "
+"sistema.>"
 
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
@@ -18749,7 +19393,8 @@ msgstr "B<--nocheck>"
 #: dpkg-statoverride.man
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 
 #. type: TP
@@ -18775,6 +19420,13 @@ msgid ""
 "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+
 #. type: TP
 #: dpkg-statoverride.man
 #, fuzzy, no-wrap
@@ -18896,8 +19548,9 @@ msgstr "B<--nocheck>"
 #. type: Plain text
 #: dpkg-trigger.man
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 
 #. type: TP
@@ -20074,10 +20727,28 @@ msgstr "B<-B>|B<--auto-deconfigure>"
 
 #. type: Plain text
 #: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
@@ -20312,6 +20983,72 @@ msgstr ""
 #. type: TP
 #: start-stop-daemon.man
 #, fuzzy, no-wrap
+msgid "B<--notify-await>"
+msgstr "B<--nocheck>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
+msgid "B<ERRNO=>I<number>"
+msgstr "B<--log=>I<filename>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<--new> | B<--old>"
 
@@ -21188,6 +21925,14 @@ msgid ""
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
+#. type: Plain text
+#: update-alternatives.man
+#, fuzzy
+msgid "Do not generate any comments unless errors occur."
+msgstr ""
+"Não gera comentário algum a menos que ocorram erros. Esta opção ainda não "
+"está implementada."
+
 #. type: TP
 #: update-alternatives.man
 #, fuzzy, no-wrap
@@ -21203,10 +21948,10 @@ msgstr "Gera mais comentários sobre o que B<update-alternatives> está fazendo.
 #. type: Plain text
 #: update-alternatives.man
 #, fuzzy
-msgid "Don't generate any comments unless errors occur."
-msgstr ""
-"Não gera comentário algum a menos que ocorram erros. Esta opção ainda não "
-"está implementada."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr "Gera mais comentários sobre o que B<update-alternatives> está fazendo."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -21526,6 +22271,22 @@ msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, o Padrão da Hierarquia do Sistema de Arquivos."
 
 #, fuzzy
+#~ msgid "The program B<dpkg> will execute when displaying the conffiles."
+#~ msgstr ""
+#~ "O programa que o B<dpkg> executará quando estiver iniciando um novo shell."
+
+#~ msgid "B<COLUMNS>"
+#~ msgstr "B<COLUMNS>"
+
+#, fuzzy
+#~ msgid ""
+#~ "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~ "text.  Currently only used by B<--list>."
+#~ msgstr ""
+#~ "Ajusta o número de colunas que o B<dpkg> deve usar quando estiver "
+#~ "exibindo texto formatado. Atualmente só usado por -l."
+
+#, fuzzy
 #~ msgid "B<Testsuite-Restrictions:>I< name-list>"
 #~ msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
diff --git a/man/po/ru.po b/man/po/ru.po
index ff1aed6d2..d29c0d2e9 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2016-12-17 16:42+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-02-24 18:25+0100\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
 "Language: ru\n"
@@ -620,7 +620,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<Package:> E<lt>package nameE<gt>"
 msgid "B<Binary:> I<binary-package-list> (required)"
@@ -824,6 +824,95 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, fuzzy, no-wrap
+msgid "B<Build-Tainted-By:>"
+msgstr "B<dpkg> [I<параметры>] I<действие>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+msgid "B<usr-local-has-configs>"
+msgstr "I<control>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+msgid "B<usr-local-has-includes>"
+msgstr "B<dpkg-deb-actions>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+msgid "B<usr-local-has-libraries>"
+msgstr "I<control>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
 #| msgid "B<reinst-required>"
 msgid "B<Installed-Build-Depends:> (required)"
 msgstr "B<reinst-required>"
@@ -1145,16 +1234,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1315,10 +1404,18 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Package:> E<lt>package nameE<gt>"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Package:> E<lt>имя пакетаE<gt>"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1433,7 +1530,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1462,7 +1560,7 @@ msgstr ""
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 
 #. type: TP
@@ -1557,8 +1655,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr "ОШИБКИ РЕАЛИЗАЦИИ"
@@ -1567,7 +1665,7 @@ msgstr "ОШИБКИ РЕАЛИЗАЦИИ"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
@@ -2341,6 +2439,26 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2352,7 +2470,6 @@ msgstr "ПРИМЕР"
 #: deb-control.man
 #, fuzzy, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2395,9 +2512,18 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
 #, fuzzy
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
 #. type: TH
@@ -2508,9 +2634,10 @@ msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 
 #. type: Plain text
@@ -2667,6 +2794,28 @@ msgstr ""
 #. type: TP
 #: deb-src-control.man dsc.man
 #, fuzzy, no-wrap
+#| msgid "B<Suggests:> E<lt>package listE<gt>"
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<Suggests:> E<lt>список пакетовE<gt>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:> E<lt>package listE<gt>"
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<Suggests:> E<lt>список пакетовE<gt>"
+
+#. type: Plain text
+#: deb-src-control.man
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
 msgid "B<Vcs-Arch:>I< url>"
 msgstr "B<Replaces:> E<lt>список пакетовE<gt>"
 
@@ -3117,8 +3266,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3188,7 +3337,7 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
 msgstr ""
 
 #. type: Plain text
@@ -3204,6 +3353,14 @@ msgid ""
 "archive."
 msgstr ""
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -3304,7 +3461,7 @@ msgstr "B<dpkg> [I<параметры>] I<действие>"
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -4138,10 +4295,11 @@ msgstr ""
 #: deb-substvars.man
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 
 #. type: Plain text
@@ -5092,8 +5250,18 @@ msgstr "B<--log=>I<имя файла>"
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
+"triggers control file."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
 "functionality provided by the trigger is not crucial."
 msgstr ""
 
@@ -5121,9 +5289,17 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
 msgstr ""
 
 #. type: Plain text
@@ -5168,6 +5344,17 @@ msgid ""
 "to errors if used with an older dpkg."
 msgstr ""
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -5221,17 +5408,19 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 #. type: TP
@@ -5323,13 +5512,6 @@ msgid ""
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:> E<lt>package listE<gt>"
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<Suggests:> E<lt>список пакетовE<gt>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -5340,20 +5522,14 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:> E<lt>package listE<gt>"
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<Suggests:> E<lt>список пакетовE<gt>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -5758,6 +5934,20 @@ msgstr ""
 "Пакет выбран для полной очистки (т.е. будут удалены абсолютно все файлы, "
 "включая конфигурационные)."
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+
 #. type: SS
 #: dpkg.man
 #, no-wrap
@@ -5974,12 +6164,14 @@ msgstr "B<dpkg -r> | B<--remove> | B<-P> | B<--purge >I<имя пакета> ...
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 
 #. type: Plain text
@@ -6012,9 +6204,10 @@ msgstr "B<dpkg --configure >I<имя пакета> ... | B<-a> | B<--pending>"
 #: dpkg.man
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 
 #. type: Plain text
@@ -6290,6 +6483,13 @@ msgstr ""
 "Найти пакеты, выбранные для установки, но по какой-то причине ещё не "
 "установленные."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -6584,7 +6784,7 @@ msgid "Display a brief help message."
 msgstr "Вывести небольшую подсказку."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 msgid "B<--force-help>"
 msgstr "B<dpkg --force-help>"
@@ -6837,13 +7037,13 @@ msgstr ""
 " 2000   Невероятное количество ерунды\n"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 msgid "B<--force->I<things>"
 msgstr "B<--nocheck>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<things> | B<--no-force->I<things> | B<--refuse->I<things>"
@@ -6874,7 +7074,7 @@ msgstr ""
 "работоспособность всей системы.>"
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Включить (или выключить) все принудительные параметры."
@@ -6952,13 +7152,21 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+#, fuzzy
+#| msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends>: Превратить проблемы с зависимостями в предупреждения."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<depends-version>: Don't care about versions when checking dependencies."
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 "B<depends-version>: Не обращать внимание на версии при проверке зависимостей."
 
@@ -6966,14 +7174,19 @@ msgstr ""
 #: dpkg.man
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<conflicts>: Install, even if it conflicts with another package. This is "
+#| "dangerous, for it will usually cause overwriting of some files."
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 "B<conflicts>: Установить, даже если пакет конфликтует с другим пакетом. Это "
 "опасно, так как обычно приводит к перезаписи некоторых файлов."
@@ -7090,6 +7303,28 @@ msgstr ""
 "расположением(diverted) его неизменённой версией."
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking (since dpkg "
@@ -7120,7 +7355,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -7176,9 +7411,14 @@ msgstr "B<--ignore-depends>=I<пакет>,..."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Ignore dependency-checking for specified packages (actually, checking is "
+#| "performed, but only warnings about conflicts are given, nothing else)."
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "Игнорировать проверку зависимостей для указанных пакетов (на самом деле, "
 "проверка выполняется, но выдаются только предупреждения о конфликтах и "
@@ -7263,9 +7503,9 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 
 #. type: TP
@@ -7278,10 +7518,10 @@ msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 #: dpkg.man
 #, fuzzy
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 "Изменить каталоги по умолчанию. Каталог B<admindir> по умолчанию имеет "
 "значение B<%ADMINDIR%> и содержит много файлов, в которых даётся информация "
@@ -7301,8 +7541,9 @@ msgstr "B<--log=>I<имя файла>"
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
 
 #. type: TP
@@ -7619,6 +7860,19 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+msgid "B<--no-pager>"
+msgstr "B<--no-debsig>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+#, fuzzy
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr "Пакет выбран для установки."
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -7711,8 +7965,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, fuzzy, no-wrap
@@ -7720,7 +7977,7 @@ msgid "ENVIRONMENT"
 msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -7768,20 +8025,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<-G>"
-msgid "B<PAGER>"
-msgstr "B<-G>"
-
-#. type: Plain text
-#: dpkg.man
-#, fuzzy
-msgid "The program B<dpkg> will execute when displaying the conffiles."
-msgstr "Программа, которую запустит B<dpkg> при старте новой оболочки."
-
-#. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
@@ -7789,51 +8033,113 @@ msgstr "B<SHELL>"
 #. type: Plain text
 #: dpkg.man
 #, fuzzy
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr "Программа, которую запустит B<dpkg> при старте новой оболочки."
 
 #. type: TP
 #: dpkg.man dpkg-query.man
-#, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+#, fuzzy, no-wrap
+#| msgid "B<-G>"
+msgid "B<PAGER>"
+msgstr "B<-G>"
+
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<-G>"
+msgid "B<DPKG_PAGER>"
+msgstr "B<-G>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
-"Задаёт количество колонок текста, используемых программой B<dpkg> при "
-"форматировании текста. В настоящий момент используется только с параметром "
-"B<-l>."
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_OLD_CONFFILE>"
 msgid "B<DPKG_COLORS>"
 msgstr "B<DPKG_OLD_CONFFILE>"
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 msgid ""
 "Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
 "B<auto> (default), B<always> and B<never>."
 msgstr ""
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_OLD_CONFFILE>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_OLD_CONFFILE>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
+msgstr ""
+
+#. type: TP
+#: dpkg.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_OLD_CONFFILE>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
+msgstr "B<DPKG_OLD_CONFFILE>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
+msgstr ""
+
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_ROOT>"
@@ -7868,6 +8174,13 @@ msgid ""
 "is always set to the current B<--admindir> value."
 msgstr ""
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -8720,7 +9033,9 @@ msgstr "ПЕРЕМЕННЫЕ ОКРУЖЕНИЯ"
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr ""
 
 #. type: IP
@@ -9351,6 +9666,31 @@ msgid ""
 "«%PKGDATADIR%»."
 msgstr ""
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_OLD_CONFFILE>"
+msgid "B<DPKG_NLS>"
+msgstr "B<DPKG_OLD_CONFFILE>"
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -9649,7 +9989,7 @@ msgstr ""
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 
@@ -10014,7 +10354,7 @@ msgstr ""
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
 
 #. type: SS
@@ -10291,16 +10631,22 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -10425,6 +10771,29 @@ msgstr ""
 #. type: TP
 #: dpkg-buildflags.man
 #, fuzzy, no-wrap
+msgid "B<fixfilepath>"
+msgstr "B<--no-debsig>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.man
+#, fuzzy, no-wrap
 msgid "B<fixdebugpath>"
 msgstr "B<--no-debsig>"
 
@@ -10628,7 +10997,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr ""
 
 #. type: Plain text
@@ -10985,9 +11354,10 @@ msgstr "B<--nocheck>"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -11353,15 +11723,29 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+msgid "B<--rules-requires-root>"
+msgstr "B<-t>|B<--test>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr "B<-o>|B<--oknodo>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
 
 #. type: TP
@@ -11373,7 +11757,9 @@ msgstr "B<unpacked>"
 #. type: Plain text
 #: dpkg-buildpackage.man
 #, fuzzy
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr "Пакет выбран для установки."
 
 #. type: TP
@@ -11392,6 +11778,19 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+msgid "B<--no-post-clean>"
+msgstr "B<-o>|B<--oknodo>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr "B<-s>|B<--signal> I<сигнал>"
 
@@ -11895,9 +12294,24 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
-msgid "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_GAIN_ROOT_CMD>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
@@ -12758,7 +13172,7 @@ msgid "B<--showformat=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -13016,7 +13430,9 @@ msgstr "B<--log=>I<имя файла>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
 msgstr ""
 
 #. type: TP
@@ -13027,7 +13443,9 @@ msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
 msgstr ""
 
 #. type: TP
@@ -13075,7 +13493,35 @@ msgstr "B<--status-fd >I<E<lt>nE<gt>>"
 #. type: Plain text
 #: dpkg-divert.man
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+msgid "B<--instdir>I< directory>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+msgid "B<--root>I< directory>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
 msgstr ""
 
 #. type: TP
@@ -13140,7 +13586,26 @@ msgstr "B<--log=>I<имя файла>"
 #: dpkg-divert.man
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man
+#, fuzzy, no-wrap
+msgid "B<--no-rename>"
+msgstr "B<--log=>I<имя файла>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
 msgstr ""
 
 #. type: TP
@@ -13155,10 +13620,17 @@ msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 
 #. type: Plain text
@@ -14453,6 +14925,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, fuzzy, no-wrap
+msgid "B<-l>I<directory>"
+msgstr "B<--status-fd >I<E<lt>nE<gt>>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, fuzzy, no-wrap
 msgid "B<-I>I<filename>"
@@ -15058,6 +15552,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 #, fuzzy
 #| msgid "B<installed>"
 msgid "B<dh_installdeb>(1)."
@@ -15136,8 +15637,8 @@ msgstr "ДЕЙСТВИЯ"
 #: dpkg-mergechangelogs.man
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 
 #. type: SH
@@ -15455,7 +15956,8 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 
 #. type: TP
@@ -15571,6 +16073,19 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, fuzzy, no-wrap
+msgid "B<--reverse>"
+msgstr "B<-v>|B<--verbose>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, fuzzy, no-wrap
 msgid "B<--all>"
@@ -15694,7 +16209,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
 
 #. type: Plain text
@@ -15810,13 +16327,16 @@ msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 
 #. type: Plain text
@@ -15917,16 +16437,18 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
 msgstr "B<-a>|B<--startas> I<полное_имя>"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 
 #. type: TP
@@ -16008,7 +16530,7 @@ msgstr "B<dpkg --get-selections> [I<шаблон имени пакета>...]"
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 
@@ -16033,16 +16555,17 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
 msgstr "B<-n>|B<--name> I<имя_процесса>"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
 
 #. type: Plain text
@@ -16082,6 +16605,14 @@ msgstr "B<-r>|B<--chroot> I<root>"
 
 #. type: Plain text
 #: dpkg-query.man
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr ""
 
@@ -16177,15 +16708,26 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+msgid "B<binary:Synopsis>"
+msgstr "B<--nocheck>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+msgid "It contains the package short description (since dpkg 1.19.1)."
+msgstr "Пакет выбран для установки."
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<binary:Summary>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
-#, fuzzy
-msgid "It contains the package short description (since dpkg 1.16.2)."
-msgstr "Пакет выбран для установки."
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
+msgstr ""
 
 #. type: TP
 #: dpkg-query.man
@@ -16243,6 +16785,33 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, fuzzy, no-wrap
+msgid "B<db-fsys:Files>"
+msgstr "B<config-files>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "Пакет выбран для установки."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
+#, fuzzy, no-wrap
 msgid "B<source:Package>"
 msgstr "B<Source:> E<lt>имя архивов с исходникамиE<gt>"
 
@@ -16300,8 +16869,34 @@ msgstr ""
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
 msgstr ""
 
 #. type: TH
@@ -16576,8 +17171,8 @@ msgid ""
 "the source override takes precedence for setting the section."
 msgstr ""
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, fuzzy, no-wrap
 msgid "B<--debug>"
 msgstr "B<--no-debsig>"
@@ -16823,12 +17418,6 @@ msgid ""
 "I<executable>.  This option can be used multiple times."
 msgstr ""
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, fuzzy, no-wrap
-msgid "B<-l>I<directory>"
-msgstr "B<--status-fd >I<E<lt>nE<gt>>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 msgid ""
@@ -16836,15 +17425,6 @@ msgid ""
 "libraries (since dpkg 1.17.0). This option can be used multiple times."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, fuzzy, no-wrap
@@ -17815,7 +18395,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 
 #. type: TP
@@ -17944,11 +18524,11 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 
 #. type: Plain text
@@ -17966,11 +18546,18 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
@@ -17981,6 +18568,15 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
 "The timestamp of all patched files is reset to the extraction time of the "
 "source package (this avoids timestamp skews leading to problems when "
 "autogenerated files are patched)."
@@ -18686,6 +19282,12 @@ msgstr ""
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
@@ -18694,10 +19296,13 @@ msgstr ""
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -19172,10 +19777,60 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
+#, fuzzy
+#| msgid "Give help about the B<--force->I<thing> options."
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr "Вывести подсказку о параметрах B<--force->I<что-нибудь>."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do "
+#| "some things. I<things> is a comma separated list of things specified "
+#| "below. B<--force-help> displays a message describing them.  Things marked "
+#| "with (*) are forced by default."
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
 msgstr ""
+"Принудительно выполнять или же отказываться выполнять (B<no-force> и B<--"
+"refuse> означают одно и то же) те или иные вещи. I<things> -- это список "
+"через запятую элементов описанных далее). B<--force-help> выдает сообщение, "
+"описывающие их. Элементы, обозначенные звёздочкой (*), принудительно "
+"выполняются по умолчанию."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "I<Warning: These options are mostly intended to be used by experts only. "
+#| "Using them without fully understanding their effects may break your whole "
+#| "system.>"
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Предупреждение: Эти параметры предназначены только для использования "
+"экспертами. Использование без полного понимания их действия может нарушить "
+"работоспособность всей системы.>"
 
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
@@ -19187,7 +19842,8 @@ msgstr "B<--nocheck>"
 #: dpkg-statoverride.man
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 
 #. type: TP
@@ -19213,6 +19869,13 @@ msgid ""
 "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+
 #. type: TP
 #: dpkg-statoverride.man
 #, fuzzy, no-wrap
@@ -19334,8 +19997,9 @@ msgstr "B<--no-debsig>"
 #. type: Plain text
 #: dpkg-trigger.man
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 
 #. type: TP
@@ -20547,10 +21211,28 @@ msgstr "B<-p>|B<--pidfile> I<pid-файл>"
 
 #. type: Plain text
 #: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr "Проверить какой процесс создал I<pid-файл>."
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
@@ -20843,6 +21525,72 @@ msgstr ""
 #. type: TP
 #: start-stop-daemon.man
 #, fuzzy, no-wrap
+msgid "B<--notify-await>"
+msgstr "B<--no-debsig>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
+msgid "B<ERRNO=>I<number>"
+msgstr "B<--log=>I<имя файла>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<-o>|B<--oknodo>"
 
@@ -21580,6 +22328,11 @@ msgid ""
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
+#. type: Plain text
+#: update-alternatives.man
+msgid "Do not generate any comments unless errors occur."
+msgstr ""
+
 #. type: TP
 #: update-alternatives.man
 #, fuzzy, no-wrap
@@ -21593,7 +22346,9 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
 msgstr ""
 
 #. type: Plain text
@@ -21895,6 +22650,25 @@ msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
 #, fuzzy
+#~ msgid "The program B<dpkg> will execute when displaying the conffiles."
+#~ msgstr "Программа, которую запустит B<dpkg> при старте новой оболочки."
+
+#~ msgid "B<COLUMNS>"
+#~ msgstr "B<COLUMNS>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~| "text. Currently only used by -l."
+#~ msgid ""
+#~ "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~ "text.  Currently only used by B<--list>."
+#~ msgstr ""
+#~ "Задаёт количество колонок текста, используемых программой B<dpkg> при "
+#~ "форматировании текста. В настоящий момент используется только с "
+#~ "параметром B<-l>."
+
+#, fuzzy
 #~ msgid "B<dpkg-buildpackage>(1), B<dpkg-cross>(1)."
 #~ msgstr "B<deb>(5), B<dpkg>(1), B<dpkg-deb>(1)."
 
@@ -22230,9 +23004,6 @@ msgstr ""
 #~ msgid "B<-S>I<pkgbuilddir>"
 #~ msgstr "B<--log=>I<имя файла>"
 
-#~ msgid "Check whether a process has created the file I<pid-file>."
-#~ msgstr "Проверить какой процесс создал I<pid-файл>."
-
 #~ msgid ""
 #~ "Check for processes that are instances of this executable (according to "
 #~ "B</proc/>I<pid>B</exe>)."
diff --git a/man/po/sv.po b/man/po/sv.po
index 573843e0f..17f0d66dc 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.11\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2016-12-17 16:42+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-02-24 18:25+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\n"
 "Language: sv\n"
@@ -705,7 +705,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<Package:> I<binary-package-name> (required)"
 msgid "B<Binary:> I<binary-package-list> (required)"
@@ -933,6 +933,99 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, fuzzy, no-wrap
+#| msgid "B<Building>"
+msgid "B<Build-Tainted-By:>"
+msgstr "B<Bygga>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<-L>I<local-shlibs-file>"
+msgid "B<usr-local-has-configs>"
+msgstr "B<-L>I<lokal-shlibs-fil>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<--single-debian-patch>"
+msgid "B<usr-local-has-includes>"
+msgstr "B<--single-debian-patch>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<-L>I<local-shlibs-file>"
+msgid "B<usr-local-has-libraries>"
+msgstr "B<-L>I<lokal-shlibs-fil>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
 #| msgid "B<reinst-required>"
 msgid "B<Installed-Build-Depends:> (required)"
 msgstr "B<ominstallation krävs> (\"reinst-required\")"
@@ -1258,16 +1351,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1441,10 +1534,18 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Package:> I<binary-package-name> (required)"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Package:> I<binärpaketnamn> (krävs)"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1564,7 +1665,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1595,7 +1697,7 @@ msgstr "B<binary:Version>"
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 
 #. type: TP
@@ -1701,8 +1803,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr "PROGRAMFEL"
@@ -1711,7 +1813,7 @@ msgstr "PROGRAMFEL"
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
@@ -2562,6 +2664,27 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+#| msgid "B<Date:>I< date>"
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Date:> I<datum>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2571,9 +2694,29 @@ msgstr "EXEMPEL"
 
 #. type: Plain text
 #: deb-control.man
-#, no-wrap
+#, fuzzy, no-wrap
+#| msgid ""
+#| "# Comment\n"
+#| "Package: grep\n"
+#| "Essential: yes\n"
+#| "Priority: required\n"
+#| "Section: base\n"
+#| "Maintainer: Wichert Akkerman E<lt>wakkerma@debian.orgE<gt>\n"
+#| "Architecture: sparc\n"
+#| "Version: 2.4-1\n"
+#| "Pre-Depends: libc6 (E<gt>= 2.0.105)\n"
+#| "Provides: rgrep\n"
+#| "Conflicts: rgrep\n"
+#| "Description: GNU grep, egrep and fgrep.\n"
+#| " The GNU family of grep utilities may be the \"fastest grep in the west\".\n"
+#| " GNU grep is based on a fast lazy-state deterministic matcher (about\n"
+#| " twice as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper\n"
+#| " search for a fixed string that eliminates impossible text from being\n"
+#| " considered by the full regexp matcher without necessarily having to\n"
+#| " look at every character. The result is typically many times faster\n"
+#| " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
+#| " will run more slowly, however).\n"
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2617,11 +2760,20 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
 #, fuzzy
 #| msgid ""
 #| "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr ""
 "B<deb>(5), B<deb-version>(5), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 
@@ -2764,12 +2916,20 @@ msgstr "B<Source:> I<källkodspaketnamn> (krävs)"
 
 #. type: Plain text
 #: deb-src-control.man
+#, fuzzy
+#| msgid ""
+#| "The value of this field is the name of the source package, and should "
+#| "match the name of the source package in the debian/changelog file. A "
+#| "package name must consist only of lower case letters (a-z), digits (0-9), "
+#| "plus (+) and minus (-) signs, and periods (.). Package names must be at "
+#| "least two characters long and must start with an alphanumeric character."
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 "Värdet på det här fältet är namnet på källkodspaketet, och måste motsvara "
 "namnet på källkodspaketet i filen debian/changelog. Paketnamnet måste bestå "
@@ -2954,6 +3114,34 @@ msgstr ""
 
 #. type: TP
 #: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:>I< package-list>"
+msgid "B<Testsuite:>I< name-list>"
+msgstr "B<Suggests:>I< paketlista>"
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, fuzzy, no-wrap
+#| msgid "B<Suggests:>I< package-list>"
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr "B<Suggests:>I< paketlista>"
+
+#. type: Plain text
+#: deb-src-control.man
+#, fuzzy
+#| msgid ""
+#| "These fields are described in the B<deb-control>(5)  manual page, as they "
+#| "are copied literally to the control file of the binary package."
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+"Dessa fält beskrivs i manualsidan B<deb-control>(5), eftersom de kopieras "
+"ordagrant till binärpaketets styrfil."
+
+#. type: TP
+#: deb-src-control.man dsc.man
 #, no-wrap
 msgid "B<Vcs-Arch:>I< url>"
 msgstr "B<Vcs-Arch:>I< url>"
@@ -3528,8 +3716,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -3638,8 +3826,10 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
-msgstr ""
+#, fuzzy
+#| msgid "I<package> I<priority> I<section> [I<maintainerinfo>]"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
+msgstr "I<paket> I<prioritet> I<sektion> [I<ansvariginfo>]"
 
 #. type: Plain text
 #: deb-src-files.man
@@ -3662,6 +3852,14 @@ msgstr ""
 "I<prioritet> och I<sektion> motsvarar respektive styrfält i .deb-filen. "
 "Tillåtna värden beskrivs i Debians policydokument."
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -3766,7 +3964,7 @@ msgstr "B<Bygga>"
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -4816,12 +5014,20 @@ msgstr ""
 
 #. type: Plain text
 #: deb-substvars.man
+#, fuzzy
+#| msgid ""
+#| "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
+#| "names consist of alphanumerics, hyphens and colons and start with an "
+#| "alphanumeric. Variable substitutions are performed repeatedly until none "
+#| "are left; the full text of the field after the substitution is rescanned "
+#| "to look for more substitutions."
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 "En variabelsubstitution har formen B<${>I<variabelnamn>B<}>. Variabelnamn "
 "består av alfanumeriska tecken, bindestreck och kolon och börjar med ett "
@@ -5983,9 +6189,7 @@ msgstr "B<interest-noawait> I<utlösarnamn>"
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
-"functionality provided by the trigger is not crucial."
+"triggers control file."
 msgstr ""
 "Anger att paketet är intresserat av den namngivna utlösaren. Alla utlösare "
 "som ett paket är intresserat av måste listas genom att använda detta "
@@ -5993,6 +6197,18 @@ msgstr ""
 "utlösande paketet i avvaktande tillstånd. Detta bör användas när "
 "funktionaliteten som tillhandahålls av utlösaren inte är avgörande."
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
+"functionality provided by the trigger is not crucial."
+msgstr ""
+
 #. type: TP
 #: deb-triggers.man
 #, no-wrap
@@ -6026,9 +6242,7 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
 msgstr ""
 "Gör så att ändringar av detta pakets tillstånd aktiverar den angivna "
 "utlösaren. Utlösaren aktiveras när en av följande operationer påbörjas: "
@@ -6040,6 +6254,28 @@ msgstr ""
 
 #. type: Plain text
 #: deb-triggers.man
+#, fuzzy
+#| msgid ""
+#| "Specifies that the package is interested in the named trigger. All "
+#| "triggers in which a package is interested must be listed using this "
+#| "directive in the triggers control file. The \"noawait\" variant does not "
+#| "put the triggering packages in triggers-awaited state. This should be "
+#| "used when the functionality provided by the trigger is not crucial."
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
+msgstr ""
+"Anger att paketet är intresserat av den namngivna utlösaren. Alla utlösare "
+"som ett paket är intresserat av måste listas genom att använda detta "
+"direktiv i utlösar-styrfilen. Varianten \"noawait\" sätter inte det "
+"utlösande paketet i avvaktande tillstånd. Detta bör användas när "
+"funktionaliteten som tillhandahålls av utlösaren inte är avgörande."
+
+#. type: Plain text
+#: deb-triggers.man
 msgid ""
 "If this package disappears during the unpacking of another package the "
 "trigger will be activated when the disappearance is noted towards the end of "
@@ -6120,6 +6356,17 @@ msgstr ""
 "därför att du lägger till ett \"Pre-Depends: dpkg (E<gt>= 1.17.21)\" till "
 "eventuella paket som vill använda dessa direktiv."
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -6186,17 +6433,19 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 #. type: TP
@@ -6295,13 +6544,6 @@ msgid ""
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite:>I< name-list>"
-msgstr "B<Suggests:>I< paketlista>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -6312,20 +6554,14 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, fuzzy, no-wrap
-#| msgid "B<Suggests:>I< package-list>"
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr "B<Suggests:>I< paketlista>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -6737,6 +6973,20 @@ msgstr ""
 "Paketet är markerat för rensning (dvs. vi vill ta bort allting från "
 "systemkataloger, även konfigurationsfiler)."
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+
 #. type: SS
 #: dpkg.man
 #, no-wrap
@@ -6953,13 +7203,23 @@ msgstr "B<-r>, B<--remove> I<paket>B<...|-a|--pending>"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Remove an installed package. This removes everything except conffiles, "
+#| "which may avoid having to reconfigure the package if it is reinstalled "
+#| "later (conffiles are configuration files that are listed in the I<DEBIAN/"
+#| "conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
+#| "package name, then all packages unpacked, but marked to be removed in "
+#| "file I<%ADMINDIR%/status>, are removed."
 msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 "Ta bort ett installerat paket. Detta tar bort allt utom konffiler, vilket "
 "kan göra att du kan undvika att konfigurera om paketet om du ominstallerar "
@@ -6997,11 +7257,18 @@ msgstr "B<-P>, B<--purge >I<paket>...|B<-a>|B<--pending>"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Purge an installed or already removed package. This removes everything, "
+#| "including conffiles.  If B<-a> or B<--pending> is given instead of a "
+#| "package name, then all packages unpacked or removed, but marked to be "
+#| "purged in file I<%ADMINDIR%/status>, are purged."
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 "Rensa ett installerat eller redan borttaget paket. Detta tar bort allting, "
 "inklusive konffiler. Om B<-a> eller B<--pending> anges instället för ett "
@@ -7333,6 +7600,13 @@ msgstr ""
 "Söker efter paket som markerats för installation men som av någon anledning "
 "ännu inte har installerats."
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -7671,7 +7945,7 @@ msgid "Display a brief help message."
 msgstr "Visar en kortfattad hjälptext."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
@@ -7938,14 +8212,14 @@ msgstr ""
 "   2000   Knäppa mängder pladder\n"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force-sign>"
 msgid "B<--force->I<things>"
 msgstr "B<--force-sign>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
@@ -7976,7 +8250,7 @@ msgstr ""
 "du förstöra din systeminstallation.>"
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: Slår på (eller av) alla tvingande flaggor."
 
@@ -8045,13 +8319,21 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+#, fuzzy
+#| msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends>: Gör alla beroendeproblem till varningar."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<depends-version>: Don't care about versions when checking dependencies."
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr ""
 "B<depends-version>: Ignorera versionsnummer när beroenden kontrolleras."
 
@@ -8061,14 +8343,19 @@ msgstr ""
 #| msgid "B<breaks>: Install, even if this would break another package."
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr "B<breaks>: Installera, även om det skulle förstöra ett annat paket."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<conflicts>: Install, even if it conflicts with another package. This is "
+#| "dangerous, for it will usually cause overwriting of some files."
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 "B<conflicts>: Installera även om paket som är i konflikt (krockar) med ett "
 "annat paket. Detta är farligt, eftersom det oftast leder till att vissa "
@@ -8178,6 +8465,28 @@ msgstr ""
 "version."
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
 #, fuzzy
 #| msgid ""
@@ -8229,7 +8538,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -8283,9 +8592,14 @@ msgstr "B<--ignore-depends>=I<paket>,..."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Ignore dependency-checking for specified packages (actually, checking is "
+#| "performed, but only warnings about conflicts are given, nothing else)."
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "Ignorera beroendekontroll för angivna paket (i verkligheten utförs "
 "kontrollen, men det ges endast varningar, ingenting annat)."
@@ -8371,9 +8685,9 @@ msgstr "B<--admindir=>I<kat>"
 #| "give information about status of installed or uninstalled packages, etc.  "
 #| "(Defaults to I<%ADMINDIR%>)"
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "Ändra förvald administrationskatalog, vilken innehåller flera filer som "
 "beskriver status för installerade eller avinstallerade paket, osv. "
@@ -8394,10 +8708,10 @@ msgstr "B<--instdir=>I<katalog>"
 #| "B<chroot>(2) before running package's installation scripts, which means "
 #| "that the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 "Ändra standardinstallationskatalog, vilket anger katalogen där paket skall "
 "installeras. B<instdir> är även katalogen som skickas som argument till "
@@ -8417,8 +8731,9 @@ msgstr "B<--root=>I<katalog>"
 #| "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 #| "var/lib/dpkg>."
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
 "Genom att ändra B<rot> så ändras B<installationskatalog> till I<katalog> och "
 "B<administrationskatalog> till I<katalog>B<%ADMINDIR%>."
@@ -8840,6 +9155,21 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<--no-triggers>"
+msgid "B<--no-pager>"
+msgstr "B<--no-triggers>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+#, fuzzy
+#| msgid "The Debian system name of the host machine (since dpkg 1.13.2)."
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr "Debiansystemnamnet för värdmaskinen (sedan dpkg 1.13.2)."
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -8951,8 +9281,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, no-wrap
@@ -8960,7 +9293,7 @@ msgid "ENVIRONMENT"
 msgstr "MILJÖVARIABLER"
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -9011,19 +9344,7 @@ msgstr ""
 "temporära filer och kataloger."
 
 #. type: TP
-#: dpkg.man
-#, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
-
-#. type: Plain text
-#: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
-msgstr ""
-"Programmet B<dpkg> kommer att exekveras för att visa konfigurationsfiler."
-
-#. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<SHELL>"
 msgstr "B<SHELL>"
@@ -9032,50 +9353,112 @@ msgstr "B<SHELL>"
 #: dpkg.man
 #, fuzzy
 #| msgid "The program B<dpkg> will execute when starting a new shell."
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr "Programmet B<dpkg> kommer att exekveras när ett nytt skal startas."
 
 #. type: TP
 #: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+msgid "B<PAGER>"
+msgstr "B<PAGER>"
+
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<PAGER>"
+msgid "B<DPKG_PAGER>"
+msgstr "B<PAGER>"
 
 #. type: Plain text
 #: dpkg.man
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
-"Sätter antalet kolumner B<dpkg> skall använda när formaterad text visas. "
-"Används för närvarande enbart av -l."
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
 msgid "B<DPKG_COLORS>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 msgid ""
 "Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
 "B<auto> (default), B<always> and B<never>."
 msgstr ""
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
+msgstr ""
+
+#. type: TP
+#: dpkg.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
+msgstr ""
+
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
 msgid "B<DPKG_ROOT>"
@@ -9115,6 +9498,19 @@ msgstr ""
 "Definieras av B<dpkg> i utvecklarskriptets miljö till den privata "
 "bibliotekskatalogen för den instans av B<dpkg> som körs för tillfället."
 
+#. type: Plain text
+#: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the "
+#| "architecture the package got built for."
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+"Definieras av B<dpkg> i utvecklarskriptets miljö till arkitekturen paketet "
+"byggdes för."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -10114,7 +10510,11 @@ msgstr "VARIABLER"
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+#, fuzzy
+#| msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr "Följande variabler sätts av B<dpkg-architecture>:"
 
 #. type: IP
@@ -10801,6 +11201,31 @@ msgid ""
 "«%PKGDATADIR%»."
 msgstr ""
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_CONFFILE_OLD>"
+msgid "B<DPKG_NLS>"
+msgstr "B<DPKG_CONFFILE_OLD>"
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -11163,7 +11588,7 @@ msgstr "B<make>"
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 "Make-direktiv för att sätta och exportera alla kompileringsflaggor i miljön. "
@@ -11603,7 +12028,7 @@ msgstr ""
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
 
 #. type: SS
@@ -11972,16 +12397,22 @@ msgstr "B<pie>"
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -12159,6 +12590,40 @@ msgstr ""
 #: dpkg-buildflags.man
 #, fuzzy, no-wrap
 #| msgid "B<--debug>"
+msgid "B<fixfilepath>"
+msgstr "B<--debug>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+#, fuzzy
+#| msgid ""
+#| "This setting (enabled by default) adds B<-fstack-protector-strong> to "
+#| "B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+#| "B<FFLAGS> and B<FCFLAGS>.  This is a stronger variant of "
+#| "B<stackprotector>, but without significant performance penalties."
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+"Inställningen (aktiverad som standard) lägger till B<-fstack-protector-"
+"strong> till B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, "
+"B<GCJFLAGS>, B<FFLAGS> och B<FCFLAGS>. Detta är en starkare variant av "
+"B<stackprotector>, men utan markanta prestandaminskningar."
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.man
+#, fuzzy, no-wrap
+#| msgid "B<--debug>"
 msgid "B<fixdebugpath>"
 msgstr "B<--debug>"
 
@@ -12398,7 +12863,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr "För att sända byggflaggor till en byggkommandorad i en makefil:"
 
 #. type: Plain text
@@ -12869,9 +13334,10 @@ msgstr "B<--force>"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -13361,6 +13827,20 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<--as-root>"
+msgid "B<--rules-requires-root>"
+msgstr "B<--as-root>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<-C>, B<--no-close>"
 msgid "B<-nc>, B<--no-pre-clean>"
 msgstr "B<-C>, B<--no-close>"
@@ -13372,9 +13852,10 @@ msgstr "B<-C>, B<--no-close>"
 #| "Do not clean the source tree (implies B<-b> if nothing else has been "
 #| "selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or B<-S>)."
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
 "Städa inte upp byggträdet (implicerar B<-b> om inget annat har valts bland "
 "B<-F>, B<-g>, B<-G>, B<-B>, B<-A> eller B<-S>)."
@@ -13392,7 +13873,9 @@ msgstr "B<-p>I<paket>"
 #| msgid ""
 #| "It contains the source package name for this binary package (since dpkg "
 #| "1.16.2)."
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr "Innehåller källkodsnamnet för binärpaketet (sedan dpkg 1.16.2)."
 
 #. type: TP
@@ -13418,6 +13901,26 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
+#| msgid "B<-C>, B<--no-close>"
+msgid "B<--no-post-clean>"
+msgstr "B<-C>, B<--no-close>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+#, fuzzy
+#| msgid ""
+#| "This option does the inverse of B<--no-await>. It is currently the "
+#| "default behavior."
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+"Flaggan gör det motsatta mot B<--no-await>. Det är för närvarande "
+"standardbetendet."
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, fuzzy, no-wrap
 #| msgid "B<-c>, B<--command> I<command>"
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr "B<-c>, B<--command> I<kommando>"
@@ -14073,9 +14576,24 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_NO_TSTP>"
-msgid "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_GAIN_ROOT_CMD>"
 msgstr "B<DPKG_NO_TSTP>"
 
 #. type: Plain text
@@ -15156,7 +15674,7 @@ msgid "B<--showformat=>I<format>"
 msgstr "B<--showformat=>I<format>"
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -15520,8 +16038,10 @@ msgstr "[B<--add>] I<fil>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
-msgstr "Lägg till en omdirigering för I<fil>."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
 
 #. type: TP
 #: dpkg-divert.man
@@ -15531,8 +16051,10 @@ msgstr "B<--remove>I< fil>"
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
-msgstr "Ta bort en omdirigering för I<fil>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
+msgstr ""
 
 #. type: TP
 #: dpkg-divert.man
@@ -15584,11 +16106,44 @@ msgstr "B<--admindir>I< katalog>"
 
 #. type: Plain text
 #: dpkg-divert.man
+#, fuzzy
+#| msgid ""
+#| "Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
 msgstr "Ställ B<dpkg>:s datakatalog till I<katalog> (standard: I<%ADMINDIR%>)."
 
 #. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--admindir>I< directory>"
+msgid "B<--instdir>I< directory>"
+msgstr "B<--admindir>I< katalog>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--depotdir>I< directory>"
+msgid "B<--root>I< directory>"
+msgstr "B<--depotdir>I< katalog>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: TP
 #: dpkg-divert.man
 #, no-wrap
 msgid "B<--divert>I< divert-to>"
@@ -15656,15 +16211,39 @@ msgstr "B<--rename>"
 
 #. type: Plain text
 #: dpkg-divert.man
+#, fuzzy
+#| msgid ""
+#| "Actually move the file aside (or back). B<dpkg-divert> will abort "
+#| "operation in case the destination file already exists."
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
 msgstr ""
 "Flytta faktiskt filen åt sidan (eller tillbaka). B<dpkg-divert> kommer att "
 "avbryta körningen om destinationsfilen redan existerar."
 
 #. type: TP
 #: dpkg-divert.man
+#, fuzzy, no-wrap
+#| msgid "B<--rename>"
+msgid "B<--no-rename>"
+msgstr "B<--rename>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man
 #, no-wrap
 msgid "B<--test>"
 msgstr "B<--test>"
@@ -15676,10 +16255,27 @@ msgstr ""
 "Testläge, dvs. utför inga faktiska ändringar, bara visa vad som skulle hända."
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the base administrative directory."
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+"Om satt och flaggan B<--admindir> inte har angivits används det som bas-"
+"administrativ katalog."
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the B<dpkg> data directory."
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 "Om satt, och flaggan B<--admindir> inte har angivits, används värdet som "
 "datakatalog för B<dpkg>."
@@ -17447,6 +18043,39 @@ msgstr ""
 "e>)."
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, no-wrap
+msgid "B<-l>I<directory>"
+msgstr "B<-l>I<katalog>"
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+#, fuzzy
+#| msgid ""
+#| "Add I<directory> to the list of directories to search for private shared "
+#| "libraries (since dpkg 1.17.0). This option can be used multiple times."
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+"Lägg till I<katalog> till listan över kataloger som skall eftersökas efter "
+"privata delade bibliotek (sedan dpkg 1.17.0). Flaggan kan användas flera "
+"gånger."
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+"Observera: Använd den här flaggan istället för att sätta B<LD_LIBRARY_PATH>, "
+"eftersom miljövariabeln används för att styra körtidslänkaren, och genom att "
+"utnyttja det för att ange sökvägen till delade bibliotek vid kompilering kan "
+"det uppstå problem, till exempel vid korskompilering."
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<-I>I<filename>"
@@ -18231,6 +18860,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 msgid "B<dh_installdeb>(1)."
 msgstr "B<dh_installdeb>(1)."
 
@@ -18332,8 +18968,8 @@ msgstr "BEGRÄNSNINGAR"
 #| "supposed to be there, etc."
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 "Allt som inte tolkas av Dpkg::Changelog försvinner under sammanslagningen. "
 "Det kan gälla saker som vim-lägesrader, kommentarer som inte skulle vara "
@@ -18761,7 +19397,8 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 "Välj utdataformat. Stödda format är för närvarande I<dpkg> och I<rfc822>. "
 "I<dpkg> är det klassiska utdataformatet (från innan denna flagga var "
@@ -18894,6 +19531,20 @@ msgstr ""
 "ändringsloggspost så att all metadata för varje post behålls."
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, fuzzy, no-wrap
+#| msgid "B<--verbose>"
+msgid "B<--reverse>"
+msgstr "B<--verbose>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, no-wrap
 msgid "B<--all>"
@@ -19057,7 +19708,11 @@ msgstr "       @@@ changelog-format: I<annatformat> @@@\n"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+#, fuzzy
+#| msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
 "Namn på ändringsloggformat är icke-tomma strängar av alfanumeriska tecken."
 
@@ -19226,13 +19881,16 @@ msgstr "B<-l>, B<--list> [I<paketnamnsmönster> ...]"
 #| "the shell from performing filename expansion. For example this will list "
 #| "all package names starting with ``libc6'':"
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 "Lista paket som matchar det givna mönstret. Om inget I<paketnamnsmönster> "
 "anges listas alla paket i I<%ADMINDIR%/status>, förutom de paket som "
@@ -19367,17 +20025,26 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
+#, fuzzy, no-wrap
+#| msgid "B<-s>, B<--status> I<package-name>..."
+msgid "B<-s>, B<--status> [I<package-name>...]"
 msgstr "B<-s>, B<--status> I<paketnamn> ..."
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Report status of specified package. This just displays the entry in the "
+#| "installed package status database. When multiple I<package-name> are "
+#| "listed, the requested status entries are separated by an empty line, with "
+#| "the same order as specified on the argument list."
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 "Rapportera status om det angivna paketet.  Detta alternativ visar helt "
 "enkelt posten i statusdatabasen för installerade paket. Om flera "
@@ -19500,7 +20167,7 @@ msgstr "B<-S>, B<--search> I<filnamnssökmönster> ..."
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 "Sök efter paket som äger filer som motsvarar det angivna mönstret. Alla "
@@ -19538,17 +20205,25 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
+#, fuzzy, no-wrap
+#| msgid "B<-p>, B<--print-avail> I<package-name>..."
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
 msgstr "B<-p>, B<--print-avail> I<paketnamn>"
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Display details about I<package-name>, as found in I<%ADMINDIR%/"
+#| "available>. When multiple I<package-name> are listed, the requested "
+#| "I<available> entries are separated by an empty line, with the same order "
+#| "as specified on the argument list."
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
 "Visar information om I<paketnamn>, enligt vad som finns i I<%ADMINDIR%/"
 "available>. Om flera I<paketnamn> anges avdelas de efterfrågade posterna ur "
@@ -19604,6 +20279,21 @@ msgstr "B<-f>, B<--showformat=>I<format>"
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "This option is used to specify the format of the output B<--show> will "
+#| "produce. The format is a string that will be output for each package "
+#| "listed."
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+"Flaggan används för att ange formatet på utdata som skapas av B<--show>. "
+"Formatet är en sträng som matas ut för varje paket i listan."
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr "I formatsträngen inleds följande styrsekvenser med “B<\\e>”:"
 
@@ -19754,14 +20444,28 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<source:Version>"
+msgid "B<binary:Synopsis>"
+msgstr "B<source:Version>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid "It contains the package short description (since dpkg 1.19.1)."
+msgstr "Innehåller paketets korta beskrivning (sedan dpkg 1.16.2)."
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<binary:Summary>"
 msgstr "B<binary:Summary>"
 
 #. type: Plain text
 #: dpkg-query.man
-msgid "It contains the package short description (since dpkg 1.16.2)."
-msgstr "Innehåller paketets korta beskrivning (sedan dpkg 1.16.2)."
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
+msgstr ""
 
 #. type: TP
 #: dpkg-query.man
@@ -19828,6 +20532,35 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<debian/files>"
+msgid "B<db-fsys:Files>"
+msgstr "B<debian/files>"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "Innehåller paketets korta beskrivning (sedan dpkg 1.16.2)."
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<source:Package>"
 msgstr "B<source:Package>"
@@ -19893,12 +20626,40 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
+#, fuzzy
+#| msgid "Sets the output format for the B<--verify> command."
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr "Väljer utdataformat för kommandot B<--verify>."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+"Om satt, och flaggan B<--admindir> inte har angivits, används värdet som "
+"datakatalog för B<dpkg>."
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
 msgstr ""
-"Inställningen påverkar utdata från kommandot B<--list> genom att ändra "
-"bredden på dess utdata."
 
 #. type: TH
 #: dpkg-scanpackages.man
@@ -20304,8 +21065,8 @@ msgstr ""
 "kommentarer ignoreras på vanligt sätt. Om ett paket specificeras i båda "
 "filerna kommer källkodsöverstyrningsfilen först för att välja sektion."
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
@@ -20605,12 +21366,6 @@ msgstr ""
 "Ta med beroenden som är passar för delade bibliotek som krävs för "
 "I<programfil>. Flaggan kan användas flera gånger."
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, no-wrap
-msgid "B<-l>I<directory>"
-msgstr "B<-l>I<katalog>"
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 #, fuzzy
@@ -20625,19 +21380,6 @@ msgstr ""
 "privata delade bibliotek (sedan dpkg 1.17.0). Flaggan kan användas flera "
 "gånger."
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-"Observera: Använd den här flaggan istället för att sätta B<LD_LIBRARY_PATH>, "
-"eftersom miljövariabeln används för att styra körtidslänkaren, och genom att "
-"utnyttja det för att ange sökvägen till delade bibliotek vid kompilering kan "
-"det uppstå problem, till exempel vid korskompilering."
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
@@ -22117,6 +22859,20 @@ msgstr "B<-sa> eller B<-sA>"
 
 #. type: Plain text
 #: dpkg-source.man
+#, fuzzy
+#| msgid ""
+#| "Specifies to look for the original source archive as a tarfile or as a "
+#| "directory - the second argument, if any, may be either, or the empty "
+#| "string (this is equivalent to using B<-sn>).  If a tarfile is found it "
+#| "will unpack it to create the diff and remove it afterwards (this is "
+#| "equivalent to B<-sp>); if a directory is found it will pack it to create "
+#| "the original source and remove it afterwards (this is equivalent to B<-"
+#| "sr>); if neither is found it will assume that the package has no "
+#| "debianization diffs, only a straightforward source archive (this is "
+#| "equivalent to B<-sn>).  If both are found then B<dpkg-source> will ignore "
+#| "the directory, overwriting it, if B<-sA> was specified (this is "
+#| "equivalent to B<-sP>)  or raise an error if B<-sa> was specified.  B<-sA> "
+#| "is the default."
 msgid ""
 "Specifies to look for the original source archive as a tarfile or as a "
 "directory - the second argument, if any, may be either, or the empty string "
@@ -22128,7 +22884,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 "Anger att originalkällkoden finns som en katalog eller en tarfil - det andra "
 "argumentet, om det anges, kan vara det ena eller det andra, eller den tomma "
@@ -22323,11 +23079,11 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 "Ett källkodspaket i detta format innehåller åtminstone en original-tarboll "
 "(B<.orig.tar.>I<ext>, där I<ext> kan vara B<gz>, B<bz2>, B<lzma> eller "
@@ -22358,12 +23114,31 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-source.man
-msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+#, fuzzy
+#| msgid ""
+#| "All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
+#| "series> are then applied.  If the former file is used and the latter one "
+#| "doesn't exist (or is a symlink), then the latter is replaced with a "
+#| "symlink to the former. This is meant to simplify usage of B<quilt> to "
+#| "manage the set of patches. Note however that while B<dpkg-source> parses "
+#| "correctly series files with explicit options used for patch application "
+#| "(stored on each line after the patch filename and one or more spaces), it "
+#| "does ignore those options and always expect patches that can be applied "
+#| "with the B<-p1> option of B<patch>. It will thus emit a warning when it "
+#| "encounters such options, and the build is likely to fail."
+msgid ""
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
@@ -22385,6 +23160,15 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
 "The timestamp of all patched files is reset to the extraction time of the "
 "source package (this avoids timestamp skews leading to problems when "
 "autogenerated files are patched)."
@@ -23382,6 +24166,13 @@ msgstr ""
 
 #. type: SS
 #: dpkg-source.man
+#, fuzzy, no-wrap
+#| msgid "debian/patches/series"
+msgid "debian/patches/I<vendor>.series"
+msgstr "debian/patches/series"
+
+#. type: SS
+#: dpkg-source.man
 #, no-wrap
 msgid "debian/patches/series"
 msgstr "debian/patches/series"
@@ -23401,10 +24192,13 @@ msgstr "debian/patches/series"
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -24003,13 +24797,66 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
+#, fuzzy
+#| msgid "Give help about the B<--force->I<thing> options."
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr "Get hjälp om B<--force->I<nånting>-flaggorna."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Change the I<directory> of the B<dpkg> database where the statoverride "
+#| "file is also stored. Defaults to I<%ADMINDIR%>."
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "Ändra I<katalog> för B<dpkg>-databasen där statoverride-filen också lagras. "
 "Förval är I<%ADMINDIR%>."
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do "
+#| "some things. I<things> is a comma separated list of things specified "
+#| "below. B<--force-help> displays a message describing them.  Things marked "
+#| "with (*) are forced by default."
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
+msgstr ""
+"Tvinga eller vägra (B<no-force> och B<refuse> betyder detsamma) att göra "
+"vissa saker. I<saker> är en kommaavgränsad lista med saker som anges nedan. "
+"B<--force-help> visar en lista med beskrivningar. Saker som markeras med (*) "
+"är tvingade som förval."
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "I<Warning: These options are mostly intended to be used by experts only. "
+#| "Using them without fully understanding their effects may break your whole "
+#| "system.>"
+msgid ""
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
+msgstr ""
+"I<Varning: Dessa flaggor är huvudsakligen avsedda att endast användas av "
+"experter. Om du använder dem utan att fullt ut förstå vad de går ut på kan "
+"du förstöra din systeminstallation.>"
+
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -24018,9 +24865,14 @@ msgstr "B<--force>"
 
 #. type: Plain text
 #: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force an action, even if a sanity check would otherwise prohibit it.  "
+#| "This is necessary to override an existing override."
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 "Tvinga ett kommando, även om en säkerhetskontroll annars skulle förhindra "
 "det. Detta behövs för att överstyra en befintlig överstyrning."
@@ -24050,6 +24902,19 @@ msgid ""
 "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set and the B<--admindir> option has not been specified, it will be "
+#| "used as the base administrative directory."
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+"Om satt och flaggan B<--admindir> inte har angivits används det som bas-"
+"administrativ katalog."
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -24206,8 +25071,9 @@ msgstr "B<--await>"
 #| "This option does the inverse of B<--no-await>. It is currently the "
 #| "default behavior."
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 "Flaggan gör det motsatta mot B<--no-await>. Det är för närvarande "
 "standardbetendet."
@@ -25879,15 +26745,39 @@ msgstr "B<-p>, B<--pidfile> I<pidfil>"
 
 #. type: Plain text
 #: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr "Sök efter processer vars process-id anges i I<pidfil>."
+
+#. type: Plain text
+#: start-stop-daemon.man
+#, fuzzy
+#| msgid ""
+#| "Check whether a process has created the file I<pid-file>. Note: using "
+#| "this matching option alone might cause unintended processes to be acted "
+#| "on, if the old process terminated without being able to remove the I<pid-"
+#| "file>."
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
 msgstr ""
 "Kontrollera om en process har skapat filen I<pidfil>. Observera: om flaggan "
 "används på egen hand kan den orsaka att oönskade processer berörs, om den "
 "gamla processen avslutats utan att kunna ta bort I<pidfil>."
 
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -26198,6 +27088,74 @@ msgstr ""
 
 #. type: TP
 #: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<--no-await>"
+msgid "B<--notify-await>"
+msgstr "B<--no-await>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<-n>I<filename>"
+msgid "B<ERRNO=>I<number>"
+msgstr "B<-n>I<filnamn>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
 #, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr "B<-C>, B<--no-close>"
@@ -27193,6 +28151,13 @@ msgstr ""
 "i automatiskt läge. Denna flagga är endast relevant för B<--config> och B<--"
 "all>."
 
+#. type: Plain text
+#: update-alternatives.man
+#, fuzzy
+#| msgid "Don't generate any comments unless errors occur."
+msgid "Do not generate any comments unless errors occur."
+msgstr "Skriv inte några kommentarer såvida det inte uppstår ett fel."
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -27208,8 +28173,12 @@ msgstr "Visa fler kommentarer om vad B<update-alternatives> gör."
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
-msgstr "Skriv inte några kommentarer såvida det inte uppstår ett fel."
+#, fuzzy
+#| msgid "Generate more comments about what B<update-alternatives> is doing."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr "Visa fler kommentarer om vad B<update-alternatives> gör."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -27558,6 +28527,37 @@ msgstr "B<update-alternatives --auto vi>"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, Filesystem Hierarchy Standard."
 
+#~ msgid "The program B<dpkg> will execute when displaying the conffiles."
+#~ msgstr ""
+#~ "Programmet B<dpkg> kommer att exekveras för att visa konfigurationsfiler."
+
+#~ msgid "B<COLUMNS>"
+#~ msgstr "B<COLUMNS>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~| "text. Currently only used by -l."
+#~ msgid ""
+#~ "Sets the number of columns B<dpkg> should use when displaying formatted "
+#~ "text.  Currently only used by B<--list>."
+#~ msgstr ""
+#~ "Sätter antalet kolumner B<dpkg> skall använda när formaterad text visas. "
+#~ "Används för närvarande enbart av -l."
+
+#~ msgid "Add a diversion for I<file>."
+#~ msgstr "Lägg till en omdirigering för I<fil>."
+
+#~ msgid "Remove a diversion for I<file>."
+#~ msgstr "Ta bort en omdirigering för I<fil>."
+
+#~ msgid ""
+#~ "This setting influences the output of the B<--list> option by changing "
+#~ "the width of its output."
+#~ msgstr ""
+#~ "Inställningen påverkar utdata från kommandot B<--list> genom att ändra "
+#~ "bredden på dess utdata."
+
 #, fuzzy
 #~| msgid ""
 #~| "These fields declare relationships between packages. They are discussed "
@@ -28748,9 +29748,6 @@ msgstr "B<ln>(1), FHS, Filesystem Hierarchy Standard."
 #~ "paket som behandlas). Alla paramerar till paketskriptet måste "
 #~ "vidaresändas till programmet efter \"--\"."
 
-#~ msgid "Check whether a process has created the file I<pid-file>."
-#~ msgstr "Sök efter processer vars process-id anges i I<pidfil>."
-
 #~ msgid ""
 #~ "Check for processes that are instances of this executable (according to "
 #~ "B</proc/>I<pid>B</exe>)."
diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index dc4c240af..5a6d70d34 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.21\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-15 01:06+0200\n"
-"PO-Revision-Date: 2016-12-17 16:42+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"PO-Revision-Date: 2019-02-24 18:25+0100\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
 "Language: zh_CN\n"
@@ -633,7 +633,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<Package:>I< package-name>"
 msgid "B<Binary:> I<binary-package-list> (required)"
@@ -827,6 +827,96 @@ msgstr ""
 
 #. type: TP
 #: deb-buildinfo.man
+#, no-wrap
+msgid "B<Build-Tainted-By:>"
+msgstr ""
+
+#. type: TQ
+#: deb-buildinfo.man
+#, no-wrap
+msgid "I<taint-reason-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"This folded field contains a space-separated list of non-exhaustive reason "
+"tags (formed by alphanumeric and dash characters) which identify why the "
+"current build has been tainted (since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<merged-usr-via-symlinks>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has a merged I</usr> via symlinks.  This will confuse B<dpkg-"
+"query>, B<dpkg-statoverride>, B<dpkg-trigger>, B<update-alternatives> and "
+"any other tool using pathnames as keys into their databases, as it creates "
+"filesystem aliasing problems, and messes with the understanding of the "
+"filesystem that B<dpkg> has recorded in its database.  For build systems "
+"that hardcode pathnames to specific binaries or libraries on the resulting "
+"artifacts, it can also produce packages that will be incompatible with non-/"
+"usr-merged filesystems."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-configs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has configuration files under I</usr/local/etc>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<--path-include=>I<glob-pattern>"
+msgid "B<usr-local-has-includes>"
+msgstr "B<--path-include=>I<glob-pattern>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has header files under I</usr/local/include>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-programs>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid "The system has programs under I</usr/local/bin> or I</usr/local/sbin>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
+#, no-wrap
+msgid "B<usr-local-has-libraries>"
+msgstr ""
+
+#. type: Plain text
+#: deb-buildinfo.man
+msgid ""
+"The system has libraries, either static or shared under I</usr/local/lib>."
+msgstr ""
+
+#. type: TP
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<reinst-required>"
 msgid "B<Installed-Build-Depends:> (required)"
@@ -1150,16 +1240,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1310,10 +1400,18 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Package:>I< package-name>"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Package:>I< package-name>"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1403,7 +1501,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1432,7 +1531,7 @@ msgstr ""
 msgid ""
 "This field denotes that the upload is a binary-only non-maintainer build.  "
 "It originates from the B<binary-only=yes> key/value from the changelog "
-"matadata entry."
+"metadata entry."
 msgstr ""
 
 #. type: TP
@@ -1527,8 +1626,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -1537,7 +1636,7 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "The B<Files> field is inconsistent with the other B<Checksums> fields.  The "
-"B<Change-By> and B<Maintainer> fields have confusing names.  The "
+"B<Changed-By> and B<Maintainer> fields have confusing names.  The "
 "B<Distribution> field contains information about what is commonly referred "
 "to as a suite."
 msgstr ""
@@ -2144,6 +2243,27 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+#| msgid "B<--abort-after=>I<number>"
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<--abort-after=>I<number>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2155,7 +2275,6 @@ msgstr "示例"
 #: deb-control.man
 #, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2179,10 +2298,19 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
 #, fuzzy
 #| msgid "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 
 #. type: TH
@@ -2290,9 +2418,10 @@ msgstr ""
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 
 #. type: Plain text
@@ -2433,6 +2562,26 @@ msgstr ""
 #. type: TP
 #: deb-src-control.man dsc.man
 #, no-wrap
+msgid "B<Testsuite:>I< name-list>"
+msgstr ""
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, no-wrap
+msgid "B<Testsuite-Triggers:>I< package-list>"
+msgstr ""
+
+#. type: Plain text
+#: deb-src-control.man
+msgid ""
+"These fields are described in the B<dsc>(5)  manual page, as they are "
+"generated from information inferred from B<debian/tests/control> or copied "
+"literally to the source control file."
+msgstr ""
+
+#. type: TP
+#: deb-src-control.man dsc.man
+#, no-wrap
 msgid "B<Vcs-Arch:>I< url>"
 msgstr ""
 
@@ -2858,8 +3007,8 @@ msgid ""
 "# this field is copied to the binary and source packages\n"
 "XBS-Upstream-Release-Status: stable\n"
 "Homepage: https://wiki.debian.org/Teams/Dpkg\n"
-"Vcs-Browser: https://anonscm.debian.org/cgit/dpkg/dpkg.git\n"
-"Vcs-Git: https://anonscm.debian.org/git/dpkg/dpkg.git\n"
+"Vcs-Browser: https://git.dpkg.org/cgit/dpkg/dpkg.git\n"
+"Vcs-Git: https://git.dpkg.org/git/dpkg/dpkg.git\n"
 "Standards-Version: 3.7.3\n"
 "Build-Depends: pkg-config, debhelper (E<gt>= 4.1.81),\n"
 " libselinux1-dev (E<gt>= 1.28-4) [!linux-any]\n"
@@ -2931,7 +3080,7 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
 msgstr ""
 
 #. type: Plain text
@@ -2949,6 +3098,14 @@ msgid ""
 "archive."
 msgstr ""
 
+#. type: Plain text
+#: deb-src-files.man
+msgid ""
+"I<keyword=value\\&...\\&> corresponds to an optional whitespace-delimited "
+"list of attributes for this entry.  The only currently supported keyword is "
+"B<automatic> with value B<yes>, to mark automatically generated files."
+msgstr ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -3054,7 +3211,7 @@ msgstr ""
 #: deb-src-rules.man
 msgid ""
 "Build architecture independent files required to build any architecture "
-"independent binary package.  If there are no architecture indepdenent binary "
+"independent binary package.  If there are no architecture independent binary "
 "packages to generate, the target must still exist but do nothing.  This "
 "target must not require root privileges."
 msgstr ""
@@ -3851,10 +4008,11 @@ msgstr ""
 #: deb-substvars.man
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 
 #. type: Plain text
@@ -4736,7 +4894,7 @@ msgstr ""
 #, fuzzy
 #| msgid "The package is unpacked, but not configured."
 msgid "Before the package is replaced due to conflict."
-msgstr "该软件已经解包，但还没有进行配置。"
+msgstr "该软件已经解压，但还没有进行配置。"
 
 #. type: TH
 #: deb-triggers.man
@@ -4798,8 +4956,18 @@ msgstr ""
 msgid ""
 "Specifies that the package is interested in the named trigger. All triggers "
 "in which a package is interested must be listed using this directive in the "
-"triggers control file. The “noawait” variant does not put the triggering "
-"packages in triggers-awaited state. This should be used when the "
+"triggers control file."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants put the triggering package in triggers-awaited state "
+"depending on how the trigger was activated.  The “noawait” variant does not "
+"put the triggering packages in triggers-awaited state, even if the "
+"triggering package declared an “await” activation (either with an B<activate-"
+"await> or B<activate> directive, or by using the B<dpkg-trigger> B<--no-"
+"await> command-line option).  The “noawait” variant should be used when the "
 "functionality provided by the trigger is not crucial."
 msgstr ""
 
@@ -4827,9 +4995,17 @@ msgid ""
 "Arranges that changes to this package's state will activate the specified "
 "trigger. The trigger will be activated at the start of the following "
 "operations: unpack, configure, remove (including for the benefit of a "
-"conflicting package), purge and deconfigure.  The “noawait” variant does not "
-"put the triggering packages in triggers-awaited state. This should be used "
-"when the functionality provided by the trigger is not crucial."
+"conflicting package), purge and deconfigure."
+msgstr ""
+
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"The “await” variants only put the triggering package in triggers-awaited "
+"state if the interest directive is also “await”.  The “noawait” variant "
+"never puts the triggering packages in triggers-awaited state.  The “noawait” "
+"variant should be used when the functionality provided by the trigger is not "
+"crucial."
 msgstr ""
 
 #. type: Plain text
@@ -4874,6 +5050,17 @@ msgid ""
 "to errors if used with an older dpkg."
 msgstr ""
 
+#. type: Plain text
+#: deb-triggers.man
+msgid ""
+"When a package provides an B<interest-noawait> directive, any activation "
+"will set the triggering package into “noawait” mode, regardless of the "
+"awaiting mode requested by the activation (either “await” or “noawait”).  "
+"When a package provides an B<interest> or B<interest-await> directive, any "
+"activation will set the triggering package into “await” or “noawait“ "
+"depending on how it was activated."
+msgstr ""
+
 #.  FIXME: Unhardcode the pathname, and use dpkg instead of dpkg-dev.
 #. type: Plain text
 #: deb-triggers.man
@@ -4920,17 +5107,19 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 #. type: TP
@@ -5021,12 +5210,6 @@ msgid ""
 "used to maintain this package.  See B<deb-src-control>(5) for more details."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, no-wrap
-msgid "B<Testsuite:>I< name-list>"
-msgstr ""
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -5037,19 +5220,14 @@ msgid ""
 "automatically add it, preserving previous values."
 msgstr ""
 
-#. type: TP
-#: dsc.man
-#, no-wrap
-msgid "B<Testsuite-Triggers:>I< package-list>"
-msgstr ""
-
 #. type: Plain text
 #: dsc.man
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -5332,7 +5510,7 @@ msgstr "B<unpacked>"
 #. type: Plain text
 #: dpkg.man
 msgid "The package is unpacked, but not configured."
-msgstr "该软件已经解包，但还没有进行配置。"
+msgstr "该软件已经解压，但还没有进行配置。"
 
 #. type: TP
 #: dpkg.man
@@ -5345,7 +5523,7 @@ msgstr "B<half-configured>"
 msgid ""
 "The package is unpacked and configuration has been started, but not yet "
 "completed for some reason."
-msgstr "该软件已经解包而且配置过程有曾开始，但由于某些原因未完成。"
+msgstr "该软件已经解压而且配置过程有曾开始，但由于某些原因未完成。"
 
 #. type: TP
 #: dpkg.man
@@ -5378,7 +5556,7 @@ msgstr "B<installed>"
 #. type: Plain text
 #: dpkg.man
 msgid "The package is correctly unpacked and configured."
-msgstr "该软件包已被成功解包并配置。"
+msgstr "该软件包已被成功解压并配置。"
 
 #. type: SS
 #: dpkg.man
@@ -5438,6 +5616,20 @@ msgid ""
 "system directories, even configuration files)."
 msgstr "该软件包被选择清除（亦即，想要移除包括配置文件的所有文件）。"
 
+#. type: TP
+#: dpkg.man
+#, no-wrap
+msgid "B<unknown>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"The package selection is unknown.  A package that is also in a B<not-"
+"installed> state, and with an B<ok> flag will be forgotten in the next "
+"database store."
+msgstr ""
+
 #. type: SS
 #: dpkg.man
 #, no-wrap
@@ -5528,7 +5720,7 @@ msgstr "B<3.> 运行 I<preinst> 脚本，如果软件包有提供的话。"
 msgid ""
 "B<4.> Unpack the new files, and at the same time back up the old files, so "
 "that if something goes wrong, they can be restored."
-msgstr "B<4.> 将新文件解包，并备份旧文件，备份档用于在出问题时进行恢复。"
+msgstr "B<4.> 将新文件解压，并备份旧文件，备份档用于在出问题时进行恢复。"
 
 #. type: Plain text
 #: dpkg.man
@@ -5577,8 +5769,8 @@ msgid ""
 "a> or B<--pending> is given instead of I<package>, all unpacked but "
 "unconfigured packages are configured."
 msgstr ""
-"配置一个解包完成但仍未进行过配置的软件包。如果给定 B<-a> 或者 B<--pending> 选"
-"项而不是 I<package>，所有解包但未配置的包均会被配置。"
+"配置一个解压完成但仍未进行过配置的软件包。如果给定 B<-a> 或者 B<--pending> 选"
+"项而不是 I<package>，所有解压但未配置的包均会被配置。"
 
 #. type: Plain text
 #: dpkg.man
@@ -5597,7 +5789,7 @@ msgstr "配置过程包含以下环节："
 msgid ""
 "B<1.> Unpack the conffiles, and at the same time back up the old conffiles, "
 "so that they can be restored if something goes wrong."
-msgstr "B<1.> 解包配置文件，同时备份旧配置文件，以备出错时恢复之需。"
+msgstr "B<1.> 解压配置文件，同时备份旧配置文件，以备出错时恢复之需。"
 
 #. type: Plain text
 #: dpkg.man
@@ -5642,18 +5834,28 @@ msgstr "B<-r>, B<--remove> I<package>B<...|-a|--pending>"
 
 #. type: Plain text
 #: dpkg.man
-msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+#, fuzzy
+#| msgid ""
+#| "Remove an installed package. This removes everything except conffiles, "
+#| "which may avoid having to reconfigure the package if it is reinstalled "
+#| "later (conffiles are configuration files that are listed in the I<DEBIAN/"
+#| "conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
+#| "package name, then all packages unpacked, but marked to be removed in "
+#| "file I<%ADMINDIR%/status>, are removed."
+msgid ""
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 "移除一个已安装的软件包。此操作会移除配置文件之外的所有文件，如果稍后要重新安"
 "装该包，这可以避免重新配置它（conffiles 是在 I<DEBIAN/conffiles> 中列出的配置"
 "文件，亦即上文所指文件）。如果给定 B<-a> 或 B<--pending> 参数而不是软件包名，"
-"那么所有已被解包，但在 I<%ADMINDIR%/status> 中被标记为“待删除”的软件包，将被"
+"那么所有已被解压，但在 I<%ADMINDIR%/status> 中被标记为“待删除”的软件包，将被"
 "删除。"
 
 #. type: Plain text
@@ -5685,15 +5887,22 @@ msgstr "B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Purge an installed or already removed package. This removes everything, "
+#| "including conffiles.  If B<-a> or B<--pending> is given instead of a "
+#| "package name, then all packages unpacked or removed, but marked to be "
+#| "purged in file I<%ADMINDIR%/status>, are purged."
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 "彻底清除已安装或已移除的软件包。这会删除所有有关的文件，包括所有配置文件。如"
 "果给定 B<-a> 或 B<--pending> 选项而不是软件包名，那么在 I<%ADMINDIR%/status> "
-"中所有已解包的、已移除但标记了“待清除”的软件包均会被彻底清除。"
+"中所有已解压的、已移除但标记了“待清除”的软件包均会被彻底清除。"
 
 #. type: Plain text
 #: dpkg.man
@@ -5754,7 +5963,7 @@ msgid ""
 msgstr ""
 "对已安装文件的信息与 B<dpkg> 数据库中的文件元信息进行比较，以检查软件包 "
 "I<package-name> 的完整性，若参数缺省则检查所有包。数据库中的原始的文件元信息"
-"正是二进制包本身。这些元信息是在安装过程的解包环节中收集的。"
+"正是二进制包本身。这些元信息是在安装过程的解压环节中收集的。"
 
 #. type: Plain text
 #: dpkg.man
@@ -5987,6 +6196,13 @@ msgid ""
 "still haven't been installed."
 msgstr "搜索那些已选择安装，但因某种缘故仍未安装完成的软件包。"
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -6313,7 +6529,7 @@ msgid "Display a brief help message."
 msgstr "显示简短的帮助信息。"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<--force-help>"
 msgstr "B<--force-help>"
@@ -6575,14 +6791,14 @@ msgstr ""
 "      2000   数量惊世骇俗的废话\n"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force-help>"
 msgid "B<--force->I<things>"
 msgstr "B<--force-help>"
 
 #. type: TQ
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 #, fuzzy, no-wrap
 #| msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 msgid "B<--no-force->I<things>, B<--refuse->I<things>"
@@ -6611,7 +6827,7 @@ msgstr ""
 "下使用，很可能会破坏您的整个系统。>"
 
 #. type: Plain text
-#: dpkg.man
+#: dpkg.man dpkg-statoverride.man
 msgid "B<all>: Turns on (or off) all force options."
 msgstr "B<all>: 强制选项全开（或全关）。"
 
@@ -6664,13 +6880,21 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+#, fuzzy
+#| msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends>: 将所有依赖问题转为警告。"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<depends-version>: Don't care about versions when checking dependencies."
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends-version>: 检查依赖关系时忽略版本。"
 
 #. type: Plain text
@@ -6679,14 +6903,19 @@ msgstr "B<depends-version>: 检查依赖关系时忽略版本。"
 #| msgid "B<breaks>: Install, even if this would break another package."
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr "B<breaks>: 即使会破坏别的软件包也坚持安装。"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<conflicts>: Install, even if it conflicts with another package. This is "
+#| "dangerous, for it will usually cause overwriting of some files."
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 "B<conflicts>: 即使与别的软件包冲突也坚持安装。不过这很危险，因为很有可能会导"
 "致一些文件被覆盖。"
@@ -6785,6 +7014,28 @@ msgid ""
 msgstr "B<overwrite-diverted>: 将转移后的文件以未转移版本覆盖。"
 
 #. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-add>: Overwrite an existing stat override when adding it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<statoverride-remove>: Ignore a missing stat override when removing it "
+"(since dpkg 1.19.5)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg.man dpkg-statoverride.man
+msgid ""
+"B<security-mac>(*): Use platform-specific Mandatory Access Controls (MAC) "
+"based security when installing files into the filesystem (since dpkg "
+"1.19.5).  On Linux systems the implementation uses SELinux."
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
 msgid ""
 "B<unsafe-io>: Do not perform safe I/O operations when unpacking (since dpkg "
@@ -6815,7 +7066,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"B<script-chrootless>: Run maintainer scrips without B<chroot>(2)ing into "
+"B<script-chrootless>: Run maintainer scripts without B<chroot>(2)ing into "
 "B<instdir> even if the package does not support this mode of operation "
 "(since dpkg 1.18.5)."
 msgstr ""
@@ -6863,9 +7114,14 @@ msgstr "B<--ignore-depends>=I<package>,..."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Ignore dependency-checking for specified packages (actually, checking is "
+#| "performed, but only warnings about conflicts are given, nothing else)."
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "忽略对指定软件包的依赖检查（实际上进行了检查，只是当且仅当发生冲突时才会发出"
 "警告）。"
@@ -6939,9 +7195,9 @@ msgstr "B<--admindir=>I<dir>"
 #| "give information about status of installed or uninstalled packages, etc.  "
 #| "(Defaults to I<%ADMINDIR%>)"
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "变更默认管理目录，这个目录包含着许多已安装和未安装软件包的状态记录文件等。"
 "（默认为 I<%ADMINDIR%>）"
@@ -6961,10 +7217,10 @@ msgstr "B<--instdir=>I<dir>"
 #| "B<chroot>(2) before running package's installation scripts, which means "
 #| "that the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 "变更默认的软件包安装目录。在执行软件包的安装脚本之前，目录 B<instdir> 同样会"
 "传递给 B<chroot>(2)，这意味着那些脚本会视 B<instdir> 为根目录。（默认为 I</"
@@ -6983,8 +7239,9 @@ msgstr "B<--root=>I<dir>"
 #| "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 #| "var/lib/dpkg>."
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
 "对 B<root> 的更改会将 B<instdir> 迁至 I<dir> 并把 B<admindir> 迁至 I<dir>B</"
 "var/lib/dpkg> 。"
@@ -7299,6 +7556,19 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<--version>"
+msgid "B<--no-pager>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -7404,8 +7674,11 @@ msgstr ""
 
 #. type: SH
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
-#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-deb.man dpkg-divert.man
-#: dpkg-gensymbols.man dpkg-query.man dpkg-source.man dpkg-split.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
 #: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man dselect.man
 #: update-alternatives.man
 #, no-wrap
@@ -7413,7 +7686,7 @@ msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -7459,61 +7732,115 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<SHELL>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-query.man
 #, no-wrap
 msgid "B<PAGER>"
 msgstr ""
 
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<DPKG_PAGER>"
+msgstr ""
+
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+msgid ""
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-maintscript-helper.man dpkg-mergechangelogs.man
+#: dpkg-name.man dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
 #, no-wrap
-msgid "B<SHELL>"
+msgid "B<DPKG_COLORS>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.man
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+#: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-deb.man dpkg-divert.man dpkg-genchanges.man dpkg-gencontrol.man
+#: dpkg-gensymbols.man dpkg-mergechangelogs.man dpkg-name.man
+#: dpkg-parsechangelog.man dpkg-query.man dpkg-scanpackages.man
+#: dpkg-scansources.man dpkg-shlibdeps.man dpkg-source.man dpkg-split.man
+#: dpkg-statoverride.man dpkg-trigger.man dpkg-vendor.man
+msgid ""
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 msgstr ""
 
 #. type: TP
-#: dpkg.man dpkg-query.man
+#: dpkg.man dpkg-statoverride.man
 #, no-wrap
-msgid "B<COLUMNS>"
+msgid "B<DPKG_FORCE>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
 msgid ""
-"Sets the number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the force flags (since dpkg 1.19.5).  When this variable is present, no "
+"built-in force defaults will be applied.  If the variable is present but "
+"empty, all force flags will be disabled."
 msgstr ""
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man
 #, no-wrap
-msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man
 msgid ""
-"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
-"B<auto> (default), B<always> and B<never>."
+"Set by a package manager frontend to notify dpkg that it should not acquire "
+"the frontend lock (since dpkg 1.19.1)."
 msgstr ""
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<DPKG_ROOT>"
 msgstr ""
@@ -7546,6 +7873,13 @@ msgid ""
 "is always set to the current B<--admindir> value."
 msgstr ""
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Defined by B<dpkg> on the subprocesses environment to all the currently "
+"enabled force option names separated by commas (since dpkg 1.19.5)."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -8348,7 +8682,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr ""
 
 #. type: IP
@@ -8967,6 +9303,30 @@ msgid ""
 "«%PKGDATADIR%»."
 msgstr ""
 
+#. type: TP
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+#, no-wrap
+msgid "B<DPKG_NLS>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
+#: dpkg-genbuildinfo.man dpkg-checkbuilddeps.man dpkg-distaddfile.man
+#: dpkg-genchanges.man dpkg-gencontrol.man dpkg-gensymbols.man
+#: dpkg-mergechangelogs.man dpkg-name.man dpkg-parsechangelog.man
+#: dpkg-scanpackages.man dpkg-scansources.man dpkg-shlibdeps.man
+#: dpkg-source.man dpkg-vendor.man
+msgid ""
+"If set, it will be used to decide whether to activate Native Language "
+"Support, also known as internationalization (or i18n) support (since dpkg "
+"1.19.0).  The accepted values are: B<0> and B<1> (default)."
+msgstr ""
+
 #. type: Plain text
 #: dpkg-architecture.man
 msgid "All long command and option names available only since dpkg 1.17.17."
@@ -9263,7 +9623,7 @@ msgstr ""
 #: dpkg-buildflags.man
 msgid ""
 "Make directives to set and export all the compilation flags in the "
-"environment. Output can be written to a makefile fragment and evaluated "
+"environment. Output can be written to a Makefile fragment and evaluated "
 "using an B<include> directive."
 msgstr ""
 
@@ -9629,7 +9989,7 @@ msgstr ""
 msgid ""
 "This setting (disabled by default) enables Large File Support on 32-bit "
 "architectures where their ABI does not include LFS by default, by adding B<-"
-"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>"
+"D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64> to B<CPPFLAGS>."
 msgstr ""
 
 #. type: SS
@@ -9906,16 +10266,22 @@ msgstr ""
 #. type: Plain text
 #: dpkg-buildflags.man
 msgid ""
-"This setting (with no default since dpkg 1.18.23, and injected by default by "
-"gcc on the amd64, arm64, armel, armhf, i386, kfreebsd-amd64, kfreebsd-i386, "
-"mips, mipsel, mips64el, ppc64el, s390x, sparc and sparc64 Debian "
-"architectures)  adds the required options via gcc specs files if needed to "
-"enable or disable PIE. When enabled and injected by gcc, adds nothing. When "
-"enabled and not injected by gcc, adds B<-fPIE> to B<CFLAGS>, B<CXXFLAGS>, "
-"B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and B<FCFLAGS>, and B<-"
-"fPIE -pie> to B<LDFLAGS>. When disabled and injected by gcc, adds B<-fno-"
-"PIE> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
-"B<FFLAGS> and B<FCFLAGS>, and B<-fno-PIE -no-pie> to B<LDFLAGS>."
+"This setting (with no global default since dpkg 1.18.23, as it is enabled by "
+"default now by gcc on the amd64, arm64, armel, armhf, hurd-i386, i386, "
+"kfreebsd-amd64, kfreebsd-i386, mips, mipsel, mips64el, powerpc, ppc64, "
+"ppc64el, riscv64, s390x, sparc and sparc64 Debian architectures) adds the "
+"required options to enable or disable PIE via gcc specs files, if needed, "
+"depending on whether gcc injects on that architecture the flags by itself or "
+"not.  When the setting is enabled and gcc injects the flags, it adds "
+"nothing.  When the setting is enabled and gcc does not inject the flags, it "
+"adds B<-fPIE> (via I<%PKGDATADIR%/pie-compiler.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fPIE -pie> (via I<%PKGDATADIR%/pie-link.specs>) to "
+"B<LDFLAGS>.  When the setting is disabled and gcc injects the flags, it adds "
+"B<-fno-PIE> (via I<%PKGDATADIR%/no-pie-compile.specs>) to B<CFLAGS>, "
+"B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, B<FFLAGS> and "
+"B<FCFLAGS>, and B<-fno-PIE -no-pie> (via I<%PKGDATADIR%/no-pie-link.specs>) "
+"to B<LDFLAGS>."
 msgstr ""
 
 #. type: Plain text
@@ -10039,6 +10405,30 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildflags.man
+#, fuzzy, no-wrap
+#| msgid "B<config-files>"
+msgid "B<fixfilepath>"
+msgstr "B<config-files>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"This setting (disabled by default) adds B<-ffile-prefix-map=>I<BUILDPATH>B<=."
+"> to B<CFLAGS>, B<CXXFLAGS>, B<OBJCFLAGS>, B<OBJCXXFLAGS>, B<GCJFLAGS>, "
+"B<FFLAGS> and B<FCFLAGS> where B<BUILDPATH> is set to the top-level "
+"directory of the package being built.  This has the effect of removing the "
+"build path from any generated file."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildflags.man
+msgid ""
+"If both B<fixdebugpath> and B<fixfilepath> are set, this option takes "
+"precedence, because it is a superset of the former."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildflags.man
 #, no-wrap
 msgid "B<fixdebugpath>"
 msgstr ""
@@ -10237,7 +10627,7 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-buildflags.man
-msgid "To pass build flags to a build command in a makefile:"
+msgid "To pass build flags to a build command in a Makefile:"
 msgstr ""
 
 #. type: Plain text
@@ -10599,9 +10989,10 @@ msgstr "dpkg-source"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -10967,6 +11358,19 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<--rules-requires-root>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not honor the B<Rules-Requires-Root> field, falling back to its legacy "
+"default value (since dpkg 1.19.1)."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
 #, fuzzy, no-wrap
 #| msgid "B<-R>, B<--recursive>"
 msgid "B<-nc>, B<--no-pre-clean>"
@@ -10975,9 +11379,10 @@ msgstr "B<-R>, B<--recursive>"
 #. type: Plain text
 #: dpkg-buildpackage.man
 msgid ""
-"Do not clean the source tree (long option since dpkg 1.18.8).  Implies B<-b> "
-"if nothing else has been selected among B<-F>, B<-g>, B<-G>, B<-B>, B<-A> or "
-"B<-S>.  Implies B<-d> with B<-S> (since dpkg 1.18.0)."
+"Do not clean the source tree before building (long option since dpkg "
+"1.18.8).  Implies B<-b> if nothing else has been selected among B<-F>, B<-"
+"g>, B<-G>, B<-B>, B<-A> or B<-S>.  Implies B<-d> with B<-S> (since dpkg "
+"1.18.0)."
 msgstr ""
 
 #. type: TP
@@ -10989,7 +11394,9 @@ msgstr "B<--ignore-depends>=I<package>,..."
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-msgid "Clean the source tree before building (since dpkg 1.18.8)."
+msgid ""
+"Clean the source tree before building (since dpkg 1.18.8).  This is the "
+"default behavior."
 msgstr ""
 
 #. type: TP
@@ -11008,6 +11415,20 @@ msgstr ""
 
 #. type: TP
 #: dpkg-buildpackage.man
+#, fuzzy, no-wrap
+#| msgid "B<-E>, B<--skip-same-version>"
+msgid "B<--no-post-clean>"
+msgstr "B<-E>, B<--skip-same-version>"
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"Do not clean the source tree after the package has been built (since dpkg "
+"1.19.1).  This is the default behavior."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
 #, no-wrap
 msgid "B<-r>, B<--root-command=>I<gain-root-command>"
 msgstr ""
@@ -11519,7 +11940,22 @@ msgstr ""
 #. type: TP
 #: dpkg-buildpackage.man
 #, no-wrap
-msgid "B<DPKG_GAIN_ROOT_CMD>"
+msgid "B<DEB_RULES_REQUIRES_ROOT>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-buildpackage.man
+msgid ""
+"This variable is set to the value obtained from the B<Rules-Requires-Root> "
+"field or from the command-line.  When set, it will be a valid value for the "
+"B<Rules-Requires-Root> field.  It is used to notify B<debian/rules> whether "
+"the B<rootless-builds.txt> specification is supported."
+msgstr ""
+
+#. type: TP
+#: dpkg-buildpackage.man
+#, no-wrap
+msgid "B<DEB_GAIN_ROOT_CMD>"
 msgstr ""
 
 #. type: Plain text
@@ -12349,7 +12785,7 @@ msgid "B<--showformat=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -12605,7 +13041,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Add a diversion for I<file>."
+msgid ""
+"Add a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
 msgstr ""
 
 #. type: TP
@@ -12616,7 +13054,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-divert.man
-msgid "Remove a diversion for I<file>."
+msgid ""
+"Remove a diversion for I<file>.  The file is currently not renamed, see B<--"
+"rename>."
 msgstr ""
 
 #. type: TP
@@ -12664,7 +13104,37 @@ msgstr ""
 #. type: Plain text
 #: dpkg-divert.man
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--instdir=>I<dir>"
+msgid "B<--instdir>I< directory>"
+msgstr "B<--instdir=>I<dir>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--root=>I<dir>"
+msgid "B<--root>I< directory>"
+msgstr "B<--root=>I<dir>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
 msgstr ""
 
 #. type: TP
@@ -12729,7 +13199,27 @@ msgstr ""
 #: dpkg-divert.man
 msgid ""
 "Actually move the file aside (or back). B<dpkg-divert> will abort operation "
-"in case the destination file already exists."
+"in case the destination file already exists.  This is the common behavior "
+"used for diversions of files from the non-B<Essential> package set (see B<--"
+"no-rename> for more details)."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man
+#, fuzzy, no-wrap
+#| msgid "B<--version>"
+msgid "B<--no-rename>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Specifies that the file should not be renamed while adding or removing the "
+"diversion into the database (since dpkg 1.19.1).  This is intended for "
+"diversions of files from the B<Essential> package set, where the temporary "
+"disappearance of the original file is not acceptable, as it can render the "
+"system non-functional.  This is the default behavior, but that will change "
+"in the dpkg 1.20.x cycle."
 msgstr ""
 
 #. type: TP
@@ -12744,10 +13234,17 @@ msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 
 #. type: Plain text
@@ -14038,6 +14535,28 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+#, no-wrap
+msgid "B<-l>I<directory>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-gensymbols.man
+msgid ""
+"Prepend I<directory> to the list of directories to search for private shared "
+"libraries (since dpkg 1.19.1). This option can be used multiple times."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-gensymbols.man dpkg-shlibdeps.man
+msgid ""
+"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
+"environment variable is used to control the run-time linker and abusing it "
+"to set the shared library paths at build-time can be problematic when cross-"
+"compiling for example."
+msgstr ""
+
+#. type: TP
 #: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<-I>I<filename>"
@@ -14638,6 +15157,13 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-maintscript-helper.man
+msgid ""
+"Sets the color mode (since dpkg 1.19.1).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-maintscript-helper.man
 msgid "B<dh_installdeb>(1)."
 msgstr ""
 
@@ -14713,8 +15239,8 @@ msgstr ""
 #: dpkg-mergechangelogs.man
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 
 #. type: SH
@@ -15031,7 +15557,8 @@ msgid ""
 "B<rfc822>.  B<dpkg> is the classic output format (from before this option "
 "existed) and the default. It consists of one paragraph in Debian control "
 "format (see B<deb-control>(5)). If more than one entry is requested, then "
-"most fields are taken from the most recent entry, except otherwise stated:"
+"most fields are taken from the first entry (usually the most recent entry), "
+"except otherwise stated:"
 msgstr ""
 
 #. type: TP
@@ -15147,6 +15674,20 @@ msgid ""
 msgstr ""
 
 #. type: TP
+#: dpkg-parsechangelog.man
+#, fuzzy, no-wrap
+#| msgid "B<--version>"
+msgid "B<--reverse>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: dpkg-parsechangelog.man
+msgid ""
+"Include all changes in reverse order (since dpkg 1.19.1).  Note: for the "
+"B<dpkg> format the first entry will be the most ancient entry."
+msgstr ""
+
+#. type: TP
 #: dpkg-parsechangelog.man update-alternatives.man
 #, no-wrap
 msgid "B<--all>"
@@ -15278,7 +15819,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
 
 #. type: Plain text
@@ -15394,13 +15937,16 @@ msgstr ""
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 
 #. type: Plain text
@@ -15500,17 +16046,20 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-s>, B<--status> I<package-name>..."
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "B<-C>, B<--audit> [I<package-name>...]"
+msgid "B<-s>, B<--status> [I<package-name>...]"
+msgstr "B<-C>, B<--audit> [I<package-name>...]"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
 "Report status of specified package. This just displays the entry in the "
-"installed package status database. When multiple I<package-name> are listed, "
-"the requested status entries are separated by an empty line, with the same "
-"order as specified on the argument list."
+"installed package status database.  If no I<package-name> is specified it "
+"will display all package entries in the status database (since dpkg "
+"1.19.1).  When multiple I<package-name> entries are listed, the requested "
+"status entries are separated by an empty line, with the same order as "
+"specified on the argument list."
 msgstr ""
 
 #. type: TP
@@ -15592,7 +16141,7 @@ msgstr ""
 msgid ""
 "Search for packages that own files corresponding to the given pattern.  "
 "Standard shell wildcard characters can be used in the pattern, where "
-"asterisk (B<*>) and question mark (B<?>) will match a slash, and blackslash "
+"asterisk (B<*>) and question mark (B<?>) will match a slash, and backslash "
 "(B<\\e>) will be used as an escape character."
 msgstr ""
 
@@ -15616,17 +16165,19 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
-#, no-wrap
-msgid "B<-p>, B<--print-avail> I<package-name>..."
-msgstr ""
+#, fuzzy, no-wrap
+#| msgid "B<-C>, B<--audit> [I<package-name>...]"
+msgid "B<-p>, B<--print-avail> [I<package-name>...]"
+msgstr "B<-C>, B<--audit> [I<package-name>...]"
 
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"Display details about I<package-name>, as found in I<%ADMINDIR%/available>. "
-"When multiple I<package-name> are listed, the requested I<available> entries "
-"are separated by an empty line, with the same order as specified on the "
-"argument list."
+"Display details about packages, as found in I<%ADMINDIR%/available>.  If no "
+"I<package-name> is specified, it will display all package entries in the "
+"I<available> database (since dpkg 1.19.1).  When multiple I<package-name> "
+"are listed, the requested I<available> entries are separated by an empty "
+"line, with the same order as specified on the argument list."
 msgstr ""
 
 #. type: Plain text
@@ -15666,6 +16217,14 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr ""
 
@@ -15761,13 +16320,27 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "dpkg-source"
+msgid "B<binary:Synopsis>"
+msgstr "dpkg-source"
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid "B<bad-version>: Process even packages with wrong versions."
+msgid "It contains the package short description (since dpkg 1.19.1)."
+msgstr "B<bad-version>: 容忍错误的软件包版本并继续。"
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<binary:Summary>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
-msgid "It contains the package short description (since dpkg 1.16.2)."
+msgid "This is an alias for B<binary:Synopsis> (since dpkg 1.16.2)."
 msgstr ""
 
 #. type: TP
@@ -15825,6 +16398,35 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<--unpack >I<package-file>..."
+msgid "B<db-fsys:Files>"
+msgstr "B<--unpack >I<package-file>..."
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid "B<bad-version>: Process even packages with wrong versions."
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "B<bad-version>: 容忍错误的软件包版本并继续。"
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<source:Package>"
 msgstr ""
@@ -15884,8 +16486,34 @@ msgstr ""
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"This setting influences the output of the B<--list> option by changing the "
-"width of its output."
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
 msgstr ""
 
 #. type: TH
@@ -16159,8 +16787,8 @@ msgid ""
 "the source override takes precedence for setting the section."
 msgstr ""
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr ""
@@ -16404,12 +17032,6 @@ msgid ""
 "I<executable>.  This option can be used multiple times."
 msgstr ""
 
-#. type: TP
-#: dpkg-shlibdeps.man
-#, no-wrap
-msgid "B<-l>I<directory>"
-msgstr ""
-
 #. type: Plain text
 #: dpkg-shlibdeps.man
 msgid ""
@@ -16417,15 +17039,6 @@ msgid ""
 "libraries (since dpkg 1.17.0). This option can be used multiple times."
 msgstr ""
 
-#. type: Plain text
-#: dpkg-shlibdeps.man
-msgid ""
-"Note: Use this option instead of setting B<LD_LIBRARY_PATH>, as that "
-"environment variable is used to control the run-time linker and abusing it "
-"to set the shared library paths at build-time can be problematic when cross-"
-"compiling for example."
-msgstr ""
-
 #. type: TP
 #: dpkg-shlibdeps.man
 #, no-wrap
@@ -17394,7 +18007,7 @@ msgid ""
 "straightforward source archive (this is equivalent to B<-sn>).  If both are "
 "found then B<dpkg-source> will ignore the directory, overwriting it, if B<-"
 "sA> was specified (this is equivalent to B<-sP>)  or raise an error if B<-"
-"sa> was specified.  B<-sA> is the default."
+"sa> was specified.  B<-sa> is the default."
 msgstr ""
 
 #. type: TP
@@ -17523,11 +18136,11 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 
 #. type: Plain text
@@ -17545,11 +18158,18 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
@@ -17560,6 +18180,15 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
+"Note that B<lintian>(1) will emit unconditional warnings when using vendor "
+"series due to a controversial Debian specific ruling, which should not "
+"affect any external usage; to silence these, the dpkg lintian profile can be "
+"used by passing «B<--profile dpkg>» to B<lintian>(1)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-source.man
+msgid ""
 "The timestamp of all patched files is reset to the extraction time of the "
 "source package (this avoids timestamp skews leading to problems when "
 "autogenerated files are patched)."
@@ -18258,6 +18887,12 @@ msgstr ""
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
@@ -18266,10 +18901,13 @@ msgstr ""
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -18742,10 +19380,57 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
+#, fuzzy
+#| msgid "Give help about the B<--force->I<thing> options."
+msgid "Give help about the B<--force->I<thing> options (since dpkg 1.19.5)."
+msgstr "显示有关 B<--force->I<thing> 选项的帮助。"
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do "
+#| "some things. I<things> is a comma separated list of things specified "
+#| "below. B<--force-help> displays a message describing them.  Things marked "
+#| "with (*) are forced by default."
+msgid ""
+"Force or refuse (B<no-force> and B<refuse> mean the same thing)  to do some "
+"things (since dpkg 1.19.5).  I<things> is a comma separated list of things "
+"specified below.  B<--force-help> displays a message describing them.  "
+"Things marked with (*) are forced by default."
+msgstr ""
+"强制或拒绝做某事（B<no-force> 和 B<refuse> 所指相同）。I<things> 是一个逗号分"
+"隔的事件表，具体事件请参见下文。B<--force-help> 会给出相应的帮助信息。另外，"
+"标记了（*）的事件是默认选择强制的。"
+
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "I<Warning: These options are mostly intended to be used by experts only. "
+#| "Using them without fully understanding their effects may break your whole "
+#| "system.>"
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"I<Warning: These options are mostly intended to be used by experts only.  "
+"Using them without fully understanding their effects may break your whole "
+"system.>"
 msgstr ""
+"I<警告: 这些选项大多数是提供给专家用户使用的。在没有完全理解它们的效果的情况"
+"下使用，很可能会破坏您的整个系统。>"
 
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
@@ -18757,7 +19442,8 @@ msgstr ""
 #: dpkg-statoverride.man
 msgid ""
 "Force an action, even if a sanity check would otherwise prohibit it.  This "
-"is necessary to override an existing override."
+"is necessary to override an existing override.  This option is deprecated "
+"(since dpkg 1.19.5), it is replaced by B<--force-all>."
 msgstr ""
 
 #. type: TP
@@ -18783,6 +19469,13 @@ msgid ""
 "For B<--list>, if there are no overrides or none match the supplied glob."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"If set and none of the B<--force->I<...> options have been specified, it "
+"will be used as the force options to use (since dpkg 1.19.5)."
+msgstr ""
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -18901,8 +19594,9 @@ msgstr ""
 #. type: Plain text
 #: dpkg-trigger.man
 msgid ""
-"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  It is "
-"currently the default behavior."
+"This option does the inverse of B<--no-await> (since dpkg 1.17.21).  If the "
+"interested package has declared a “noawait” directive, then this option will "
+"not be effective.  It is currently the default behavior."
 msgstr ""
 
 #. type: TP
@@ -20074,10 +20768,28 @@ msgstr ""
 
 #. type: Plain text
 #: start-stop-daemon.man
+msgid "Check whether a process has created the file I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Note: using this matching option alone might cause unintended processes to "
+"be acted on, if the old process terminated without being able to remove the "
+"I<pid-file>."
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
 msgid ""
-"Check whether a process has created the file I<pid-file>. Note: using this "
-"matching option alone might cause unintended processes to be acted on, if "
-"the old process terminated without being able to remove the I<pid-file>."
+"B<Warning:> using this match option with a world-writable pidfile or using "
+"it alone with a daemon that writes the pidfile as an unprivileged (non-"
+"root)  user will be refused with an error (since version 1.19.3) as this is "
+"a security risk, because either any user can write to it, or if the daemon "
+"gets compromised, the contents of the pidfile cannot be trusted, and then a "
+"privileged runner (such as an init script executed as root) would end up "
+"acting on any system process.  Using I</dev/null> is exempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
@@ -20311,6 +21023,74 @@ msgstr ""
 
 #. type: TP
 #: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<--version>"
+msgid "B<--notify-await>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<--abort-after=>I<number>"
+msgid "B<ERRNO=>I<number>"
+msgstr "B<--abort-after=>I<number>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
 #, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr ""
@@ -21038,6 +21818,11 @@ msgid ""
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
+#. type: Plain text
+#: update-alternatives.man
+msgid "Do not generate any comments unless errors occur."
+msgstr ""
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -21051,7 +21836,9 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
 msgstr ""
 
 #. type: Plain text
diff --git a/man/start-stop-daemon.man b/man/start-stop-daemon.man
index cb01cff19..1813ea375 100644
--- a/man/start-stop-daemon.man
+++ b/man/start-stop-daemon.man
@@ -5,7 +5,7 @@
 .\" Copyright © 2000-2001 Wichert Akkerman <wakkerma@debian.org>
 .\" Copyright © 2002-2003 Adam Heath <doogie@debian.org>
 .\" Copyright © 2004 Scott James Remnant <keybuk@debian.org>
-.\" Copyright © 2008-2015 Guillem Jover <guillem@debian.org>
+.\" Copyright © 2008-2016, 2018 Guillem Jover <guillem@debian.org>
 .\"
 .\" This is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -21,6 +21,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH start\-stop\-daemon 8 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 start\-stop\-daemon \- start and stop system daemon programs
@@ -115,10 +116,21 @@ Check for a process with the specified parent pid \fIppid\fP
 (since version 1.17.7).
 The \fIppid\fP must be a number greater than 0.
 .TP
-.BR \-p ", " \-\-pidfile " \fIpid-file\fP"
-Check whether a process has created the file \fIpid-file\fP. Note: using this
-matching option alone might cause unintended processes to be acted on, if the
-old process terminated without being able to remove the \fIpid-file\fP.
+.BR \-p ", " \-\-pidfile " \fIpidfile\fP"
+Check whether a process has created the file \fIpidfile\fP.
+.IP
+Note: using this matching option alone might cause unintended processes to
+be acted on, if the old process terminated without being able to remove the
+\fIpidfile\fP.
+.IP
+\fBWarning:\fP using this match option with a world-writable pidfile or using
+it alone with a daemon that writes the pidfile as an unprivileged (non-root)
+user will be refused with an error (since version 1.19.3) as this is a
+security risk, because either any user can write to it, or if the daemon
+gets compromised, the contents of the pidfile cannot be trusted, and then
+a privileged runner (such as an init script executed as root) would end up
+acting on any system process.
+Using \fI/dev/null\fP is exempt from these checks.
 .TP
 .BR \-x ", " \-\-exec " \fIexecutable\fP"
 Check for processes that are instances of this \fIexecutable\fP. The
@@ -233,18 +245,18 @@ group membership for generic users like
 .BR nobody ).
 .TP
 .BR \-r ", " \-\-chroot " \fIroot\fP"
-Chdir and chroot to
+Change directory and chroot to
 .I root
 before starting the process. Please note that the pidfile is also written
 after the chroot.
 .TP
 .BR \-d ", " \-\-chdir " \fIpath\fP"
-Chdir to
+Change directory to
 .I path
 before starting the process. This is done after the chroot if the
 \fB\-r\fP|\fB\-\-chroot\fP option is set. When not specified,
 .B start\-stop\-daemon
-will chdir to the root directory before starting the process.
+will change directory to the root directory before starting the process.
 .TP
 .BR \-b ", " \-\-background
 Typically used with programs that don't detach on their own. This option
@@ -258,6 +270,33 @@ reason. This is a last resort, and is only meant for programs that either
 make no sense forking on their own, or where it's not feasible to add the
 code for them to do this themselves.
 .TP
+.BR \-\-notify\-await
+Wait for the background process to send a readiness notification before
+considering the service started (since version 1.19.3).
+This implements parts of the systemd readiness protocol, as specified
+in the \fBsd_notify\fP(3) man page.
+The following variables are supported:
+.RS
+.TP
+.B READY=1
+The program is ready to give service, so we can exit safely.
+.TP
+.BI EXTEND_TIMEOUT_USEC= number
+The program requests to extend the timeout by \fInumber\fP microseconds.
+This will reset the current timeout to the specified value.
+.TP
+.BI ERRNO= number
+The program is exiting with an error.
+Do the same and print the user-friendly string for the \fBerrno\fP value.
+.RE
+.
+.TP
+.BI \-\-notify\-timeout timeout
+Set a timeout for the \fB\-\-notify\-await\fP option (since version 1.19.3).
+When the timeout is reached, \fBstart\-stop\-daemon\fP will exit with an
+error code, and no readiness notification will be awaited.
+The default is \fB60\fP seconds.
+.TP
 .BR \-C ", " \-\-no\-close
 Do not close any file descriptor when forcing the daemon into the background
 (since version 1.16.5).
diff --git a/man/update-alternatives.man b/man/update-alternatives.man
index 7d81271c9..6535532a1 100644
--- a/man/update-alternatives.man
+++ b/man/update-alternatives.man
@@ -23,6 +23,7 @@
 .\" along with this program.  If not, see <https://www.gnu.org/licenses/>.
 .
 .TH update\-alternatives 1 "%RELEASE_DATE%" "%VERSION%" "dpkg suite"
+.ad l
 .nh
 .SH NAME
 update\-alternatives \- maintain symbolic links determining default commands
@@ -364,11 +365,15 @@ Skip configuration prompt for alternatives which are properly configured
 in automatic mode. This option is only relevant with \fB\-\-config\fR or
 \fB\-\-all\fR.
 .TP
+.B \-\-quiet
+Do not generate any comments unless errors occur.
+.TP
 .B \-\-verbose
 Generate more comments about what is being done.
 .TP
-.B \-\-quiet
-Don't generate any comments unless errors occur.
+.B \-\-debug
+Generate even more comments, helpful for debugging, about what is being done
+(since version 1.19.3).
 .
 .SH EXIT STATUS
 .TP
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1b890c55e..2bc37a9b3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,6 +11,13 @@ lib/dpkg/command.c
 lib/dpkg/compress.c
 lib/dpkg/dbdir.c
 lib/dpkg/dbmodify.c
+lib/dpkg/db-ctrl-access.c
+lib/dpkg/db-ctrl-format.c
+lib/dpkg/db-ctrl-upgrade.c
+lib/dpkg/db-fsys-digest.c
+lib/dpkg/db-fsys-divert.c
+lib/dpkg/db-fsys-files.c
+lib/dpkg/db-fsys-override.c
 lib/dpkg/deb-version.c
 lib/dpkg/debug.c
 lib/dpkg/depcon.c
@@ -21,6 +28,9 @@ lib/dpkg/error.c
 lib/dpkg/fdio.c
 lib/dpkg/fields.c
 lib/dpkg/file.c
+lib/dpkg/fsys-dir.c
+lib/dpkg/fsys-iter.c
+lib/dpkg/fsys-hash.c
 lib/dpkg/glob.c
 lib/dpkg/i18n.c
 lib/dpkg/log.c
@@ -29,13 +39,15 @@ lib/dpkg/namevalue.c
 lib/dpkg/nfmalloc.c
 lib/dpkg/options-parsers.c
 lib/dpkg/options.c
+lib/dpkg/pager.c
 lib/dpkg/parse.c
 lib/dpkg/parsehelp.c
 lib/dpkg/path-remove.c
 lib/dpkg/path.c
 lib/dpkg/pkg-array.c
-lib/dpkg/pkg-db.c
+lib/dpkg/pkg-files.c
 lib/dpkg/pkg-format.c
+lib/dpkg/pkg-hash.c
 lib/dpkg/pkg-list.c
 lib/dpkg/pkg-namevalue.c
 lib/dpkg/pkg-queue.c
@@ -65,26 +77,21 @@ src/cleanup.c
 src/configure.c
 src/depcon.c
 src/divertcmd.c
-src/divertdb.c
 src/enquiry.c
 src/errors.c
 src/file-match.c
-src/filesdb-hash.c
-src/filesdb.c
 src/filters.c
+src/force.c
 src/help.c
-src/infodb-access.c
-src/infodb-format.c
-src/infodb-upgrade.c
 src/main.c
 src/packages.c
+src/perpkgstate.c
 src/querycmd.c
 src/remove.c
 src/script.c
 src/select.c
 src/selinux.c
 src/statcmd.c
-src/statdb.c
 src/trigcmd.c
 src/trigproc.c
 src/unpack.c
diff --git a/po/ast.po b/po/ast.po
index 085b4e842..4bddeebd8 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:47+0200\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
 "com>\n"
@@ -149,7 +149,8 @@ msgstr "desaniciar diversions-old antiguu: %s"
 msgid "error creating new backup file '%s'"
 msgstr "error al criar el tubu `%.255s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "nun se puede desaniciar `%.250s'"
@@ -374,23 +375,39 @@ msgstr "nun puede tornase al entamu de %.250s dempués del rellenu"
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "nun pue abrise un ficheru temporal pa vsnprintf"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr ""
+"nun pueden lleese les propiedaes del descriptor de ficheros pa `%.250s'"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr ""
 "nun puede abrise/criase'l ficheru de bloquéu de la base de datos d'estáu"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr ""
+"nun puede abrise/criase'l ficheru de bloquéu de la base de datos d'estáu"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "nun tien permisu pa bloquiar la base de datos d'estáu de dpkg"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "nun puede bloquiase la base de datos d'estáu de dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -398,11 +415,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "la operación solicitada precisa privilexos de superusuariu"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "nun puede accedese al área d'estáu de dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 "la operación precisa accesu de llectura y escritura al área d'estáu de dpkg"
 
@@ -441,6 +462,215 @@ msgstr "nun pue zarrase l'estau actualizau de `%.250s'"
 msgid "unable to install updated status of '%.250s'"
 msgstr "nun pue instalase l'estau actualizau de `%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "nun puede comprobase la esistencia de `%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "nun puede lleese'l direutoriu `info'"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "fallu intentando abrir %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "nun se puede abrir el ficheru fonte `%.250s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "el conffile `%.250s' nun apaez dientro del paquete"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "error al criar l'enllaz duru `%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "fallu al escribir `%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
+"final erma"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
+"final erma"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
+"final erma"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"el ficheru de llista de ficheros del paquete `%.250s' contién un nome de "
+"ficheru vacíu"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr ""
+"nun puede lleese'l direutoriu del ficheru de configuración `%.250s'\n"
+"(a partir de `%.250s')"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "fallu al abrir el ficheru de desvíos"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "fallu al facer `fstat' del ficheru de desvíos"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "desvíos conflictivos sobre `%.250s' ou `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "error al zarrar el ficheru de llista de ficheros del paquete `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid ""
+#| "files list file for package `%.250s' missing, assuming package has no "
+#| "files currently installed."
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"falta'l ficheru de llista de ficheros del paquete `%.250s', suponse qu'el "
+"paquete nun tien dengún ficheru instaláu actualmente."
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
+"final erma"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"el ficheru de llista de ficheros del paquete `%.250s' contién un nome de "
+"ficheru vacíu"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Lleendo la base de datos ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d ficheros y direutorios instalaos actualmente.)\n"
+msgstr[1] "%d ficheros y direutorios instalaos actualmente.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "estáu inválidu"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "ficheru de `statoverride' `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "ficheru de `statoverride' `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "fallua al abrir el ficheru de  \"statoverride\""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "fallu al facer `fstat' del ficheru de `statoverride'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "ficheru de `statoverride' `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "el ficheru statoverride tien una llinia balera"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "el ficheru `statoverride'  tien una llinia balera"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "fallua al abrir el ficheru de statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "fin de llinia inesperáu en ficheru statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "multiple statusoverides present for file '%.250s'"
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "multiples statoverrides presentes pal ficheru '%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version number"
@@ -587,67 +817,75 @@ msgid "internal error"
 msgstr "error internu - mou inválidu `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "falta %s"
+#, fuzzy
+#| msgid "missing package"
+msgid "is missing a value"
+msgstr "falta'l paquete"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "nun s'almite `%.*s' pa %s"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "basura dempués de %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "nome de paquete inválidu (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "El paquete `%s' nun ta instaláu.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "campu de detalles `%s' de ficheru ermu"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "campu de detalles de ficheru `%s' non permitíu nel ficheru d'estáu"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "abondos valores nel campu de detalles de ficheru `%s'\n"
 "(comparáu con otros)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "insuficiente númberu de valores nel campu de detalles de ficheru `%s'\n"
 "(comparáu con otros)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no en campu booleanu"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "Usóse un campu `Revision' o `Package-Revision' obsoletu"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "el campu `%s', referencia a `%.255s': error na versión: %.255s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "pallabra en campu «prioridá»"
 
 #: lib/dpkg/fields.c
@@ -657,33 +895,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "el valor pal campu `status' nun ta permitíu nesti contestu"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "primer pallabra (necesaria) nel campu `status'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "segunda pallabra (fallu) nel campu `status'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "tercer pallabra d'estáu nel campu `status'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "fallu na cadena `Version' `%.250s': %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "Usóse un campu `Revision' o `Package-Revision' obsoletu"
 
 #: lib/dpkg/fields.c
@@ -695,11 +933,13 @@ msgstr "el valor de `conffiles' tien una llinia mal formateada `%.*s'"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "una llinia del valor de `conffiles' nun entama con espaciu `%c'"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "el direutoriu root o null ta llistau como conffile"
 
 #: lib/dpkg/fields.c
@@ -789,9 +1029,9 @@ msgstr "el campu `%s', referencia a `%.255s': versión nun terminada"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "el campu `%s', referencia a `%.255s': error na versión: %.255s"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "el campu `%s', referencia a `%.255s': la versión contien `%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -799,8 +1039,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "campu `%s', error de sintaxis tres la referencia al paquete `%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "nun s'almiten alternatives (`|') nel campu %s"
 
 #: lib/dpkg/fields.c
@@ -840,6 +1081,30 @@ msgstr "nun pue afitase'l mou del nuevu ficheru conf dist `%.250s'"
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat %s"
+msgstr "nun se puede facer `stat' sobre'l nome antiguu `%s': %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "conffile '%s' nun ye un ficheru planu"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "nun se puede escribir %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open %s"
+msgstr "fallu al abrir ficheru de desvíos: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "nun se puede desbloquear %s: %s"
@@ -862,10 +1127,20 @@ msgid "unable to lock %s"
 msgstr "nun se puede desbloquear %s: %s"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open file %s"
+msgstr "fallu al abrir ficheru de desvíos: %s"
+
+#: lib/dpkg/file.c
 #, fuzzy
-#| msgid "long filenames"
-msgid "showing file on pager"
-msgstr "nomes de ficheros abondo llargos"
+msgid "pager to show file"
+msgstr "nun pue escosase vsnprintf"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "Nun puen esviase direutorios"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -888,13 +1163,13 @@ msgstr "falló al asignar memoria"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "falló al efeutuar `dup' pa std%s"
+msgid "failed to dup for fd %d"
+msgstr "falló al efeutuar `dup' pa `fd' %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "falló al efeutuar `dup' pa `fd' %d"
+msgid "failed to dup for std%s"
+msgstr "falló al efeutuar `dup' pa std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1036,30 +1311,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "valor duplicáu pal campu definíu pol usuariu `%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "falta %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "valor ermu pa %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "valor duplicáu pal campu `%s'"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has '%s' field but is missing architecture"
+msgstr "el paquete tien l'estáu %s pero los disparadores tán n'espera"
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
 #| msgid "package has status %s but triggers are awaited"
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "el paquete tien l'estáu %s pero los disparadores tán n'espera"
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Campu `Configured-Version' pa un paquete con Status non afayaízu"
 
 #: lib/dpkg/parse.c
@@ -1068,10 +1346,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "el paquete tien l'estáu %s pero los disparadores tán n'espera"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"el paquete tien l'estáu «triggers-awaited» pero nun hai dengún disparador "
-"n'espera"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "el paquete tien l'estáu %s pero los disparadores tán n'espera"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1079,13 +1357,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "el paquete tien l'estáu %s pero los disparadores tán pendientes"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"el paquete tien l'estáu «triggers-pending» pero nun hai disparadores "
-"pendientes"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "el paquete tien l'estáu %s pero los disparadores tán pendientes"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "Paquete que nun tando instaláu tien conffiles, escaecémonos d'ellos"
 
 #: lib/dpkg/parse.c
@@ -1103,8 +1383,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1314,11 +1594,6 @@ msgstr "nun puede crease '%.255s'"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1335,6 +1610,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "falta'l nome alternativu"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(ensin descripción disponible)"
@@ -1421,6 +1706,69 @@ msgstr "el soprocesu %s falló con códigu d'estáu d'espera %d"
 msgid "wait for %s subprocess failed"
 msgstr "el `wait' de %s falló"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "caráuter `%c' inválidu nel anchor del campu\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "caráuter `%c' inválidu nel anchor del campu\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "estáu inválidu"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header gid field"
+msgstr "ficheru de `statoverride' `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "caráuter `%c' inválidu nel anchor del campu\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "¡triba de compresión «%s» desconocía!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -1440,15 +1788,16 @@ msgid "treewalk root %s is not a directory"
 msgstr "nun puede lleese'l direutoriu info"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr ""
 "nun puede abrise/criase'l ficheru de bloquéu de los disparadores `%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
 #| msgid "triggered"
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "disparáu"
 
 #: lib/dpkg/trigdeferred.c
@@ -1686,11 +2035,6 @@ msgstr "error al criar el tubu `%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "error al criar el preséu `%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "error al criar l'enllaz duru `%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -2032,10 +2376,10 @@ msgstr "nun se puede acceder al ficheru"
 msgid "archive '%s' is not a regular file"
 msgstr "conffile '%s' nun ye un ficheru planu"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2256,6 +2600,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "En acabando, escribir `exit'.\n"
 
@@ -2660,7 +3008,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2704,6 +3055,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -2839,6 +3196,13 @@ msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 msgstr "inorando petición de desaniciu de %.250s que nun ta instaláu"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
@@ -2886,19 +3250,6 @@ msgstr "el nome de paquete nun puede tener saltos de llinia"
 msgid "divert-to may not contain newlines"
 msgstr "«divert-to» nun puede tener saltos de llinia"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "fallu al abrir el ficheru de desvíos"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "fallu al facer `fstat' del ficheru de desvíos"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "desvíos conflictivos sobre `%.250s' ou `%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3204,142 +3555,165 @@ msgid ""
 msgstr ""
 "El paquete %s ta reteníu, nun va tocase. Use --force-hold pa cambiar esto\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "avisu, saltando'l problema por tar activao --force: "
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
-"final erma"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
 msgstr ""
-"el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
-"final erma"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Configure any package which may help this one"
 msgstr ""
-"el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
-"final erma"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
 msgstr ""
-"el ficheru de llista de ficheros del paquete `%.250s' contién un nome de "
-"ficheru vacíu"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "nun pue abrise'l ficheru de llista de ficheros del paquete `%.250s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to stat files list file for package '%.250s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "nun pue abrise'l ficheru de llista de ficheros del paquete '%.250s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is not a regular file"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
 msgstr ""
-"el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
-"final erma"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
 msgstr ""
-"nun puede lleese'l direutoriu del ficheru de configuración `%.250s'\n"
-"(a partir de `%.250s')"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "error al zarrar el ficheru de llista de ficheros del paquete `%.250s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "nun pue abrise'l ficheru de llista de ficheros del paquete `%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid ""
-#| "files list file for package `%.250s' missing, assuming package has no "
-#| "files currently installed."
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"falta'l ficheru de llista de ficheros del paquete `%.250s', suponse qu'el "
-"paquete nun tien dengún ficheru instaláu actualmente."
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "nun pue abrise'l ficheru de llista de ficheros del paquete '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "files list for package '%.250s' is not a regular file"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
-"el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
-"final erma"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "llista de ficheros del paquete `%.250s'"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "problemes de dependencies - nun se desinstala"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "problemes de dependencies - nun se desinstala"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
-"final erma"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"el ficheru de llista de ficheros del paquete `%.250s' contién un nome de "
-"ficheru vacíu"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "error al zarrar el ficheru de llista de ficheros del paquete `%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Lleendo la base de datos ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "opción «force/refuse» desconocía `%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d ficheros y direutorios instalaos actualmente.)\n"
-msgstr[1] "%d ficheros y direutorios instalaos actualmente.)\n"
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "opción force/refuse obsoleta '%s'\n"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "avisu, saltando'l problema por tar activao --force: "
 
 #: src/help.c
 msgid "not installed"
@@ -3402,42 +3776,6 @@ msgstr ""
 "%d programa(es) esperáu(aos) ensin atopar en PATH.\n"
 "NB: el PATH del root debería contener /usr/local/sbin, /usr/sbin e /sbin."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "nun puede comprobase la esistencia de `%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "nun puede lleese'l direutoriu `info'"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "fallu intentando abrir %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "nun se puede abrir el ficheru fonte `%.250s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "el conffile `%.250s' nun apaez dientro del paquete"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "fallu al escribir `%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3477,27 +3815,27 @@ msgstr "Programa de xestión de paquetes \"%s\" de Debian versión %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3748,114 +4086,6 @@ msgstr ""
 "¡peñérala con `less' o con `more'!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "problemes de dependencies - nun se desinstala"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "problemes de dependencies - nun se desinstala"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3991,34 +4221,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "opción «force/refuse» desconocía `%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "opción force/refuse obsoleta '%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "nun se pudo abrir `%i' pa un fluxu"
 
@@ -4211,6 +4413,12 @@ msgid "Description"
 msgstr "Descripción"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "long filenames"
+msgid "showing package list on pager"
+msgstr "nomes de ficheros abondo llargos"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "esviáu por %s de: %s\n"
@@ -4249,6 +4457,16 @@ msgstr ""
 "El paquete `%s' nun ta instaláu y nun hai denguna información disponible.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Use dpkg --info (= dpkg-deb --info) pa desaminar ficheros,\n"
+"y dpkg --contents (= dpkg-deb --contents) pa llistar el so conteníu.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4275,9 +4493,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "esviáu por %s a: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Use dpkg --info (= dpkg-deb --info) pa desaminar ficheros,\n"
 "y dpkg --contents (= dpkg-deb --contents) pa llistar el so conteníu.\n"
@@ -4325,16 +4546,16 @@ msgstr "Programa de xestión de paquetes \"%s\" de Debian versión %s.\n"
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4547,6 +4768,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "fallu al facer chroot a `%.250s'"
@@ -4700,8 +4927,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4779,71 +5011,11 @@ msgstr "Nun existe una redefinición."
 msgid "--update is useless for --remove"
 msgstr "avisu: --update ye inútil pa --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "estáu inválidu"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "ficheru de `statoverride' `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "ficheru de `statoverride' `%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "fallua al abrir el ficheru de  \"statoverride\""
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "fallu al facer `fstat' del ficheru de `statoverride'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "ficheru de `statoverride' `%.250s'"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "el ficheru statoverride tien una llinia balera"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "el ficheru `statoverride'  tien una llinia balera"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "fallua al abrir el ficheru de statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "syntax error: unknown user '%s' in statoverride file"
-msgid "unknown user '%s' in statoverride file"
-msgstr "error de sintaxis: usuariu desconocíu '%s' en ficheru statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "fin de llinia inesperáu en ficheru statoverride"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "syntax error: unknown group '%s' in statoverride file"
-msgid "unknown group '%s' in statoverride file"
-msgstr "error de ficheru: grupu desconocíu '%s' en ficheru statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "multiple statusoverides present for file '%.250s'"
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "multiples statoverrides presentes pal ficheru '%.250s'"
+#| msgid "obsolete option '--%s', please use '--%s' instead."
+msgid "deprecated --%s option; use --%s instead"
+msgstr "opción obsoleta '--%s', por favor, usa nel so llugar '--%s'"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5105,6 +5277,12 @@ msgstr "Desconfigurando %s, pa poder desaniciar %s ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Desconfigurando %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "el ficheru `statoverride'  tien una llinia balera"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 #| msgid "conffile name '%.50s...' is too long, or missing final newline"
@@ -5253,11 +5431,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "fallu al lleer la salida de tar de dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "sistema de ficheros del archivu-tar dañado - archivu de paquete frañáu"
 
 #: src/unpack.c
@@ -5273,16 +5449,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s necesita esautamente un ficheru de Paquetes como argumentu"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "nun puede accedese al área d'estáu de dpkg pa un anovamientu\n"
 "de `available'"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"l'anovamientu de `available' requier accesu d' escritura al área d'estáu\n"
-"de dpkg"
+"nun puede accedese al área d'estáu de dpkg pa un anovamientu\n"
+"de `available'"
 
 #: src/update.c
 #, c-format
@@ -5670,16 +5852,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "falló al camudar al direutoriu"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "falló al crear direutoriu"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "falló al camudar a un direutoriu dempués de crialu"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "eof inesperáu nel nome del paquete na llinia %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "falló al camudar al direutoriu"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6614,8 +6798,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -7171,9 +7356,106 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~| msgid "obsolete option '--%s', please use '--%s' instead."
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "opción obsoleta '--%s', por favor, usa nel so llugar '--%s'"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "nun pue abrise un ficheru temporal pa vsnprintf"
+
+#, fuzzy
+#~| msgid "syntax error: unknown user '%s' in statoverride file"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "error de sintaxis: usuariu desconocíu '%s' en ficheru statoverride"
+
+#, fuzzy
+#~| msgid "syntax error: unknown group '%s' in statoverride file"
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "error de ficheru: grupu desconocíu '%s' en ficheru statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "falta %s"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "nun s'almite `%.*s' pa %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "basura dempués de %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "nome de paquete inválidu (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no en campu booleanu"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "el campu `%s', referencia a `%.255s': error na versión: %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr "valor ermu pa %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "el paquete tien l'estáu «triggers-awaited» pero nun hai dengún disparador "
+#~ "n'espera"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "el paquete tien l'estáu «triggers-pending» pero nun hai disparadores "
+#~ "pendientes"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "l'anovamientu de `available' requier accesu d' escritura al área d'estáu\n"
+#~ "de dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "fallu al lleer la salida de tar de dpkg-deb"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "nun pue abrise'l ficheru de llista de ficheros del paquete `%.250s'"
+
+#, fuzzy
+#~| msgid "unable to stat files list file for package '%.250s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "nun pue abrise'l ficheru de llista de ficheros del paquete '%.250s'"
+
+#, fuzzy
+#~| msgid "files list file for package '%.250s' is missing final newline"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr ""
+#~ "el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
+#~ "final erma"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "error al zarrar el ficheru de llista de ficheros del paquete `%.250s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "nun pue abrise'l ficheru de llista de ficheros del paquete `%.250s'"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "nun pue abrise'l ficheru de llista de ficheros del paquete '%.250s'"
+
+#, fuzzy
+#~| msgid "files list file for package '%.250s' is missing final newline"
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "el ficheru de llista de ficheros del paquete '%.250s' contién una llinia "
+#~ "final erma"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "llista de ficheros del paquete `%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "falló al camudar a un direutoriu dempués de crialu"
 
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
@@ -7253,9 +7535,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF na entrada estándar nel prompt del ficheru conf"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "eof inesperáu nel nome del paquete na llinia %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "eof inesperáu tres el nome del paquete na llinia %d"
 
@@ -7548,11 +7827,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "ye esclavu de %s"
 
-#, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "nun se puede facer `stat' sobre'l nome antiguu `%s': %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "llecturaenllaz(%s) falló: %s"
 
@@ -7582,11 +7856,6 @@ msgstr ""
 #~ msgstr "nun se puede zarrar %s: %s"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "nun se puede escribir %s: %s"
-
-#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "nun se puede renomar %s a %s: %s"
@@ -7975,9 +8244,6 @@ msgstr ""
 #~ msgid "cannot open diversions: %s"
 #~ msgstr "fallu al abrir ficheru de desvíos: %s"
 
-#~ msgid "missing package"
-#~ msgstr "falta'l paquete"
-
 #~ msgid "rename: rename `%s' to `%s': %s"
 #~ msgstr "rename: renomar `%s' como `%s': %s"
 
diff --git a/po/bs.po b/po/bs.po
index 53752ae3c..095bc9db8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -1,13 +1,13 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# translation of dpkg to Bosnian.
+# Copyright © 2004 Dpkg Developers
+# This file is distributed under the same license as the dpkg package.
+# Safir Šećerović <sapphire@linux.org.ba>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 10:02+0200\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -169,7 +169,8 @@ msgstr ""
 "\n"
 "Konfiguracijska datoteka `%s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr ""
@@ -371,19 +372,40 @@ msgstr ""
 
 #: lib/dpkg/dbmodify.c
 #, c-format
-msgid "unable to open lock file %s for testing"
+msgid "unable to check lock file for dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+msgid "dpkg database lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
@@ -391,11 +413,13 @@ msgid "requested operation requires superuser privilege"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, c-format
+msgid "unable to access the dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, c-format
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
@@ -433,6 +457,212 @@ msgstr ""
 msgid "unable to install updated status of '%.250s'"
 msgstr ""
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "corrupt info database format file '%s'"
+msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "loading files list file for package '%s'"
+msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride mode %s"
+msgstr "broj verzije"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr ""
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -547,60 +777,67 @@ msgid "internal error"
 msgstr "upozorenje"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "is missing a value"
 msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%.50s' is not allowed for %s"
+msgid "has invalid value '%.50s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
+msgid "has trailing junk"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr ""
+#, fuzzy, c-format
+msgid "invalid package name in '%s' field: %s"
+msgstr "broj verzije"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
+#, c-format
+msgid "boolean (yes/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, c-format
+msgid "word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -609,25 +846,28 @@ msgid "value for '%s' field not allowed in this context"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, c-format
+msgid "first (want) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, c-format
+msgid "second (error) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, c-format
+msgid "third (status) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -637,11 +877,12 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, c-format
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -713,7 +954,7 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
+msgid "'%s' field, reference to '%.255s': version '%s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -723,7 +964,7 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -763,6 +1004,31 @@ msgstr ""
 
 #: lib/dpkg/file.c
 #, c-format
+msgid "cannot stat %s"
+msgstr ""
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "%s is not a regular file"
+msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot read %s"
+msgstr ""
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot open %s"
+msgstr ""
+
+#: lib/dpkg/file.c
+#, c-format
 msgid "unable to unlock %s"
 msgstr ""
 
@@ -782,7 +1048,17 @@ msgid "unable to lock %s"
 msgstr ""
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
+#, c-format
+msgid "cannot open file %s"
+msgstr ""
+
+#: lib/dpkg/file.c
+msgid "pager to show file"
+msgstr ""
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot write file %s into the pager"
 msgstr ""
 
 #: lib/dpkg/log.c
@@ -805,12 +1081,12 @@ msgstr ""
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
+msgid "failed to dup for fd %d"
 msgstr ""
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
+msgid "failed to dup for std%s"
 msgstr ""
 
 #: lib/dpkg/mlib.c
@@ -951,26 +1227,27 @@ msgstr ""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "missing %s"
+msgid "missing '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "empty value for %s"
+msgid "empty value for '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr ""
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, c-format
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -979,7 +1256,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -988,11 +1266,13 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
+#, c-format
+msgid "package has status %s but no triggers pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, c-format
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1010,8 +1290,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1196,11 +1476,6 @@ msgstr ""
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 msgid "invalid character '%c' in field width"
@@ -1214,6 +1489,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr ""
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr ""
@@ -1295,6 +1580,63 @@ msgstr ""
 msgid "wait for %s subprocess failed"
 msgstr ""
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header size field"
+msgstr "broj verzije"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header mtime field"
+msgstr "broj verzije"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "broj verzije"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header gid field"
+msgstr "broj verzije"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header checksum field"
+msgstr "broj verzije"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unknown tar header type '%c'"
+msgstr ""
+
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot stat pathname '%s'"
@@ -1311,12 +1653,17 @@ msgid "treewalk root %s is not a directory"
 msgstr ""
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr ""
 
 #: lib/dpkg/trigdeferred.c
@@ -1529,11 +1876,6 @@ msgstr ""
 msgid "error creating device '%.255s'"
 msgstr ""
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr ""
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1819,10 +2161,10 @@ msgstr ""
 msgid "archive '%s' is not a regular file"
 msgstr ""
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2004,6 +2346,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Ukucajte `exit' kada završite.\n"
 
@@ -2338,7 +2684,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2355,6 +2704,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2477,6 +2832,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
@@ -2514,19 +2876,6 @@ msgstr ""
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr ""
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr ""
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr ""
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2773,147 +3122,160 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
 msgstr ""
-"\n"
-"Konfiguracijska datoteka `%s'"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Configure any package which may help this one"
 msgstr ""
-"\n"
-"Konfiguracijska datoteka `%s'"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
 msgstr ""
-"\n"
-"Konfiguracijska datoteka `%s'"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
-msgid "cannot open control file '%s' for package '%s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
 msgstr ""
-"\n"
-"Konfiguracijska datoteka `%s'"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
-msgid "cannot stat control file '%s' for package '%s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
 msgstr ""
-"\n"
-"Konfiguracijska datoteka `%s'"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
-msgid "control file '%s' for package '%s' is not a regular file"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
 msgstr ""
-"\n"
-"Konfiguracijska datoteka `%s'"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
-msgid "cannot read control file '%s' for package '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
 msgstr ""
-"\n"
-"Konfiguracijska datoteka `%s'"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
-msgid "cannot close control file '%s' for package '%s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"\n"
-"Konfiguracijska datoteka `%s'"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
 msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
+
+#: src/force.c
+msgid "Install even if it would break another package"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr ""
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr ""
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "obsolete force/refuse option '%s'"
+msgstr ""
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr ""
 
 #: src/help.c
 msgid "not installed"
@@ -2972,45 +3334,6 @@ msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin"
 msgstr ""
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr ""
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr ""
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr ""
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
-msgid "corrupt info database format file '%s'"
-msgstr ""
-"\n"
-"Konfiguracijska datoteka `%s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr ""
-
 #: src/main.c
 #, fuzzy, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3020,27 +3343,27 @@ msgstr "Debianov `%s' program za rukovanje paketima."
 #, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3161,110 +3484,6 @@ msgid ""
 msgstr ""
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr ""
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr ""
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3388,33 +3607,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr ""
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr ""
 
@@ -3584,6 +3776,10 @@ msgid "Description"
 msgstr "Opis"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr ""
@@ -3618,6 +3814,10 @@ msgid "package '%s' is not installed and no information is available"
 msgstr ""
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr ""
@@ -3644,8 +3844,7 @@ msgstr ""
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 
 #: src/querycmd.c dpkg-deb/info.c
@@ -3693,16 +3892,16 @@ msgstr "Debianov `%s' program za rukovanje paketima."
 #, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -3847,6 +4046,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr ""
@@ -3985,8 +4190,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4050,63 +4260,9 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr ""
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride mode %s"
-msgstr "broj verzije"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr ""
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr ""
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr ""
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr ""
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr ""
-
-#: src/statdb.c
+#: src/statcmd.c
 #, c-format
-msgid "multiple statoverrides present for file '%.250s'"
+msgid "deprecated --%s option; use --%s instead"
 msgstr ""
 
 #: src/trigcmd.c
@@ -4294,6 +4450,16 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr ""
 
+#: src/unpack.c
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "conffile file contains an empty line"
+msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4424,11 +4590,7 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr ""
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 
 #: src/unpack.c
@@ -4442,11 +4604,15 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr ""
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, c-format
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, c-format
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
 
 #: src/update.c
@@ -4780,15 +4946,16 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
+msgid "failed to create directory"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to create directory"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
+msgid "failed to chdir to directory"
 msgstr ""
 
 #: dpkg-deb/extract.c
@@ -5486,8 +5653,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -5966,7 +6134,16 @@ msgstr ""
 #~| msgid ""
 #~| "\n"
 #~| "Configuration file `%s'"
-#~ msgid "control file '%s' missing value"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "\n"
+#~ "Konfiguracijska datoteka `%s'"
+
+#, fuzzy
+#~| msgid ""
+#~| "\n"
+#~| "Configuration file `%s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
 #~ msgstr ""
 #~ "\n"
 #~ "Konfiguracijska datoteka `%s'"
diff --git a/po/ca.po b/po/ca.po
index d2c04d0d1..14400a8db 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,14 +3,14 @@
 # Antoni Bella <bella5@teleline.es>, 2001-2002.
 # Jordi Mallach <jordi@debian.org>, 2002-2006, 2008-2010, 2015.
 # Jordà Polo <jorda@ettin.org>, 2006.
-# Guillem Jover <guillem@debian.org>, 2010, 2012, 2014.
+# Guillem Jover <guillem@debian.org>, 2006, 2009-2010, 2012-2015, 2017, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.18.1\n"
+"Project-Id-Version: dpkg 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2017-04-29 16:21+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
+"PO-Revision-Date: 2019-05-09 05:38+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
 "Language: ca\n"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: lib/dpkg/ar.c
 msgid "failed to fstat archive"
-msgstr "no s'ha pogut fer «fstat» sobre l'arxiu"
+msgstr "no s'ha pogut fer «fstat» a l'arxiu"
 
 #: lib/dpkg/ar.c
 #, c-format
@@ -118,7 +118,7 @@ msgstr "no es pot escriure el fitxer nou «%.250s»"
 #: lib/dpkg/atomic-file.c
 #, c-format
 msgid "unable to flush new file '%.250s'"
-msgstr "no es pot fer «flush» sobre el fitxer nou «%s»"
+msgstr "no es pot fer «flush» al fitxer nou «%s»"
 
 #: lib/dpkg/atomic-file.c
 #, c-format
@@ -142,7 +142,8 @@ msgid "error creating new backup file '%s'"
 msgstr ""
 "s'ha produït un error en crear el nou fitxer de copia de seguretat «%s»"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "no es pot esborrar «%.250s»"
@@ -349,34 +350,54 @@ msgstr "no es pot tornar al principi de %.250s després del farciment"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "no es pot obrir el fitxer de blocatge %s per comprovar"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr ""
+"no es pot comprovar l'estat de blocatge pel directori %s de la base de dades "
+"de dpkg"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr ""
+"no es pot obrir/crear el fitxer de blocatge frontal de dpkg per al directori "
+"%s"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr ""
+"no es pot obrir/crear el fitxer de blocatge de la base de dades de dpkg per "
+"al directori %s"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, c-format
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr ""
-"no es pot obrir/crear el fitxer de blocatge de la base de dades d'estat"
+"no teniu permís per a blocar el directori %s de la base de dades de dpkg "
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
-msgstr "no teniu permís per a blocar la base de dades d'estat del dpkg"
+msgid "dpkg frontend lock"
+msgstr "blocatge frontal de dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
-msgstr "base de dades d'estat del dpkg"
+msgid "dpkg database lock"
+msgstr "blocatge de la base de dades de dpkg"
 
 #: lib/dpkg/dbmodify.c
 msgid "requested operation requires superuser privilege"
 msgstr "la operació sol·licitada requereix privilegis de superusuari"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
-msgstr "no es pot accedir a l'àrea d'estat del dpkg"
+#, c-format
+msgid "unable to access the dpkg database directory %s"
+msgstr "no es pot accedir al directori %s de la base de dades de dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, c-format
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
-"l'operació requereix accés de lectura i escriptura a l'àrea d'estat del dpkg"
+"l'operació requereix accés de lectura i escriptura al directori %s de la "
+"base de dades de dpkg"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
@@ -401,7 +422,7 @@ msgstr "no es pot truncar l'estat actualitzat de «%.250s»"
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to fsync updated status of '%.250s'"
-msgstr "no es pot fer «fsync» sobre l'estat d'actualització de «%.250s»"
+msgstr "no es pot fer «fsync» a l'estat d'actualització de «%.250s»"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
@@ -413,11 +434,204 @@ msgstr "no es pot tancar l'estat d'actualització de «%.250s»"
 msgid "unable to install updated status of '%.250s'"
 msgstr "no es pot instal·lar l'estat actualització de «%.250s»"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "no es pot comprovar l'existència de «%.250s»"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "no es pot llegir el directori «info»"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "s'ha produït un error en intentar obrir %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "el fitxer de format «%s» de la base de dades «info» està corromput"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"el format (%d) de la base de dades «info» és erroni o massa nou; proveu amb "
+"una versió més nova de dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "el fitxer d'informació %s/%s no està associat a cap paquet"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "s'ha produït un error en crear l'enllaç dur «%.255s»"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "s'ha produït un error en escriure «%s»"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"al fitxer de control «%s» del paquet «%.250s» li manca una línia nova final"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "el fitxer de control «%s» del paquet «%.250s» manca un valor"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"el fitxer de control «%s» del paquet «%.250s» manca un separador de valor"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"el fitxer de control «%s» del paquet «%.250s» conté un nom de fitxer buit"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "loading control file '%s' for package '%s'"
+msgstr "no es pot carregar el fitxer de control «%s» del paquet «%s»"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "no s'ha pogut obrir el fitxer de desviacions"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "no s'ha pogut fer «fstat» al fitxer de desviacions"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "hi ha desviacions en conflicte en «%.250s» o «%.250s»"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "loading files list file for package '%s'"
+msgstr "s'esta carregant el fitxer de la llista de fitxers del paquet «%s»"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"manca el fitxer de la llista de fitxers del paquet «%.250s», s'assumirà que "
+"el paquet no té cap fitxer actualment instal·lat"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"al fitxer de la llista de fitxers del paquet «%.250s» li manca una línia "
+"nova final"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"el fitxer de la llista de fitxers del paquet «%.250s» conté un nom de fitxer "
+"buit"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(S'està llegint la base de dades… "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "hi ha %d fitxer o directori instal·lat actualment.)\n"
+msgstr[1] "hi ha %d fitxers i directoris instal·lats actualment.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "l'uid %s de statoverride no és vàlid"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "el gid %s de statoverride no és vàlid"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "el mode %s de statoverride no és vàlid "
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "no s'ha pogut obrir el fitxer de statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "no s'ha pogut fer «fstat» al fitxer de statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "s'ha produït un error en llegir el fitxer de statoverride «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "al fitxer de statoverride li manca una línia nova final"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "el fitxer de statoverride conté una línia buida"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "error de sintaxi al fitxer de statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+"usuari de sistema «%s» desconegut en el fitxer statoverride; l'usuari de "
+"sistema s'ha eliminat abans de la substitució, que és probablement un error "
+"en l'empaquetat, per a recuperar-ho podeu eliminar manualment la substitució "
+"amb %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "s'ha trobat una fi de línia inesperada al fitxer de statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+"grup de sistema «%s» desconegut en el fitxer statoverride; el grup de "
+"sistema s'ha eliminat abans de la substitució, que és probablement un error "
+"en l'empaquetat, per a recuperar-ho podeu eliminar manualment la substitució "
+"amb %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "hi ha múltiples statoverrides per al fitxer «%.250s»"
+
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty major component"
 msgid "format version with too big major component"
-msgstr "número de versió del format amb component principal buit"
+msgstr "número de versió del format amb component principal massa gran"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty major component"
@@ -428,10 +642,8 @@ msgid "format version has no dot"
 msgstr "número de versió del format no conté un punt"
 
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty minor component"
 msgid "format version with too big minor component"
-msgstr "número de versió del format amb component secundari buit"
+msgstr "número de versió del format amb component secundari massa gran"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty minor component"
@@ -450,7 +662,7 @@ msgstr "no es pot obtenir el descriptor de fitxer del directori «%.250s»"
 #: lib/dpkg/dir.c
 #, c-format
 msgid "unable to sync directory '%s'"
-msgstr "no es pot fer «sync» sobre el directori «%s»"
+msgstr "no es pot fer «sync» al directori «%s»"
 
 #: lib/dpkg/dir.c
 #, c-format
@@ -467,7 +679,7 @@ msgstr "no es pot obrir el fitxer «%s»"
 #: dpkg-split/queue.c utils/update-alternatives.c
 #, c-format
 msgid "unable to sync file '%s'"
-msgstr "no es pot fer «sync» sobre el fitxer «%s»"
+msgstr "no es pot fer «sync» al fitxer «%s»"
 
 #: lib/dpkg/dump.c
 #, c-format
@@ -533,64 +745,65 @@ msgid "internal error"
 msgstr "s'ha produït un error intern"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "manca %s"
+msgid "is missing a value"
+msgstr "li manca un valor"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "no s'admet «%.50s» per a %s"
+msgid "has invalid value '%.50s'"
+msgstr "hi ha un valor invàlid «%.50s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "brossa després de %s"
+msgid "has trailing junk"
+msgstr "hi ha brossa al final"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "invalid package name (%.250s)"
-msgstr "el nom del paquet no és vàlid (%.250s)"
+msgid "invalid package name in '%s' field: %s"
+msgstr "el nom de paquet no és vàlid en el camp «%s»: %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
-msgstr "camp de detalls «%s» del fitxer buit"
+msgid "empty archive details '%s' field"
+msgstr "el camp «%s» de detalls de l'arxiu és buit"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "file details field '%s' not allowed in status file"
-msgstr "camp de detalls del fitxer «%s» no permès al fitxer d'estat"
+msgid "archive details '%s' field not allowed in status file"
+msgstr "el camp «%s» de detalls de l'arxiu no es permès al fitxer d'estat"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
-"massa valors en el camp de detalls del fitxer «%s» (comparat amb d'altres)"
+"massa valors en el camp «%s» de detalls de l'arxiu (comparat amb d'altres)"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
-"nom de valors insuficient en el camp dels detalls de fitxer «%s» (comparat "
-"amb d'altres)"
+"valors insuficients en el camp «%s» dels detalls de l'arxiu (comparat amb "
+"d'altres)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "sí/no en un camp booleà"
+#, c-format
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "camp «%s» booleà (yes/no): %s"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
-msgstr "foreign/allowed/same/no en un camp d'estat quàdruple"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
+msgstr "camp «%s» d'estat quàdruple (foreign/allowed/same/no): %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr "«%s» no és un nom valid d'arquitectura: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "«%s» no és un nom valid d'arquitectura en el camp «%s»: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
-msgstr "paraula al camp «Priority»"
+#, c-format
+msgid "word in '%s' field: %s"
+msgstr "paraula al camp «%s»: %s"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -598,26 +811,29 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "el valor pel camp «%s» no està permès en aquest context"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
-msgstr "primera paraula (de requeriment) al camp «Status»"
+#, c-format
+msgid "first (want) word in '%s' field: %s"
+msgstr "primera paraula (de requeriment) al camp «%s»: %s"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
-msgstr "segona paraula (d'error) al camp «Status»"
+#, c-format
+msgid "second (error) word in '%s' field: %s"
+msgstr "segona paraula (d'error) al camp «%s»: %s"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
-msgstr "tercera paraula (d'estat) al camp «Status»"
+#, c-format
+msgid "third (status) word in '%s' field: %s"
+msgstr "tercera paraula (d'estat) al camp «%s»: %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "error in '%s' field string '%.250s'"
-msgstr "error en la cadena «%2$.250s» del camp «%1$s»"
+msgid "'%s' field value '%.250s'"
+msgstr "valor «%2$.250s» del camp «%1$s»"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "obsolete '%s' or '%s' field used"
-msgstr "s'ha utilitzat un camp «%s» o «%s» obsolet"
+msgid "obsolete '%s' field used"
+msgstr "s'ha utilitzat un camp «%s» obsolet"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -626,14 +842,17 @@ msgstr "el valor de «%s» té una línia amb format erroni «%.*s»"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
-"el valor de «%s» conté una línia que comença amb un caràcter «%c» que no és "
-"un espai"
+"el valor del camp «%s» conté una línia que comença amb un caràcter «%c» que "
+"no és un espai"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
-msgstr "s'ha indicat com conffile el directori arrel o un directori nul"
+#, c-format
+msgid "root or empty directory listed as a conffile in '%s' field"
+msgstr ""
+"s'ha indicat com conffile el directori arrel o un directori buit en el camp "
+"«%s»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -720,8 +939,8 @@ msgstr "en el camp «%s», que fa referència a «%.255s»: versió no terminada
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "en el camp «%s», que fa referència a «%.255s»: error en la versió"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "en el camp «%s», que fa referència a «%.255s»: versió «%s»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -731,8 +950,8 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "alternatives ('|') not allowed in %s field"
-msgstr "no s'admeten alternatives («|») en el camp %s"
+msgid "alternatives ('|') not allowed in '%s' field"
+msgstr "no s'admeten alternatives («|») en el camp «%s»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -757,7 +976,7 @@ msgstr "el paquet de l'activador esperat «%.255s» és duplicat"
 #: lib/dpkg/file.c
 #, c-format
 msgid "unable to stat source file '%.250s'"
-msgstr "no es pot fer «stat» sobre el fitxer font «%.250s»"
+msgstr "no es pot fer «stat» al fitxer font «%.250s»"
 
 #: lib/dpkg/file.c
 #, c-format
@@ -771,6 +990,26 @@ msgstr "no es pot establir el mode del fitxer destí «%.250s»"
 
 #: lib/dpkg/file.c
 #, c-format
+msgid "cannot stat %s"
+msgstr "no es pot fer «stat» a «%s»"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "%s is not a regular file"
+msgstr "«%s» no és un fitxer regular"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot read %s"
+msgstr "no es pot llegir «%s»"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot open %s"
+msgstr "no es pot obrir «%s»"
+
+#: lib/dpkg/file.c
+#, c-format
 msgid "unable to unlock %s"
 msgstr "no es pot desblocar %s"
 
@@ -790,8 +1029,18 @@ msgid "unable to lock %s"
 msgstr "no es pot desblocar %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "s'està mostrant el fitxer en el paginador"
+#, c-format
+msgid "cannot open file %s"
+msgstr "no es pot obrir el fitxer «%s»"
+
+#: lib/dpkg/file.c
+msgid "pager to show file"
+msgstr "paginador per mostrar el fitxer"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot write file %s into the pager"
+msgstr "no es pot escriure el fitxer «%s» al paginador"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -813,13 +1062,13 @@ msgstr "no s'ha pogut assignar memòria"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "no s'ha pogut fer «dup» per a std%s"
+msgid "failed to dup for fd %d"
+msgstr "no s'ha pogut fer «dup» per al fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "no s'ha pogut fer «dup» per al fd %d"
+msgid "failed to dup for std%s"
+msgstr "no s'ha pogut fer «dup» per a std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -958,27 +1207,28 @@ msgstr "valor duplicat pel camp definit per l'usuari «%.*s»"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "missing %s"
-msgstr "manca %s"
+msgid "missing '%s' field"
+msgstr "manca el camp «%s»"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "empty value for %s"
-msgstr "valor buit per a %s"
+msgid "empty value for '%s' field"
+msgstr "valor buit en el camp «%s»"
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "el paquet te el camp «%s» però li manca una arquitectura"
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is architecture all"
-msgstr "el paquet té el camp «%s» però és d'arquitectura “all”"
+msgid "package has '%s' field but is architecture '%s'"
+msgstr "el paquet té el camp «%s» però és d'arquitectura “%s”"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
-msgstr "camp «Config-Version» per a un paquet amb Status no apropiat"
+#, c-format
+msgid "'%s' field present for package with inappropriate '%s' field"
+msgstr "el camp «%s» es present per a un paquet amb un camp «%s» no apropiat"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -986,8 +1236,9 @@ msgid "package has status %s but triggers are awaited"
 msgstr "el paquet té l'estat %s però s'esperen activadors"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "el paquet té l'estat triggers-awaited però no s'espera cap activador"
+#, c-format
+msgid "package has status %s but no triggers awaited"
+msgstr "el paquet té l'estat %s però no s'esperen activadors"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -995,13 +1246,14 @@ msgid "package has status %s but triggers are pending"
 msgstr "el paquet té estat %s però els activadors són pendents"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"el paquet té l'estat triggers-pending però no hi ha cap activador pendent"
+#, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "el paquet té estat %s però els activadors no són pendents"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
-msgstr "Paquet que no estant instal·lat té conffiles, ens n'oblidem"
+#, c-format
+msgid "package has status %s and has conffiles, forgetting them"
+msgstr "el paquet té testat %s i té “conffiles”, ens n'oblidem"
 
 #: lib/dpkg/parse.c
 msgid ""
@@ -1023,11 +1275,11 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
-"%s %s (Multi-Arch: %s) no és coinstal·lable amb %s, el qual té múltiples "
-"instàncies instal·lades"
+"el paquet %s (%s) amb camp «%s: %s» no és coinstal·lable amb %s, el qual té "
+"múltiples instàncies instal·lades"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1038,7 +1290,7 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid "can't stat package info file '%.255s'"
-msgstr "no es pot executar «stat» sobre el fitxer «%.255s»"
+msgstr "no es pot executar «stat» al fitxer «%.255s»"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1049,8 +1301,7 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid "can't mmap package info file '%.255s'"
-msgstr ""
-"no es pot executar «mmap» sobre el fitxer d'informació de paquet «%.255s»"
+msgstr "no es pot executar «mmap» al fitxer d'informació de paquet «%.255s»"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1212,11 +1463,6 @@ msgstr "no es pot esborrar «%.255s» de forma segura"
 msgid "rm command for cleanup"
 msgstr "ordre «rm» de neteja"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "amb més d'una instància instal·lada el nom del paquet «%s» és ambigu"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1230,6 +1476,18 @@ msgstr "l'amplada del camp és fora de rang"
 msgid "missing closing brace"
 msgstr "manca la clau de tancament"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+"no es pot obtenir el temps de la última modificació del sistema de fitxers "
+"pel paquet %s"
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "amb més d'una instància instal·lada el nom del paquet «%s» és ambigu"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(no hi ha cap descripció disponible)"
@@ -1285,43 +1543,90 @@ msgid "fork failed"
 msgstr "ha fallat el «fork»"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s returned error exit status %d"
+#, c-format
 msgid "%s subprocess returned error exit status %d"
-msgstr "el subprocés %s retornà el codi d'eixida d'error %d"
+msgstr "el subprocés «%s» retornà el codi d'eixida d'error %d"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was interrupted"
+#, c-format
 msgid "%s subprocess was interrupted"
-msgstr "el subprocés %s ha estat interromput"
+msgstr "el subprocés «%s» ha estat interromput"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was killed by signal (%s)%s"
+#, c-format
 msgid "%s subprocess was killed by signal (%s)%s"
-msgstr "el subprocés %s ha estat finalitzat pel senyal (%s)%s"
+msgstr "el subprocés «%s» ha estat finalitzat pel senyal (%s)%s"
 
 #: lib/dpkg/subproc.c
 msgid ", core dumped"
 msgstr ", s'ha generat un fitxer «core»"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s failed with wait status code %d"
+#, c-format
 msgid "%s subprocess failed with wait status code %d"
-msgstr "el subprocés %s ha fallat amb codi d'estat en espera %d"
+msgstr "el subprocés «%s» ha fallat amb codi d'estat en espera %d"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "wait for subprocess %s failed"
+#, c-format
 msgid "wait for %s subprocess failed"
-msgstr "el «wait» per al subprocés %s ha fallat"
+msgstr "l'espera per al subprocés %s ha fallat"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header size field"
+msgstr "el camp de mida de la capçalera tar no és vàlid"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header mtime field"
+msgstr "el camp «mtime» de la capçalera tar no és vàlid"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header uid field"
+msgstr "el camp «uid» de la capçalera tar no és vàlid"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header gid field"
+msgstr "el camp «gid» de la capçalera tar no és vàlid"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum field"
+msgstr "el camp de suma de verificació de la capçalera tar no és vàlid"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr "la suma de verificació de la capçalera tar no és vàlida"
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr "la capçalera tar s'ha llegit parcialment"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr "la capçalera tar és invàlida amb un nom de camp buit"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr "no s'admet el tipus '%c' de capçalera de tar GNU"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "no s'admet el tipus '%c' de capçalera de tar Solaris"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr "no s'admet el tipus '%c' de capçalera de tar PAX"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unknown tar header type '%c'"
+msgstr "el tipus de capçalera tar «%c» és desconegut"
 
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot stat pathname '%s'"
-msgstr "no es pot fer «stat» sobre el nom de camí «%s»"
+msgstr "no es pot fer «stat» al nom de camí «%s»"
 
 #: lib/dpkg/treewalk.c
 #, c-format
@@ -1335,12 +1640,12 @@ msgstr "l'arrel pel caminador de l'arbre «%s» no és un directori"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
-msgstr "no es pot obrir el fitxer de blocatge d'activadors «%.250s»"
+msgid "unable to open/create triggers lock file '%.250s'"
+msgstr "no es pot obrir/crear el fitxer de blocatge d'activadors «%.250s»"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
-msgstr "àrea d'activadors"
+msgid "triggers database lock"
+msgstr "blocatge de la base de dades d'activadors"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
@@ -1350,7 +1655,7 @@ msgstr "no es pot obrir el fitxer d'activadors ajornats «%.250s»"
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to stat triggers deferred file '%.250s'"
-msgstr "no es pot fer «stat» sobre el fitxer d'activadors ajornats «%.250s»"
+msgstr "no es pot fer «stat» al fitxer d'activadors ajornats «%.250s»"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
@@ -1570,11 +1875,6 @@ msgstr "s'ha produït un error en crear el conducte «%.255s»"
 msgid "error creating device '%.255s'"
 msgstr "s'ha produït un error en crear el dispositiu «%.255s»"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "s'ha produït un error en crear l'enllaç dur «%.255s»"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1624,8 +1924,7 @@ msgstr ""
 #, c-format
 msgid "failed to stat (dereference) existing symlink '%.250s'"
 msgstr ""
-"no s'ha pogut fer «stat» (dereferència) sobre l'enllaç simbòlic existent "
-"«%.250s»"
+"no s'ha pogut fer «stat» (dereferència) a l'enllaç simbòlic existent «%.250s»"
 
 #: src/archives.c
 #, c-format
@@ -1633,8 +1932,8 @@ msgid ""
 "failed to stat (dereference) proposed new symlink target '%.250s' for "
 "symlink '%.250s'"
 msgstr ""
-"no s'ha pogut fer «stat» (dereferència) sobre l'objectiu del nou enllaç "
-"simbòlic proposat «%.250s» per a l'enllaç simbòlic «%.250s»"
+"no s'ha pogut fer «stat» (dereferència) a l'objectiu del nou enllaç simbòlic "
+"proposat «%.250s» per a l'enllaç simbòlic «%.250s»"
 
 #: src/archives.c
 #, c-format
@@ -1660,8 +1959,7 @@ msgstr ""
 #: src/archives.c
 #, c-format
 msgid "unable to stat '%.255s' (which I was about to install)"
-msgstr ""
-"no es pot fer «stat» sobre «%.255s» (que és el que s'anava a instal·lar)"
+msgstr "no es pot fer «stat» a «%.255s» (que és el que s'anava a instal·lar)"
 
 #: src/archives.c
 #, c-format
@@ -1675,8 +1973,8 @@ msgstr ""
 #, c-format
 msgid "unable to stat restored '%.255s' before installing another version"
 msgstr ""
-"no es pot fer «stat» sobre el «%.255s» restablert abans d'instal·lar una "
-"altra versió"
+"no es pot fer «stat» al «%.255s» restablert abans d'instal·lar una altra "
+"versió"
 
 #: src/archives.c
 #, c-format
@@ -1724,7 +2022,7 @@ msgstr ""
 #, c-format
 msgid "unable to chown backup symlink for '%.255s'"
 msgstr ""
-"no es pot fer «chown» sobre l'enllaç simbòlic de la còpia de seguretat de "
+"no es pot fer «chown» a l'enllaç simbòlic de la còpia de seguretat de "
 "«%.255s»"
 
 #: src/archives.c
@@ -1902,10 +2200,10 @@ msgstr "no es pot accedir a l'arxiu «%s»"
 msgid "archive '%s' is not a regular file"
 msgstr "l'arxiu «%s» no és un fitxer regular"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<eixida estàndard>"
 
@@ -2075,8 +2373,8 @@ msgstr "[no hi ha opció per defecte]"
 #: src/configure.c
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
-"error a l'escriure l'eixida d'error, s'ha descobert abans de preguntar sobre "
-"conffiles"
+"error en escriure a l'eixida d'error, s'ha descobert abans de preguntar "
+"sobre conffiles"
 
 #: src/configure.c
 msgid "read error on stdin at conffile prompt"
@@ -2091,6 +2389,10 @@ msgid "conffile difference visualizer"
 msgstr "visualitzador de diferencies de conffile"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr "Variables d'entorn útils:\n"
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Escriviu «exit» quan acabeu.\n"
 
@@ -2101,12 +2403,12 @@ msgstr "intèrpret d'ordres de conffile"
 #: src/configure.c
 #, c-format
 msgid "unable to stat new distributed conffile '%.250s'"
-msgstr "no es pot fer «stat» sobre el conffile de nova distribució «%.250s»"
+msgstr "no es pot fer «stat» al conffile de nova distribució «%.250s»"
 
 #: src/configure.c
 #, c-format
 msgid "unable to stat current installed conffile '%.250s'"
-msgstr "no es pot fer «stat» sobre el conffile «%.250s» actualment instal·lat"
+msgstr "no es pot fer «stat» al conffile «%.250s» actualment instal·lat"
 
 #: src/configure.c
 #, c-format
@@ -2240,7 +2542,7 @@ msgid ""
 "%s: unable to stat config file '%s'\n"
 " (= '%s'): %s"
 msgstr ""
-"%s: no es pot fer «stat» sobre el fitxer de configuració «%s»\n"
+"%s: no es pot fer «stat» al fitxer de configuració «%s»\n"
 " (= «%s»): %s"
 
 #: src/configure.c
@@ -2459,7 +2761,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2472,7 +2777,14 @@ msgstr ""
 "  --local                  desvia totes les versions del paquet.\n"
 "  --divert <desviació>     nom utilitzat per altres versions dels paquets.\n"
 "  --rename                 mou el fitxer a un costat (o el torna enrere)\n"
+"  --no-rename              no mou el fitxer a un costat (o el torna enrere)\n"
+"                             (predeterminat)\n"
 "  --admindir <directori>   estableix el directori amb les desviacions.\n"
+"  --instdir <directori>    estableix el directori arrel, però no el "
+"directori\n"
+"                             administratiu.\n"
+"  --root <directori>       estableix el directori arrel del sistema de "
+"fixters.\n"
 "  --test                   no facis res, només demostra.\n"
 "  --quiet                  opera silenciosament, amb l'eixida mínima.\n"
 "  --help                   mostra aquest missatge d'ajuda\n"
@@ -2494,10 +2806,18 @@ msgstr ""
 "Els guions de preinst/postrm sempre haurien d'especificar --package i --"
 "divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+"especifiqueu --no-rename explícitament, l'opció predeterminada canviar a --"
+"rename a 1.20.x"
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
-msgstr "no es pot fer «stat» sobre el fitxer «%s»"
+msgstr "no es pot fer «stat» al fitxer «%s»"
 
 #: src/divertcmd.c
 #, c-format
@@ -2615,6 +2935,15 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+"la desviació del fitxer '%s' d'un paquet Essencial amb renombrament és "
+"perillós, feu servir --no-rename"
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "No hi ha cap desviació «%s», no s'ha suprimit.\n"
 
@@ -2660,19 +2989,6 @@ msgstr "el paquet no pot contenir línies noves"
 msgid "divert-to may not contain newlines"
 msgstr "la desviació no pot contenir línies noves"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "no s'ha pogut obrir el fitxer de desviacions"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "no s'ha pogut fer «fstat» sobre el fitxer de desviacions"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "hi ha desviacions en conflicte en «%.250s» o «%.250s»"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2968,123 +3284,176 @@ msgstr ""
 "El paquet %s està en mantindre, no es toca. Empreu --force-hold per a forçar-"
 "ho.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "no es tindrà en compte el problema per estar activa una opció --force:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Activa totes les opcions de forçat"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr ""
-"al fitxer de control «%s» del paquet «%.250s» li manca una línia nova final"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr "Empra seguretat basada en MAC si està disponible"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "el fitxer de control «%s» del paquet «%.250s» manca un valor"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Reemplaça un paquet amb una versió menor"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr ""
-"el fitxer de control «%s» del paquet «%.250s» manca un separador de valor"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configura qualsevol paquet que pugui ajudar a aquest"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr ""
-"el fitxer de control «%s» del paquet «%.250s» conté un nom de fitxer buit"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Processa paquets accessori fins i tot si són retinguts"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "no es pot obrir el fitxer de control «%s» del paquet «%s»"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Intenta (des)instal·lar coses fins i tot sense ser root"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "no es pot fer «stat» sobre el fitxer de control «%s» del paquet «%s»"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "Falten programes importants al PATH, poden haver-hi problemes"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "el fitxer «%s» del paquet «%s» no és un fitxer regular"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Instal·la un paquet fins i tot si falla la comprovació"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "no es pot llegir el fitxer de control «%s» del paquet «%s»"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Processa fins i tot els paquets amb versions errònies"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "no es pot tancar el fitxer de control «%s» del paquet «%s»"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr "Sobreescriu un statoverride existent al afegir-lo"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "no es pot obrir el fitxer de la llista de fitxers del paquet «%.250s»"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr "Ignora un statoverride que manga al eliminar-lo"
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Sobreescriu un fitxer d'un paquet amb un altre"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Sobreescriu un fitxer desviat amb una versió no desviada"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Sobreescriu el directori d'un paquet amb el fitxer"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "No realitza operacions d'E/S segures al desempaquetar"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr "No canvia el directori arrel en l'entorn del guió de mantenidor"
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Utilitza sempre els conffiles nous, sense preguntar"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Utilitza sempre els conffiles antics, sense preguntar"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"manca el fitxer de la llista de fitxers del paquet «%.250s», s'assumirà que "
-"el paquet no té cap fitxer actualment instal·lat"
+"Utilitza l'opció predeterminada pels conffiles nous\n"
+"si estan disponibles, sense preguntar. Si no en troba\n"
+"cap de predeterminat preguntarà, a menys que també\n"
+"li doneu alguna de les opcions confold o confnew"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr ""
-"no es pot fer «stat» sobre el fitxer de la llista de fitxers del paquet "
-"«%.250s»"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Instal·la sempre els conffiles que falten"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr ""
-"el fitxer de la llista de fitxers del paquet «%.250s» no és un fitxer regular"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Ofereix reemplaçar els fitxer de configuració per cap versió nova"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr ""
-"s'ha produït un error en llegir el fitxer de la llista de fitxers del paquet "
-"«%.250s»"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Processa fins i tot els paquets amb arquitectura errònia"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Instal·la fins i tot si hagués de trencar un altre paquet"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Permet la instal·lació de paquets en conflicte"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Converteix en avisos tots els problemes de dependències"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Converteix en avisos els problemes de dependència de versió"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Desinstal·la els paquets que precisen instal·lació"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Desinstal·la un paquet essencial"
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"al fitxer de la llista de fitxers del paquet «%.250s» li manca una línia "
-"nova final"
+"Les opcions de forçat de %s - controlen el comportament quan hi ha "
+"problemes:\n"
+"  avisa però continua:      --force-<cosa>,<cosa>,…\n"
+"  atura't amb error:        --refuse-<cosa>,<cosa>,… | --no-force-<cosa>,…\n"
+" Forçat de coses:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"el fitxer de la llista de fitxers del paquet «%.250s» conté un nom de fitxer "
-"buit"
+"\n"
+"AVÍS - forçar l'ús de les opcions marcades amb [!] poden malmetre\n"
+"seriosament la instal·lació. Les opcions de forçat marcades amb [*] estan\n"
+"activades per defecte.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
-"s'ha produït un error en tancar el fitxer de la llista de fitxers del paquet "
-"«%.250s»"
+"\n"
+"Opcions habilitades actualment:\n"
+" %s\n"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(S'està llegint la base de dades… "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "l'opció de forçat/refusat «%.*s» és desconeguda"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "hi ha %d fitxer o directori instal·lat actualment.)\n"
-msgstr[1] "hi ha %d fitxers i directoris instal·lats actualment.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "l'opció de forçat/refusat «%s» és obsoleta"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "no es tindrà en compte el problema per estar activa una opció --force:"
 
 #: src/help.c
 msgid "not installed"
@@ -3149,42 +3518,6 @@ msgstr ""
 "Nota: el PATH del root normalment ha de contenir /usr/local/sbin, /usr/sbin "
 "i /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "no es pot comprovar l'existència de «%.250s»"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "no es pot llegir el directori «info»"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "s'ha produït un error en intentar obrir %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "el fitxer de format «%s» de la base de dades «info» està corromput"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"el format (%d) de la base de dades «info» és erroni o massa nou; proveu amb "
-"una versió més nova de dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "el fitxer d'informació %s/%s no està associat a cap paquet"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "s'ha produït un error en escriure «%s»"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3194,27 +3527,27 @@ msgstr "Programa de gestió de paquets «%s» de Debian versió %s.\n"
 #, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3238,7 +3571,7 @@ msgstr ""
 "  --configure             <paquet>… | -a|--pending\n"
 "  -r|--remove             <paquet>… | -a|--pending\n"
 "  -P|--purge              <paquet>… | -a|--pending\n"
-"  -V|--verify <paquet>…            Verifica la integritat dels paquets.\n"
+"  -V|--verify [<paquet>…]          Verifica la integritat dels paquets.\n"
 "  --get-selections [<patró>…]      Aconsegueix la llista de seleccions en\n"
 "                                     l'eixida estàndard.\n"
 "  --set-selections                 Estableix seleccions de paquets des de\n"
@@ -3254,8 +3587,8 @@ msgstr ""
 "                                     paquets disponibles.\n"
 "  --forget-old-unavail             Oblida la informació sobre paquets no\n"
 "                                     instal·lats i no disponibles.\n"
-"  -s|--status <paquet>…            Mostra detalls sobre l'estat del paquet.\n"
-"  -p|--print-avail <paquet>…       Mostra detalls sobre la versió "
+"  -s|--status [<paquet>…]          Mostra detalls sobre l'estat del paquet.\n"
+"  -p|--print-avail [<paquet>…]     Mostra detalls sobre la versió "
 "disponible.\n"
 "  -L|--listfiles <paquet>…         Llista els fitxers que pertanyen als\n"
 "                                     paquets.\n"
@@ -3409,7 +3742,7 @@ msgstr ""
 "                             No tingues en compte les dependències que\n"
 "                               impliquen a <paquet>.\n"
 "  --force-…                  Descarta problemes (vegeu --force-help).\n"
-"  --no-force-…|--refuse-…    Atura't quan trobes problemes.\n"
+"  --no-force-…|--refuse-…    Aturar-se quan es troben problemes.\n"
 "  --abort-after <n>          Interromp després de trobar <n> errors.\n"
 "\n"
 
@@ -3468,114 +3801,6 @@ msgstr ""
 "a través de «less» o «more»!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Activa totes les opcions de forçat"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Reemplaça un paquet amb una versió menor"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Configura qualsevol paquet que pugui ajudar a aquest"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Processa paquets accessori fins i tot si són retinguts"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Intenta (des)instal·lar coses fins i tot sense ser root"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "Falten programes importants al PATH, poden haver-hi problemes"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Instal·la un paquet fins i tot si falla la comprovació"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Processa fins i tot els paquets amb versions errònies"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Sobreescriu un fitxer d'un paquet amb un altre"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Sobreescriu un fitxer desviat amb una versió no desviada"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Sobreescriu el directori d'un paquet amb el fitxer"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "No realitza operacions d'E/S segures al desempaquetar"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr "No canvia el directori arrel en l'entorn del guió de mantenidor"
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Utilitza sempre els conffiles nous, sense preguntar"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Utilitza sempre els conffiles antics, sense preguntar"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Utilitza l'opció predeterminada pels conffiles nous\n"
-"si estan disponibles, sense preguntar. Si no en troba\n"
-"cap de predeterminat preguntarà, a menys que també\n"
-"li doneu alguna de les opcions confold o confnew"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Instal·la sempre els conffiles que falten"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Ofereix reemplaçar els fitxer de configuració per cap versió nova"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Processa fins i tot els paquets amb arquitectura errònia"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Instal·la fins i tot si hagués de trencar un altre paquet"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Permet la instal·lació de paquets en conflicte"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Converteix en avisos tots els problemes de dependències"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Converteix en avisos els problemes de dependència de versió"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Desinstal·la els paquets que precisen instal·lació"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Desinstal·la un paquet essencial"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Informació de progrés generalment útil"
 
@@ -3708,42 +3933,6 @@ msgstr "no es pot esborrar l'arquitectura «%s» que és en ús a la base de dad
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"Les opcions de forçat de %s - controlen el comportament quan hi ha "
-"problemes:\n"
-"  avisa però continua:      --force-<cosa>,<cosa>,…\n"
-"  atura't amb error:        --refuse-<cosa>,<cosa>,… | --no-force-<cosa>,…\n"
-" Forçat de coses:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"AVÍS - forçar l'ús de les opcions marcades amb [!] poden malmetre\n"
-"seriosament la instal·lació. Les opcions de forçat marcades amb [*] estan\n"
-"activades per defecte.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "l'opció de forçat/refusat «%.*s» és desconeguda"
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "l'opció de forçat/refusat «%s» és obsoleta"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "no s'ha pogut obrir «%i» per a un flux"
 
@@ -3926,6 +4115,10 @@ msgid "Description"
 msgstr "Descripció"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr "s'està mostrant la llista de paquets en el paginador"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "desviat per %s des de: %s\n"
@@ -3960,6 +4153,11 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "el paquet «%s» no està instal·lat i no hi ha informació disponible"
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Empreu dpkg --info (= dpkg-deb --info) per a examinar els fitxers d'arxiu.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "el paquet «%s» no està disponible"
@@ -3986,11 +4184,10 @@ msgstr "desviat per %s cap a: %s\n"
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
-"Empreu dpkg --info (= dpkg-deb --info) per a examinar els fitxers d'arxiu,\n"
-"i dpkg --contents (= dpkg-deb --contents) per a llistar-ne el contingut.\n"
+"Empreu dpkg --contents (= dpkg-deb --contents) per a llistar el contingut "
+"d'arxiu.\n"
 
 #: src/querycmd.c dpkg-deb/info.c
 #, c-format
@@ -4033,26 +4230,26 @@ msgstr ""
 #, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
 "Ordres:\n"
-"  -s|--status <paquet>…          Mostra detalls de l'estat del paquet.\n"
-"  -p|--print-avail <paquet>…     Mostra detalls de la versió disponible.\n"
+"  -s|--status [<paquet>…]        Mostra detalls de l'estat del paquet.\n"
+"  -p|--print-avail [<paquet>…]   Mostra detalls de la versió disponible.\n"
 "  -L|--listfiles <paquet>…       Llista els fitxers que pertanyen als\n"
 "                                   paquets.\n"
 "  -l|--list [<patró>…]           Llista els paquets sense massa detalls.\n"
-"  -W|--show <patró>…             Mostra informació sobre els paquets.\n"
+"  -W|--show [<patró>…]           Mostra informació sobre els paquets.\n"
 "  -S|--search <patró>…           Cerca els paquets als que pertanyen\n"
 "                                   els fitxers.\n"
 "     --control-list <paquet>     Mostra la llista de fitxers de control del\n"
@@ -4238,6 +4435,14 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr "per al bon funcionament de dpkg, l'admindir ha d'estar dins d'instdir"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+"manquen privilegis per a canviar el directori arrel amb --force-not-root, "
+"considereu emprar --force-script-chrootless?"
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "no s'ha pogut fer «chroot» a «%.250s»"
@@ -4258,32 +4463,29 @@ msgstr ""
 "mantenidor"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "installed %s script"
+#, c-format
 msgid "installed %s package %s script"
-msgstr "s'ha instal·lat el script %s"
+msgstr "s'ha instal·lat el script %s del paquet %s"
 
 #: src/script.c
 #, c-format
 msgid "unable to stat %s '%.250s'"
-msgstr "no es pot fer «stat» sobre %s «%.250s»"
+msgstr "no es pot fer «stat» a %s «%.250s»"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "new %s script"
+#, c-format
 msgid "new %s package %s script"
-msgstr "guió «%s» nou"
+msgstr "guió «%s» nou del paquet %s"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "old %s script"
+#, c-format
 msgid "old %s package %s script"
-msgstr "guió de «%s» antic"
+msgstr "guió de «%s» antic del paquet %s"
 
 #: src/script.c
 #, c-format
 msgid "unable to stat %s '%.250s': %s"
-msgstr "no es pot fer «stat» sobre %s «%.250s»: %s"
+msgstr "no es pot fer «stat» a %s «%.250s»: %s"
 
 #: src/script.c
 msgid "trying script from the new package instead ..."
@@ -4404,8 +4606,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4414,10 +4621,18 @@ msgstr ""
 "Opcions:\n"
 "  --admindir <directori>   defineix el directori amb el fitxer "
 "statoverride.\n"
+"  --instdir <directori>    defineix el directori arrel, però no el "
+"d'administració.\n"
+"  --root <directori>       definexx el directori arrel del sistema de "
+"fitxers.\n"
 "  --update                 actualitza els permisos del <camí> de forma\n"
 "                             immediata.\n"
 "  --force                  força una acció fins i tot si fallen les\n"
 "                             comprovacions d'integritat.\n"
+"  --force                  alies obsolete per --force-all.\n"
+"  --force-…                descarta problemes (vegeu --force-help).\n"
+"  --no-force-…             aturar-se quan es troben problemes.\n"
+"  --refuse-…               idem.\n"
 "  --quiet                  opera silenciosament, amb l'eixida mínima.\n"
 "  --help                   mostra aquest missatge d'ajuda.\n"
 "  --version                mostra la versió.\n"
@@ -4471,64 +4686,10 @@ msgstr "no hi ha cap substitució present"
 msgid "--update is useless for --remove"
 msgstr "no té sentit utilitzar --update amb --remove"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "l'uid %s de statoverride no és vàlid"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "el gid %s de statoverride no és vàlid"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "el mode %s de statoverride no és vàlid "
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "no s'ha pogut obrir el fitxer de statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "no s'ha pogut fer «fstat» sobre el fitxer de statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "s'ha produït un error en llegir el fitxer de statoverride «%.250s»"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "al fitxer de statoverride li manca una línia nova final"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "el fitxer de statoverride conté una línia buida"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "error de sintaxi al fitxer de statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "l'usuari «%s» és desconegut al fitxer statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "s'ha trobat una fi de línia inesperada al fitxer de statoverride"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "el grup «%s» és desconegut al fitxer statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "hi ha múltiples statoverrides per al fitxer «%.250s»"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "l'opció «--%s» és obsoleta, empreu «--%s» en el seu lloc"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4749,6 +4910,10 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "S'està desconfigurant %s (%s)…\n"
 
+#: src/unpack.c
+msgid "conffile file contains an empty line"
+msgstr "el fitxer «conffile» conté una línia buida"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4822,8 +4987,7 @@ msgstr ""
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
-"no es pot fer «stat» sobre el fitxer antic «%.250s» així doncs no "
-"s'eliminarà: %s"
+"no es pot fer «stat» al fitxer antic «%.250s» així doncs no s'eliminarà: %s"
 
 #: src/unpack.c
 #, c-format
@@ -4838,7 +5002,7 @@ msgstr "el conffile antic «%.250s» era un directori buit (i s'ha eliminat)"
 #: src/unpack.c
 #, c-format
 msgid "unable to stat other new file '%.250s'"
-msgstr "no es pot fer «stat» sobre el fitxer nou «%.250s»"
+msgstr "no es pot fer «stat» al fitxer nou «%.250s»"
 
 #: src/unpack.c
 #, c-format
@@ -4893,13 +5057,8 @@ msgid "package filesystem archive extraction"
 msgstr "extracció de l'arxiu de sistema de fitxers del paquet"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "s'ha produït un error en llegir l'eixida tar de dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
-msgstr ""
-"sistema de fitxers de l'arxiu tar corromput - arxiu del paquet corromput"
+msgid "corrupted filesystem tarfile in package archive"
+msgstr "sistema de fitxers de l'arxiu tar corromput en l'arxiu de paquet"
 
 #: src/unpack.c
 #, c-format
@@ -4912,16 +5071,20 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s accepta com a molt un fitxer Packages com a argument"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, c-format
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
-"no es pot accedir a l'àrea d'estat de dpkg per a una actualització de "
-"«available»"
+"no es pot accedir al directori «%s» de la base de dades de dpkg per a una "
+"actualització d'«available»"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, c-format
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"l'actualització d'«available» requereix accés d'escriptura a l'àrea d'estat "
-"de dpkg"
+"es requereix accés d'escriptura al directori «%s» de la base de dades de "
+"dpkg per a una actualització d'«available»"
 
 #: src/update.c
 #, c-format
@@ -4969,7 +5132,7 @@ msgstr "element de dades"
 
 #: dpkg-deb/build.c
 msgid "unable to stat control directory"
-msgstr "no es pot fer «stat» sobre el directori de control"
+msgstr "no es pot fer «stat» al directori de control"
 
 #: dpkg-deb/build.c
 msgid "control directory is not a directory"
@@ -5022,7 +5185,7 @@ msgstr "el conffile «%.250s» no està dins del paquet"
 #: dpkg-deb/build.c
 #, c-format
 msgid "conffile '%.250s' is not stattable"
-msgstr "no es pot fer «stat» sobre el conffile «%.250s»"
+msgstr "no es pot fer «stat» al conffile «%.250s»"
 
 #: dpkg-deb/build.c
 #, c-format
@@ -5162,11 +5325,10 @@ msgstr ""
 "erroni"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "file '%.250s' is not a debian binary archive (try dpkg-split?)"
+#, c-format
 msgid "file '%.250s' is not a Debian binary archive (try dpkg-split?)"
 msgstr ""
-"el fitxer «%.250s» no és un arxiu binari de debian (proveu amb el dpkg-"
+"el fitxer «%.250s» no és un arxiu binari de Debian (proveu amb el dpkg-"
 "split?)"
 
 #: dpkg-deb/extract.c
@@ -5211,15 +5373,12 @@ msgid "archive '%.250s' contains two control members, giving up"
 msgstr "l'arxiu «%.250s» conté dos elements de control, s'abandona"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " new debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd bytes.\n"
+#, c-format
 msgid ""
 " new Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
 msgstr ""
-" paquet de debian nou, versió %d.%d.\n"
+" paquet de Debian nou, versió %d.%d.\n"
 " mida %jd octets: arxiu de control=%jd octets.\n"
 
 #: dpkg-deb/extract.c
@@ -5238,15 +5397,12 @@ msgid "cannot skip archive control member from '%s': %s"
 msgstr "no es pot ometre l'element de control de l'arxiu de «%s»: %s"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " old debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd, main archive=%jd.\n"
+#, c-format
 msgid ""
 " old Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgstr ""
-" paquet debian antic, versió %d.%d.\n"
+" paquet Debian antic, versió %d.%d.\n"
 " mida %jd octets: arxiu de control=%jd, arxiu principal=%jd.\n"
 
 #: dpkg-deb/extract.c
@@ -5258,10 +5414,9 @@ msgstr ""
 " al ser descarregat en mode ASCII"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "'%.255s' is not a debian format archive"
+#, c-format
 msgid "'%.255s' is not a Debian format archive"
-msgstr "«%.255s» no és un arxiu amb el format debian"
+msgstr "«%.255s» no és un arxiu amb el format Debian"
 
 #: dpkg-deb/extract.c
 #, c-format
@@ -5279,16 +5434,17 @@ msgid "decompressing archive member"
 msgstr "descomprimint l'element de l'arxiu"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "no s'ha pogut canviar al directori"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "no s'ha pogut crear el directori"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "no s'ha pogut canviar a un directori després de crear-lo"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr "s'ha trobat un nom de camí %s pre-existent inesperat"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "no s'ha pogut canviar al directori"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5365,7 +5521,7 @@ msgstr "no es pot examinar el directori «%.255s»"
 #: dpkg-deb/info.c
 #, c-format
 msgid "cannot stat '%.255s' (in '%.255s')"
-msgstr "no es pot fer «stat» sobre «%.255s» (en «%.255s»)"
+msgstr "no es pot fer «stat» a «%.255s» (en «%.255s»)"
 
 #: dpkg-deb/info.c
 #, c-format
@@ -5446,31 +5602,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  -v, --verbose                    Enable verbose output.\n"
-#| "  -D, --debug                      Enable debugging output.\n"
-#| "      --showformat=<format>        Use alternative format for --show.\n"
-#| "      --deb-format=<format>        Select archive format.\n"
-#| "                                     Allowed values: 0.939000, 2.0 "
-#| "(default).\n"
-#| "      --nocheck                    Suppress control file check (build "
-#| "bad\n"
-#| "                                     packages).\n"
-#| "      --uniform-compression        Use the compression params on all "
-#| "members.\n"
-#| "  -z#                              Set the compression level when "
-#| "building.\n"
-#| "  -Z<type>                         Set the compression type used when "
-#| "building.\n"
-#| "                                     Allowed types: gzip, xz, none.\n"
-#| "  -S<strategy>                     Set the compression strategy when "
-#| "building.\n"
-#| "                                     Allowed values: none; extreme (xz);\n"
-#| "                                     filtered, huffman, rle, fixed "
-#| "(gzip).\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  -v, --verbose                    Enable verbose output.\n"
@@ -5503,7 +5635,9 @@ msgstr ""
 "(predeterminat).\n"
 "      --nocheck              Suprimeix la comprovació del fitxer de control\n"
 "                               (construeix un paquet erroni).\n"
-"      --uniform-compression  Empra els paràmetres de compressió en tots els\n"
+"      --root-owner-group     Força el propietari i el grup a «root».\n"
+"      --[no-]uniform-compression\n"
+"                             Empra els paràmetres de compressió en tots els\n"
 "                               elements.\n"
 "  -z#                        Estableix el nivell de compressió.\n"
 "  -Z<tipus>                  Estableix el tipus de compressió.\n"
@@ -5976,7 +6110,7 @@ msgstr "Queden fitxers de brutícia al directori de dipòsit:\n"
 #: dpkg-split/queue.c
 #, c-format
 msgid "unable to stat '%.250s'"
-msgstr "no es pot fer «stat» sobre «%.250s»"
+msgstr "no es pot fer «stat» a «%.250s»"
 
 #: dpkg-split/queue.c
 #, c-format
@@ -6032,7 +6166,7 @@ msgstr "no es pot obrir el fitxer font «%.250s»"
 
 #: dpkg-split/split.c
 msgid "unable to fstat source file"
-msgstr "no es pot fer «fstat» sobre el fitxer font"
+msgstr "no es pot fer «fstat» al fitxer font"
 
 #: dpkg-split/split.c
 #, c-format
@@ -6144,8 +6278,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6159,8 +6294,8 @@ msgstr ""
 "                             configurades al mode automàtic (només "
 "rellevant\n"
 "                             per a --config).\n"
-"  --verbose                opera detalladament, amb més eixida.\n"
 "  --quiet                  opera silenciosament, amb la eixida mínima.\n"
+"  --verbose                opera detalladament, amb més eixida.\n"
 "  --help                   mostra aquest missatge d'ajuda.\n"
 "  --version                mostra la versió.\n"
 
@@ -6307,7 +6442,7 @@ msgstr "s'està descartant l'enllaç esclau obsolet %s (%s)"
 #: utils/update-alternatives.c
 #, c-format
 msgid "unable to flush file '%s'"
-msgstr "no es pot fer «flush» sobre el fitxer «%s»"
+msgstr "no es pot fer «flush» al fitxer «%s»"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6656,11 +6791,86 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Es requereix autenticació per a executar update-alternatives"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "l'opció «--%s» és obsoleta, empreu  «--%s» en el seu lloc"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "no es pot obrir el fitxer de blocatge %s per comprovar"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "l'usuari «%s» és desconegut al fitxer statoverride"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "el grup «%s» és desconegut al fitxer statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "manca %s"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "no s'admet «%.50s» per a %s"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "al fitxer de control «%s» li manca un valor"
+#~ msgid "junk after %s"
+#~ msgstr "brossa després de %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "el nom del paquet no és vàlid (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "sí/no en un camp booleà"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "en el camp «%s», que fa referència a «%.255s»: error en la versió"
+
+#~ msgid "empty value for %s"
+#~ msgstr "valor buit per a %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "el paquet té l'estat triggers-awaited però no s'espera cap activador"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "el paquet té l'estat triggers-pending però no hi ha cap activador pendent"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "l'actualització d'«available» requereix accés d'escriptura a l'àrea "
+#~ "d'estat de dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "s'ha produït un error en llegir l'eixida tar de dpkg-deb"
+
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "no es pot obrir el fitxer de control «%s» del paquet «%s»"
+
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "no es pot fer «stat» sobre el fitxer de control «%s» del paquet «%s»"
+
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "el fitxer «%s» del paquet «%s» no és un fitxer regular"
+
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "no es pot tancar el fitxer de control «%s» del paquet «%s»"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr ""
+#~ "no es pot obrir el fitxer de la llista de fitxers del paquet «%.250s»"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "no es pot fer «stat» sobre el fitxer de la llista de fitxers del paquet "
+#~ "«%.250s»"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "el fitxer de la llista de fitxers del paquet «%.250s» no és un fitxer "
+#~ "regular"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr ""
+#~ "s'ha produït un error en llegir el fitxer de la llista de fitxers del "
+#~ "paquet «%.250s»"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "no s'ha pogut canviar a un directori després de crear-lo"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "al fitxer de control «%s» li manca un separador de valor"
@@ -6725,9 +6935,6 @@ msgstr "Es requereix autenticació per a executar update-alternatives"
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF en l'entrada estàndard al preguntar sobre conffiles"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "s'ha trobat un EOF inesperat en el nom del paquet en la línia %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr ""
 #~ "s'ha trobat un EOF inesperat després del nom del paquet en la línia %d"
diff --git a/po/cs.po b/po/cs.po
index 6ac1c8315..312e9a7fe 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2017-05-06 12:49+0200\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -138,7 +138,8 @@ msgstr "chyba při odstranění starého záložního souboru „%s“"
 msgid "error creating new backup file '%s'"
 msgstr "chyba při vytváření nového záložního souboru „%s“"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "nelze odstranit „%.250s“"
@@ -342,20 +343,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "nelze se přesunout na začátek %.250s"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "nelze otevřít zámkový soubor %s pro test"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "nelze získat popisovač souboru pro adresář „%s“"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "zámek stavové databáze nelze otevřít nebo vytvořit"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "zámek stavové databáze nelze otevřít nebo vytvořit"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "nemáte právo k uzamčení stavové databáze dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "stavová databáze dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -363,11 +381,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "požadovaná operace vyžaduje správcovská oprávnění"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "ke stavové oblasti dpkg nelze přistoupit"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operace požaduje zápisová práva do stavové oblasti dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -405,6 +427,189 @@ msgstr "nelze uzavřít změněný stav balíku „%.250s“"
 msgid "unable to install updated status of '%.250s'"
 msgstr "nelze nainstalovat změněný stav balíku „%.250s“"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "nelze zkontrolovat existenci „%.250s“"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "nelze přečíst adresář info"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "chyba při pokusu o otevření %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "porušený info soubor „%s“ obsahující verzi formátu"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"verze formátu info databáze (%d) je falešná nebo příliš nová; zkuste novější "
+"dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "info soubor %s/%s není přiřazen žádnému balíku"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "chyba při vytváření pevného odkazu „%.255s“"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "chyba při zápisu „%s“"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "řídící soubor „%s“ balíku „%s“ neobsahuje závěrečný nový řádek"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "řídící soubor „%s“ balíku „%s“ neobsahuje hodnotu"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "řídící soubor „%s“ balíku „%s“ neobsahuje oddělovač hodnoty"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "řídící soubor „%s“ balíku „%s“ obsahuje prázdné jméno souboru"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read control file '%s' for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "nelze číst řídící soubor „%s“ balíku „%s“"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "nelze otevřít soubor s odsuny"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "nelze volat fstat na soubor s odsuny"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "odsuny „%.250s“ a „%.250s“ v konfliktu"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "chyba při zavírání seznamu souborů pro balík „%.250s“"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"seznam souborů balíku „%.250s“ chybí, předpokládám, že program nemá "
+"nainstalované žádné soubory."
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "seznam souborů balíku „%.250s“ neobsahuje závěrečný nový řádek"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "seznam souborů balíku „%.250s“ obsahuje prázdné jméno souboru"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Načítá se databáze … "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "nyní je nainstalován %d soubor nebo adresář.)\n"
+msgstr[1] "nyní jsou nainstalovány %d soubory a adresáře.)\n"
+msgstr[2] "nyní je nainstalováno %d souborů a adresářů.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "neplatné uid %s ve statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "neplatné gid %s ve statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "neplatný režim %s ve statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "nelze otevřít soubor statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "nelze získat fstat souboru statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "načítá se statoverride soubor „%.250s“"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "soubor statoverride neobsahuje závěrečný nový řádek"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "soubor statoverride obsahuje prázdný řádek"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "syntaktická chyba v souboru statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "neočekávaný konec řádku v souboru statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "pro soubor „%.250s“ existuje více statoverride"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -520,60 +725,73 @@ msgid "internal error"
 msgstr "vnitřní chyba"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s chybí"
+#, fuzzy
+#| msgid "missing package"
+msgid "is missing a value"
+msgstr "chybí balík"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "„%.50s“ není v %s povoleno"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Přeskočení neplatného řádku: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "nesmyslná data za %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "chybné jméno balíku (%.250s)"
+#, fuzzy, c-format
+#| msgid "package name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "jméno balíku „%s“ není platné: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "prázdné pole podrobností o souboru „%s“"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "pole podrobností o souboru „%s“ není ve stavovém souboru dovoleno"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "příliš mnoho hodnot v položce „%s“ (vzhledem k ostatním)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "příliš málo hodnot v položce „%s“ (vzhledem k ostatním)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no v dvouhodnotovém poli"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "použito zastaralé pole „%s“ nebo „%s“"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "foreign/allowed/same/no ve čtyřstavovém poli"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "„%s“ není platné jméno architektury: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "slovo v poli „Priority“"
 
 #: lib/dpkg/fields.c
@@ -582,25 +800,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "hodnota pole „%s“ není v tomto místě přípustná"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "první slovo (want) v poli „Status“"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "druhé slovo (error) v poli „Status“"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "třetí slovo (status) v poli „Status“"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "chyba v poli „%s“ v řetězci „%.250s“"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "použito zastaralé pole „%s“ nebo „%s“"
 
 #: lib/dpkg/fields.c
@@ -609,12 +835,15 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "hodnota pole „%s“ obsahuje zkomolený řádek „%.*s“"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "hodnota „%s“ obsahuje řádek nezačínající mezerou „%c“"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "kořenový nebo prázdný adresář uveden jako conffile"
 
 #: lib/dpkg/fields.c
@@ -694,9 +923,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "položka „%s“, odkaz na „%.255s“: neurčitelná verze"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "položka „%s“, odkaz na „%.255s“: chyba ve verzi"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "položka „%s“, odkaz na „%.255s“: verze obsahuje „%c“"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -704,8 +934,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "položka „%s“, syntaktická chyba po referenci na balík „%.255s“"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternativy („|“) nejsou v položce %s povoleny"
 
 #: lib/dpkg/fields.c
@@ -744,6 +975,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "nelze nastavit mód cílového souboru „%.250s“"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "nelze volat stat na %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "archive '%s' is not a regular file"
+msgid "%s is not a regular file"
+msgstr "archiv „%s“ není obyčejný soubor"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "nelze zapsat %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "nelze připojit k „%s“"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "nelze odemknout %s"
@@ -764,8 +1019,22 @@ msgid "unable to lock %s"
 msgstr "nelze zamknout %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "soubor se zobrazuje ve stránkovači"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "nelze připojit k „%s“"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "nelze vyprázdnit soubor „%s“"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "nelze odklonit soubor „%s“ sám na sebe"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -787,13 +1056,13 @@ msgstr "selhala alokace paměti"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "dup selhal pro std%s"
+msgid "failed to dup for fd %d"
+msgstr "dup selhal pro fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "dup selhal pro fd %d"
+msgid "failed to dup for std%s"
+msgstr "dup selhal pro std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -930,27 +1199,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "zdvojená hodnota uživatelem definované položky „%.*s“"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "chybí %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "položka „%s“ je prázdná"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "zdvojená hodnota položky „%s“"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "balík má položku „%s“, ale postrádá architekturu"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "balík má položku „%s“, ale architektura je all"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Config-Version pro balík s neodpovídajícím Stavem"
 
 #: lib/dpkg/parse.c
@@ -959,9 +1234,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "balík je ve stavu %s, ale očekávají se spouštěče"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"balík je ve stavu „čekání na spouštěče“, ale žádné spouštěče nejsou očekávány"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "balík je ve stavu %s, ale očekávají se spouštěče"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -969,12 +1245,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "balík je ve stavu %s, ale spouštěče zatím nejsou vyřízené"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"balík je ve stavu „nevyřízené spouštěče“, ale všechny spouštěče jsou vyřízeny"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "balík je ve stavu %s, ale spouštěče zatím nejsou vyřízené"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Balík je ve stavu nenainstalovaný a má konfigurační soubory, vypouštím je"
 
@@ -995,10 +1274,13 @@ msgstr ""
 "být nainstalovány současně; pravděpodobně kvůli přechodu z neoficiálního dpkg"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Multi-Arch: %s) se nedá nainstalovat spolu s %s, který má vícero "
 "nainstalovaných instancí"
@@ -1176,11 +1458,6 @@ msgstr "nelze bezpečně odstranit „%.255s“"
 msgid "rm command for cleanup"
 msgstr "příkaz rm pro úklid"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "víceznačné jméno balíku „%s“ s vícero instalovanými instancemi"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1194,6 +1471,16 @@ msgstr "šířka položky je mimo rozsah"
 msgid "missing closing brace"
 msgstr "chybí uzavírací závorka"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "víceznačné jméno balíku „%s“ s vícero instalovanými instancemi"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(popis není k dispozici)"
@@ -1280,6 +1567,70 @@ msgstr "podproces %s vrátil čekací chybový status %d"
 msgid "wait for %s subprocess failed"
 msgstr "čekání na podproces %s selhalo"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "šířka položky obsahuje neplatný znak „%c“"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "šířka položky obsahuje neplatný znak „%c“"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "neplatné uid %s ve statoverride"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "neplatné gid %s ve statoverride"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "šířka položky obsahuje neplatný znak „%c“"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "nepodporované volby v hlavičce souboru"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "neznámý typ komprese „%s“!"
+
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot stat pathname '%s'"
@@ -1296,12 +1647,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "vrcholový adresář %s není adresářem"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "nelze otevřít/vytvořit zámek pro spouštěče (%.250s)"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "oblast spouštěčů"
 
 #: lib/dpkg/trigdeferred.c
@@ -1522,11 +1876,6 @@ msgstr "chyba při vytváření roury „%.255s“"
 msgid "error creating device '%.255s'"
 msgstr "chyba při vytváření spec. souboru „%.255s“"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "chyba při vytváření pevného odkazu „%.255s“"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1832,10 +2181,10 @@ msgstr "nelze přistoupit k archivu „%s“"
 msgid "archive '%s' is not a regular file"
 msgstr "archiv „%s“ není obyčejný soubor"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<standardní výstup>"
 
@@ -2017,6 +2366,10 @@ msgid "conffile difference visualizer"
 msgstr "zobrazovač rozdílů konfiguračních souborů"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Po skončení napište „exit“.\n"
 
@@ -2371,7 +2724,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2380,7 +2747,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2414,6 +2784,12 @@ msgstr ""
 "Před/poinstalační skripty balíku by měly vždy používat --package a --"
 "divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2535,6 +2911,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Odklonění „%s“ neexistuje, tedy nebylo odstraněno\n"
 
@@ -2578,19 +2961,6 @@ msgstr "jméno balíku nemůže obsahovat znak nového řádku"
 msgid "divert-to may not contain newlines"
 msgstr "kam-odklonit nemůže obsahovat znak nového řádku"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "nelze otevřít soubor s odsuny"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "nelze volat fstat na soubor s odsuny"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "odsuny „%.250s“ a „%.250s“ v konfliktu"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2877,110 +3247,172 @@ msgid ""
 msgstr ""
 "Balík %s je ve stavu hold, ponechávám. K vynucení použijte --force-hold.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "potlačuje se problém, protože je nastaveno --force:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "nastaví všechny donucovací volby"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "řídící soubor „%s“ balíku „%s“ neobsahuje závěrečný nový řádek"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "řídící soubor „%s“ balíku „%s“ neobsahuje hodnotu"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "nahradí balík nižší verzí"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "řídící soubor „%s“ balíku „%s“ neobsahuje oddělovač hodnoty"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "nakonfiguruje všechny balíky, které mohou pomoci tomuto balíku"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "řídící soubor „%s“ balíku „%s“ obsahuje prázdné jméno souboru"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "zpracuje balíky, i když jsou podrženy"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "nelze otevřít řídící soubor „%s“ balíku „%s“"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "zkusí (od|na)instalovat balík, i když není root"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "nelze zjistit stav řídícího souboru „%s“ balíku „%s“"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "v PATH chybí důležité programy, očekávejte potíže"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "řídící soubor „%s“ balíku „%s“ není běžným souborem"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "nainstaluje balík, i když selže kontrola autenticity"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "nelze číst řídící soubor „%s“ balíku „%s“"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "zpracuje i balíky s chybnou verzí"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "nelze zavřít řídící soubor „%s“ balíku „%s“"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "seznam souborů balíku „%.250s“ nelze otevřít"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "přepíše soubory patřící jinému balíku"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "přepíše odkloněný soubor neodkloněnou verzí"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "přepíše adresář balíku souborem z jiného balíku"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "při rozbalování nepoužije bezpečné V/V operace"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr "nepřejde do speciálního chrootu"
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "vždy bez dotazu použije nový konfigurační soubor"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "vždy bez dotazu použije starý konfigurační soubor"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"seznam souborů balíku „%.250s“ chybí, předpokládám, že program nemá "
-"nainstalované žádné soubory."
+"pokud existuje, použije pro nové konfigurační\n"
+"soubory výchozí volbu a neptá se. Pokud žádná\n"
+"výchozí volba neexistuje, budete dotázáni, ale\n"
+"pouze pokud nebyly zadány přepínače confold nebo\n"
+"confnew"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "nelze zjistit stav seznamu souborů balíku „%.250s“"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "vždy nainstaluje chybějící konfigurační soubory"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "seznam souborů balíku „%.250s“ není běžným souborem"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "nabídne nahrazení i konfig. souborů bez nové verze"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "čte se seznam souborů balíku „%.250s“"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "zpracuje i balík s chybnou nebo žádnou architekturou"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "instaluje, i když tím poruší jiný balík"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "umožní instalaci konfliktních balíků"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "převede všechny problémy se závislostmi na varování"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "převede problémy se závislostmi na verzi na varování"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "odstraní balíky vyžadující instalaci"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "odstraní nezbytný balík"
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "seznam souborů balíku „%.250s“ neobsahuje závěrečný nový řádek"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"%s donucovací volby - usměrňují chování při výskytu problémů:\n"
+"  varuje ale pokračuje:  --force-<něco>,<něco>,…\n"
+"  zastaví s chybou:      --refuse-<něco>,<něco>,… | --no-force-<něco>,…\n"
+" Donucovací <něco>:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "seznam souborů balíku „%.250s“ obsahuje prázdné jméno souboru"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"VAROVÁNÍ - použití voleb označených [!] může vážně poškodit instalaci.\n"
+"Implicitně zapnuté donucovací volby jsou označeny [*].\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "chyba při zavírání seznamu souborů pro balík „%.250s“"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Načítá se databáze … "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "neznámá donucovací volba „%.*s“"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "nyní je nainstalován %d soubor nebo adresář.)\n"
-msgstr[1] "nyní jsou nainstalovány %d soubory a adresáře.)\n"
-msgstr[2] "nyní je nainstalováno %d souborů a adresářů.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "zastaralá donucovací volba „%s“"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "potlačuje se problém, protože je nastaveno --force:"
 
 #: src/help.c
 msgid "not installed"
@@ -3048,72 +3480,78 @@ msgstr ""
 "Pozn: PATH uživatele root by měla obsahovat /usr/local/sbin, /usr/sbin a /"
 "sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "nelze zkontrolovat existenci „%.250s“"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "nelze přečíst adresář info"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "chyba při pokusu o otevření %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "porušený info soubor „%s“ obsahující verzi formátu"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"verze formátu info databáze (%d) je falešná nebo příliš nová; zkuste novější "
-"dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "info soubor %s/%s není přiřazen žádnému balíku"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "chyba při zápisu „%s“"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
 msgstr "Debian „%s“ - program pro správu balíků verze %s.\n"
 
 #: src/main.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -i|--install       <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  --unpack           <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  -A|--record-avail  <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  --configure        <package> ... | -a|--pending\n"
+#| "  --triggers-only    <package> ... | -a|--pending\n"
+#| "  -r|--remove        <package> ... | -a|--pending\n"
+#| "  -P|--purge         <package> ... | -a|--pending\n"
+#| "  -V|--verify <package> ...        Verify the integrity of package(s).\n"
+#| "  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+#| "  --set-selections                 Set package selections from stdin.\n"
+#| "  --clear-selections               Deselect every non-essential package.\n"
+#| "  --update-avail [<Packages-file>] Replace available packages info.\n"
+#| "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
+#| "  --clear-avail                    Erase existing available info.\n"
+#| "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "  -C|--audit [<package> ...]       Check for broken package(s).\n"
+#| "  --yet-to-unpack                  Print packages selected for "
+#| "installation.\n"
+#| "  --predep-package                 Print pre-dependencies to unpack.\n"
+#| "  --add-architecture <arch>        Add <arch> to the list of "
+#| "architectures.\n"
+#| "  --remove-architecture <arch>     Remove <arch> from the list of "
+#| "architectures.\n"
+#| "  --print-architecture             Print dpkg architecture.\n"
+#| "  --print-foreign-architectures    Print allowed foreign architectures.\n"
+#| "  --assert-<feature>               Assert support for the specified "
+#| "feature.\n"
+#| "  --validate-<thing> <string>      Validate a <thing>'s <string>.\n"
+#| "  --compare-versions <a> <op> <b>  Compare version numbers - see below.\n"
+#| "  --force-help                     Show help on forcing.\n"
+#| "  -Dh|--debug=help                 Show help on debugging.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3325,115 +3763,6 @@ msgstr ""
 "Volby označené [*] produkují obsáhlý výstup - použijte „less“ nebo „more“!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "nastaví všechny donucovací volby"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "nahradí balík nižší verzí"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "nakonfiguruje všechny balíky, které mohou pomoci tomuto balíku"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "zpracuje balíky, i když jsou podrženy"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "zkusí (od|na)instalovat balík, i když není root"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "v PATH chybí důležité programy, očekávejte potíže"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "nainstaluje balík, i když selže kontrola autenticity"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "zpracuje i balíky s chybnou verzí"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "přepíše soubory patřící jinému balíku"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "přepíše odkloněný soubor neodkloněnou verzí"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "přepíše adresář balíku souborem z jiného balíku"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "při rozbalování nepoužije bezpečné V/V operace"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr "nepřejde do speciálního chrootu"
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "vždy bez dotazu použije nový konfigurační soubor"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "vždy bez dotazu použije starý konfigurační soubor"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"pokud existuje, použije pro nové konfigurační\n"
-"soubory výchozí volbu a neptá se. Pokud žádná\n"
-"výchozí volba neexistuje, budete dotázáni, ale\n"
-"pouze pokud nebyly zadány přepínače confold nebo\n"
-"confnew"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "vždy nainstaluje chybějící konfigurační soubory"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "nabídne nahrazení i konfig. souborů bez nové verze"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "zpracuje i balík s chybnou nebo žádnou architekturou"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "instaluje, i když tím poruší jiný balík"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "umožní instalaci konfliktních balíků"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "převede všechny problémy se závislostmi na varování"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "převede problémy se závislostmi na verzi na varování"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "odstraní balíky vyžadující instalaci"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "odstraní nezbytný balík"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "obecně užitečné informace o průběhu"
 
@@ -3563,40 +3892,6 @@ msgstr "nelze odstranit aktuálně používanou architekturu „%s“"
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s donucovací volby - usměrňují chování při výskytu problémů:\n"
-"  varuje ale pokračuje:  --force-<něco>,<něco>,…\n"
-"  zastaví s chybou:      --refuse-<něco>,<něco>,… | --no-force-<něco>,…\n"
-" Donucovací <něco>:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"VAROVÁNÍ - použití voleb označených [!] může vážně poškodit instalaci.\n"
-"Implicitně zapnuté donucovací volby jsou označeny [*].\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "neznámá donucovací volba „%.*s“"
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "zastaralá donucovací volba „%s“"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "nelze otevřít „%i“ pro proud"
 
@@ -3777,6 +4072,12 @@ msgid "Description"
 msgstr "Popis"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "soubor se zobrazuje ve stránkovači"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "odkloněno balíkem %s z: %s\n"
@@ -3811,6 +4112,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "balík „%s“ není nainstalován a není dostupná žádná informace"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Použijte dpkg --info (= dpkg-deb --info) k prozkoumání archivu\n"
+"a dpkg --contents (= dpkg-deb --contents) k vypsání jeho obsahu.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "balík „%s“ není dostupný"
@@ -3836,9 +4147,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "odkloněno balíkem %s do: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Použijte dpkg --info (= dpkg-deb --info) k prozkoumání archivu\n"
 "a dpkg --contents (= dpkg-deb --contents) k vypsání jeho obsahu.\n"
@@ -3879,19 +4193,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "Debian „%s“ - nástroj pro dotazování se na balíky verze %s.\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4069,6 +4397,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr "aby dpkg pracovalo správně, musí se admindir nacházet uvnitř instdir"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "chroot na „%.250s“ selhal"
@@ -4215,12 +4549,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4281,64 +4629,11 @@ msgstr "žádné přepsání neexistuje"
 msgid "--update is useless for --remove"
 msgstr "pro --remove je --update zbytečné"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "neplatné uid %s ve statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "neplatné gid %s ve statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "neplatný režim %s ve statoverride"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "nelze otevřít soubor statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "nelze získat fstat souboru statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "načítá se statoverride soubor „%.250s“"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "soubor statoverride neobsahuje závěrečný nový řádek"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "soubor statoverride obsahuje prázdný řádek"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "syntaktická chyba v souboru statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "neznámý uživatel „%s“ v souboru statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "neočekávaný konec řádku v souboru statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "neznámá skupina „%s“ v souboru statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "pro soubor „%.250s“ existuje více statoverride"
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "zastaralá volba „--%s“, použijte místo ní „--%s“"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4550,6 +4845,12 @@ msgstr "Dekonfiguruje se %s (%s), aby mohl být odstraněn %s (%s) …\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Dekonfiguruje se %s (%s) …\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "soubor statoverride obsahuje prázdný řádek"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4686,11 +4987,9 @@ msgid "package filesystem archive extraction"
 msgstr "rozbalení balíku"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "chyba při čtení tar výstupu z dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "poškozený systémový tar soubor - poškozený balík"
 
 #: src/unpack.c
@@ -4704,14 +5003,20 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s akceptuje nejvýše jedno jméno souboru Packages"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "nelze přistoupit ke stavové oblasti dpkg pro objemnou dostupnou aktualizaci"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"objemná dostupná aktualizace vyžaduje práva zápisu do stavové oblasti dpkg"
+"nelze přistoupit ke stavové oblasti dpkg pro objemnou dostupnou aktualizaci"
 
 #: src/update.c
 #, c-format
@@ -5052,16 +5357,18 @@ msgid "decompressing archive member"
 msgstr "rozbaluje se část archivu"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "nelze vstoupit do adresáře"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "nelze vytvořit adresář"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "nelze se přepnout do právě vytvořeného adresáře"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "neočekávaný konec souboru ve jménu balíku na řádku %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "nelze vstoupit do adresáře"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5876,7 +6183,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -5886,8 +6207,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6380,8 +6702,79 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "zastaralá volba „--%s“, použijte místo ní „--%s“"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "nelze otevřít zámkový soubor %s pro test"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "neznámý uživatel „%s“ v souboru statoverride"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "neznámá skupina „%s“ v souboru statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s chybí"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "„%.50s“ není v %s povoleno"
+
+#~ msgid "junk after %s"
+#~ msgstr "nesmyslná data za %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "chybné jméno balíku (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no v dvouhodnotovém poli"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "položka „%s“, odkaz na „%.255s“: chyba ve verzi"
+
+#~ msgid "empty value for %s"
+#~ msgstr "položka „%s“ je prázdná"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "balík je ve stavu „čekání na spouštěče“, ale žádné spouštěče nejsou "
+#~ "očekávány"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "balík je ve stavu „nevyřízené spouštěče“, ale všechny spouštěče jsou "
+#~ "vyřízeny"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "objemná dostupná aktualizace vyžaduje práva zápisu do stavové oblasti dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "chyba při čtení tar výstupu z dpkg-deb"
+
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "nelze otevřít řídící soubor „%s“ balíku „%s“"
+
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "nelze zjistit stav řídícího souboru „%s“ balíku „%s“"
+
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "řídící soubor „%s“ balíku „%s“ není běžným souborem"
+
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "nelze zavřít řídící soubor „%s“ balíku „%s“"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "seznam souborů balíku „%.250s“ nelze otevřít"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "nelze zjistit stav seznamu souborů balíku „%.250s“"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "seznam souborů balíku „%.250s“ není běžným souborem"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "čte se seznam souborů balíku „%.250s“"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "nelze se přepnout do právě vytvořeného adresáře"
 
 #~ msgid "control file '%s' missing value"
 #~ msgstr "v řídícím souboru „%s“ chybí hodnota"
@@ -6449,9 +6842,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF na stdin při otázce na konfigurační soubor"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "neočekávaný konec souboru ve jménu balíku na řádku %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "neočekávaný konec souboru za jménem balíku na řádku %d"
 
@@ -6687,9 +7077,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "je to závislost %s"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "nelze volat stat na %s: %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "volání readlink(%s) selhalo: %s"
 
@@ -6714,9 +7101,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "nelze zavřít %s: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "nelze zapsat %s: %s"
-
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "nelze přejmenovat „%s“ na „%s“"
 
@@ -7037,9 +7421,6 @@ msgstr ""
 #~ msgid "cannot open diversions: %s"
 #~ msgstr "nelze otevřít soubor s odsuny: %s"
 
-#~ msgid "missing package"
-#~ msgstr "chybí balík"
-
 #~ msgid "rename: rename `%s' to `%s': %s"
 #~ msgstr "přejmenování: přejmenování „%s“ na „%s“: %s"
 
diff --git a/po/da.po b/po/da.po
index 772b7dc43..88302fddb 100644
--- a/po/da.po
+++ b/po/da.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:48+0200\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish@lists.debian.org>\n"
@@ -151,7 +151,8 @@ msgstr "fejl ved fjernelse af gammel sikkerhedskopifil '%s'"
 msgid "error creating new backup file '%s'"
 msgstr "fejl under oprettelse af ny sikkerhedskopifil '%.s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "kan ikke afinstallere '%.250s'"
@@ -356,20 +357,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "kunne ikke søge til starten af %.250s efter efterfyldningen"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "kan ikke åbne låsefil %s til test"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "kunne ikke indhente fildeskriptor for mappe '%s'"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "kunne ikke åbne/oprette statusdatabasens låsefil"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "kunne ikke åbne/oprette statusdatabasens låsefil"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "du har ikke rettigheder til at låse dpkg's statusdatabase"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg's statusdatabase"
 
 #: lib/dpkg/dbmodify.c
@@ -377,11 +395,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "den ønskede handling kræver superbrugerrettigheder"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "kunne ikke tilgå dpkg-statusområdet"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "handling kræver læse/skriveadgang til dpkg-statusområdet"
 
 #: lib/dpkg/dbmodify.c
@@ -419,6 +441,193 @@ msgstr "kunne ikke lukke opdateret status for '%.250s'"
 msgid "unable to install updated status of '%.250s'"
 msgstr "kunne ikke installere opdateret status for '%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "kunne ikke kontrollere eksistensen af '%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "kan ikke læse info-katalog"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "fejl ved forsøg på at åbne %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "ødelagt formatfil for informationsdatabase '%s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"format for informationsdatabasen (%d) er fejlbehæftet eller for ny; prøv at "
+"få fat i en nyere dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "informationsfilen %s/%s er ikke associeret til nogen pakke"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "fejl under oprettelse af hård lænke '%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "fejl under skrivning af '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "kontrolfil '%s' for pakke '%s' mangler afsluttende linjeskift"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "kontrolfil '%s' for pakke '%s' mangler afsluttende linjeskift"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "kontrolfil '%s' for pakke '%s' mangler afsluttende linjeskift"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "kontrolfilen '%s' for pakke '%s' indeholder et tomt filnavn"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read '%s' control file for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "kan ikke læse kontrolfilen '%s' for pakke '%s'"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "kunne ikke åbne omdirigeringsfil"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "kunne ikke køre 'fstat' på omdirigeringsfil"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "modstridende omdirigeringer, der involverer '%.250s' eller '%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "fejl under lukning af fillistefil for pakken '%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"fillistefilen for pakken '%.250s' mangler; antager at pakken ikke har nogen "
+"filer installeret"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "fillistefilen for pakken '%.250s' mangler afsluttende linjeskift"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "fillistefilen for pakken '%.250s' indeholder tomt filnavn"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Læser database ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d fil eller katalog installeret i øjeblikket.)\n"
+msgstr[1] "%d filer og kataloger installeret i øjeblikket.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "ugyldig status"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "læser statoverride-fil '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "læser statoverride-fil '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "kunne ikke åbne statoverride-fil"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "kunne ikke køre 'fstat' på 'statoverride'-fil"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "læser statoverride-fil '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "statoverride-fil mangler afsluttende linjeskift"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statoverride-fil indeholder en tom linje"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "syntaksfejl i statoverride-fil"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "uventet linjeafslutning i statoverride-fil"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "der er flere statusomgåelser til stede for filen '%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -554,60 +763,73 @@ msgid "internal error"
 msgstr "intern fejl (fejl)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s mangler"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "kontrolfilen '%s' mangler en værdi"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.50s' er ikke tilladt for %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Spring ugyldig linje over: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "affald efter %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ugyldigt pakkenavn (%.250s)"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "pakken '%s' er ikke installeret"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tomt fildetaljefelt '%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "fildetaljefelt '%s' ikke tilladt i statusfil"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "for mange værdier i fildetaljefelt '%s' (sammenlignet med andre)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "for få værdier i fildetaljefelt '%s' (sammenlignet med andre)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no i boolsk felt"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "forældet '%s'- eller '%s'-felt blev brugt"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "fremmed/tilladt/samme/nej i quadstate-felt"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "'%s' er ikke et gyldigt arkitekturnavn :%s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "ord i 'Priority'-felt"
 
 #: lib/dpkg/fields.c
@@ -616,25 +838,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "værdi i feltet '%s' er ikke tilladt i denne sammenhæng"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "første (ønske) ord i 'Status'-feltet"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "andet (fejl) ord i 'Status'-feltet"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "tredje (status) ord i 'Status'-feltet"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "fejl i '%s'-feltstrengen '%.250s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "forældet '%s'- eller '%s'-felt blev brugt"
 
 #: lib/dpkg/fields.c
@@ -643,12 +873,15 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "værdien for '%s'-feltet har en linje med ugyldigt format '%.*s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "værdien for '%s' har en linje, der starter uden mellemrum '%c'"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "root- eller null-kataloget er nævnt i konfigurationsfil"
 
 #: lib/dpkg/fields.c
@@ -732,9 +965,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "Feltet '%s', henvisning til '%.255s': version uafsluttet"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "Feltet '%s', henvisning til '%.255s': fejl i version"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "Feltet '%s', henvisning til '%.255s': version indeholder '%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -742,8 +976,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "Feltet '%s', syntaksfejl efter henvisning til pakken '%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternativer ('|') tillades ikke i %s-feltet"
 
 #: lib/dpkg/fields.c
@@ -783,6 +1018,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "kan ikke ændre tilstand for målfilen '%.250s'"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat file '%s'"
+msgid "cannot stat %s"
+msgstr "kan ikke tilgå filen '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "konfigurationsfil '%s' er ikke en almindelig fil"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot read %s"
+msgstr "kan ikke føje til '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "kan ikke føje til '%s'"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "kunne ikke låse %s op"
@@ -803,8 +1062,23 @@ msgid "unable to lock %s"
 msgstr "kan ikke låse %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "viser fil på tekstsøger"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "kan ikke føje til '%s'"
+
+# bemærk at flush normalt dækker over at tømme en buffer (her til en fil)
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "kan ikke tømme til filen '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "kan ikke omdirigere filen '%s' til sig selv"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -826,13 +1100,13 @@ msgstr "kan ikke allokere hukommelse"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "kunne ikke udføre 'dup' for std%s"
+msgid "failed to dup for fd %d"
+msgstr "kunne ikke 'dup' for fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "kunne ikke 'dup' for fd %d"
+msgid "failed to dup for std%s"
+msgstr "kunne ikke udføre 'dup' for std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -971,27 +1245,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "værdi for brugerdefineret felt '%.*s' optræder mere end én gang"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "manglende %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "tom værdi for %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "værdi for '%s'-feltet optræder mere end én gang"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "pakke har felt '%s' men mangler arkitektur"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "pakke har felt '%s', men er arkitektur alle"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Config-Version for pakke med upassende Status"
 
 #: lib/dpkg/parse.c
@@ -1000,8 +1280,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "pakke har status %s, men der afventes udløsere"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "pakke har status triggers-awaited, men ingen udløsere afventes"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "pakke har status %s, men der afventes udløsere"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1009,11 +1291,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "pakke har status %s, men der er ventende udløsere"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "pakke har status triggers-pending, men ingen udløsere venter"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "pakke har status %s, men der er ventende udløsere"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Pakke, der har status \"ikke-installeret\", har konfigurationsfiler. Glemmer "
 "disse"
@@ -1035,10 +1321,13 @@ msgstr ""
 "stede; højst sandsynlig på grund af en opgradering fra en uofficiel dpkg"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (flerarkitektur: %s) er ikkesamtidig installerbar med %s, som har "
 "flere installerede instanser"
@@ -1228,11 +1517,6 @@ msgstr "kan ikke på sikker vis fjerne '%.255s'"
 msgid "rm command for cleanup"
 msgstr "rm-kommando for oprydning"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "tvetydigt pakkenavn '%s' med mere end en installeret instans"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1246,6 +1530,16 @@ msgstr "feltbredde er uden for interval"
 msgid "missing closing brace"
 msgstr "manglende slutkantparentes"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "tvetydigt pakkenavn '%s' med mere end en installeret instans"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(ingen tilgængelig beskrivelse)"
@@ -1333,6 +1627,70 @@ msgstr "underproces %s mislykkedes med ventestatuskode %d"
 msgid "wait for %s subprocess failed"
 msgstr "afventning af underprocessen %s mislykkedes"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "ugyldigt tegn '%c' i feltbredden"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "ugyldigt tegn '%c' i feltbredden"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "ugyldig status"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid tar header gid field"
+msgstr "læser statoverride-fil '%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "ugyldigt tegn '%c' i feltbredden"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "ikke understøttede indstillinger i filhoved"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "ukendt komprimeringstype '%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1352,12 +1710,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "kontrolkatalog er ikke et katalog"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "kan ikke åbne/oprette låsefilen '%.250s' til udløsere"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "udløserområde"
 
 #: lib/dpkg/trigdeferred.c
@@ -1578,11 +1939,6 @@ msgstr "fejl under oprettelse af datakanal '%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "fejl under oprettelse af enhed '%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "fejl under oprettelse af hård lænke '%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1898,10 +2254,10 @@ msgstr "kan ikke tilgå arkivet"
 msgid "archive '%s' is not a regular file"
 msgstr "konfigurationsfil '%s' er ikke en almindelig fil"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<standard-uddata>"
 
@@ -2086,6 +2442,10 @@ msgid "conffile difference visualizer"
 msgstr "visualiseringsprogram for forskel i konfigurationsfil (conffile)"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Skriv 'exit', når du er færdig.\n"
 
@@ -2438,7 +2798,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2447,7 +2821,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2480,6 +2857,12 @@ msgstr ""
 "Pakkepræinstallations- eller -postinstallationsscripter skal altid angive \n"
 "--package og --divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2600,6 +2983,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Ingen omdirigering '%s', ingen fjernet.\n"
 
@@ -2643,19 +3033,6 @@ msgstr "pakke må ikke indeholde linjeskift"
 msgid "divert-to may not contain newlines"
 msgstr "omrokér-til må ikke indeholde linjeskift"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "kunne ikke åbne omdirigeringsfil"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "kunne ikke køre 'fstat' på omdirigeringsfil"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "modstridende omdirigeringer, der involverer '%.250s' eller '%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2957,116 +3334,173 @@ msgstr ""
 "Pakken %s er tilbageholdt, rører den ikke.  Brug --force-hold for at "
 "gennemtvinge.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "undertrykker problemet, fordi --force er givet:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Angiv alle tvungne tilvalg"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "kontrolfil '%s' for pakke '%s' mangler afsluttende linjeskift"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "kontrolfil '%s' for pakke '%s' mangler afsluttende linjeskift"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Erstat en pakke med en lavere version"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "kontrolfil '%s' for pakke '%s' mangler afsluttende linjeskift"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Konfigurer alle pakker som kan hjælpe denne pakke"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "kontrolfilen '%s' for pakke '%s' indeholder et tomt filnavn"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Behandl trinvis øgende pakker selv på tilbagehold"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "kan ikke åbne kontrolfilen '%s' for pakke '%s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Forsøg at (af)installere ting selv når ikke administrator (root)"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "kan ikke stat (køre) '%s' fillistefil for pakken '%s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH mangler vigtige programmer, problemer er sandsynlige"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "'%s'-filen for pakke '%s' er ikke en normal fil"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Installer en pakke selv hvis den fejler godkendelseskontrol"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "kan ikke læse kontrolfilen '%s' for pakke '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Behandl også pakker med forkerte versioner"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "kan ikke lukke kontrolfilen '%s' for pakke '%s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "kunne ikke åbne fillistefil for pakken '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Overskriv en fil fra en pakke med en anden"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Overskriv en omdirigeret fil med en ikke omdirigeret version"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Overskriv en pakkes mappe med en andens fil"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Udfør ikke sikre I/O-handlinger under udpakning"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Brug altid de nye konfigurationsfiler, spørg ikke"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Brug altid de gamle konfigurationsfiler, spørg ikke"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"fillistefilen for pakken '%.250s' mangler; antager at pakken ikke har nogen "
-"filer installeret"
+"Brug standardindstillingen for nye konfigurationsfiler\n"
+"hvis en sådan er tilgængelig, spørg ikke. Hvis ingen\n"
+"standard kan findes, vil du blive spurgt med mindre\n"
+"en af tilvalgene confold eller confnew også er angivet"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "kan ikke tilgå fillistefil for pakken '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Installer altid manglende konfigurationsfiler"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "fillistefilen for pakken '%.250s' er ikke en normal fil"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Tilbyd at erstatte konfigurationsfiler med ingen nye versioner"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Behandl selv pakker med forkert eller ingen arkitektur"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Installer selv om det ødelægger en anden pakke"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Tillad installation af pakker i konflikt"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Omdan alle afhængighedsproblemer til advarsler"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Omdan afhængighedsversionsproblemer til advarsler"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Fjern pakker som kræver installation"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Fjern en essentiel pakke"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "læser filliste for pakken '%.250s'"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"%s fremtvinger tilvalg - kontroller opførsel når der opstår problemer:\n"
+"  advar men fortsæt:   --force<ting>,<ting>,...\n"
+"  stop med fejl:       --refuse-<ting>,<ting>,... | --no-force-<ting>,...\n"
+" Fremtvinger ting:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "fillistefilen for pakken '%.250s' mangler afsluttende linjeskift"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"ADVARSEL - brug af tilvalg markeret [!] kan i alvorlig grad skade din "
+"installation.\n"
+"Fremtvingelse af tilvalg markeret med [*] er aktiveret som standard.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "fillistefilen for pakken '%.250s' indeholder tomt filnavn"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "fejl under lukning af fillistefil for pakken '%.250s'"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "ukendt gennemtvingnings/afvisnings-tilvalg '%.*s'"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Læser database ... "
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "forældet gennemtvangs/afvisnings-tilvalg '%s'\n"
 
-#: src/filesdb.c
-#, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d fil eller katalog installeret i øjeblikket.)\n"
-msgstr[1] "%d filer og kataloger installeret i øjeblikket.)\n"
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "undertrykker problemet, fordi --force er givet:"
 
 #: src/help.c
 msgid "not installed"
@@ -3129,42 +3563,6 @@ msgstr ""
 "Bemærk: PATH for root bør normalt indeholde /usr/local/sbin, /usr/sbin og /"
 "sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "kunne ikke kontrollere eksistensen af '%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "kan ikke læse info-katalog"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "fejl ved forsøg på at åbne %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "ødelagt formatfil for informationsdatabase '%s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"format for informationsdatabasen (%d) er fejlbehæftet eller for ny; prøv at "
-"få fat i en nyere dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "informationsfilen %s/%s er ikke associeret til nogen pakke"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "fejl under skrivning af '%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3210,27 +3608,27 @@ msgstr "Debian '%s' pakkehåndteringsprogram version %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3462,114 +3860,6 @@ msgstr ""
 "Tilvalg med [*] giver mange uddata - led dem gennem 'less' eller 'more'!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Angiv alle tvungne tilvalg"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Erstat en pakke med en lavere version"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Konfigurer alle pakker som kan hjælpe denne pakke"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Behandl trinvis øgende pakker selv på tilbagehold"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Forsøg at (af)installere ting selv når ikke administrator (root)"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "PATH mangler vigtige programmer, problemer er sandsynlige"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Installer en pakke selv hvis den fejler godkendelseskontrol"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Behandl også pakker med forkerte versioner"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Overskriv en fil fra en pakke med en anden"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Overskriv en omdirigeret fil med en ikke omdirigeret version"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Overskriv en pakkes mappe med en andens fil"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Udfør ikke sikre I/O-handlinger under udpakning"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Brug altid de nye konfigurationsfiler, spørg ikke"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Brug altid de gamle konfigurationsfiler, spørg ikke"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Brug standardindstillingen for nye konfigurationsfiler\n"
-"hvis en sådan er tilgængelig, spørg ikke. Hvis ingen\n"
-"standard kan findes, vil du blive spurgt med mindre\n"
-"en af tilvalgene confold eller confnew også er angivet"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Installer altid manglende konfigurationsfiler"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Tilbyd at erstatte konfigurationsfiler med ingen nye versioner"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Behandl selv pakker med forkert eller ingen arkitektur"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Installer selv om det ødelægger en anden pakke"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Tillad installation af pakker i konflikt"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Omdan alle afhængighedsproblemer til advarsler"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Omdan afhængighedsversionsproblemer til advarsler"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Fjern pakker som kræver installation"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Fjern en essentiel pakke"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Generelt nyttig information om forløbet"
 
@@ -3699,42 +3989,6 @@ msgstr "kan ikke fjerne arkitektur '%s' aktuelt i brug af databasen"
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s fremtvinger tilvalg - kontroller opførsel når der opstår problemer:\n"
-"  advar men fortsæt:   --force<ting>,<ting>,...\n"
-"  stop med fejl:       --refuse-<ting>,<ting>,... | --no-force-<ting>,...\n"
-" Fremtvinger ting:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"ADVARSEL - brug af tilvalg markeret [!] kan i alvorlig grad skade din "
-"installation.\n"
-"Fremtvingelse af tilvalg markeret med [*] er aktiveret som standard.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "ukendt gennemtvingnings/afvisnings-tilvalg '%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "forældet gennemtvangs/afvisnings-tilvalg '%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "kunne ikke åbne '%i' for strøm"
 
@@ -3939,6 +4193,12 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "viser fil på tekstsøger"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "omdirigeret af %s fra: %s\n"
@@ -3974,6 +4234,16 @@ msgstr ""
 "pakken '%s' er ikke installeret og der er ingen tilgængelig information"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Brug dpkg --info (= dpkg-deb --info) til at undersøge arkivfiler,\n"
+"og dpkg --contents (= dpkg-deb --contents) til at vise deres indhold.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "pakken '%s' er ikke tilgængelig"
@@ -3999,9 +4269,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "omdirigeret af %s til %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Brug dpkg --info (= dpkg-deb --info) til at undersøge arkivfiler,\n"
 "og dpkg --contents (= dpkg-deb --contents) til at vise deres indhold.\n"
@@ -4044,19 +4317,33 @@ msgstr ""
 "Programforespørgselsværktøjet %s version %s til Debianpakkehåndtering.\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4238,6 +4525,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr "admindir skal være inden i instdir for at dpkg virker korrekt"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "kunne ikke skifte filrod til '%.250s'"
@@ -4391,12 +4684,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4461,67 +4768,11 @@ msgstr "der er ingen omgåelser"
 msgid "--update is useless for --remove"
 msgstr "--update er nytteløs med --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "ugyldig status"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "læser statoverride-fil '%.250s'"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "læser statoverride-fil '%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "kunne ikke åbne statoverride-fil"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "kunne ikke køre 'fstat' på 'statoverride'-fil"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "læser statoverride-fil '%.250s'"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "statoverride-fil mangler afsluttende linjeskift"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "statoverride-fil indeholder en tom linje"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "syntaksfejl i statoverride-fil"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "ukendt bruger '%s' i statoverride-fil"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "uventet linjeafslutning i statoverride-fil"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "ukendt gruppe '%s' i statoverride-fil"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "der er flere statusomgåelser til stede for filen '%.250s'"
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "forældet tilvalg '--%s'; brug venligst '--%s' i stedet"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4736,6 +4987,12 @@ msgstr "Afkonfigurerer %s (%s), så %s (%s) kan afinstalleres ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Afkonfigurerer %s (%s) ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "statoverride-fil indeholder en tom linje"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4877,11 +5134,9 @@ msgid "package filesystem archive extraction"
 msgstr "arkivudtrækning for pakkefilsystem"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "fejl ved læsning af dpkg-deb's tar-uddata"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "ødelagt filsystem-tarfil - ødelagt pakkearkiv"
 
 #: src/unpack.c
@@ -4895,13 +5150,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s skal bruge højst én 'Packages'-fil som parameter"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "kunne ikke tilgå dpkg's statusområde for rå tilgængelighedsopdatering"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr ""
-"rå tilgængelighedsopdatering kræve skriveadgang til dpkg's statusområde"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "kunne ikke tilgå dpkg's statusområde for rå tilgængelighedsopdatering"
 
 #: src/update.c
 #, c-format
@@ -5253,16 +5513,18 @@ msgid "decompressing archive member"
 msgstr "udpakker arkivmedlem"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "kunne ikke skifte til katalog"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "kunne ikke oprette katalog"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "kunne ikke skifte til katalog efter at have oprettet den"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "uventet slut-på-fil i pakkenavn på linje %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "kunne ikke skifte til katalog"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6093,7 +6355,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6103,8 +6379,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6607,11 +6884,83 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "forældet tilvalg '--%s'; brug venligst '--%s' i stedet"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "kan ikke åbne låsefil %s til test"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "ukendt bruger '%s' i statoverride-fil"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "ukendt gruppe '%s' i statoverride-fil"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "kontrolfilen '%s' mangler en værdi"
+#~ msgid "%s is missing"
+#~ msgstr "%s mangler"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "'%.50s' er ikke tilladt for %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "affald efter %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "ugyldigt pakkenavn (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no i boolsk felt"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "Feltet '%s', henvisning til '%.255s': fejl i version"
+
+#~ msgid "empty value for %s"
+#~ msgstr "tom værdi for %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "pakke har status triggers-awaited, men ingen udløsere afventes"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr "pakke har status triggers-pending, men ingen udløsere venter"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "rå tilgængelighedsopdatering kræve skriveadgang til dpkg's statusområde"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "fejl ved læsning af dpkg-deb's tar-uddata"
+
+#, fuzzy
+#~| msgid "cannot open '%s' control file for package '%s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "kan ikke åbne kontrolfilen '%s' for pakke '%s'"
+
+#, fuzzy
+#~| msgid "cannot stat '%s' control file for package '%s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "kan ikke stat (køre) '%s' fillistefil for pakken '%s'"
+
+#, fuzzy
+#~| msgid "'%s' file for package '%s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "'%s'-filen for pakke '%s' er ikke en normal fil"
+
+#, fuzzy
+#~| msgid "cannot close '%s' control file for package '%s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "kan ikke lukke kontrolfilen '%s' for pakke '%s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "kunne ikke åbne fillistefil for pakken '%.250s'"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "kan ikke tilgå fillistefil for pakken '%.250s'"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "fillistefilen for pakken '%.250s' er ikke en normal fil"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "læser filliste for pakken '%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "kunne ikke skifte til katalog efter at have oprettet den"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "kontrolfilen '%s' mangler en værdiseparator"
@@ -6676,9 +7025,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "Slut-på-fil ved standard-ind ved konfigurationsfil-prompt"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "uventet slut-på-fil i pakkenavn på linje %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "uventet slut-på-fil efter pakkenavn på linje %d"
 
diff --git a/po/de.po b/po/de.po
index b8a4a6165..3d98b9db5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,18 +1,18 @@
 # Texte für Debian dpkg/po/de.po
-# Copyright © 2017 Dpkg Developers.
+# Copyright © 2019 Dpkg Developers.
 # Hartmut Koptein <koptein@debian.org>, Apr 2000.
 # Erich Schubert <debian@vitavonni.de>, March 2001.
 # Michael Piefel <piefel@debian.org>, 2001-2005.
 # Florian Ernst <florian@uni-hd.de>, 2004.
-# Sven Joachim <svenjoac@gmx.de>, 2006-2017.
+# Sven Joachim <svenjoac@gmx.de>, 2006-2019.
 # Holger Wansing <linux@wansing-online.de>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.0\n"
+"Project-Id-Version: dpkg 1.20.0~\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2017-11-03 17:09+0100\n"
+"POT-Creation-Date: 2019-11-05 17:04+0100\n"
+"PO-Revision-Date: 2019-11-05 20:50+0100\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -139,7 +139,8 @@ msgstr "Fehler beim Entfernen der alten Sicherungsdatei »%s«"
 msgid "error creating new backup file '%s'"
 msgstr "Fehler beim Anlegen der neuen Sicherungsdatei »%s«"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "»%.250s« kann nicht entfernt werden"
@@ -345,32 +346,51 @@ msgstr "Nach Auffüllen kann nicht zum Start von %.250s gesprungen werden"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "Sperrdatei %s kann nicht zum Testen geöffnet werden"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr ""
+"Sperrdatei für dpkg-Datenbank-Verzeichnis »%s« kann nicht überprüft werden"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr ""
+"Sperrdatei des dpkg-Frontends für Verzeichnis %s kann nicht geöffnet/"
+"angelegt werden"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr ""
+"Sperrdatei der dpkg-Datenbank für Verzeichnis %s kann nicht geöffnet/"
+"angelegt werden"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
-msgstr "Sperrdatei der Status-Datenbank kann nicht geöffnet/angelegt werden"
+#, c-format
+msgid "you do not have permission to lock the dpkg database directory %s"
+msgstr ""
+"Sieh haben keine Berechtigung, das dpkg-Datenbank-Verzeichnis %s zu sperren"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
-msgstr "Fehlende Rechte, um die dpkg-Status-Datenbank zu sperren"
+msgid "dpkg frontend lock"
+msgstr "dpkg-Frontend-Sperre"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
-msgstr "dpkg-Status-Datenbank"
+msgid "dpkg database lock"
+msgstr "dpkg-Datenbank-Sperre"
 
 #: lib/dpkg/dbmodify.c
 msgid "requested operation requires superuser privilege"
 msgstr "Angeforderte Operation benötigt Superuser-Rechte"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
-msgstr "Auf den Statusbereich von dpkg kann nicht zugegriffen werden"
+#, c-format
+msgid "unable to access the dpkg database directory %s"
+msgstr "Auf das dpkg-Datenbank-Verzeichnis %s kann nicht zugegriffen werden"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
-msgstr "Operation benötigt Lese-/Schreibrechte für den Statusbereich von dpkg"
+#, c-format
+msgid "required read/write access to the dpkg database directory %s"
+msgstr "Lese-/Schreibzugriff für dpkg-Datenbank-Verzeichnis %s benötigt"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
@@ -408,6 +428,198 @@ msgstr "Aktualisierter Status von »%.250s« kann nicht geschlossen werden"
 msgid "unable to install updated status of '%.250s'"
 msgstr "Aktualisierter Status von »%.250s« kann nicht installiert werden"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "Die Existenz von »%.250s« kann nicht überprüft werden"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "Info-Verzeichnis kann nicht gelesen werden"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "Fehler beim Versuch, %.250s zu öffnen"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "beschädigte Info-Datenbank-Formatdatei »%s«"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"Info-Datenbank-Format (%d) ist falsch oder zu neu; versuchen Sie, ein "
+"neueres dpkg zu erhalten"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "Infodatei %s/%s gehört zu keinem Paket"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "Fehler beim Anlegen des harten Links »%.255s«"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "Fehler beim Schreiben von »%s«"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"Abschließender Zeilenvorschub fehlt in Control-Datei »%s« für Paket »%s«"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "Wert fehlt in Control-Datei »%s« für Paket »%s«"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "Trennzeichen fehlt in Control-Datei »%s« für Paket »%s«"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "Control-Datei »%s« für Paket »%s« enthält leeren Dateinamen"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "loading control file '%s' for package '%s'"
+msgstr "Laden der Control-Datei »%s« für Paket »%s«"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "Öffnen der diversions-Datei fehlgeschlagen"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "Abfragen der diversions-Datei mit fstat fehlgeschlagen"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "kollidierende Umleitungen betreffend »%.250s« und »%.250s«"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "loading files list file for package '%s'"
+msgstr "Laden der Dateilisten-Datei des Paketes »%s«"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"Dateilisten-Datei des Paketes »%.250s« fehlt; es wird angenommen,\n"
+" dass das Paket derzeit keine Dateien installiert hat"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"Abschließender Zeilenvorschub fehlt in Dateilisten-Datei des Paketes »%.250s«"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "Dateilisten-Datei des Paketes »%.250s« enthält leeren Dateinamen"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Lese Datenbank ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d Datei oder Verzeichnis ist derzeit installiert.)\n"
+msgstr[1] "%d Dateien und Verzeichnisse sind derzeit installiert.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "ungültige Statoverride-UID %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "ungültige Statoverride-GID %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "ungültiger Statoverride-Modus %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "Öffnen der statoverride-Datei fehlgeschlagen"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "Abfragen der statoverride-Datei mit fstat fehlgeschlagen"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "Lesen der statoverride-Datei »%.250s«"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "Abschließender Zeilenvorschub fehlt in statoverride-Datei"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statoverride-Datei enthält leere Zeile"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "Syntaxfehler in statoverride-Datei"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+"unbekannter Systembenutzer »%s« in der statoverride-Datei; der\n"
+"Systembenutzer wurde vor dem Override entfernt, was höchstwahrscheinlich "
+"ein\n"
+"Paketierungsfehler ist, um dies auszugleichen können Sie den Override\n"
+"manuell mit %s entfernen"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "unerwartetes Zeilenende in statoverride-Datei"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+"unbekannte Systemgruppe »%s« in der statoverride-Datei; die Systemgruppe "
+"wurde\n"
+"vor dem Override entfernt, was höchstwahrscheinlich ein Paketierungsfehler "
+"ist,\n"
+"um dies auszugleichen können Sie den Override manuell mit %s entfernen"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "Mehrere Status-Overrides für Datei »%.250s« vorhanden"
+
 #: lib/dpkg/deb-version.c
 msgid "format version with too big major component"
 msgstr "Formatversion mit zu großer Hauptkomponente"
@@ -519,61 +731,62 @@ msgid "internal error"
 msgstr "interner Fehler"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s fehlt"
+msgid "is missing a value"
+msgstr "fehlt ein Wert"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "»%.50s« ist nicht erlaubt für %s"
+msgid "has invalid value '%.50s'"
+msgstr "hat ungültigen Wert »%.50s«"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "Unsinn hinter %s"
+msgid "has trailing junk"
+msgstr "enthält Unsinn am Ende"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ungültiger Paketname (%.250s)"
+msgid "invalid package name in '%s' field: %s"
+msgstr "ungültiger Paketname im Feld »%s«: %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
-msgstr "leeres Dateidetailfeld »%s«"
+msgid "empty archive details '%s' field"
+msgstr "leeres Archivdetailfeld »%s«"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "file details field '%s' not allowed in status file"
-msgstr "Dateidetailfeld »%s« in Statusdatei nicht erlaubt"
+msgid "archive details '%s' field not allowed in status file"
+msgstr "Archivdetailfeld »%s« in Statusdatei nicht erlaubt"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too many values in file details field '%s' (compared to others)"
-msgstr "zu viele Werte in dem Dateidetailfeld »%s« (im Vergleich zu anderen)"
+msgid "too many values in archive details '%s' field (compared to others)"
+msgstr "zu viele Werte in dem Archivdetailfeld »%s« (im Vergleich zu anderen)"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too few values in file details field '%s' (compared to others)"
-msgstr "zu wenige Werte in dem Dateidetailfeld »%s« (im Vergleich zu anderen)"
+msgid "too few values in archive details '%s' field (compared to others)"
+msgstr "zu wenige Werte in dem Archivdetailfeld »%s« (im Vergleich zu anderen)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no in booleschem Feld"
+#, c-format
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "Boolesches (yes/no) Feld »%s«: %s"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
-msgstr "foreign/allowed/same/no in Quadstate-Feld"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
+msgstr "Quadstate (foreign/allowed/same/no) Feld »%s«: %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr "»%s« ist kein gültiger Architekturname: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "»%s« ist kein gültiger Architekturname in Feld »%s«: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
-msgstr "Wort im Feld »Priority«"
+#, c-format
+msgid "word in '%s' field: %s"
+msgstr "Wort im Feld »%s«: %s"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -581,26 +794,29 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "Wert für Feld »%s« ist in diesem Kontext nicht erlaubt"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
-msgstr "erstes (Gewünscht-)Wort im Feld »Status«"
+#, c-format
+msgid "first (want) word in '%s' field: %s"
+msgstr "erstes (Gewünscht-)Wort im Feld »%s«: %s"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
-msgstr "zweites (Fehler-)Wort im Feld »Status«"
+#, c-format
+msgid "second (error) word in '%s' field: %s"
+msgstr "zweites (Fehler-)Wort im Feld »%s«: %s"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
-msgstr "drittes (Status-)Wort im Feld »Status«"
+#, c-format
+msgid "third (status) word in '%s' field: %s"
+msgstr "drittes (Status-)Wort im Feld »%s«: %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "error in '%s' field string '%.250s'"
-msgstr "Fehler in Zeichenkette »%2$.250s« für Feld »%1$s«"
+msgid "'%s' field value '%.250s'"
+msgstr "Feld »%s« Wert »%.250s«"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "obsolete '%s' or '%s' field used"
-msgstr "veraltetes Feld »%s« oder »%s« benutzt"
+msgid "obsolete '%s' field used"
+msgstr "veraltetes Feld »%s« verwendet"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -609,12 +825,15 @@ msgstr "Wert für Feld »%s« enthält falsch formatierte Zeile »%.*s«"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
-msgstr "Wert für »%s« enthält Zeile, die mit Nicht-Leerzeichen »%c« beginnt"
+msgid "value for '%s' field has line starting with non-space '%c'"
+msgstr ""
+"Wert für Feld »%s« enthält Zeile, die mit Nicht-Leerzeichen »%c« beginnt"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
-msgstr "Wurzel- oder leeres Verzeichnis ist als Conffile aufgeführt"
+#, c-format
+msgid "root or empty directory listed as a conffile in '%s' field"
+msgstr ""
+"Wurzel- oder leeres Verzeichnis ist als Conffile in Feld »%s« aufgeführt"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -698,8 +917,8 @@ msgstr "Feld »%s«, Referenz auf »%.255s«: Version nicht abgeschlossen"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "Feld »%s«, Referenz auf »%.255s«: Fehler in Version"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "Feld »%s«, Referenz auf »%.255s«: Version »%s«"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -708,8 +927,8 @@ msgstr "Feld »%s«, Syntaxfehler nach Referenz zu Paket »%.255s«"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "alternatives ('|') not allowed in %s field"
-msgstr "Alternativen (»|«) sind im Feld %s nicht erlaubt"
+msgid "alternatives ('|') not allowed in '%s' field"
+msgstr "Alternativen (»|«) sind im Feld »%s« nicht erlaubt"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -749,6 +968,26 @@ msgstr "Zugriffsrechte der Zieldatei »%.250s« können nicht gesetzt werden"
 
 #: lib/dpkg/file.c
 #, c-format
+msgid "cannot stat %s"
+msgstr "%s kann nicht mit stat abgefragt werden"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "%s is not a regular file"
+msgstr "%s ist keine reguläre Datei"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot read %s"
+msgstr "%s kann nicht gelesen werden"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot open %s"
+msgstr "%s kann nicht geöffnet werden"
+
+#: lib/dpkg/file.c
+#, c-format
 msgid "unable to unlock %s"
 msgstr "%s kann nicht entsperrt werden"
 
@@ -759,17 +998,50 @@ msgstr "Sperrstatus der Datei »%s« kann nicht überprüft werden"
 
 #: lib/dpkg/file.c
 #, c-format
-msgid "%s is locked by another process"
-msgstr "%s ist von einem anderen Prozess gesperrt"
+msgid "unable to lock %s"
+msgstr "%s kann nicht gesperrt werden"
+
+#: lib/dpkg/file.c
+msgid ""
+"Note: removing the lock file is always wrong, and can end up damaging the\n"
+"locked area and the entire system. See <https://wiki.debian.org/Teams/Dpkg/"
+"FAQ>."
+msgstr ""
+"Anmerkung: Die Sperrdatei zu entfernen is immer falsch, und kann darin\n"
+"enden, den gesperrten Bereich und das gesamte System zu beschädigen.\n"
+"Siehe <https://wiki.debian.org/Teams/Dpkg/FAQ>."
+
+#: lib/dpkg/file.c
+#, c-format
+msgid ""
+"%s was locked by another process\n"
+"%s"
+msgstr ""
+"%s war von einem anderen Prozess gesperrt\n"
+"%s"
 
 #: lib/dpkg/file.c
 #, c-format
-msgid "unable to lock %s"
-msgstr "%s kann nicht gesperrt werden"
+msgid ""
+"%s was locked by another process with pid %d\n"
+"%s"
+msgstr ""
+"%s war von einem anderen Prozess mit PID %d gesperrt\n"
+"%s"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot open file %s"
+msgstr "Datei %s kann nicht geöffnet werden"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "Anzeige der Datei im Pager"
+msgid "pager to show file"
+msgstr "Pager zum Anzeigen der Datei"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot write file %s into the pager"
+msgstr "Datei »%s« kann nicht in den Pager geschrieben werden"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -791,13 +1063,13 @@ msgstr "Speicherzuweisung fehlgeschlagen"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "dup fehlgeschlagen für std%s"
+msgid "failed to dup for fd %d"
+msgstr "dup fehlgeschlagen für Dateideskriptor %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "dup fehlgeschlagen für Dateideskriptor %d"
+msgid "failed to dup for std%s"
+msgstr "dup fehlgeschlagen für std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -935,27 +1207,28 @@ msgstr "doppelter Wert für benutzerdefiniertes Feld »%.*s«"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "missing %s"
-msgstr "%s fehlt"
+msgid "missing '%s' field"
+msgstr "fehlendes Feld »%s«"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "empty value for %s"
-msgstr "leerer Wert für %s"
+msgid "empty value for '%s' field"
+msgstr "leerer Wert für Feld »%s«"
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "Paket hat Feld »%s«, aber fehlende Architektur"
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is architecture all"
-msgstr "Paket hat Feld %s, ist aber architekturunabhängig"
+msgid "package has '%s' field but is architecture '%s'"
+msgstr "Paket hat Feld »%s«, ist aber Architektur »%s«"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
-msgstr "Config-Version für Paket mit unpassendem Status"
+#, c-format
+msgid "'%s' field present for package with inappropriate '%s' field"
+msgstr "Feld »%s« vorhanden für Paket mit unpassendem Feld »%s«"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -963,8 +1236,9 @@ msgid "package has status %s but triggers are awaited"
 msgstr "Paket hat Status %s, aber Trigger werden erwartet"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "Paket hat Status »triggers-awaited«, erwartet aber keine Trigger"
+#, c-format
+msgid "package has status %s but no triggers awaited"
+msgstr "Paket hat Status %s, aber keine Trigger werden erwartet"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -972,12 +1246,14 @@ msgid "package has status %s but triggers are pending"
 msgstr "Paket hat Status %s, aber Trigger sind anhängig"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "Paket hat Status »triggers-pending«, aber keine Trigger sind anhängig"
+#, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "Paket hat Status %s, aber keine Trigger sind anhängig"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
-msgstr "Paket mit dem Status »nicht installiert« hat Conffiles, vergesse sie"
+#, c-format
+msgid "package has status %s and has conffiles, forgetting them"
+msgstr "Paket hat Status %s und hat Conffiles, vergesse sie"
 
 #: lib/dpkg/parse.c
 msgid ""
@@ -999,11 +1275,11 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
-"%s %s (Multi-Arch: %s) kann nicht zusammen mit %s installiert werden, "
-"welches mehrere installierte Instanzen hat"
+"Paket %s (%s) mit Feld »%s: %s« kann nicht zusammen mit %s installiert "
+"werden, welches mehrere installierte Instanzen hat"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1181,11 +1457,6 @@ msgstr "»%.255s« kann nicht auf sichere Weise entfernt werden"
 msgid "rm command for cleanup"
 msgstr "rm-Befehl zum Aufräumen"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "mehrdeutiger Paketname »%s« mit mehr als einer installierten Instanz"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1199,6 +1470,17 @@ msgstr "Feldbreite ist außerhalb des Wertebereichs"
 msgid "missing closing brace"
 msgstr "fehlende schließende geschweifte Klammer"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+"letztes Dateisystem-Änderungsdatum von Paket %s kann nicht ermittelt werden"
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "mehrdeutiger Paketname »%s« mit mehr als einer installierten Instanz"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(keine Beschreibung vorhanden)"
@@ -1283,6 +1565,58 @@ msgstr "»%s«-Unterprozess mit Warte-Statuswert %d fehlgeschlagen"
 msgid "wait for %s subprocess failed"
 msgstr "Warten auf »%s«-Unterprozess fehlgeschlagen"
 
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header size field"
+msgstr "ungültiges Größenfeld in Tar-Kopfteil"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header mtime field"
+msgstr "ungültiges Mtime-Feld in Tar-Kopfteil"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header uid field"
+msgstr "ungültiges UID-Feld in Tar-Kopfteil"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header gid field"
+msgstr "ungültiges GID-Feld in Tar-Kopfteil"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum field"
+msgstr "ungültiges Prüfsumme-Feld in Tar-Kopfteil"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr "ungültige Tar-Kopfteil-Prüfsumme"
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr "teilweise gelesener Tar-Kopfteil"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr "ungültiger Tar-Kopfteil mit leerem Namensfeld"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr "nicht unterstützter GNU-Tar-Kopfteil-Typ »%c«"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "nicht unterstützter Solaris-Tar-Kopfteil-Typ »%c«"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr "nicht unterstützter PAX-Tar-Kopfteil-Typ »%c«"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unknown tar header type '%c'"
+msgstr "unbekannter Tar-Kopfteil-Typ »%c«"
+
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot stat pathname '%s'"
@@ -1300,12 +1634,12 @@ msgstr "Treewalk-Wurzel %s ist kein Verzeichnis"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "Trigger-Sperrdatei »%.250s« kann nicht geöffnet/angelegt werden"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
-msgstr "Triggerbereich"
+msgid "triggers database lock"
+msgstr "Trigger-Datenbank-Sperre"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
@@ -1536,11 +1870,6 @@ msgstr "Fehler beim Anlegen der Pipe »%.255s«"
 msgid "error creating device '%.255s'"
 msgstr "Fehler beim Anlegen des Geräts »%.255s«"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "Fehler beim Anlegen des harten Links »%.255s«"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1869,10 +2198,10 @@ msgstr "Auf das Archiv »%s« kann nicht zugegriffen werden"
 msgid "archive '%s' is not a regular file"
 msgstr "Archive »%s« ist keine reguläre Datei"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<Standardausgabe>"
 
@@ -2063,6 +2392,10 @@ msgid "conffile difference visualizer"
 msgstr "Conffile-Unterschied-Darsteller"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr "Nützliche Umgebungsvariablen:\n"
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Geben Sie »exit« ein, wenn Sie fertig sind.\n"
 
@@ -2429,7 +2762,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2444,7 +2780,12 @@ msgstr ""
 "wird.\n"
 "  --rename                 Datei tatsächlich beiseite schieben (oder "
 "zurück).\n"
+"  --no-rename              Datei nicht beiseite (oder zurück) schieben "
+"(Vorgabe).\n"
 "  --admindir <Verzeichnis> Verzeichnis mit der diversions-Datei setzen.\n"
+"  --instdir <Verzeichnis>  Wurzelverzeichnis setzen, aber nicht das\n"
+"                             administrative Verzeichnis.\n"
+"  --root <Verzeichnis>     Verzeichnis des Wurzeldateisystems setzen.\n"
 "  --test                   nichts tun, nur vorführen, was geschehen würde.\n"
 "  --quiet                  stille Ausführung, minimale Ausgaben.\n"
 "  --help                   diesen Hilfetext anzeigen.\n"
@@ -2464,6 +2805,14 @@ msgstr ""
 "falls angegeben. Paket-preinst/postrm-Skripte sollten immer --package\n"
 "und --divert angeben.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+"Bitte geben Sie »--no-rename« explizit an, die Vorgabe wird in 1.20.x\n"
+"auf »--rename« geändert werden"
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2585,6 +2934,15 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+"Datei »%s« aus einem essenziellen Paket mit »rename« umzuleiten\n"
+"ist gefährlich, verwenden Sie »--no-rename«"
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Keine Umleitung »%s«, keine entfernt.\n"
 
@@ -2630,19 +2988,6 @@ msgstr "Paketname darf keine Zeilenvorschübe enthalten"
 msgid "divert-to may not contain newlines"
 msgstr "Name der Umleitung darf keine Zeilenvorschübe enthalten"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "Öffnen der diversions-Datei fehlgeschlagen"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "Abfragen der diversions-Datei mit fstat fehlgeschlagen"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "kollidierende Umleitungen betreffend »%.250s« und »%.250s«"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2941,112 +3286,194 @@ msgstr ""
 "Paket %s ist auf »halten«, wird nicht angerührt. Benutzen Sie --force-hold, "
 "um es trotzdem zu verarbeiten.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "Problem wird übergangen, weil --force angegeben ist: "
+#: src/force.c
+msgid "Set all force options"
+msgstr "Alle Optionen zum Erzwingen setzen"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr "MAC-basierte Security verwenden, falls verfügbar"
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Paket durch eine niedrigere Version ersetzen"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Jedes Paket konfigurieren, das diesem helfen könnte"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Nebensächliche Pakete bearbeiten, auch wenn auf »halten«"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
 msgstr ""
-"Abschließender Zeilenvorschub fehlt in Control-Datei »%s« für Paket »%s«"
+"Dinge versuchen zu (de)installieren, selbst wenn\n"
+"nicht root"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "Wert fehlt in Control-Datei »%s« für Paket »%s«"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "Wichtige Programme nicht in PATH, Probleme wahrsch."
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "Trennzeichen fehlt in Control-Datei »%s« für Paket »%s«"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
+"Paket installieren, selbst wenn Authentizitäts-\n"
+"überprüfung misslingt"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "Control-Datei »%s« für Paket »%s« enthält leeren Dateinamen"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Selbst Pakete mit fehlerhafter Version bearbeiten"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "Control-Datei »%s« für Paket »%s« kann nicht geöffnet werden"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+"Einen existierenden Status-Override beim\n"
+"Hinzufügen überschreiben"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "Control-Datei »%s« für Paket »%s« kann nicht mit stat abgefragt werden"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr "Einen fehlenden Status-Override beim Entfernen ignorieren"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "Control-Datei »%s« für Paket »%s« ist keine reguläre Datei"
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Datei eines anderen Paketes überschreiben"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "Control-Datei »%s« für Paket »%s« kann nicht gelesen werden"
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+"Umgeleitete Datei mit einer nicht umgeleiteten\n"
+"Version überschreiben"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "Control-Datei »%s« für Paket »%s« kann nicht geschlossen werden"
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+"Verzeichnis eines Paketes mit Datei eines\n"
+"anderen überschreiben"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "Dateilisten-Datei des Paketes »%.250s« kann nicht geöffnet werden"
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+"Beim Entpacken keine sicheren Ein/Ausgabe-Operationen\n"
+"durchführen"
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr "Nicht in die Umgebung von Betreuerskripten wechseln"
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Immer neue Konf.-Dateien verwenden, nicht nachfragen"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Immer alte Konf.-Dateien verwenden, nicht nachfragen"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"Dateilisten-Datei des Paketes »%.250s« fehlt; es wird angenommen,\n"
-" dass das Paket derzeit keine Dateien installiert hat"
+"Vorgabe für neue Konf.-Dateien benutzen, wenn es eine\n"
+"gibt, nicht nachfragen. Wenn Vorgaben nicht\n"
+"gefunden werden können, nachfragen, außer confold\n"
+"oder confnew ist auch angegeben."
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Fehlende Konf.-Dateien immer installieren"
+
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
-"Dateilisten-Datei des Paketes »%.250s« kann nicht mit stat abgefragt werden"
+"Anbieten, Konf.-Dateien durch nicht neue Versionen\n"
+"zu ersetzen"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "Dateilisten-Datei des Paketes »%.250s« ist keine reguläre Datei"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
+"Selbst Pakete mit falscher oder fehlender Architektur\n"
+"bearbeiten"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "Lesen der Dateiliste des Paketes »%.250s«"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+"Installieren, selbst wenn es andere Pakete\n"
+"beschädigt"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Installation kollidierender Pakete erlauben"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Alle Abhängigkeitsprobleme in Warnungen umwandeln"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Versionsabhängigkeitsprobleme in Warnungen umwandeln"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Pakete entfernen, die Installation erfordern"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Ein essenzielles Paket entfernen"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"Abschließender Zeilenvorschub fehlt in Dateilisten-Datei des Paketes »%.250s«"
+"%s-Optionen zum Erzwingen - Verhalten steuern, wenn Probleme gefunden "
+"werden:\n"
+"  Warnen aber fortsetzen: --force-<Ding>,<Ding>,...\n"
+"  Mit Fehler anhalten:    --refuse-<Ding>,<Ding>,... | --no-force-"
+"<Ding>,...\n"
+" Dinge erzwingen:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "Dateilisten-Datei des Paketes »%.250s« enthält leeren Dateinamen"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"WARNUNG - Anwenden der mit [!] markierten Optionen kann Ihre Installation\n"
+"schwer beschädigen. Mit [*] markierte Optionen sind per Vorgabe aktiviert.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "Fehler beim Schließen der Dateilisten-Datei des Paketes »%.250s«"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+"\n"
+"Gegenwärtig aktivierte Optionen:\n"
+" %s\n"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Lese Datenbank ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "unbekannte force/refuse-Option »%.*s«"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d Datei oder Verzeichnis ist derzeit installiert.)\n"
-msgstr[1] "%d Dateien und Verzeichnisse sind derzeit installiert.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "veraltete force/refuse-Option »%s«"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "Problem wird übergangen, weil --force angegeben ist: "
 
 #: src/help.c
 msgid "not installed"
@@ -3112,42 +3539,6 @@ msgstr ""
 "Beachten Sie: PATH von root sollte normalerweise /usr/local/sbin, /usr/sbin "
 "und /sbin enthalten"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "Die Existenz von »%.250s« kann nicht überprüft werden"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "Info-Verzeichnis kann nicht gelesen werden"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "Fehler beim Versuch, %.250s zu öffnen"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "beschädigte Info-Datenbank-Formatdatei »%s«"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"Info-Datenbank-Format (%d) ist falsch oder zu neu; versuchen Sie, ein "
-"neueres dpkg zu erhalten"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "Infodatei %s/%s gehört zu keinem Paket"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "Fehler beim Schreiben von »%s«"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3157,27 +3548,27 @@ msgstr "Debian »%s« Paketmanagement-Programm Version %s.\n"
 #, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3195,18 +3586,15 @@ msgid ""
 "\n"
 msgstr ""
 "Befehle:\n"
-"  -i|--install       <.deb-Dateiname> ... | -R|--recursive "
-"<Verzeichnis> ...\n"
-"  --unpack           <.deb-Dateiname> ... | -R|--recursive "
-"<Verzeichnis> ...\n"
-"  -A|--record-avail  <.deb-Dateiname> ... | -R|--recursive "
-"<Verzeichnis> ...\n"
-"  --configure        <Paket> ... | -a|--pending\n"
-"  --triggers-only    <Paket> ... | -a|--pending\n"
-"  -r|--remove        <Paket> ... | -a|--pending\n"
-"  -P|--purge         <Paket> ... | -a|--pending\n"
-"  -V|--verify <Paket> ...          Integrität von Paket(en) überprüfen.\n"
-"  --get-selections [<Muster> ...]  Paketauswahl auf Standardausgabe "
+"  -i|--install       <.deb-Dateiname>... | -R|--recursive <Verzeichnis> ...\n"
+"  --unpack           <.deb-Dateiname>... | -R|--recursive <Verzeichnis> ...\n"
+"  -A|--record-avail  <.deb-Dateiname>... | -R|--recursive <Verzeichnis> ...\n"
+"  --configure        <Paket>... | -a|--pending\n"
+"  --triggers-only    <Paket>... | -a|--pending\n"
+"  -r|--remove        <Paket>... | -a|--pending\n"
+"  -P|--purge         <Paket>... | -a|--pending\n"
+"  -V|--verify [<Paket>...]         Integrität von Paket(en) überprüfen.\n"
+"  --get-selections [<Muster>...]   Paketauswahl auf Standardausgabe "
 "ausgeben.\n"
 "  --set-selections                 Paketauswahl aus Standardeingabe setzen.\n"
 "  --clear-selections               Jedes nicht-essenzielle Paket abwählen.\n"
@@ -3216,19 +3604,19 @@ msgstr ""
 "  --clear-avail                    Verfügbarkeits-Informationen löschen.\n"
 "  --forget-old-unavail             Nicht verfügbare uninst. Pakete "
 "vergessen.\n"
-"  -s|--status <Paket> ...          Details zum Paketstatus anzeigen.\n"
-"  -p|--print-avail <Paket> ...     Details zur verfügbaren Version "
+"  -s|--status [<Paket>...]         Details zum Paketstatus anzeigen.\n"
+"  -p|--print-avail [<Paket>...]    Details zur verfügbaren Version "
 "anzeigen.\n"
-"  -L|--listfiles <Paket> ...       Dateien auflisten, die dem Paket "
+"  -L|--listfiles <Paket>...        Dateien auflisten, die dem Paket "
 "»gehören«.\n"
-"  -l|--list [<Muster> ...]         Pakete kurz auflisten.\n"
-"  -S|--search <Muster> ...         Paket(e) suchen, denen Datei(en) "
+"  -l|--list [<Muster>...]          Pakete kurz auflisten.\n"
+"  -S|--search <Muster>...          Paket(e) suchen, denen Datei(en) "
 "»gehören«.\n"
+"  -C|--audit [<Paket>...]         Auf beschädigte(s) Paket(e) prüfen.\n"
 "  --yet-to-unpack                  Zur Installation ausgewählte Pakete "
 "ausgeben.\n"
 "  --predep-package                 Zu entpackende Vor-Abhängigkeiten "
 "ausgeben.\n"
-"  -C|--audit [<Paket> ...]         Auf beschädigte(s) Paket(e) prüfen.\n"
 "  --add-architecture <Arch>        <Arch> zur Liste der Architekturen\n"
 "                                     hinzufügen.\n"
 "  --remove-architecture <Arch>     <Arch> aus der Liste der Architekturen\n"
@@ -3421,130 +3809,6 @@ msgstr ""
 "Optionen mit [*] geben viel aus - schicken Sie es durch »less« oder »more«!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Alle Optionen zum Erzwingen setzen"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Paket durch eine niedrigere Version ersetzen"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Jedes Paket konfigurieren, das diesem helfen könnte"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Nebensächliche Pakete bearbeiten, auch wenn auf »halten«"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-"Dinge versuchen zu (de)installieren, selbst wenn\n"
-"nicht root"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "Wichtige Programme nicht in PATH, Probleme wahrsch."
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-"Paket installieren, selbst wenn Authentizitäts-\n"
-"überprüfung misslingt"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Selbst Pakete mit fehlerhafter Version bearbeiten"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Datei eines anderen Paketes überschreiben"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-"Umgeleitete Datei mit einer nicht umgeleiteten\n"
-"Version überschreiben"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-"Verzeichnis eines Paketes mit Datei eines\n"
-"anderen überschreiben"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-"Beim Entpacken keine sicheren Ein/Ausgabe-Operationen\n"
-"durchführen"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr "Nicht in die Umgebung von Betreuerskripten wechseln"
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Immer neue Konf.-Dateien verwenden, nicht nachfragen"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Immer alte Konf.-Dateien verwenden, nicht nachfragen"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Vorgabe für neue Konf.-Dateien benutzen, wenn es eine\n"
-"gibt, nicht nachfragen. Wenn Vorgaben nicht\n"
-"gefunden werden können, nachfragen, außer confold\n"
-"oder confnew ist auch angegeben."
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Fehlende Konf.-Dateien immer installieren"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-"Anbieten, Konf.-Dateien durch nicht neue Versionen\n"
-"zu ersetzen"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-"Selbst Pakete mit falscher oder fehlender Architektur\n"
-"bearbeiten"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-"Installieren, selbst wenn es andere Pakete\n"
-"beschädigt"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Installation kollidierender Pakete erlauben"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Alle Abhängigkeitsprobleme in Warnungen umwandeln"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Versionsabhängigkeitsprobleme in Warnungen umwandeln"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Pakete entfernen, die Installation erfordern"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Ein essenzielles Paket entfernen"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Allgemein hilfreiche Fortschrittsinformationen"
 
@@ -3676,42 +3940,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s-Optionen zum Erzwingen - Verhalten steuern, wenn Probleme gefunden "
-"werden:\n"
-"  Warnen aber fortsetzen: --force-<Ding>,<Ding>,...\n"
-"  Mit Fehler anhalten:    --refuse-<Ding>,<Ding>,... | --no-force-"
-"<Ding>,...\n"
-" Dinge erzwingen:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"WARNUNG - Anwenden der mit [!] markierten Optionen kann Ihre Installation\n"
-"schwer beschädigen. Mit [*] markierte Optionen sind per Vorgabe aktiviert.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "unbekannte force/refuse-Option »%.*s«"
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "veraltete force/refuse-Option »%s«"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "»%i« konnte nicht für Datenstrom geöffnet werden"
 
@@ -3897,6 +4125,10 @@ msgid "Description"
 msgstr "Beschreibung"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr "Anzeige der Paketliste im Pager"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "Umleitung durch %s von: %s\n"
@@ -3932,6 +4164,11 @@ msgstr ""
 "Paket »%s« ist nicht installiert und es ist keine Information verfügbar"
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Verwenden Sie dpkg --info (= dpkg-deb --info) zum Untersuchen von Archiven.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "Paket »%s« ist nicht verfügbar"
@@ -3958,11 +4195,10 @@ msgstr "umgeleitet durch %s zu: %s\n"
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
-"Verwenden Sie dpkg --info (= dpkg-deb --info) zum Untersuchen von Archiven\n"
-"und dpkg --contents (= dpkg-deb --contents) zum Auflisten ihres Inhalts.\n"
+"Verwenden Sie dpkg --contents (= dpkg-deb --contents) zum Auflisten von "
+"Archivinhalten.\n"
 
 #: src/querycmd.c dpkg-deb/info.c
 #, c-format
@@ -4003,32 +4239,32 @@ msgstr "Debian %s Abfragewerkzeug für Paketmanagement-Programm Version %s.\n"
 #, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
 "Befehle:\n"
-"  -s|--status <Paket> ...          Details zum Paketstatus anzeigen.\n"
-"  -p|--print-avail <Paket> ...     Details zur vorhandenen Version "
+"  -s, --status [<Paket>...]        Details zum Paketstatus anzeigen.\n"
+"  -p, --print-avail [<Paket>...]   Details zur vorhandenen Version "
 "anzeigen.\n"
-"  -L|--listfiles <Paket> ...       zu Paket(en) gehörende Dateien "
+"  -L, --listfiles <Paket>...       zu Paket(en) gehörende Dateien "
 "auflisten.\n"
-"  -l|--list [<Muster> ...]         Übersicht zu Paketen auflisten.\n"
-"  -W|--show [<Muster> ...]         Informationen zu Paket(en) anzeigen.\n"
-"  -S|--search <Muster> ...         Pakete suchen, denen Datei(en) gehören.\n"
+"  -l, --list [<Muster>...]         Übersicht zu Paketen auflisten.\n"
+"  -W, --show [<Muster>...]         Informationen zu Paket(en) anzeigen.\n"
+"  -S, --search <Muster>...         Pakete suchen, denen Datei(en) gehören.\n"
 "     --control-list <Paket>        Control-Dateiliste des Paketes ausgeben.\n"
 "     --control-show <Paket> <Datei>\n"
 "                                   Control-Datei des Paketes anzeigen.\n"
-"  -c|--control-path <Paket> [<Datei>]\n"
+"  -c, --control-path <Paket> [<Datei>]\n"
 "                                   Pfad zur control-Datei des Paketes "
 "ausgeben.\n"
 "\n"
@@ -4209,6 +4445,14 @@ msgstr ""
 "liegen, damit dpkg korrekt funktioniert"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+"Nicht genug Privilegien, das Wurzelverzeichnis mit --force-not-root zu "
+"ändern, vielleicht sollten Sie --force-script-chrootless verwenden?"
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "chroot nach »%.250s« fehlgeschlagen"
@@ -4364,8 +4608,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4373,9 +4622,14 @@ msgid ""
 msgstr ""
 "Optionen:\n"
 "  --admindir <Verzeichnis> Verzeichnis mit der statoverride-Datei setzen.\n"
+"  --instdir <Verzeichnis>  Wurzelverzeichnis setzen, aber nicht das\n"
+"                             administrative Verzeichnis.\n"
+"  --root <Verzeichnis>     Verzeichnis des Wurzeldateisystems setzen.\n"
 "  --update                 Zugriffsrechte von <Pfad> sofort aktualisieren.\n"
-"  --force                  Aktion erzwingen, selbst wenn Überprüfung "
-"scheitert.\n"
+"  --force                  veralteter Alias für --force-all.\n"
+"  --force-...              Probleme überstimmen (siehe --force-help).\n"
+"  --no-force-...           Anhalten, wenn Probleme auftauchen.\n"
+"  --refuse-...             Dito.\n"
 "  --quiet                  stille Ausführung, minimale Ausgaben.\n"
 "  --help                   diesen Hilfetext anzeigen.\n"
 "  --version                Version anzeigen.\n"
@@ -4430,64 +4684,10 @@ msgstr "kein Override vorhanden"
 msgid "--update is useless for --remove"
 msgstr "--update ist sinnlos für --remove"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "ungültige Statoverride-UID %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "ungültige Statoverride-GID %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "ungültiger Statoverride-Modus %s"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "Öffnen der statoverride-Datei fehlgeschlagen"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "Abfragen der statoverride-Datei mit fstat fehlgeschlagen"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "Lesen der statoverride-Datei »%.250s«"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "Abschließender Zeilenvorschub fehlt in statoverride-Datei"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "statoverride-Datei enthält leere Zeile"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "Syntaxfehler in statoverride-Datei"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "unbekannter Benutzer »%s« in statoverride-Datei"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "unerwartetes Zeilenende in statoverride-Datei"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "unbekannte Gruppe »%s« in statoverride-Datei"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "Mehrere Status-Overrides für Datei »%.250s« vorhanden"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "überholte Option »--%s«; bitte verwenden Sie »--%s« stattdessen"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4706,6 +4906,10 @@ msgstr "De-konfigurieren von %s (%s), um %s (%s) entfernen zu können ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "%s (%s) wird de-konfiguriert ...\n"
 
+#: src/unpack.c
+msgid "conffile file contains an empty line"
+msgstr "conffile-Datei enthält eine leere Zeile"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4847,12 +5051,8 @@ msgid "package filesystem archive extraction"
 msgstr "Paket-Dateisystemarchiv-Extraktion"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "Fehler beim Lesen der dpkg-deb-tar-Ausgabe"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
-msgstr "defektes Tar-Dateisystem - Paketarchiv ist defekt"
+msgid "corrupted filesystem tarfile in package archive"
+msgstr "defektes Tar-Dateisystem in Paketarchiv"
 
 #: src/unpack.c
 #, c-format
@@ -4865,16 +5065,20 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s benötigt höchstens eine Packages-Datei als Argument"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, c-format
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
-"Für eine große Verfügbarkeits-Aktualisierung kann nicht auf den\n"
-"dpkg-Status-Bereich zugegriffen werden"
+"Für eine große Verfügbarkeits-Aktualisierung kann nicht auf das\n"
+"dpkg-Datenbank-Verzeichnis »%s« zugegriffen werden"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, c-format
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"Große Verfügbarkeits-Aktualisierung benötigt Schreibzugriff auf den dpkg-"
-"Status-Bereich"
+"Für eine große Verfügbarkeits-Aktualisierung ist Schreibzugriff auf das\n"
+"dpkg-Datenbank-Verzeichnis »%s« erforderlich"
 
 #: src/update.c
 #, c-format
@@ -5220,16 +5424,17 @@ msgid "decompressing archive member"
 msgstr "Archiv-Element wird dekomprimiert"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "Wechsel in das Verzeichnis fehlgeschlagen"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "Anlegen eines Verzeichnisses fehlgeschlagen"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "Wechsel in das Verzeichnis nach dessen Erzeugung fehlgeschlagen"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr "unerwarteter bereits existierender Pfadname %s"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "Wechsel in das Verzeichnis fehlgeschlagen"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6058,8 +6263,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6070,8 +6276,9 @@ msgstr ""
 "  --skip-auto              Aufforderung für korrekt konfigurierte\n"
 "                           Alternativen im automatischen Modus auslassen\n"
 "                           (nur für --config relevant)\n"
-"  --verbose                ausführliche Operation, mehr Ausgaben.\n"
 "  --quiet                  stille Ausführung, minimale Ausgaben.\n"
+"  --verbose                ausführliche Operation, mehr Ausgaben.\n"
+"  --debug                  Debug-Ausgabe, wesentlich mehr Ausgaben.\n"
 "  --help                   diesen Hilfetext anzeigen.\n"
 "  --version                Version anzeigen.\n"
 "\n"
@@ -6574,11 +6781,80 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Authentifizierung ist erforderlich, um update-alternatives auszuführen"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "veraltete Option »--%s«; bitte verwenden Sie »--%s« stattdessen"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "Sperrdatei %s kann nicht zum Testen geöffnet werden"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "unbekannter Benutzer »%s« in statoverride-Datei"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "unbekannte Gruppe »%s« in statoverride-Datei"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s fehlt"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "»%.50s« ist nicht erlaubt für %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "Unsinn hinter %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "ungültiger Paketname (%.250s)"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "Fehlender Wert in Control-Datei »%s«"
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no in booleschem Feld"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "Feld »%s«, Referenz auf »%.255s«: Fehler in Version"
+
+#~ msgid "empty value for %s"
+#~ msgstr "leerer Wert für %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "Paket hat Status »triggers-awaited«, erwartet aber keine Trigger"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "Paket hat Status »triggers-pending«, aber keine Trigger sind anhängig"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "Große Verfügbarkeits-Aktualisierung benötigt Schreibzugriff auf den dpkg-"
+#~ "Status-Bereich"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "Fehler beim Lesen der dpkg-deb-tar-Ausgabe"
+
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "Control-Datei »%s« für Paket »%s« kann nicht geöffnet werden"
+
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "Control-Datei »%s« für Paket »%s« kann nicht mit stat abgefragt werden"
+
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "Control-Datei »%s« für Paket »%s« ist keine reguläre Datei"
+
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "Control-Datei »%s« für Paket »%s« kann nicht geschlossen werden"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "Dateilisten-Datei des Paketes »%.250s« kann nicht geöffnet werden"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "Dateilisten-Datei des Paketes »%.250s« kann nicht mit stat abgefragt "
+#~ "werden"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "Dateilisten-Datei des Paketes »%.250s« ist keine reguläre Datei"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "Lesen der Dateiliste des Paketes »%.250s«"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "Wechsel in das Verzeichnis nach dessen Erzeugung fehlgeschlagen"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "Fehlendes Trennzeichen in Control-Datei »%s«"
@@ -6643,9 +6919,6 @@ msgstr "Authentifizierung ist erforderlich, um update-alternatives auszuführen"
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF auf Standardeingabe an der Conffile-Eingabeaufforderung"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "unerwartetes EOF im Paketnamen in Zeile %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "unerwartetes EOF nach Paketnamen in Zeile %d"
 
@@ -6882,9 +7155,6 @@ msgstr "Authentifizierung ist erforderlich, um update-alternatives auszuführen"
 #~ msgid "it is a slave of %s"
 #~ msgstr "Sie ist ein Slave von %s"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "»%s« kann nicht mit stat abgefragt werden: %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "readlink(%s) fehlgeschlagen: %s"
 
@@ -6909,9 +7179,6 @@ msgstr "Authentifizierung ist erforderlich, um update-alternatives auszuführen"
 #~ msgid "unable to close %s: %s"
 #~ msgstr "%s kann nicht geschlossen werden: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "%s kann nicht geschrieben werden: %s"
-
 #~ msgid "unable to unbuffer `%.255s'"
 #~ msgstr "»%.255s« kann nicht entpuffert werden"
 
diff --git a/po/dpkg.pot b/po/dpkg.pot
index cf53dc504..54ba5e7fc 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.0\n"
+"Project-Id-Version: dpkg 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -135,7 +135,8 @@ msgstr ""
 msgid "error creating new backup file '%s'"
 msgstr ""
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr ""
@@ -337,19 +338,30 @@ msgstr ""
 
 #: lib/dpkg/dbmodify.c
 #, c-format
-msgid "unable to open lock file %s for testing"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, c-format
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
@@ -357,11 +369,13 @@ msgid "requested operation requires superuser privilege"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, c-format
+msgid "unable to access the dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, c-format
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
@@ -399,6 +413,182 @@ msgstr ""
 msgid "unable to install updated status of '%.250s'"
 msgstr ""
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "loading control file '%s' for package '%s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "loading files list file for package '%s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr ""
+
 #: lib/dpkg/deb-version.c
 msgid "format version with too big major component"
 msgstr ""
@@ -508,60 +698,61 @@ msgid "internal error"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
+msgid "is missing a value"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%.50s' is not allowed for %s"
+msgid "has invalid value '%.50s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
+msgid "has trailing junk"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "invalid package name (%.250s)"
+msgid "invalid package name in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
+#, c-format
+msgid "boolean (yes/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, c-format
+msgid "word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -570,25 +761,28 @@ msgid "value for '%s' field not allowed in this context"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, c-format
+msgid "first (want) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, c-format
+msgid "second (error) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, c-format
+msgid "third (status) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -598,11 +792,12 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, c-format
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -674,7 +869,7 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
+msgid "'%s' field, reference to '%.255s': version '%s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -684,7 +879,7 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -724,6 +919,26 @@ msgstr ""
 
 #: lib/dpkg/file.c
 #, c-format
+msgid "cannot stat %s"
+msgstr ""
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "%s is not a regular file"
+msgstr ""
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot read %s"
+msgstr ""
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot open %s"
+msgstr ""
+
+#: lib/dpkg/file.c
+#, c-format
 msgid "unable to unlock %s"
 msgstr ""
 
@@ -743,7 +958,17 @@ msgid "unable to lock %s"
 msgstr ""
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
+#, c-format
+msgid "cannot open file %s"
+msgstr ""
+
+#: lib/dpkg/file.c
+msgid "pager to show file"
+msgstr ""
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot write file %s into the pager"
 msgstr ""
 
 #: lib/dpkg/log.c
@@ -766,12 +991,12 @@ msgstr ""
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
+msgid "failed to dup for fd %d"
 msgstr ""
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
+msgid "failed to dup for std%s"
 msgstr ""
 
 #: lib/dpkg/mlib.c
@@ -910,26 +1135,27 @@ msgstr ""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "missing %s"
+msgid "missing '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "empty value for %s"
+msgid "empty value for '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr ""
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, c-format
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -938,7 +1164,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -947,11 +1174,13 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
+#, c-format
+msgid "package has status %s but no triggers pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, c-format
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -969,8 +1198,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1141,11 +1370,6 @@ msgstr ""
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1159,6 +1383,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr ""
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr ""
@@ -1240,6 +1474,58 @@ msgstr ""
 msgid "wait for %s subprocess failed"
 msgstr ""
 
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header size field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header mtime field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header uid field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header gid field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unknown tar header type '%c'"
+msgstr ""
+
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot stat pathname '%s'"
@@ -1257,11 +1543,11 @@ msgstr ""
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr ""
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr ""
 
 #: lib/dpkg/trigdeferred.c
@@ -1469,11 +1755,6 @@ msgstr ""
 msgid "error creating device '%.255s'"
 msgstr ""
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr ""
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1759,10 +2040,10 @@ msgstr ""
 msgid "archive '%s' is not a regular file"
 msgstr ""
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -1934,6 +2215,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr ""
 
@@ -2262,7 +2547,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2279,6 +2567,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2396,6 +2690,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
@@ -2433,19 +2734,6 @@ msgstr ""
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr ""
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr ""
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr ""
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2692,107 +2980,160 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Configure any package which may help this one"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
 msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr ""
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr ""
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] ""
-msgstr[1] ""
+msgid "obsolete force/refuse option '%s'"
+msgstr ""
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr ""
 
 #: src/help.c
 msgid "not installed"
@@ -2851,40 +3192,6 @@ msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin"
 msgstr ""
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr ""
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr ""
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr ""
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr ""
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr ""
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -2894,27 +3201,27 @@ msgstr ""
 #, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3035,110 +3342,6 @@ msgid ""
 msgstr ""
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr ""
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr ""
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3262,33 +3465,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr ""
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr ""
 
@@ -3458,6 +3634,10 @@ msgid "Description"
 msgstr ""
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr ""
@@ -3492,6 +3672,10 @@ msgid "package '%s' is not installed and no information is available"
 msgstr ""
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr ""
@@ -3518,8 +3702,7 @@ msgstr ""
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 
 #: src/querycmd.c dpkg-deb/info.c
@@ -3561,16 +3744,16 @@ msgstr ""
 #, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -3713,6 +3896,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr ""
@@ -3851,8 +4040,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -3906,63 +4100,9 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr ""
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr ""
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr ""
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr ""
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr ""
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr ""
-
-#: src/statdb.c
+#: src/statcmd.c
 #, c-format
-msgid "multiple statoverrides present for file '%.250s'"
+msgid "deprecated --%s option; use --%s instead"
 msgstr ""
 
 #: src/trigcmd.c
@@ -4150,6 +4290,10 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr ""
 
+#: src/unpack.c
+msgid "conffile file contains an empty line"
+msgstr ""
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4280,11 +4424,7 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr ""
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 
 #: src/unpack.c
@@ -4298,11 +4438,15 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr ""
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, c-format
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, c-format
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
 
 #: src/update.c
@@ -4627,15 +4771,16 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
+msgid "failed to create directory"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to create directory"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
+msgid "failed to chdir to directory"
 msgstr ""
 
 #: dpkg-deb/extract.c
@@ -5329,8 +5474,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
diff --git a/po/dz.po b/po/dz.po
index bc6f9f4b5..40c306394 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -1,13 +1,14 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Software in the Public Interest, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# translation of dpkg to Dzongkha.
+# Copyright © 2006-2007 Dpkg Developers
+# This file is distributed under the same license as the dpkg package.
+# Kinley Tshering <gasepkuenden2k3@hotmail.com>, 2006.
+# Tshewang Norbu <bumthap2006@hotmail.com>, 2006-2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:48+0200\n"
 "Last-Translator: Tshewang Norbu <bumthap2006@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -149,7 +150,8 @@ msgstr "ཁ་སྒྱུར་རྙིངམ་-རྙིངམ་ རྩ་�
 msgid "error creating new backup file '%s'"
 msgstr "རྒྱུད་དུང་ `%.255s' གསར་བསྐུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "`%.250s' རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
@@ -374,22 +376,36 @@ msgstr "%.250s འདི་བར་ཤབས་ཀྱི་ཤུལ་ལས�
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "vsnprintf གི་དོན་ལུ་ ཊི་ཨེམ་པི་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "%.250s གི་དོན་ལུ་ ཡིག་སྣོད་འགྲེལ་བཤདཔ་ཟུར་རྟགས་ཚུ་ལྷག་མ་ཚུགས།"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "གནས་ཚད་གནད་སྡུད་ཀྱི་གཞི་རྟེན་ལྡེ་མིག་ཡིག་སྣོད་ ཁ་ཕྱེ་/གསར་བསྐྲུན་འབད་མ་ཚུགས།"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "གནས་ཚད་གནད་སྡུད་ཀྱི་གཞི་རྟེན་ལྡེ་མིག་ཡིག་སྣོད་ ཁ་ཕྱེ་/གསར་བསྐྲུན་འབད་མ་ཚུགས།"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "ཁྱོད་ལུ་ཌི་པི་ཀེ་ཇི་གནས་ཚད་གནད་སྡུད་གཞི་རྟེན་ལྡེ་མིག་རྐྱབས་ནིའི་གནང་བ་མེད།"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "ཌི་པི་ཀེ་ཇི་གནས་ཚད་ཀྱི་གནད་སྡུད་གཞི་རྟེན་ལྡེ་མིག་རྐྱབས་མ་ཚུགས།"
 
 #: lib/dpkg/dbmodify.c
@@ -397,11 +413,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "ཞུ་བ་འབད་ཡོད་པའི་བཀོལ་སྤྱོད་པ་ལུ་ ལག་ལེན་པ་གཙོ་བོའི་ཁེ་དབང་དགོཔ་ཨིན།"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 "ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ལུ་འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལས་བཀོལ་སྤྱོད་པ་ལུ་ ལྷག་/འབྲི་ནི་དགོཔ་ཨིན།"
 
@@ -440,6 +460,196 @@ msgstr " `%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་�
 msgid "unable to install updated status of '%.250s'"
 msgstr " `%.250s' གི་དུས་མཐུན་བཟོ་ཡོད་པའི་གནས་ཚད་ཀྱི་དོན་ལུ་ གཞི་བཙུགས་འབད་མ་ཚུགས།"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "`%.250s' གི་གནས་ས་ཞིབ་དཔྱད་འབད་མ་ཚུགས།"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "བརྡ་དོན་སྣོད་ཐོ་ལྷག་མི་ཚུགས།"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "%.250s ཁ་ཕྱེ་ནིའ་འབད་རྩོལ་བསྐྱེདཔ་ད་འཛོལ་བ།"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "ཀཱོན་ཕ་ཡིལ་`%.250s' འདི་ ཐུམ་སྒྲིལ་ནང་མི་འབྱུང་།"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "ཧརཌི་ལིངཀ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "`%s' འབྲིཝ་ད་འཛོལ་བ།"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ སྣོད་ཐོ་`%.250s'(`%.250s' ལས་)ལྷག་མ་ཚུགས།"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "ཁ་སྒྱུར་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "ཁ་སྒྱུར་ཡིག་སྣོད་ཨེཕ་སི་ཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "`%.250s' ཡང་ན་ `%.250s' འབྲེལ་བ་ཡོད་མི་མི་མཐུན་པའི་ཁ་སྒྱུར་ཚུ།"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་བསྡམ་ད་འཛོལ་བ།"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg: འཚུབ་ཅན་ཉེན་བརྡ་: ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་བརླག་སྟོར་ཞུགས་"
+"ནུག་ ཐུམ་སྒྲིལ་ལུ་ད་ལྟོ་གཞི་བཙུགས་འབད་མི་ཡིག་སྣོད་ཚུ་མེདཔ་སྦེ་ཚོད་དཔག་སྟེ།\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(གནད་སྡུད་གཞི་རྟེན་ལྷག་དོ་..."
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d ཡིག་སྣོད་ཚུ་དང་སྣོད་ཐོ་ཚུ་ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད།)\n"
+msgstr[1] "%d ཡིག་སྣོད་ཚུ་དང་སྣོད་ཐོ་ཚུ་ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད།)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "ནུས་མེད་དུས་མཐུནམ་བཟོ་ནི་ཐབས་ལམ"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "dpkg-statoverride: %s"
+msgid "invalid statoverride gid %s"
+msgstr "ཌི་པི་ཀེ་ཇི་-སི་ཊེཊི་ཟུར་བཞག: %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "dpkg-statoverride: %s"
+msgid "invalid statoverride mode %s"
+msgstr "ཌི་པི་ཀེ་ཇི་-སི་ཊེཊི་ཟུར་བཞག: %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཨེཕ་སི་ཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཀྱི་ནང་ན་གྲལ་ཐིག་སྟོངམ་འདུག"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཀྱི་ནང་ན་གྲལ་ཐིག་སྟོངམ་འདུག"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "གྲལ་ཐིག་ %d གུ་ལུ་ཐུམ་སྒྲིལ་མིང་ནང་ལུ་རེ་བ་མེད་པའི་གྲལ་ཐིག་གི་མཇུག"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ `%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -570,63 +780,71 @@ msgid "internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ་ - ཐབས་ལམ་བྱང་ཉེས་ `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s འདི་བརླག་སྟོར་ཞུགས་ནུག"
+#, fuzzy
+#| msgid "cannot stat old name `%s': %s"
+msgid "is missing a value"
+msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "`%.*s' འདི་ %s གི་དོན་ལུ་མི་ཆོག"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "%s གི་ཤུལ་ལས་མཁོ་མེད།"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "ཐུམ་སྒྲིལ་ `%s' འདི་གཞི་བཙུགས་མ་འབད་བས།\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "ཡིག་སྣོད་སྟོངམ་རྒྱས་བཤད་ས་སྒོ་ `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "ཡིག་སྣོད་རྒྱས་བཤད་ས་སྒོ་ `%s' གནས་ཚད་ཡིག་སྣོད་ནང་ལུ་མི་ཆོག"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "ཡིག་སྣོད་རྒྱས་བཤད་ཀྱི་ས་སྒོ་ `%s' ནང་ལུ་གནས་གོང་ལེ་ཤ་ (གཞན་མི་ཚུ་ལུ་ག་བསྡུར་རྐྱབས་ད)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "ཡིག་སྣོད་རྒྱས་བཤད་ཀྱི་ས་སྒོ་ `%s' ནང་ལུ་གནས་གོང་ཉུང་སུ་(གཞན་མི་ཚུ་ལུ་ག་བསྡུར་རྐྱབས་ད)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "བུ་ལིན་ས་སྒོ་ནང་ལུ་ཨིན་/མེན།"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "ཕན་མེད་  `བསྐྱར་སྦྱོང་' ཡང་ན་ `ཐུམ་སྒྲིལ་-བསྐྱར་སྦྱོང་' ས་སྒོ་ལག་ལེན་འཐབ་ཡོདཔ།"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་: ཐོན་རིམ་: %.255s ནང་འཛོལ་བ།"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "མིང་ཚིག་འདི་ `གཙོ་རིམ' ས་སྒོ་ནང་།"
 
 #: lib/dpkg/fields.c
@@ -636,33 +854,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "འ་ནི་སྐབས་དོན་ནང་ལུ་ `གནས་ཚད་' ས་སྒོ་གི་དོན་ལུ་གནས་གོང་མ་ཆོགཔ་ཨིན། "
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "དང་པ་(དགོ་མི་)མིང་ཚིག་འདི་  `གནས་ཚད་' ས་སྒོ་ནང་།"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "གཉིས་པ་(འཛོལ་བ་)མིང་ཚིག་འདི་ `གནས་ཚད་' ས་སྒོ་ནང་། "
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "གསུམ་པ་(གནས་ཚད་)མིང་ཚིག་འདི་  `གནས་ཚད་' ས་སྒོ་ནང་།"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "འཛོལ་བ་ ཐོན་རིམ་ཡིག་རྒྱུན་ `%.250s': %.250s ནང་།"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "ཕན་མེད་  `བསྐྱར་སྦྱོང་' ཡང་ན་ `ཐུམ་སྒྲིལ་-བསྐྱར་སྦྱོང་' ས་སྒོ་ལག་ལེན་འཐབ་ཡོདཔ།"
 
 #: lib/dpkg/fields.c
@@ -674,11 +892,13 @@ msgstr " `conffiles' གི་དོན་ལུ་གནས་གོང་ལ�
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr " `conffiles' གི་དོན་ལུ་གནས་གོང་ལུ་གྲལ་ཐིག་ བར་སྟོང་-མེདཔ་ `%c' གི་འགོ་བཙུགས་མི་ཡོད།"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "རྩ་བ་ཡང་ན་སྟོང་ཆ་སྣོད་ཐོ་འདི་ ཀཱོནཕ་ཕ་ཡིལ་སྦེ་ཐོ་བཀོད་འབད་ཡོད།"
 
 #: lib/dpkg/fields.c
@@ -765,9 +985,9 @@ msgstr "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ�
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་: ཐོན་རིམ་: %.255s ནང་འཛོལ་བ།"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "`%s' ས་སྒོ་ `%.255s' ལུ་གཞི་བསྟུན:ཐོན་རིམ་ནང་ན་ `%c'ཡོད།"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -775,8 +995,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "`%s' ས་སྒོ་ ཐུམ་སྒྲིལ་ `%.255s' ལུ་གཞི་བསྟུན་གྱི་ཤུལ་ལས་ཚིག་སྦྱོར་གྱྀ་འཛོལ་བ།"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "སྤེལ་མ་ (`|') ཚུ་ %s ས་སྒོ་ནང་མི་ཆོག"
 
 #: lib/dpkg/fields.c
@@ -816,6 +1037,29 @@ msgstr "གྱང་ཚད་རིམ་སྒྲིག་ཡིག་སྣོ
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat %s"
+msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "ཉེན་བརྡ་ ཀཱོནཕ་ཕ་ཡིལ་ `%s' འདི་ཉག་རྐྱང་ཡིག་སྣོད་མེན།\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "write %s: %s"
+msgid "cannot read %s"
+msgstr "%s: %s འབྲི།"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "%s: can't open %s: %s"
+msgid "cannot open %s"
+msgstr "%s: %s ཁ་ཕྱེ་མི་ཚུགས་: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "ཁ་བསྡམ་མ་ཚུགས་ %s: %s"
@@ -838,8 +1082,20 @@ msgid "unable to lock %s"
 msgstr "ཁ་བསྡམ་མ་ཚུགས་ %s: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: can't open %s: %s"
+msgid "cannot open file %s"
+msgstr "%s: %s ཁ་ཕྱེ་མི་ཚུགས་: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "vsnprintf ནང་ ངོས་སྙོམ་མ་ཚུགས།"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "སྣོད་ཐོ་ཚུ་ཁ་ཕྱོགས་སྒྱུར་མི་ཚུགས།"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -863,13 +1119,13 @@ msgstr "སྣོད་ཐོ་གསར་བསྐྲུན་འབད་ན
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "std%s གི་དོན་ལུ་ཌུཔ་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+msgid "failed to dup for fd %d"
+msgstr "fd %d གི་དོན་ལུ་ཌུཔ་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "fd %d གི་དོན་ལུ་ཌུཔ་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+msgid "failed to dup for std%s"
+msgstr "std%s གི་དོན་ལུ་ཌུཔ་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1007,29 +1263,31 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "ལག་ལེན་པ་-ངེས་འཛིན་འབད་ཡོད་པའི་ས་སྒོ་ `%.*s' གི་དོན་ལུ་གནས་གོང་རྫུན་མ།"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "%s བརླག་སྟོར་ཞུགས་ཡོདཔ།"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s གི་དོན་ལུ་གནས་གོང་སྟོངམ།"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "`%s' ས་སྒོའི་དོན་ལུ་གནས་གོང་རྫུན་མ།"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has '%s' field but is missing architecture"
+msgstr "(ཐུམ་སྒྲིལ:"
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "(ཐུམ་སྒྲིལ:"
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "འོས་ལྡན་མིན་པའི་གནས་ཚད་དང་ཅིག་ཁར་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་རིམ་སྒྲིག་འབད་ཡོད་པའི་-ཐོན་རིམ།"
 
 #: lib/dpkg/parse.c
@@ -1038,7 +1296,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1047,11 +1306,14 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "ཐུམ་སྒྲིལ་ %s འདི་རྩ་བསྐྲད་གཏང་ནི་ཨིན།\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "གཞི་བཙུགས་མིན་པའི་གནས་ལུགས་ཀྱི་ཐུམ་སྒྲིལ་འདི་ལུ་ཀཱོན་ཕ་ཡིལ་ཚུ་ཡོད། འདི་ཚུ་བརྗེད་དོ།"
 
 #: lib/dpkg/parse.c
@@ -1069,8 +1331,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1268,11 +1530,6 @@ msgstr "`%.255s' གསར་བསྐྲུན་འབད་མ་ཚུགས
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1289,6 +1546,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་གདམ་ལྡེ་མིང་།"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(འགྲེལ་བཤད་འཐོབ་ཚུགསཔ་མེད་)"
@@ -1373,6 +1640,68 @@ msgstr "ལས་སྦྱོར་ཡན་ལག་ %s འདི་བསྒ�
 msgid "wait for %s subprocess failed"
 msgstr "%s གི་དོན་ལུ་བསྒུག་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "ས་སྒོ་རྒྱ་ཚད་ནང་ལུ་ནུས་མེད་ཡིག་འབྲུ་ `%c' \n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "ས་སྒོ་རྒྱ་ཚད་ནང་ལུ་ནུས་མེད་ཡིག་འབྲུ་ `%c' \n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "ནུས་མེད་དུས་མཐུནམ་བཟོ་ནི་ཐབས་ལམ"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "dpkg-statoverride: %s"
+msgid "invalid tar header gid field"
+msgstr "ཌི་པི་ཀེ་ཇི་-སི་ཊེཊི་ཟུར་བཞག: %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "ས་སྒོ་རྒྱ་ཚད་ནང་ལུ་ནུས་མེད་ཡིག་འབྲུ་ `%c' \n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "མ་ཤེས་པའི་ཨེབ་བཙུགས་ཀྱི་དབྱེ་བ་ `%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -1392,12 +1721,12 @@ msgstr "བརྡ་དོན་སྣོད་ཐོ་ལྷག་མི་ཚ
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "ཁ་བསྡམ་མ་ཚུགས་ %s: %s"
 
 #: lib/dpkg/trigdeferred.c
@@ -1609,11 +1938,6 @@ msgstr "རྒྱུད་དུང་ `%.255s' གསར་བསྐུན་�
 msgid "error creating device '%.255s'"
 msgstr "ཐབས་འཕྲུལ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "ཧརཌི་ལིངཀ་ `%.255s' གསར་བསྐྲུན་འབདཝ་ད་འཛོལ་བ།"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1937,10 +2261,10 @@ msgstr "ཡིག་མཛོད་འཛུལ་སྤྱོད་འབད་
 msgid "archive '%s' is not a regular file"
 msgstr "ཉེན་བརྡ་ ཀཱོནཕ་ཕ་ཡིལ་ `%s' འདི་ཉག་རྐྱང་ཡིག་སྣོད་མེན།\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2158,6 +2482,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "ཁྱོད་འབད་ཚར་བའི་སྐབས་ `exit' ཡིག་དཔར་རྐྱབས།\n"
 
@@ -2536,7 +2864,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2579,6 +2910,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -2711,6 +3048,13 @@ msgstr ""
 "དོ།\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
@@ -2759,19 +3103,6 @@ msgstr "ཐུམ་སྒྲིལ་ལུ་གྲལ་ཐིག་གསར
 msgid "divert-to may not contain newlines"
 msgstr "ལུ་-ཁ་ཕྱོགས་སྒྱུར་བ་འདི་ནང་ལུ་གྲལ་ཐིག་གསརཔ་ཚུ་མེདཔ་འོང་།"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "ཁ་སྒྱུར་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "ཁ་སྒྱུར་ཡིག་སྣོད་ཨེཕ་སི་ཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "`%.250s' ཡང་ན་ `%.250s' འབྲེལ་བ་ཡོད་མི་མི་མཐུན་པའི་ཁ་སྒྱུར་ཚུ།"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3071,119 +3402,168 @@ msgstr ""
 "ཐུམ་སྒྲིལ་ %s འདི་འཆང་འདི་ཡོདཔ་ཨིན་  མ་སྤྲོག་པར་བཞག་དོ། ཟུར་བཞག་འབད་ནིའི་དོན་ལུ་ --force-hold "
 "ལག་ལེན་འཐབ།\n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
-"dpkg -གི་ཉེན་བརྡ་ དཀའ་ངལ་འདི་ཞུར་བཞག་འབད་དོ་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ --forceའདི་ལྕོགས་ཅན་བཟོ་"
-"ནུག:\n"
-" "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ སྣོད་ཐོ་`%.250s'(`%.250s' ལས་)ལྷག་མ་ཚུགས།"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་བསྡམ་ད་འཛོལ་བ།"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg: འཚུབ་ཅན་ཉེན་བརྡ་: ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་བརླག་སྟོར་ཞུགས་"
-"ནུག་ ཐུམ་སྒྲིལ་ལུ་ད་ལྟོ་གཞི་བཙུགས་འབད་མི་ཡིག་སྣོད་ཚུ་མེདཔ་སྦེ་ཚོད་དཔག་སྟེ།\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "རྟེན་འབམྲེལ་གྱྱི་དཀའ་ངལ་ཚུ་ - རྩ་བསྐྲད་མི་གཏང་།"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "རྟེན་འབམྲེལ་གྱྱི་དཀའ་ངལ་ཚུ་ - རྩ་བསྐྲད་མི་གཏང་།"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་བསྡམ་ད་འཛོལ་བ།"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(གནད་སྡུད་གཞི་རྟེན་ལྷག་དོ་..."
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "མ་ཤེས་པའི་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནིའི་གདམ་ཁ་ `%.*s'"
+
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d ཡིག་སྣོད་ཚུ་དང་སྣོད་ཐོ་ཚུ་ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད།)\n"
-msgstr[1] "%d ཡིག་སྣོད་ཚུ་དང་སྣོད་ཐོ་ཚུ་ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད།)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "ཉེན་བརྡ་: ཕན་མེད་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནི་གདམ་ཁ་ `%s'\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"dpkg -གི་ཉེན་བརྡ་ དཀའ་ངལ་འདི་ཞུར་བཞག་འབད་དོ་ ག་ཅི་སྦེ་ཟེར་བ་ཅིན་ --forceའདི་ལྕོགས་ཅན་བཟོ་"
+"ནུག:\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3247,42 +3627,6 @@ msgstr ""
 "%d གིས་འགྲུལ་ལམ་གུ་མ་འཐོབ་མི་ལས་རིམ་(ཚུ་)རེ་བ་བསྐྱེད་ནུག\n"
 "ཨེན་བི: རྩ་བའི་འགྲུལ་ལམ་འདི་གི་ནང་ན་/usr/local/sbin, /usr/sbin དང་ /sbin འོང་དགོ"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "`%.250s' གི་གནས་ས་ཞིབ་དཔྱད་འབད་མ་ཚུགས།"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "བརྡ་དོན་སྣོད་ཐོ་ལྷག་མི་ཚུགས།"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "%.250s ཁ་ཕྱེ་ནིའ་འབད་རྩོལ་བསྐྱེདཔ་ད་འཛོལ་བ།"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "འབྱུང་ཁུངས་ཡིག་སྣོད་ `%.250s' ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "ཀཱོན་ཕ་ཡིལ་`%.250s' འདི་ ཐུམ་སྒྲིལ་ནང་མི་འབྱུང་།"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "`%s' འབྲིཝ་ད་འཛོལ་བ།"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3292,27 +3636,27 @@ msgstr "ཌི་བི་ཡཱན་ `%s' ཐུམ་སྒྲིལ་འཛ
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3528,114 +3872,6 @@ msgstr ""
 "`more' བརྒྱུད་དེ་རྒྱུད་དུང་བཟོ !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "རྟེན་འབམྲེལ་གྱྱི་དཀའ་ངལ་ཚུ་ - རྩ་བསྐྲད་མི་གཏང་།"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "རྟེན་འབམྲེལ་གྱྱི་དཀའ་ངལ་ཚུ་ - རྩ་བསྐྲད་མི་གཏང་།"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3767,33 +4003,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "མ་ཤེས་པའི་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནིའི་གདམ་ཁ་ `%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "ཉེན་བརྡ་: ཕན་མེད་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནི་གདམ་ཁ་ `%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "རྒྱུན་རིམ་གྱི་དོན་ལུ་ `%i' ཁ་ཕྱེ་མ་ཚུགས།"
 
@@ -3982,6 +4191,10 @@ msgid "Description"
 msgstr "འགྲེལ་བཤད།"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, fuzzy, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "%s གིས་ : %s ལུ་ཁ་ཕྱོགས་སྒྱུར་ཡོདཔ་\n"
@@ -4018,6 +4231,18 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "ཐུམ་སྒྲིལ་ `%s' འདི་གཞི་བཙུགས་མ་འབད་བས་ དེ་ལས་ བརྡ་དོན་ཚུ་འཐོབ་ཚུགསཔ་མེད།\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"dpkg --བརྡ་དོན་(= dpkg-deb --བརྡ་དོན་) འདི་ ཡིག་མཛོད་ཡིག་སྣོད་ཚུ་བརྟག་དཔྱད་འབད་ནིའི་དོན་ལས་"
+"ལག་ལེན་འཐབ།\n"
+"དེ་ལས་  dpkg -- ནང་དོན་ཚུ་ (= dpkg-deb --ནང་དོན་ཚུ་) འདི་དེའི་ནང་དོན་ཛཚུ་ཐོ་བཀོད་འབད་ནིའི་"
+"དོན་ལས་ཐོ་བཀོད་འབད།\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4044,9 +4269,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "%s གིས་ : %s ལུ་ཁ་ཕྱོགས་སྒྱུར་ཡོདཔ་\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "dpkg --བརྡ་དོན་(= dpkg-deb --བརྡ་དོན་) འདི་ ཡིག་མཛོད་ཡིག་སྣོད་ཚུ་བརྟག་དཔྱད་འབད་ནིའི་དོན་ལས་"
 "ལག་ལེན་འཐབ།\n"
@@ -4096,16 +4324,16 @@ msgstr "ཌི་བི་ཡཱན་ `%s' ཐུམ་སྒྲིལ་འཛ
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4306,6 +4534,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "`%.250s' ལུ་སི་ཨེཆ་རུཊི་ འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
@@ -4456,8 +4690,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4535,70 +4774,10 @@ msgstr "ཟུར་བཞག་གཅིག་ཡང་མེད།"
 msgid "--update is useless for --remove"
 msgstr "ཉེན་བརྡ: --དུས་མཐུན་འདི་ --རྩ་བསྐྲད་ཀྱི་དོན་ལུ་ཁུངས་མེདཔ་ཨིན།"
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "ནུས་མེད་དུས་མཐུནམ་བཟོ་ནི་ཐབས་ལམ"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "dpkg-statoverride: %s"
-msgid "invalid statoverride gid %s"
-msgstr "ཌི་པི་ཀེ་ཇི་-སི་ཊེཊི་ཟུར་བཞག: %s"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "dpkg-statoverride: %s"
-msgid "invalid statoverride mode %s"
-msgstr "ཌི་པི་ཀེ་ཇི་-སི་ཊེཊི་ཟུར་བཞག: %s"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཨེཕ་སི་ཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ `%.250s'"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཀྱི་ནང་ན་གྲལ་ཐིག་སྟོངམ་འདུག"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཀྱི་ནང་ན་གྲལ་ཐིག་སྟོངམ་འདུག"
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "གྲལ་ཐིག་ %d གུ་ལུ་ཐུམ་སྒྲིལ་མིང་ནང་ལུ་རེ་བ་མེད་པའི་གྲལ་ཐིག་གི་མཇུག"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ `%.250s'"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "ཉེན་བརྡ་:ཕན་མེད་གདམ་ཁ་ `--%s'\n"
 
 #: src/trigcmd.c
 #, fuzzy
@@ -4834,6 +5013,12 @@ msgstr "%s རིམ་སྒྲིག་མ་བཟོ་  %s རྩ་བས�
 msgid "De-configuring %s (%s) ...\n"
 msgstr "%s རྩ་བསྐྲད་གཏང་དོ་...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཀྱི་ནང་ན་གྲལ་ཐིག་སྟོངམ་འདུག"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4979,11 +5164,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "dpkg-deb ཊར་ཨའུཊི་པུཏི་ ལྷག་པའི་སྐབས་འཛོལ་བ།"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "ངན་ཅན་བཟོ་ཡོད་པའི་ཡིག་སྣོད་རིམ་ལུགས་ཊར་ཡིག་སྣོད་ - ངན་ཅན་བཟོ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཡིག་མཛོད།"
 
 #: src/unpack.c
@@ -4999,16 +5182,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s ལུ་ཐུམ་སྒྲིལ་གྱི་ཡིག་སྣོད་སྒྲུབ་རྟགས་གཅིག་ཏག་ཏག་དགོཔ་ཨིན།"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་གི་དོན་ལུ་ ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ འཛུལ་"
 "སྤྱོད་འབད་མ་ཚུགས།"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་ལུ་ ཌི་པི་ཀེ་ཇི་ གནས་ཚད་མངའ་ཁོངས་ལུ་འབྲི་ནིའི་"
-"འཛུལ་སྤྱོད་དགོཔ་ཨིན།"
+"སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་གི་དོན་ལུ་ ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ འཛུལ་"
+"སྤྱོད་འབད་མ་ཚུགས།"
 
 #: src/update.c
 #, c-format
@@ -5386,16 +5575,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "སྣོད་ཐོ་གསར་བསྐྲུན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "དེ་གསར་བསྐྲུན་འབད་བའི་ཤུལ་ལས་སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "གྲལ་ཐིག་ %d གུ་ཐུམ་སྒྲིལ་མིང་ནང་ལུ་རེབ་མེད་པའི་ཨི་ཨོ་ཨེཕ།"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6277,8 +6468,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6791,13 +6983,87 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "ཉེན་བརྡ་:ཕན་མེད་གདམ་ཁ་ `--%s'\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "vsnprintf གི་དོན་ལུ་ ཊི་ཨེམ་པི་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s འདི་བརླག་སྟོར་ཞུགས་ནུག"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "`%.*s' འདི་ %s གི་དོན་ལུ་མི་ཆོག"
+
+#~ msgid "junk after %s"
+#~ msgstr "%s གི་ཤུལ་ལས་མཁོ་མེད།"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "བུ་ལིན་ས་སྒོ་ནང་ལུ་ཨིན་/མེན།"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "`%s' ས་སྒོ་ གཞི་བསྟུན་ `%.255s' ལུ་: ཐོན་རིམ་: %.255s ནང་འཛོལ་བ།"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s གི་དོན་ལུ་གནས་གོང་སྟོངམ།"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "སྦུང་ཚད་ཅན་འཐོབ་ཚུགསཔ་ཡོད་མི་དུས་མཐུན་བཟོ་ཡོད་མི་འདི་ལུ་ ཌི་པི་ཀེ་ཇི་ གནས་ཚད་མངའ་ཁོངས་ལུ་འབྲི་"
+#~ "ནིའི་འཛུལ་སྤྱོད་དགོཔ་ཨིན།"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "dpkg-deb ཊར་ཨའུཊི་པུཏི་ ལྷག་པའི་སྐབས་འཛོལ་བ།"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་བསྡམ་ད་འཛོལ་བ།"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "དེ་གསར་བསྐྲུན་འབད་བའི་ཤུལ་ལས་སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
@@ -6874,9 +7140,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ནུས་སྤེལ་ལུའི་ཨེསི་ཊི་ཌི་ཨིན་གུ་ཨི་ཨོ་ཨེཕ།"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "གྲལ་ཐིག་ %d གུ་ཐུམ་སྒྲིལ་མིང་ནང་ལུ་རེབ་མེད་པའི་ཨི་ཨོ་ཨེཕ།"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "གྲལ་ཐིག་ %d གུ་ལུ་ཐུམ་སྒྲིལ་མིང་གི་ཤུལ་ལས་རེ་བ་མེད་པའི་ཨི་ཨོ་ཨེཕ།"
 
@@ -7177,11 +7440,6 @@ msgstr ""
 #~ msgstr "བྲན་གཡོག་ %s: %s"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
-
-#, fuzzy
 #~| msgid "%s: copying %s to %s failed, giving up: %s"
 #~ msgid "scan of %s failed: %s"
 #~ msgstr "%s: %s འདི་ %s ལུ་འདྲ་བཤུས་རྐྱབས་ནི་འཐུས་ཤོར་འབྱུང་ཡོད། བཀོག་བཞག་དོ: %s "
@@ -7208,11 +7466,6 @@ msgstr ""
 #~ msgstr "%s ཁ་བསྡམ་མ་ཚུགས་: %s"
 
 #, fuzzy
-#~| msgid "write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "%s: %s འབྲི།"
-
-#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "%s འདི་ %s ལུ་བསྐྱར་མིང་བཏགས་མ་ཚུགས: %s "
diff --git a/po/el.po b/po/el.po
index 3d2cc5690..328bc2747 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1,6 +1,6 @@
-# translation of dpkg_po_el.po to Greek
-# This file is distributed under the same license as the PACKAGE package.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+# translation of dpkg to Greek
+# This file is distributed under the same license as the dpkg package.
+# Copyright © 2003-2008 Dpkg Developers
 #
 # Konstantinos Margaritis <markos@debian.org>, 2003.
 # George Papamichelakis <george@step.gr>, 2004.
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:48+0200\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -152,7 +152,8 @@ msgstr "απομάκρυνση  παλιών diversions-old: %s"
 msgid "error creating new backup file '%s'"
 msgstr "σφάλμα δημιουργίας σωλήνωσης `%.255s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "αδύνατη η αφαίρεση του `%.250s'"
@@ -378,23 +379,37 @@ msgstr "αδύνατο να ψάξω την αρχή του %.250s μετά το
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "αδύνατο το άνοιγμα του tmpfile για vsnprintf"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "αδύνατη η ανάγνωση των σημάνσεων περιγραφέα αρχείου του %.250s"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "αδύνατη το άνοιγμα ή η δημιουργία του κλειδώματος της βάσης κατάστασης"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "αδύνατη το άνοιγμα ή η δημιουργία του κλειδώματος της βάσης κατάστασης"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr ""
 "δεν έχετε την άδεια για να ξεκλειδώσετε τη βάση δεδομένων κατάστασης dpkg"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "αδυναμία κλειδώματος βάσης δεδομένων κατάστασης dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -402,11 +417,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "η ζητούμενη ενέργεια απαιτεί προνόμια υπερχρήστη"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "αδύνατη η πρόσβαση στην περιοχή κατάστασης dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 "η ενέργεια αυτή απαιτεί πρόσβαση ανάγνωσης/εγγραφής στην περιοχή κατάστασης "
 "dpkg"
@@ -447,6 +466,205 @@ msgstr "αδυναμία κλεισίματος της ενημερωμένης
 msgid "unable to install updated status of '%.250s'"
 msgstr "αδύνατη η εγκατάσταση της ενημερωμένης κατάστασης του `%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "αδύνατος ο έλεγχος ύπαρξης για το `%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "αδύνατη η ανάγνωση πληροφοριών καταλόγου"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "σφάλμα κατά το άνοιγμα του %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "το conffile `%.250s' δεν εμφανίζεται στο πακέτο"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "σφάλμα δημιουργίας συνδέσμου `%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "σφάλμα κατά την εγγραφή `%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr ""
+"αδύνατη η ανάγνωση του καταλόγου των αρχείων ρυθμίσεων του `%.250s' (από `"
+"%.250s')"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "αποτυχία κατά το άνοιγμα του αρχείου diversions"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "αποτυχία κατά την εκτέλεση της fstat στο αρχείο diversions"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "συγκρουόμενες αποκλίσεις ανάμεσα σε `%.250s' ή `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "σφάλμα κλεισίματος αρχείου λίστας αρχείων για το πακέτο `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg: σοβαρή προειδοποίηση: το αρχείο της λίστας αρχείων για το πακέτο\n"
+"`%.250s' δεν υπάρχει, θα υποθέσουμε ότι το πακέτο δεν έχει εγκατεστημένα\n"
+"αρχεία.\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Ανάγνωση βάσης δεδομένων ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "προς το παρόν εγκαταστάθηκαν %d αρχεία και κατάλογοι.)\n"
+msgstr[1] "προς το παρόν εγκαταστάθηκαν %d αρχεία και κατάλογοι.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "μη έγκυρη κατάσταση ενημέρωσης"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "αρχείο statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "αρχείο statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "αποτυχία κατά την εκτέλεση της fstat στο αρχείο statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "αρχείο statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "το αρχείο statoverride περιέχει μια κενή γραμμή"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "το αρχείο statoverride περιέχει μια κενή γραμμή"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "απρόσμενο τέλος της γραμμής στο όνομα πακέτου στη γραμμή %d"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "αρχείο statoverride `%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -575,66 +793,74 @@ msgid "internal error"
 msgstr "εσωτερικό σφάλμα - ακατάλληλος τρόπος `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s λείπει"
+#, fuzzy
+#| msgid "cannot stat old name `%s': %s"
+msgid "is missing a value"
+msgstr "αδυναμία προσδιορισμού κατάστασης του παλιού ονόματος `%s': %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "`%.*s' δεν επιτρέπεται για %s"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "σκουπίδια μετά από %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "μη έγκυρο όνομα πακέτου (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Το πακέτο `%s' δεν είναι εγκατεστημένο.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "πεδίο `%s' λεπτομερειών κενού αρχείου"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr ""
 "το πεδίο `%s' λεπτομερειών αρχείου δεν επιτρέπεται στο αρχείο κατάστασης"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "πάρα πολλές τιμές στο πεδίο `%s' αρχείου λεπτομερειών (σε σύγκριση με άλλα)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "πολύ λίγες τιμές στο πεδίο `%s' αρχείου λεπτομερειών (σε σύγκριση με άλλα)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "ναι/όχι στο πεδίο boolean"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "χρησιμοποιήθηκε παρωχημένο πεδίο `Revision' ή `Package-Revision' "
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "πεδίο `%s', αναφορά στο `%.255s': σφάλμα στην έκδοση: %.255s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "λέξη στο πεδίο `προτεραιότητα' "
 
 #: lib/dpkg/fields.c
@@ -645,33 +871,33 @@ msgstr ""
 "η τιμή για το πεδίο `κατάστασης' δεν επιτρέπεται σε αυτά τα συμφραζόμενα"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "πρώτη (want) λέξη σε πεδίο `κατάστασης'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "δεύτερη (error) λέξη σε πεδίο `κατάστασης'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "τρίτη λέξη (κατάστασης) σε πεδίο `κατάστασης'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "σφάλμα στο αλφαριθμητικό Έκδοση `%.250s': %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "χρησιμοποιήθηκε παρωχημένο πεδίο `Revision' ή `Package-Revision' "
 
 #: lib/dpkg/fields.c
@@ -683,11 +909,13 @@ msgstr "η τιμή για το `conffiles' περιέχει κακοδιαμο�
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "η τιμή για το `conffiles' περιέχει γραμμή που ξεκινά χωρίς κενό `%c'"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "root ή null κατάλογος εμφανίζεται ως conffile"
 
 #: lib/dpkg/fields.c
@@ -775,9 +1003,9 @@ msgstr "πεδίο `%s' field, αναφορά σε `%.255s': η έκδοση ε�
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "πεδίο `%s', αναφορά στο `%.255s': σφάλμα στην έκδοση: %.255s"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "πεδίο `%s', αναφορά στο `%.255s': η έκδοση περιέχει `%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -785,8 +1013,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "πεδίο `%s', συντακτικό σφάλμα μετά την αναφορά στο πακέτο `%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "εναλλακτικά (`|') δεν επιτρέπονται στο πεδίο %s"
 
 #: lib/dpkg/fields.c
@@ -826,6 +1055,29 @@ msgstr "αδύνατος ο ορισμός κατάστασης του νέου
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat %s"
+msgstr "αδυναμία προσδιορισμού κατάστασης του παλιού ονόματος `%s': %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "προειδοποίηση, το αρχείο ρυθμίσεων `%s' δεν είναι κοινό αρχείο\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "αδύνατη η εγγραφή του %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open %s"
+msgstr "αδυναμία ανοίγματος εκτροπών: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "αδύνατο το ξεκλείδωμα του %s: %s"
@@ -849,8 +1101,20 @@ msgid "unable to lock %s"
 msgstr "αδύνατο το ξεκλείδωμα του %s: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open file %s"
+msgstr "αδυναμία ανοίγματος εκτροπών: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "αδύνατη η εκκένωση στο vnsprintf"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "αδύνατη η εκτροπή των καταλόγων"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -873,13 +1137,13 @@ msgstr "αποτυχία ανάθεσης μνήμης"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "αποτυχία αντιγραφής για το std%s"
+msgid "failed to dup for fd %d"
+msgstr "αποτυχία αντιγραφής για το fd%d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "αποτυχία αντιγραφής για το fd%d"
+msgid "failed to dup for std%s"
+msgstr "αποτυχία αντιγραφής για το std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1019,30 +1283,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "διπλασιασμός του καθοριζόμενου από το χρήστη πεδίο `%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "λείπει %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "κενή τιμή για το %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "διπλή τιμή για το πεδίο `%s'"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has '%s' field but is missing architecture"
+msgstr "το πακέτο έχει κατάσταση %s αλλά αναμένονται ακόμα triggers"
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
 #| msgid "package has status %s but triggers are awaited"
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "το πακέτο έχει κατάσταση %s αλλά αναμένονται ακόμα triggers"
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Ρυθμισμένη-Έκδοση για πακέτο με ακατάλληλη Κατάσταση"
 
 #: lib/dpkg/parse.c
@@ -1051,9 +1318,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "το πακέτο έχει κατάσταση %s αλλά αναμένονται ακόμα triggers"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"το πακέτο έχει κατάσταση triggers-σε-αναμονή, αλλά δεν υπάρχουν τέτοιοι"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "το πακέτο έχει κατάσταση %s αλλά αναμένονται ακόμα triggers"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1061,13 +1329,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "το πακέτο έχει καθεστώς %s αλλά εκκρεμούν triggers"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"το πακέτο έχει κατάσταση triggers-σε-εκκρεμότητα αλλά όχι δεν υπάρχουν "
-"τέτοιοι"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "το πακέτο έχει καθεστώς %s αλλά εκκρεμούν triggers"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Πακέτο το οποίο στην κατάσταση μη εγκατεστημένο έχει ρυθμίσεις, ξέχασέ το"
 
@@ -1086,8 +1356,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1287,11 +1557,6 @@ msgstr "αδύνατη η δημιουργία `%.255s'"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1308,6 +1573,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "λείπει altname"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(χωρίς διαθέσιμη περιγραφή)"
@@ -1395,6 +1670,68 @@ msgstr "η υποδιεργασία %s απέτυχε με κωδικό κατά
 msgid "wait for %s subprocess failed"
 msgstr "η αναμονή για %s απέτυχε"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "μη έγκυρος χαρακτήρας `%c' στο πλάτος πεδίου\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "μη έγκυρος χαρακτήρας `%c' στο πλάτος πεδίου\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "μη έγκυρη κατάσταση ενημέρωσης"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header gid field"
+msgstr "αρχείο statoverride `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "μη έγκυρος χαρακτήρας `%c' στο πλάτος πεδίου\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "άγνωστος τύπος συμπίεσης '%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -1413,15 +1750,16 @@ msgid "treewalk root %s is not a directory"
 msgstr "αδύνατη η ανάγνωση πληροφοριών καταλόγου"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr ""
 "αδύναμία ανοίγματος/δημιουργίας του αρχείου κλειδώματος των trigger `%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
 #| msgid "triggered"
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "triggered"
 
 #: lib/dpkg/trigdeferred.c
@@ -1655,11 +1993,6 @@ msgstr "σφάλμα δημιουργίας σωλήνωσης `%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "σφάλμα κατά τη δημιουργία συσκευής `%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "σφάλμα δημιουργίας συνδέσμου `%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -2013,10 +2346,10 @@ msgstr "αδύνατη η πρόσβαση στην αρχειοθήκη"
 msgid "archive '%s' is not a regular file"
 msgstr "προειδοποίηση, το αρχείο ρυθμίσεων `%s' δεν είναι κοινό αρχείο\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2239,6 +2572,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Πληκτρολογήστε `exit' όταν τελειώσετε.\n"
 
@@ -2628,7 +2965,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2674,6 +3014,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -2811,6 +3157,13 @@ msgstr ""
 " εγκατασταθεί.\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
@@ -2860,19 +3213,6 @@ msgstr "το πακέτο δεν θα πρέπει να περιέχει newline
 msgid "divert-to may not contain newlines"
 msgstr "divert-to δεν θα πρέπει να περιέχει καινούριες γραμμές"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "αποτυχία κατά το άνοιγμα του αρχείου diversions"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "αποτυχία κατά την εκτέλεση της fstat στο αρχείο diversions"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "συγκρουόμενες αποκλίσεις ανάμεσα σε `%.250s' ή `%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3180,129 +3520,167 @@ msgstr ""
 "Το πακέτο %s είναι σε συγκράτηση, δεν θα επεξεργαστεί.  Χρησιμοποιήστε το --"
 "force-hold για να παρακάμψετε.\n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
-"dpkg - προειδοποίηση, το πρόβλημα παρακάμπτεται λόγω του --force enabled:\n"
-" "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
 msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Configure any package which may help this one"
 msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
 msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
 msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
 msgstr ""
-"αδύνατη η ανάγνωση του καταλόγου των αρχείων ρυθμίσεων του `%.250s' (από `"
-"%.250s')"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "σφάλμα κλεισίματος αρχείου λίστας αρχείων για το πακέτο `%.250s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg: σοβαρή προειδοποίηση: το αρχείο της λίστας αρχείων για το πακέτο\n"
-"`%.250s' δεν υπάρχει, θα υποθέσουμε ότι το πακέτο δεν έχει εγκατεστημένα\n"
-"αρχεία.\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "λίστα αρχείων για το πακέτο `%.250s'"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "προβλήματα εξάρτησης - δε γίνεται αφαίρεση"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "προβλήματα εξάρτησης - δε γίνεται αφαίρεση"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
 msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "σφάλμα κλεισίματος αρχείου λίστας αρχείων για το πακέτο `%.250s'"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Ανάγνωση βάσης δεδομένων ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "άγνωστη επιλογή force/refuse `%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "προς το παρόν εγκαταστάθηκαν %d αρχεία και κατάλογοι.)\n"
-msgstr[1] "προς το παρόν εγκαταστάθηκαν %d αρχεία και κατάλογοι.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "Προειδοποίηση: παρωχημένη επιλογή force/refuse `%s'\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"dpkg - προειδοποίηση, το πρόβλημα παρακάμπτεται λόγω του --force enabled:\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3365,42 +3743,6 @@ msgstr ""
 "%d αναμενόμενα προγράμμα δε βρέθηκαν στο PATH.\n"
 "Σημ.: το PATH του root τυπικά περιέχει /usr/local/sbin, /usr/sbin and /sbin."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "αδύνατος ο έλεγχος ύπαρξης για το `%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "αδύνατη η ανάγνωση πληροφοριών καταλόγου"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "σφάλμα κατά το άνοιγμα του %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "αδύνατο το άνοιγμα του αρχείου πηγής `%.250s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "το conffile `%.250s' δεν εμφανίζεται στο πακέτο"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "σφάλμα κατά την εγγραφή `%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3440,27 +3782,27 @@ msgstr "Πρόγραμμα διαχείρισης πακέτων του Debian `
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3734,114 +4076,6 @@ msgstr ""
 "σωλήνωση με τις `less' ή `more' !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "προβλήματα εξάρτησης - δε γίνεται αφαίρεση"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "προβλήματα εξάρτησης - δε γίνεται αφαίρεση"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3974,33 +4208,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "άγνωστη επιλογή force/refuse `%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "Προειδοποίηση: παρωχημένη επιλογή force/refuse `%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "αδύνατο το άνοιγμα του `%i' ως ροή (stream)"
 
@@ -4190,6 +4397,10 @@ msgid "Description"
 msgstr "Περιγραφή"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "εκτροπή από %s σε: %s\n"
@@ -4229,6 +4440,18 @@ msgstr ""
 "πληροφορίες.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Χρησιμοποιήστε το dpkg --info (= dpkg-deb --info) για επεξεργασία "
+"αρχειοθηκών,\n"
+"και dpkg --contents (= dpkg-deb --contents) για προβολή των περιεχομένων "
+"τους.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4255,9 +4478,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "εκτράπηκε από %s σε: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Χρησιμοποιήστε το dpkg --info (= dpkg-deb --info) για επεξεργασία "
 "αρχειοθηκών,\n"
@@ -4307,16 +4533,16 @@ msgstr "Πρόγραμμα διαχείρισης πακέτων του Debian `
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4531,6 +4757,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "αποτυχία κατά το chroot στο `%.250s'"
@@ -4683,8 +4915,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4765,70 +5002,10 @@ msgstr "Δεν υπάρχει override."
 msgid "--update is useless for --remove"
 msgstr "προειδοποίηση: το --update είναι άχρηστο για το --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "μη έγκυρη κατάσταση ενημέρωσης"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "αρχείο statoverride `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "αρχείο statoverride `%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "αποτυχία κατά την εκτέλεση της fstat στο αρχείο statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "αρχείο statoverride `%.250s'"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "το αρχείο statoverride περιέχει μια κενή γραμμή"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "το αρχείο statoverride περιέχει μια κενή γραμμή"
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "απρόσμενο τέλος της γραμμής στο όνομα πακέτου στη γραμμή %d"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "αρχείο statoverride `%.250s'"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5095,6 +5272,12 @@ msgstr "Απορρύθμιση του %s, για να επιτραπεί η αφ
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Απορρύθμιση του %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "το αρχείο statoverride περιέχει μια κενή γραμμή"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -5245,11 +5428,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "σφάλμα κατά την ανάγνωση της εξόδου της tar από το dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "κατεστραμμένη αρχειοθήκη tar - κατεστραμμένη αρχειοθήκη πακέτου"
 
 #: src/unpack.c
@@ -5265,16 +5446,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "η --%s απαιτεί ακριβώς μία παράμετρο ένα αρχείο Packages"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "αδύνατη η πρόσβαση στο αρχείο κατάστασης του dpkg για μαζικές ανανεώσεις "
 "διαθεσιμότητας"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"οι μαζικές ανανεώσεις διαθεσιμότητας απαιτούν άδεια εγγραφής στο αρχείο "
-"κατάστασης"
+"αδύνατη η πρόσβαση στο αρχείο κατάστασης του dpkg για μαζικές ανανεώσεις "
+"διαθεσιμότητας"
 
 #: src/update.c
 #, c-format
@@ -5661,16 +5848,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "απέτυχε η αλλαγή καταλόγου (chdir)"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "απέτυχε η δημιουργία καταλόγου"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "απέτυχε η αλλαγή καταλόγου (chdir) μετά τη δημιουργία του"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "απρόσμενο eof στο όνομα πακέτου στη γραμμή %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "απέτυχε η αλλαγή καταλόγου (chdir)"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6611,8 +6800,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -7138,13 +7328,100 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "αδύνατο το άνοιγμα του tmpfile για vsnprintf"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "αδυναμία προσδιορισμού κατάστασης του παλιού ονόματος `%s': %s"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s λείπει"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "`%.*s' δεν επιτρέπεται για %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "σκουπίδια μετά από %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "μη έγκυρο όνομα πακέτου (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "ναι/όχι στο πεδίο boolean"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "πεδίο `%s', αναφορά στο `%.255s': σφάλμα στην έκδοση: %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr "κενή τιμή για το %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "το πακέτο έχει κατάσταση triggers-σε-αναμονή, αλλά δεν υπάρχουν τέτοιοι"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "το πακέτο έχει κατάσταση triggers-σε-εκκρεμότητα αλλά όχι δεν υπάρχουν "
+#~ "τέτοιοι"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "οι μαζικές ανανεώσεις διαθεσιμότητας απαιτούν άδεια εγγραφής στο αρχείο "
+#~ "κατάστασης"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "σφάλμα κατά την ανάγνωση της εξόδου της tar από το dpkg-deb"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr ""
+#~ "το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα "
+#~ "αρχείου"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "σφάλμα κλεισίματος αρχείου λίστας αρχείων για το πακέτο `%.250s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα "
+#~ "αρχείου"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "λίστα αρχείων για το πακέτο `%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "απέτυχε η αλλαγή καταλόγου (chdir) μετά τη δημιουργία του"
 
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
@@ -7222,9 +7499,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "Τέλος αρχείου στην stdin κατά την προτροπή για το αρχείο ρυθμίσεων"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "απρόσμενο eof στο όνομα πακέτου στη γραμμή %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "απρόσμενο eof μετά το όνομα πακέτου στη  γραμμή %d"
 
@@ -7520,11 +7794,6 @@ msgstr ""
 #~ msgstr " δευτερεύων %s: %s"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "αδυναμία προσδιορισμού κατάστασης του παλιού ονόματος `%s': %s"
-
-#, fuzzy
 #~| msgid "%s: copying %s to %s failed, giving up: %s"
 #~ msgid "scan of %s failed: %s"
 #~ msgstr "%s: η αντιγραγή το %s σε %s απέτυχε, εγκαταλείπω: %s"
@@ -7551,11 +7820,6 @@ msgstr ""
 #~ msgstr "αδύνατο το κλείσιμο του %s: %s"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "αδύνατη η εγγραφή του %s: %s"
-
-#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "Αδύνατη η μετονομασία του %s σε %s: %s"
diff --git a/po/eo.po b/po/eo.po
index 37b1e1e43..716f148f2 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:49+0200\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <debian-l10n-esperanto@lists.debian.org>\n"
@@ -135,7 +135,8 @@ msgstr "eraro dum forigo de malnova sekurkopian dosieron '%s'"
 msgid "error creating new backup file '%s'"
 msgstr "eraro dum kreo de nova sekurkopia dosiero '%s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "ne eblas forigi '%.250s'"
@@ -340,20 +341,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "ne eblas retroiri al la komenco de %.250s post ŝtopado"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "ne eblas malfermi ŝlos-dosieron %s por testado"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "ne eblas legi dosier-priskribilon (fd) por la dosierujo '%s'"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "ne eblas malfermi/krei ŝlosdosieron de stato-datumbazo"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "ne eblas malfermi/krei ŝlosdosieron de stato-datumbazo"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "vi ne havas permeson por malŝlosi la stato-datumbazon de dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "stato-datumbazo de dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -361,11 +379,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "la petita operacio postulas privilegion de superuzanto"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "ne eblas aliri stat-areo de dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "la operacio postulas leg/skrib-aliron al la stat-areo de dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -403,6 +425,193 @@ msgstr "ne eblas fermi la ĝisdatigitan staton de '%.250s'"
 msgid "unable to install updated status of '%.250s'"
 msgstr "ne eblas instali la ĝisdatigitan staton de '%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "ne eblas kontroli ekziston de '%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "ne povas legi informan dosierujon"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "eraro dum provo malfermi %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "rompita inform-datumbaza dosier-formo '%s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"info-datumbaza formo (%d) estas falsa aŭ tro nova; provu havigi novan dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "inform-dosiero %s/%s ne asociata al iu ajn pako"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "eraro dum kreo de rekta ligilo '%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "eraro dum skribado de '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "reg-dosiero '%s' por la pako '%s' malhavas lastan linifinaĵon"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "reg-dosiero '%s' por la pako '%s' malhavas lastan linifinaĵon"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "reg-dosiero '%s' por la pako '%s' malhavas lastan linifinaĵon"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "reg-dosiero '%s' por la pako '%s' enhavas malplenan dosiernomon"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read '%s' control file for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "ne eblas legi la reg-dosieron '%s' por la pako '%s'"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "malsukcesis malfermi dosieron diversions"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "malsukcesis uzi 'fstat' je dosiero diversions"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "konfliktantaj diversions envolvantaj '%.250s' aŭ '%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "eraro dum fermo de dosier-lista dosiero por la pako '%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dosier-lista dosiero por la pako '%.250s' mankas; ni konjektas ke la pako "
+"havas neniun dosieron aktuale instalita"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "dosier-lista dosiero por la pako '%.250s' malhavas lastan linifinaĵon"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"dosier-lista dosiero por la pako '%.250s' enhavas malplenan dosiernomon"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Legado de datumbazo ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d dosiero aŭ dosierujo aktuale instalita.)\n"
+msgstr[1] "%d dosieroj kaj dosierujoj aktuale instalitaj.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "malvalida stato"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "legado de dosiero 'statoverride' '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "legado de dosiero 'statoverride' '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "malsukcesis malfermi dosieron 'statoverride'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "malsukcesis uzi fstat je dosiero 'statoverride'"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "legado de dosiero 'statoverride' '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "dosiero 'statoverride' malhavas lastan linifinaĵon"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "dosiero 'statoverride' enhavas malplenan linion"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "sintaks-eraro en dosiero 'statoverride'"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "neatendata linifinon en dosiero 'statoverride'"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "multoblaj 'statoverride' ĉeestas por la dosiero '%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -538,61 +747,74 @@ msgid "internal error"
 msgstr "interna eraro (miso)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "mankas %s"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "la reg-dosiero '%s' malhavas valoron"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.50s' ne estas permesata por %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Ni preterlasas malvalidan linion: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "rubaĵo post %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "malvalida pak-nomo (%.250s)"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "la pako '%s' ne estas instalita"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "malplena kampo de dosier-detaloj '%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "kampo de dosier-detaloj '%s' ne estas permesata en stat-dosiero"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "tro multaj valoroj en kampo de dosier-detaloj '%s' (kompare al aliaj)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "tro malmultaj valoroj en kampo de dosier-detaloj '%s' (kompare al aliaj)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "jes/ne en bulea kampo"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "malaktuala kampo '%s' aŭ '%s' estis uzata"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "fremda/permesata/sama/ne en kvarstata kampo"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "'%s' ne estas valida arkitektura nomo: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "vorto en kampo 'Priority'"
 
 #: lib/dpkg/fields.c
@@ -601,25 +823,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "valoro por la kampo '%s' ne estas permesata en tiu ĉi kunteksto"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "unua (want) vorto en kampo 'Status'"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "dua (error) vorto en kampo 'Status'"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "tria (status) vorto en kampo 'Status'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "eraro en ĉeno de kampo '%s': '%.250s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "malaktuala kampo '%s' aŭ '%s' estis uzata"
 
 #: lib/dpkg/fields.c
@@ -628,12 +858,15 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "valoro por la kampo '%s' havas misformitan linion '%.*s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "valoro por '%s' havas linion komencantan per ne-spaco '%c'"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "radika aŭ nula dosierujo estas listita kiel 'conffile'"
 
 #: lib/dpkg/fields.c
@@ -716,9 +949,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "kampo '%s', referenco al '%.255s': versio ne finigita"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "kampo '%s', referenco al '%.255s': eraro en versio"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "kampo '%s', referenco al '%.255s': la versio enhavas '%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -726,8 +960,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "kampo '%s', sintaksa eraro post referenco al pako '%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternativoj ('|') ne estas permesataj en kampo %s"
 
 #: lib/dpkg/fields.c
@@ -766,6 +1001,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "ne eblas difini reĝimon de cel-dosiero '%.250s'"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat file '%s'"
+msgid "cannot stat %s"
+msgstr "ne eblas 'stat' la dosieron '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "conffile '%s' ne estas ordinara dosiero"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot read %s"
+msgstr "ne eblas postmeti al '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "ne eblas postmeti al '%s'"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "ne eblas malŝlosi %s"
@@ -786,8 +1045,22 @@ msgid "unable to lock %s"
 msgstr "ne eblas ŝlosi %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "montranta dosieron en paĝilo"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "ne eblas postmeti al '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "ne eblas elbufrigi dosieron '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "Ne eblas deturni dosieron '%s' al si mem"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -809,13 +1082,13 @@ msgstr "malsukceso dum provo rezervi memoron"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "malsukceso de 'dup' por std%s"
+msgid "failed to dup for fd %d"
+msgstr "malsukceso de 'dup' por fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "malsukceso de 'dup' por fd %d"
+msgid "failed to dup for std%s"
+msgstr "malsukceso de 'dup' por std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -953,27 +1226,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "ripetita valoro por la kampo difinita de uzanto '%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "mankas %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "malplena valoro por %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "ripetita valoro por kampo '%s'"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "pako havas kampon '%s' tamen mankas arkitekturo"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "pako havas kampon '%s' sed ĝi estas arkitekturo ĝenerala (all)"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "'Config-Version' por pako kun maltaŭga 'Status'"
 
 #: lib/dpkg/parse.c
@@ -982,8 +1261,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "pako havas staton %s sed ekigiloj estas atendataj"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "pako havas staton 'triggers-awaited' sed neniun atendatan ekigilon"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "pako havas staton %s sed ekigiloj estas atendataj"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -991,11 +1272,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "pako havas staton %s sed ankoraŭ estas ekigiloj pritraktotaj"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "pako havas staton 'triggers-pending' sed neniun pritraktotan ekigilon"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "pako havas staton %s sed ankoraŭ estas ekigiloj pritraktotaj"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Pako kiu estas en stato ne-instalita havas 'conffiles', ni forlasas ilin"
 
@@ -1016,10 +1301,13 @@ msgstr ""
 "probable pro ĝisdatigo el neoficiala dpkg"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Mult-Ark: %s) ne estas kuninstalebla kun %s, kiu havas multoblajn "
 "instalitajn specimenojn"
@@ -1207,11 +1495,6 @@ msgstr "ne eblas sekure forigi '%.255s'"
 msgid "rm command for cleanup"
 msgstr "komando rm por purigado"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "dusenca pak-nomo '%s' kun pli ol unu instalita specimeno"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1225,6 +1508,16 @@ msgstr "kampo laĝeco estas for de intervalo"
 msgid "missing closing brace"
 msgstr "mankas ferma kuniga krampo"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "dusenca pak-nomo '%s' kun pli ol unu instalita specimeno"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(neniu priskribo disponeblas)"
@@ -1312,6 +1605,70 @@ msgstr "la subprocezo %s malsukcesis kun atenda stato-kodo %d"
 msgid "wait for %s subprocess failed"
 msgstr "atendo je subprocezo %s malsukcesis"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "malvalida signo '%c' en kampo larĝeco"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "malvalida signo '%c' en kampo larĝeco"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "malvalida stato"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid tar header gid field"
+msgstr "legado de dosiero 'statoverride' '%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "malvalida signo '%c' en kampo larĝeco"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "nesubtenataj elektebloj en dosierkapo"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "nekonata densig-tipo '%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1331,12 +1688,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "reg-dosierujo ne estas dosierujo"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "ne eblas malfermi/krei ŝlos-dosieron de ekigiloj '%.250s'"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "areo de ekigiloj"
 
 #: lib/dpkg/trigdeferred.c
@@ -1559,11 +1919,6 @@ msgstr "eraro dum kreo de dukto '%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "eraro dum kreo de aparato '%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "eraro dum kreo de rekta ligilo '%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1878,10 +2233,10 @@ msgstr "ne povas atingi arkivon"
 msgid "archive '%s' is not a regular file"
 msgstr "conffile '%s' ne estas ordinara dosiero"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<norma eligo>"
 
@@ -2065,6 +2420,10 @@ msgid "conffile difference visualizer"
 msgstr "rigardilo de malsamoj en conffile"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Tajpu 'exit' kiam vi finos.\n"
 
@@ -2417,7 +2776,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2426,7 +2799,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2460,6 +2836,12 @@ msgstr ""
 "Dum forigado, --package aŭ --local kaj --divert devas kongrui se indikite.\n"
 "Skriptoj preint/postrm de la pako devos ĉiam indiki --package kaj --divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2581,6 +2963,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Neniu deturno '%s', neniu forigita.\n"
 
@@ -2624,19 +3013,6 @@ msgstr "pako ne povas enhavi novlini-signojn"
 msgid "divert-to may not contain newlines"
 msgstr "deturni-al ne povas enhavi novlini-signojn"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "malsukcesis malfermi dosieron diversions"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "malsukcesis uzi 'fstat' je dosiero diversions"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "konfliktantaj diversions envolvantaj '%.250s' aŭ '%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2932,117 +3308,174 @@ msgstr ""
 "La pako %s estas je tenado, ni ne tuŝas ĝin. Uzu --force-hold por "
 "preterpasi.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "preterpaso de problemo ĉar --force ebligis:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Difini ĉiujn perfortajn elekteblojn"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "reg-dosiero '%s' por la pako '%s' malhavas lastan linifinaĵon"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "reg-dosiero '%s' por la pako '%s' malhavas lastan linifinaĵon"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Anstataŭigi pakon per pli malalta versio"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "reg-dosiero '%s' por la pako '%s' malhavas lastan linifinaĵon"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Akomodi iun ajn pakon kiu povas helpi tiun ĉi"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "reg-dosiero '%s' por la pako '%s' enhavas malplenan dosiernomon"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Procezi eventualajn pakojn eĉ kiam sub tenado"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "ne eblas malfermi reg-dosieron '%s' por la pako '%s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Provi (mal)instali aferojn eĉ kiam ne ĉefuzanto"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "ne eblas legi staton de reg-dosiero '%s' por la pako '%s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH malhavas gravajn programojn, problemoj okazos"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "la dosiero '%s' por la pako '%s' ne estas ordinara dosiero"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Instali pakon eĉ se ĝi malsukcesas aŭtentikan kontrolon"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "ne eblas legi la reg-dosieron '%s' por la pako '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Procezi eĉ pakojn kun malĝustaj versioj"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "ne eblas fermi la reg-dosieron '%s' por la pako '%s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "ne eblas malfermi dosier-lista dosiero por la pako '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Anstataŭigi dosieron de unu pako per alia"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Anstataŭigi deturnitan dosieron per ne-deturnita versio"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Anstataŭigi pak-dosierujon per tiu de alia dosiero"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Ne realigi sekurajn en/eligajn operaciojn dum malpakado"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Ĉiam uzi la novajn akomod-dosierojn, ne demandi"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Ĉiam uzi la malnovajn akomod-dosierojn, ne demandi"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dosier-lista dosiero por la pako '%.250s' mankas; ni konjektas ke la pako "
-"havas neniun dosieron aktuale instalita"
+"Uzi la aprioran elekteblon por novaj akomod-dosieroj\n"
+"se iu estos disponigita, kaj ne demandi. Se neniu\n"
+"aprioraĵo povas esti trovata, vi estos demandata, nur\n"
+"ne, se unu el la elektebloj 'confold' aŭ 'confnew'\n"
+"ankaŭ estos provizita"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "ne eblas legi staton de dosier-lista dosiero por la pako '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Ĉiam instali mankantajn akomod-dosierojn"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "dosier-listo por la pako '%.250s' ne estas ordinara dosiero"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Oferi anstataŭigi akomod-dosierojn kiuj havas neniujn novajn versiojn"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Procezi eĉ pakojn kun malĝusta aŭ neniu arkitekturo"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Instali eĉ se ĝi rompus alian pakon"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Permesi instalon de konfliktantaj pakoj"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Igi ĉiujn dependecajn problemojn al avertoj"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Igi dependec-versiajn problemojn al avertoj"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Forigi pakojn kiuj bezonas instalado"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Forigi esencan pakon"
+
+#: src/force.c
 #, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "legado de dosier-listo por pako '%.250s'"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"%s perfortaj elektebloj - reg-konduto kiam problemoj trovitas:\n"
+"  averti sed daŭrigi: --force-<afero>,<afero>,...\n"
+"  ĉesi kun eraro:     --refuse-<afero>,<afero>,... | --no-force-<afero>,...\n"
+" Perfortaj aferoj:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "dosier-lista dosiero por la pako '%.250s' malhavas lastan linifinaĵon"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"AVERTO - uzo de elektebloj markitaj per [!] povas serioze damaĝi vian "
+"instaladon.\n"
+"Perfortaj elektebloj markitaj per [*] estas ebligataj apriore.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
-"dosier-lista dosiero por la pako '%.250s' enhavas malplenan dosiernomon"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "eraro dum fermo de dosier-lista dosiero por la pako '%.250s'"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "nekonata perforta/rifuza elekteblo '%.*s'"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Legado de datumbazo ... "
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "malaktuala perforta/rifuza elekteblo '%s'\n"
 
-#: src/filesdb.c
-#, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d dosiero aŭ dosierujo aktuale instalita.)\n"
-msgstr[1] "%d dosieroj kaj dosierujoj aktuale instalitaj.)\n"
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "preterpaso de problemo ĉar --force ebligis:"
 
 #: src/help.c
 msgid "not installed"
@@ -3107,41 +3540,6 @@ msgstr ""
 "Rim.: PATH por la ĉefuzanto ordinare devas enhavi /usr/local/sbin, /usr/sbin "
 "kaj /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "ne eblas kontroli ekziston de '%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "ne povas legi informan dosierujon"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "eraro dum provo malfermi %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "rompita inform-datumbaza dosier-formo '%s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"info-datumbaza formo (%d) estas falsa aŭ tro nova; provu havigi novan dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "inform-dosiero %s/%s ne asociata al iu ajn pako"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "eraro dum skribado de '%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3187,27 +3585,27 @@ msgstr "Debian '%s', pak-administra programo versio %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3439,115 +3837,6 @@ msgstr ""
 "aŭ 'more' !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Difini ĉiujn perfortajn elekteblojn"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Anstataŭigi pakon per pli malalta versio"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Akomodi iun ajn pakon kiu povas helpi tiun ĉi"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Procezi eventualajn pakojn eĉ kiam sub tenado"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Provi (mal)instali aferojn eĉ kiam ne ĉefuzanto"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "PATH malhavas gravajn programojn, problemoj okazos"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Instali pakon eĉ se ĝi malsukcesas aŭtentikan kontrolon"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Procezi eĉ pakojn kun malĝustaj versioj"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Anstataŭigi dosieron de unu pako per alia"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Anstataŭigi deturnitan dosieron per ne-deturnita versio"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Anstataŭigi pak-dosierujon per tiu de alia dosiero"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Ne realigi sekurajn en/eligajn operaciojn dum malpakado"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Ĉiam uzi la novajn akomod-dosierojn, ne demandi"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Ĉiam uzi la malnovajn akomod-dosierojn, ne demandi"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Uzi la aprioran elekteblon por novaj akomod-dosieroj\n"
-"se iu estos disponigita, kaj ne demandi. Se neniu\n"
-"aprioraĵo povas esti trovata, vi estos demandata, nur\n"
-"ne, se unu el la elektebloj 'confold' aŭ 'confnew'\n"
-"ankaŭ estos provizita"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Ĉiam instali mankantajn akomod-dosierojn"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Oferi anstataŭigi akomod-dosierojn kiuj havas neniujn novajn versiojn"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Procezi eĉ pakojn kun malĝusta aŭ neniu arkitekturo"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Instali eĉ se ĝi rompus alian pakon"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Permesi instalon de konfliktantaj pakoj"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Igi ĉiujn dependecajn problemojn al avertoj"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Igi dependec-versiajn problemojn al avertoj"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Forigi pakojn kiuj bezonas instalado"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Forigi esencan pakon"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Ĝenerale helpa progres-informo"
 
@@ -3677,42 +3966,6 @@ msgstr "ne eblas forigi arkitekturon '%s', nune uzata de datumbazo"
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s perfortaj elektebloj - reg-konduto kiam problemoj trovitas:\n"
-"  averti sed daŭrigi: --force-<afero>,<afero>,...\n"
-"  ĉesi kun eraro:     --refuse-<afero>,<afero>,... | --no-force-<afero>,...\n"
-" Perfortaj aferoj:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"AVERTO - uzo de elektebloj markitaj per [!] povas serioze damaĝi vian "
-"instaladon.\n"
-"Perfortaj elektebloj markitaj per [*] estas ebligataj apriore.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "nekonata perforta/rifuza elekteblo '%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "malaktuala perforta/rifuza elekteblo '%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "ne eblis malfermi '%i' por elsendfluo"
 
@@ -3893,6 +4146,12 @@ msgid "Description"
 msgstr "Priskribo"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "montranta dosieron en paĝilo"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "deturno de %s el: %s\n"
@@ -3927,6 +4186,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "la pako '%s' ne estas instalita kaj neniu informo disponeblas"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Uzu dpkg --info (= dpkg-deb --info) por ekzameni arkivajn dosierojn,\n"
+"kaj dpkg --contents (= dpkg-deb --contents) por listigi iliajn enhavojn.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "la pako '%s' ne disponeblas"
@@ -3952,9 +4221,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "deturnita de %s al: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Uzu dpkg --info (= dpkg-deb --info) por ekzameni arkivajn dosierojn,\n"
 "kaj dpkg --contents (= dpkg-deb --contents) por listigi iliajn enhavojn.\n"
@@ -3995,19 +4267,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "Debiana %s petilo de pak-administra programo, versio %s.\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4192,6 +4478,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr "'admindir' devas esti ene de 'instdir' por ke dpkg funkciu ĝuste"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "malsukceso por apliki 'chroot' al '%.250s'"
@@ -4345,12 +4637,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4417,67 +4723,11 @@ msgstr "neniu preterpaso ĉeestas"
 msgid "--update is useless for --remove"
 msgstr "--update estas neutila por --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "malvalida stato"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "legado de dosiero 'statoverride' '%.250s'"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "legado de dosiero 'statoverride' '%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "malsukcesis malfermi dosieron 'statoverride'"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "malsukcesis uzi fstat je dosiero 'statoverride'"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "legado de dosiero 'statoverride' '%.250s'"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "dosiero 'statoverride' malhavas lastan linifinaĵon"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "dosiero 'statoverride' enhavas malplenan linion"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "sintaks-eraro en dosiero 'statoverride'"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "nekonata uzanto '%s' en dosiero 'statoverride'"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "neatendata linifinon en dosiero 'statoverride'"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "nekonata grupo '%s' en dosiero 'statoverride'"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "multoblaj 'statoverride' ĉeestas por la dosiero '%.250s'"
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "malaktuala elekteblo '--%s'; bonvolu uzi '--%s' anstataŭe"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4692,6 +4942,12 @@ msgstr "Malakomodado de %s (%s), por ebligi forigon de %s (%s) ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Malakomodado de %s (%s) ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "dosiero 'statoverride' enhavas malplenan linion"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4830,11 +5086,9 @@ msgid "package filesystem archive extraction"
 msgstr "eltirado de paka dosiersistema arkivo"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "eraro dum legado de eligo de dpkg-deb tar"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "misrompita dosiersistema tar-dosiero - misrompita pak-arkivo"
 
 #: src/unpack.c
@@ -4848,13 +5102,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s prenas maksimume unu argumenton por dosiero Packages"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "ne eblas atingi stat-areon de dpkg por ampleksa disponebla ĝisdatigo"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr ""
-"ampleksa disponebla ĝisdatigo postulas skrib-rajton al la stat-areo de dpkg"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "ne eblas atingi stat-areon de dpkg por ampleksa disponebla ĝisdatigo"
 
 #: src/update.c
 #, c-format
@@ -5208,16 +5467,18 @@ msgid "decompressing archive member"
 msgstr "malkompaktado de arkiva membro"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "malsukceso dum atingo al dosierujo"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "malsukceso dum kreo de dosierujo"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "malsukceso dum atingo al dosierujo post krei ĝin"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "neatendata dosierfino en pak-nomo ĉe linio %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "malsukceso dum atingo al dosierujo"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6054,7 +6315,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6064,8 +6339,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6568,11 +6844,85 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "malaktuala elekteblo '--%s'; bonvolu uzi '--%s' anstataŭe"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "ne eblas malfermi ŝlos-dosieron %s por testado"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "nekonata uzanto '%s' en dosiero 'statoverride'"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "nekonata grupo '%s' en dosiero 'statoverride'"
+
+#~ msgid "%s is missing"
+#~ msgstr "mankas %s"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "'%.50s' ne estas permesata por %s"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "la reg-dosiero '%s' malhavas valoron"
+#~ msgid "junk after %s"
+#~ msgstr "rubaĵo post %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "malvalida pak-nomo (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "jes/ne en bulea kampo"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "kampo '%s', referenco al '%.255s': eraro en versio"
+
+#~ msgid "empty value for %s"
+#~ msgstr "malplena valoro por %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "pako havas staton 'triggers-awaited' sed neniun atendatan ekigilon"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "pako havas staton 'triggers-pending' sed neniun pritraktotan ekigilon"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "ampleksa disponebla ĝisdatigo postulas skrib-rajton al la stat-areo de "
+#~ "dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "eraro dum legado de eligo de dpkg-deb tar"
+
+#, fuzzy
+#~| msgid "cannot open '%s' control file for package '%s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "ne eblas malfermi reg-dosieron '%s' por la pako '%s'"
+
+#, fuzzy
+#~| msgid "cannot stat '%s' control file for package '%s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "ne eblas legi staton de reg-dosiero '%s' por la pako '%s'"
+
+#, fuzzy
+#~| msgid "'%s' file for package '%s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "la dosiero '%s' por la pako '%s' ne estas ordinara dosiero"
+
+#, fuzzy
+#~| msgid "cannot close '%s' control file for package '%s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "ne eblas fermi la reg-dosieron '%s' por la pako '%s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "ne eblas malfermi dosier-lista dosiero por la pako '%.250s'"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "ne eblas legi staton de dosier-lista dosiero por la pako '%.250s'"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "dosier-listo por la pako '%.250s' ne estas ordinara dosiero"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "legado de dosier-listo por pako '%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "malsukceso dum atingo al dosierujo post krei ĝin"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "la reg-dosiero '%s' malhavas valor-apartigilon"
@@ -6637,9 +6987,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF en stdin ĉe komandinvito de conffile"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "neatendata dosierfino en pak-nomo ĉe linio %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "neatendata dosierfino post pak-nomo ĉe linio %d"
 
diff --git a/po/es.po b/po/es.po
index 10bdeee6d..da0a5182e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -40,7 +40,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.16.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2017-11-08 00:59+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -206,7 +206,8 @@ msgstr "error al eliminar la copia de seguridad antigua '%s'"
 msgid "error creating new backup file '%s'"
 msgstr "error al crear la nueva copia de seguridad '%s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "no se puede borrar `%.250s'"
@@ -414,23 +415,40 @@ msgstr "no se puede efectuar `flush' %.250s tras el relleno"
 msgid "unable to seek to start of %.250s after padding"
 msgstr "no se puede volver al comienzo de %.250s después del relleno"
 
-# "incapaz de..." queda demasiado literal. sv
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "no se puede abrir el fichero de bloqueo %s para hacer pruebas"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "no se puede leer el descriptor de ficheros para el directorio '%s'"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr ""
+"no se puede abrir/crear el fichero de bloqueo de la base de datos de estado"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
 msgstr ""
 "no se puede abrir/crear el fichero de bloqueo de la base de datos de estado"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "no tiene permiso para bloquear la base de datos de estado de dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "base de datos de estado de dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -438,11 +456,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "la operación solicitada precisa privilegios de superusuario"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "no se puede acceder al área de estado de dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 "la operación precisa acceso de lectura y escritura al área de estado de dpkg"
 
@@ -481,6 +503,198 @@ msgstr "no se puede cerrar el estado actualizado de `%.250s'"
 msgid "unable to install updated status of '%.250s'"
 msgstr "no se puede instalar el estado actualizado de `%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "no se puede comprobar la existencia de `%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "no se puede leer el directorio `info'"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "error intentando abrir %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "archivo de información de formato de base de datos corrupto '%s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"el formato de la base de datos de información (%d) es absurdo o demasiado "
+"nuevo; intente obtener un nuevo dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "archivo Info %s/%s no asociado con ningún paquete"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "error al crear el enlace duro `%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "error al escribir '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"falta un salto de línea al final del fichero de control `%s' del paquete `"
+"%s' "
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "falta un valor en el fichero de control `%s' del paquete `%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"falta un separador de valor en el fichero de control `%s' del paquete `%s' "
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"el fichero de control del paquete `%s' del paquete `%s' contiene un nombre "
+"de fichero vacío"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read control file '%s' for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "no se puede leer el fichero de control `%s' para el paquete `%s'"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "fallo al abrir fichero de desvíos"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "fallo al efectuar `fstat' sobre el fichero de desvíos"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "desvíos conflictivos acerca de `%.250s' o `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "error al cerrar el fichero de lista de ficheros del paquete `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"falta el fichero de lista de ficheros del paquete `%.250s', se supondrá que "
+"el paquete no tiene ningún fichero actualmente instalado"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"falta un salto de línea nueva al final del fichero de lista de ficheros del "
+"paquete `%.250s' "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"el fichero de lista de ficheros del paquete `%.250s'\n"
+"contiene un nombre de fichero vacío"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Leyendo la base de datos ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d fichero o directorio instalado actualmente.)\n"
+msgstr[1] "%d ficheros o directorios instalados actualmente.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "uid statoverride inválido %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "gid statoverrid inválido %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "modo statoverride inválido %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "fallo al abrir el fichero statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "fallo al efectuar `fstat' sobre el fichero statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "leyendo el fichero statoverride '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "el fichero statoverride no tiene un salto de línea final"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "El fichero statoverride contiene una línea vacía"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "error sintáctico en el fichero statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "fin de línea inesperado en el fichero statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr ""
+"se encontraron múltiples definiciones statoverride para el fichero `%.250s'"
+
 #: lib/dpkg/deb-version.c
 msgid "format version with too big major component"
 msgstr "versión de formato con valor de componente principal demasiado grande"
@@ -597,64 +811,77 @@ msgid "internal error"
 msgstr "error interno"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "falta %s"
+#, fuzzy
+#| msgid "missing package"
+msgid "is missing a value"
+msgstr "falta el paquete"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "no se admite '%.50s' para %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Omitiendo la línea inválida: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "basura después de %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "nombre de paquete inválido (%.250s)"
+#, fuzzy, c-format
+#| msgid "package name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "el nombre de paquete '%s' es inválido: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "campo de detalles `%s' de fichero vacío"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "campo de detalles de fichero `%s' no permitido en el fichero de estado"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "demasiados valores en el campo de detalles de fichero `%s'\n"
 "(comparado con otros)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "insuficiente número de valores en el campo de detalles de fichero `%s'\n"
 "(comparado con otros)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "«yes/no» en campo booleano"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "Se ha utilizado un campo `%s' o `%s' obsoleto"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "«foreign/allowed/same/no» en campo quadstate"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "`%s' no es un nombre de arquitectura válido: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "palabra en campo `Prioridad'"
 
 #: lib/dpkg/fields.c
@@ -663,25 +890,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "el valor para el campo `%s' no está permitido en este contexto"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "primera palabra (necesaria) en el campo `Status'"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "segunda palabra (error) en el campo `Status'"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "tercera palabra de estado en el campo `Status'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "error en la cadena «%s» `%.250s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "Se ha utilizado un campo `%s' o `%s' obsoleto"
 
 #: lib/dpkg/fields.c
@@ -690,14 +925,17 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "el valor de `%s' tiene una línea mal formateada `%.*s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "el valor de `%s' contiene una línea que comienza con un\n"
 " carácter `%c' que no es un espacio"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "se ha indicado como conffile el directorio raíz o un directorio vacío"
 
 #: lib/dpkg/fields.c
@@ -784,9 +1022,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "campo `%s', referencia a `%.255s': versión incompleta"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "campo `%s', referencia a `%.255s': error en la versión"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "campo `%s', referencia a `%.255s': la versión contiene `%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -794,8 +1033,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "campo `%s', error de sintaxis tras la referencia al paquete `%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "no se admiten alternativas (`|') en el campo %s"
 
 #: lib/dpkg/fields.c
@@ -833,6 +1073,31 @@ msgstr "no se puede cambiar el propietario del fichero objetivo `%.250s'"
 msgid "unable to set mode of target file '%.250s'"
 msgstr "no se puede establecer el modo del fichero objetivo `%.250s'"
 
+# FIXME: Traducción de 'stat'
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "no se puede efectuar `stat' sobre `%s': %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "archive '%s' is not a regular file"
+msgid "%s is not a regular file"
+msgstr "el archivo '%s' no es un fichero normal"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "no se puede escribir %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "no se puede añadir a '%s'"
+
 #: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
@@ -854,8 +1119,22 @@ msgid "unable to lock %s"
 msgstr "no se puede desbloquear %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "mostrando el fichero con el paginador"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "no se puede añadir a '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "no se puede volcar el fichero `%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "No se pueden desviar el fichero `%s' a sí mismo"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -875,16 +1154,16 @@ msgstr "no se puede escribir al descriptor de fichero de estado %d"
 msgid "failed to allocate memory"
 msgstr "fallo al asignar memoria"
 
-# FIXME: std%s is completely unsuitable for translation. sv
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "fallo al efectuar `dup' para std%s"
+msgid "failed to dup for fd %d"
+msgstr "fallo al efectuar `dup' para `fd' %d"
 
+# FIXME: std%s is completely unsuitable for translation. sv
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "fallo al efectuar `dup' para `fd' %d"
+msgid "failed to dup for std%s"
+msgstr "fallo al efectuar `dup' para std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1022,27 +1301,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "valor duplicado para el campo definido por el usuario `%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "falta %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "valor vacío para %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "valor duplicado para el campo `%s'"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "el paquete tiene el campo '%s' pero falta la arquitectura"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "el paquete tiene el campo '%s' pero su architectura es «all»"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Campo `Config-Version' para un paquete con `Status' no apropiado"
 
 #: lib/dpkg/parse.c
@@ -1051,10 +1336,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "el paquete tiene el estado %s pero los disparadores están en espera"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"el paquete tiene el estado «triggers-awaited» pero no hay ningún disparador "
-"en espera"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "el paquete tiene el estado %s pero los disparadores están en espera"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1062,13 +1347,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "el paquete tiene estado %s pero los disparadores están pendientes"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"el paquete tiene el estado «triggers-pending» pero no hay disparadores "
-"pendientes"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "el paquete tiene estado %s pero los disparadores están pendientes"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Paquete que no estando instalado tiene conffiles, nos olvidamos de ellos"
 
@@ -1091,10 +1378,13 @@ msgstr ""
 "oficial"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Multi-Arq: %s) no es co-instalable con %s que tiene múltiples "
 "instancias instaladas"
@@ -1287,11 +1577,6 @@ msgstr "no se puede borrar de forma segura `%.255s'"
 msgid "rm command for cleanup"
 msgstr "órden «rm» para limpieza"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "nombre ambiguo de paquete '%s' con más de una instancia instalada"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1305,6 +1590,16 @@ msgstr "el ancho del cambio está fuera de rango"
 msgid "missing closing brace"
 msgstr "falta el caracter de cierre"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "nombre ambiguo de paquete '%s' con más de una instancia instalada"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(no hay ninguna descripción disponible)"
@@ -1387,6 +1682,70 @@ msgstr "el subproceso %s falló con código de estado de espera %d"
 msgid "wait for %s subprocess failed"
 msgstr "falló la orden `wait' para el subproceso %s"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "carácter `%c' inválido en el ancho del campo"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "carácter `%c' inválido en el ancho del campo"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "uid statoverride inválido %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "gid statoverrid inválido %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "carácter `%c' inválido en el ancho del campo"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "opciones no soportadas en la cabecera del fichero"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "¡tipo de compresión `%s' desconocido!"
+
 # FIXME: Traducción de 'stat'
 #: lib/dpkg/treewalk.c
 #, c-format
@@ -1404,13 +1763,16 @@ msgid "treewalk root %s is not a directory"
 msgstr "el directorio de árbol %s no es un directorio"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr ""
 "no se puede abrir/crear el fichero de bloqueo de los disparadores `%.250s'"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "area de disparadores"
 
 #: lib/dpkg/trigdeferred.c
@@ -1647,11 +2009,6 @@ msgstr "error al crear la tubería `%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "error al crear el dispositivo `%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "error al crear el enlace duro `%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1977,10 +2334,10 @@ msgstr "no se puede acceder al archivo '%s'"
 msgid "archive '%s' is not a regular file"
 msgstr "el archivo '%s' no es un fichero normal"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<salida estándar>"
 
@@ -2179,6 +2536,10 @@ msgid "conffile difference visualizer"
 msgstr "visualizador de diferencias entre conffiles"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Escriba `exit' cuando termine.\n"
 
@@ -2539,7 +2900,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2548,7 +2923,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2585,6 +2963,12 @@ msgstr ""
 "Los scripts preinst o postrm de los paquetes deberían siempre especificar\n"
 "--package y --divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 # FIXME: Traducción de 'stat'
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
@@ -2707,6 +3091,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "No hay un desvío para `%s', no se ha eliminado ninguno.\n"
 
@@ -2752,19 +3143,6 @@ msgstr "el nombre de paquete no puede tener saltos de línea"
 msgid "divert-to may not contain newlines"
 msgstr "«divert-to» no puede tener saltos de línea"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "fallo al abrir fichero de desvíos"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "fallo al efectuar `fstat' sobre el fichero de desvíos"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "desvíos conflictivos acerca de `%.250s' o `%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3065,122 +3443,182 @@ msgstr ""
 "El paquete %s está mantenido, no se toca. Utilice --force-hold para cambiar\n"
 "el comportamiento predeterminado\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr ""
-"sobreseyendo el problema porque está activa la opción --force:\n"
-" "
+#: src/force.c
+msgid "Set all force options"
+msgstr "Activa todas las opciones de forzado."
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"falta un salto de línea al final del fichero de control `%s' del paquete `"
-"%s' "
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "falta un valor en el fichero de control `%s' del paquete `%s'"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Reemplaza el paquete con una versión menor."
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "falta un separador de valor en el fichero de control `%s' del paquete `%s' "
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configura cualquier paquete que pudiera ayudar a éste."
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Procesa paquetes accesorios aunque estén bloqueados"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Intenta (des)instalar cosas incluso sin ser root."
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
 msgstr ""
-"el fichero de control del paquete `%s' del paquete `%s' contiene un nombre "
-"de fichero vacío"
+"No se pueden encontrar programas importante en PATH, seguramente cause "
+"problemas"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "no se puede abrir el fichero de control `%s' del paquete `%s'"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Instala un paquete aunque falle la comprobación de autenticidad"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Procesa incluiso paquetes con versiones incorrectas"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"no se puede ejecutar «stat» sobre el fichero de control `%s' del paquete `%s'"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "el fichero de control `%s' para el paquete `%s' no es un fichero normal"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "no se puede leer el fichero de control `%s' para el paquete `%s'"
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Sobreescribe un fichero de un paquete con otro."
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "error al cerrar el fichero de control `%s' del paquete `%s'"
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Sobreescribe un fichero desviado con una versión no desviada."
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "no se puede abrir el fichero de lista de ficheros del paquete `%.250s'"
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Sobreescribir el directorio de un paquete con el fichero de otro"
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+"No utiliza las operaciones seguras de E/S cuando se realiza desempaqueta."
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr "No ejecutar «chroot» en el entorno de los programs del desarrollador"
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Utiliza siempre los archivos de configuración nuevos, no pregunta."
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Utiliza siempre los archivos de configuración antiguos, no pregunta."
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"falta el fichero de lista de ficheros del paquete `%.250s', se supondrá que "
-"el paquete no tiene ningún fichero actualmente instalado"
+"Utiliza la opción predeterminada para los ficheros de\n"
+"configuración nuevo si están disponibles, sin\n"
+"preguntar. Si no se encuentra ninguno predeterminado\n"
+"preguntará, a menos que se utilicen también alguna de\n"
+"las opciones confold o confnew."
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Instala siempre los ficheros de configuración que faltan."
+
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Ofrece el reemplazo de ficheros de configuración sin versiones nuevas."
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
 msgstr ""
-"no se puede ejecutar «stat» sobre el fichero de lista de ficheros del "
-"paquete `%.250s'"
+"Procesa incluso los paquetes con arquitectura errónea o sin arquitectura."
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "la lista de ficheros para el paquete '%.250s' no es un fichero normal"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Instala aunque pudiera romper otro paquete."
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "leyendo la lista de ficheros para el paquete '%.250s'"
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Permite la instalación de paquetes en conflicto."
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Convierte todos los problemas de dependencias en avisos."
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Convierte todos los problemas de versiones de dependencias en avisos."
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Elimina los paquetes que precisan instalación."
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Elimina un paquete esencial."
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"falta un salto de línea nueva al final del fichero de lista de ficheros del "
-"paquete `%.250s' "
+"opciones de forzado de %s - controlan el comportamiento cuando hay "
+"problemas:\n"
+"\n"
+" avisa pero continúa:      --force-<cosa>,<cosa>,...\n"
+" se detiene si hay error:  --refuse-<cosa>,<cosa>,... | --no-force-"
+"<cosa>,...\n"
+" Cosas que se pueden forzar:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"el fichero de lista de ficheros del paquete `%.250s'\n"
-"contiene un nombre de fichero vacío"
+"\n"
+"ATENCIÓN - el uso de las opciones marcadas con [!] puede dañar seriamente\n"
+"su instalación. Las opciones de forzado marcadas con [*] están activas\n"
+"por omisión.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "error al cerrar el fichero de lista de ficheros del paquete `%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Leyendo la base de datos ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "opción «force/refuse» desconocida `%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d fichero o directorio instalado actualmente.)\n"
-msgstr[1] "%d ficheros o directorios instalados actualmente.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "opción «force/refuse» obsoleta '%s'"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"sobreseyendo el problema porque está activa la opción --force:\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3245,72 +3683,78 @@ msgstr ""
 "NOTA: El PATH de root debería incluir habitualmente /usr/local/sbin, /usr/"
 "sbin y /sbin."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "no se puede comprobar la existencia de `%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "no se puede leer el directorio `info'"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "error intentando abrir %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "archivo de información de formato de base de datos corrupto '%s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"el formato de la base de datos de información (%d) es absurdo o demasiado "
-"nuevo; intente obtener un nuevo dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "archivo Info %s/%s no asociado con ningún paquete"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "error al escribir '%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
 msgstr "Programa de gestión de paquetes de Debian `%s' versión %s.\n"
 
 #: src/main.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -i|--install       <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  --unpack           <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  -A|--record-avail  <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  --configure        <package> ... | -a|--pending\n"
+#| "  --triggers-only    <package> ... | -a|--pending\n"
+#| "  -r|--remove        <package> ... | -a|--pending\n"
+#| "  -P|--purge         <package> ... | -a|--pending\n"
+#| "  -V|--verify <package> ...        Verify the integrity of package(s).\n"
+#| "  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+#| "  --set-selections                 Set package selections from stdin.\n"
+#| "  --clear-selections               Deselect every non-essential package.\n"
+#| "  --update-avail [<Packages-file>] Replace available packages info.\n"
+#| "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
+#| "  --clear-avail                    Erase existing available info.\n"
+#| "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "  -C|--audit [<package> ...]       Check for broken package(s).\n"
+#| "  --yet-to-unpack                  Print packages selected for "
+#| "installation.\n"
+#| "  --predep-package                 Print pre-dependencies to unpack.\n"
+#| "  --add-architecture <arch>        Add <arch> to the list of "
+#| "architectures.\n"
+#| "  --remove-architecture <arch>     Remove <arch> from the list of "
+#| "architectures.\n"
+#| "  --print-architecture             Print dpkg architecture.\n"
+#| "  --print-foreign-architectures    Print allowed foreign architectures.\n"
+#| "  --assert-<feature>               Assert support for the specified "
+#| "feature.\n"
+#| "  --validate-<thing> <string>      Validate a <thing>'s <string>.\n"
+#| "  --compare-versions <a> <op> <b>  Compare version numbers - see below.\n"
+#| "  --force-help                     Show help on forcing.\n"
+#| "  -Dh|--debug=help                 Show help on debugging.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3558,119 +4002,6 @@ msgstr ""
 "¡fíltrela con `less' o con `more'!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Activa todas las opciones de forzado."
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Reemplaza el paquete con una versión menor."
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Configura cualquier paquete que pudiera ayudar a éste."
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Procesa paquetes accesorios aunque estén bloqueados"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Intenta (des)instalar cosas incluso sin ser root."
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-"No se pueden encontrar programas importante en PATH, seguramente cause "
-"problemas"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Instala un paquete aunque falle la comprobación de autenticidad"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Procesa incluiso paquetes con versiones incorrectas"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Sobreescribe un fichero de un paquete con otro."
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Sobreescribe un fichero desviado con una versión no desviada."
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Sobreescribir el directorio de un paquete con el fichero de otro"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-"No utiliza las operaciones seguras de E/S cuando se realiza desempaqueta."
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr "No ejecutar «chroot» en el entorno de los programs del desarrollador"
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Utiliza siempre los archivos de configuración nuevos, no pregunta."
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Utiliza siempre los archivos de configuración antiguos, no pregunta."
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Utiliza la opción predeterminada para los ficheros de\n"
-"configuración nuevo si están disponibles, sin\n"
-"preguntar. Si no se encuentra ninguno predeterminado\n"
-"preguntará, a menos que se utilicen también alguna de\n"
-"las opciones confold o confnew."
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Instala siempre los ficheros de configuración que faltan."
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Ofrece el reemplazo de ficheros de configuración sin versiones nuevas."
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-"Procesa incluso los paquetes con arquitectura errónea o sin arquitectura."
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Instala aunque pudiera romper otro paquete."
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Permite la instalación de paquetes en conflicto."
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Convierte todos los problemas de dependencias en avisos."
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Convierte todos los problemas de versiones de dependencias en avisos."
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Elimina los paquetes que precisan instalación."
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Elimina un paquete esencial."
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Información de progreso generalmente útil."
 
@@ -3804,44 +4135,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"opciones de forzado de %s - controlan el comportamiento cuando hay "
-"problemas:\n"
-"\n"
-" avisa pero continúa:      --force-<cosa>,<cosa>,...\n"
-" se detiene si hay error:  --refuse-<cosa>,<cosa>,... | --no-force-"
-"<cosa>,...\n"
-" Cosas que se pueden forzar:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"ATENCIÓN - el uso de las opciones marcadas con [!] puede dañar seriamente\n"
-"su instalación. Las opciones de forzado marcadas con [*] están activas\n"
-"por omisión.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "opción «force/refuse» desconocida `%.*s'"
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "opción «force/refuse» obsoleta '%s'"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "no se pudo abrir `%i' para un flujo"
 
@@ -4022,6 +4315,12 @@ msgid "Description"
 msgstr "Descripción"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "mostrando el fichero con el paginador"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "desviado por %s de: %s\n"
@@ -4058,6 +4357,16 @@ msgstr ""
 "el paquete `%s' no está instalado y no hay ninguna información disponible."
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Utilice dpkg --info (= dpkg-deb --info) para examinar archivos,\n"
+"y dpkg --contents (= dpkg-deb --contents) para listar su contenido.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "ell paquete `%s' no está disponible."
@@ -4083,9 +4392,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "desviado por %s a: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Utilice dpkg --info (= dpkg-deb --info) para examinar archivos,\n"
 "y dpkg --contents (= dpkg-deb --contents) para listar su contenido.\n"
@@ -4129,19 +4441,33 @@ msgstr ""
 "versión %s.\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4347,6 +4673,12 @@ msgstr ""
 "correctamente"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "fallo al efectuar `chroot' a `%.250s'"
@@ -4436,7 +4768,9 @@ msgstr "nombre de paquete ilegal en la línea %d: %.250s"
 #: src/select.c
 #, c-format
 msgid "package not in status nor available database at line %d: %.250s"
-msgstr "el paquete no está en la base de datos de estado o de paquetes disponibles en la línea %d: %.250s"
+msgstr ""
+"el paquete no está en la base de datos de estado o de paquetes disponibles "
+"en la línea %d: %.250s"
 
 #: src/select.c
 #, c-format
@@ -4500,12 +4834,26 @@ msgstr ""
 # NOTE: `override' se traduce como redefinición porque no se "anula" o
 # "hace caso omiso" de los valores de dpkg, se reemplazan por otros.
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4574,65 +4922,11 @@ msgstr "no existe una redefinición"
 msgid "--update is useless for --remove"
 msgstr "es inútil utilizar --update con --remove"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "uid statoverride inválido %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "gid statoverrid inválido %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "modo statoverride inválido %s"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "fallo al abrir el fichero statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "fallo al efectuar `fstat' sobre el fichero statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "leyendo el fichero statoverride '%.250s'"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "el fichero statoverride no tiene un salto de línea final"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "El fichero statoverride contiene una línea vacía"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "error sintáctico en el fichero statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "usuario desconocido `%s' en el archivo statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "fin de línea inesperado en el fichero statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "grupo desconocido `%s' en el fichero statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr ""
-"se encontraron múltiples definiciones statoverride para el fichero `%.250s'"
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "opción obsoleta '--%s', utilice '--%s' en su lugar"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4852,6 +5146,12 @@ msgstr "Desconfigurando %s (%s), para poder eliminar %s (%s) ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Desconfigurando %s (%s) ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "El fichero statoverride contiene una línea vacía"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -5000,11 +5300,9 @@ msgid "package filesystem archive extraction"
 msgstr "extracción del archivo del sistema de ficheros del paquete"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "error al leer la salida de tar de dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "sistema de ficheros del archivo tar dañado - archivo de paquete dañado"
 
 # Please, que alguien me diga qué es eso de zap. sv
@@ -5019,17 +5317,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s necesita exactamente un fichero de Paquetes como parámetro"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "no se puede acceder al área de estado de dpkg para una actualización\n"
 "de `available'"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"la actualización de `available' requiere acceso de escritura al área de "
-"estado\n"
-"de dpkg"
+"no se puede acceder al área de estado de dpkg para una actualización\n"
+"de `available'"
 
 #: src/update.c
 #, c-format
@@ -5068,7 +5371,7 @@ msgstr "miembro de control"
 #: dpkg-deb/build.c
 #, c-format
 msgid "newline not allowed in pathname '%s'"
-msgstr "no se pemite nueva línea dentro del nombre del campo `%s'"
+msgstr "no se pemite nueva línea dentro del nombre del campo '%s'"
 
 #: dpkg-deb/build.c
 msgid "data member"
@@ -5273,7 +5576,8 @@ msgstr "el fichero '%.250s' está dañado - cabecera mágica de archivo errónea
 #: dpkg-deb/extract.c
 #, c-format
 msgid "file '%.250s' is not a Debian binary archive (try dpkg-split?)"
-msgstr "el fichero `%.250s' no es un archivo binario de debian (¿intente dpkg-split?)"
+msgstr ""
+"el fichero `%.250s' no es un archivo binario de debian (¿intente dpkg-split?)"
 
 #: dpkg-deb/extract.c
 msgid "archive information header member"
@@ -5379,16 +5683,18 @@ msgid "decompressing archive member"
 msgstr "descomprimiendo el miembro del archivo"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "fallo al cambiar al directorio"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "fallo al crear directorio"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "fallo al cambiar a un directorio después de crearlo"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "eof inesperado en el nombre del paquete en la línea %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "fallo al cambiar al directorio"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5575,20 +5881,28 @@ msgstr ""
 "Opciones:\n"
 "  -v, --verbose                Activa la salida verbosa.\n"
 "  -D, --debug                  Activa la salida de depuración.\n"
-"      --showformat=<formato>      Utiliza un formato alternativo para --show.\n"
+"      --showformat=<formato>      Utiliza un formato alternativo para --"
+"show.\n"
 "      --deb-format=<formato>      Selecciona el formato de archivo.\n"
 "                                   Los valores permitidos son: 0.939000,\n"
 "                                   2.0 (por omisión).\n"
-"      --old                       Apodo antiguo para `--deb-format=0.939000'\n"
+"      --old                       Apodo antiguo para `--deb-"
+"format=0.939000'\n"
 "      --new                       Apodo antiguo para `--deb-format=2.0'.\n"
-"      --nocheck                   Suprime la verificación del fichero de control\n"
+"      --nocheck                   Suprime la verificación del fichero de "
+"control\n"
 "                                  (construye paquetes erróneos).\n"
-"      --root-owner-group          Fuerza que el propietario y el gupo sean root.\n"
-"      --[no-]uniform-compression  Utiliza los parámetros de compresión en todos\n"
+"      --root-owner-group          Fuerza que el propietario y el gupo sean "
+"root.\n"
+"      --[no-]uniform-compression  Utiliza los parámetros de compresión en "
+"todos\n"
 "                                  los miembros.\n"
-"  -z#                          Establece el nivel de compresión al construir.\n"
-"  -Z<tipo>                     Establece el tipo de compresión a usar cuando\n"
-"                               se construye un paquete. Los valores permitidos \n"
+"  -z#                          Establece el nivel de compresión al "
+"construir.\n"
+"  -Z<tipo>                     Establece el tipo de compresión a usar "
+"cuando\n"
+"                               se construye un paquete. Los valores "
+"permitidos \n"
 "                               son: gzip, xz, bzip2, none (ninguno)\n"
 "  -S<estrategia>               Establece la estrategia de compresión al \n"
 "                               construir. Los valores permitidos son:\n"
@@ -6229,7 +6543,21 @@ msgstr ""
 # NOTE: `override' se traduce como redefinición porque no se "anula" o
 # "hace caso omiso" de los valores de dpkg, se reemplazan por otros.
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6239,8 +6567,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6741,14 +7070,97 @@ msgstr "para volver a hacer actualizaciones automáticas utilice «%s --auto %s�
 
 #: utils/update-alternatives.polkit.in
 msgid "Run update-alternatives to modify system alternative selections"
-msgstr "Ejecute `update-alternatives' para modificar la selección de alternativas del sistema"
+msgstr ""
+"Ejecute `update-alternatives' para modificar la selección de alternativas "
+"del sistema"
 
 #: utils/update-alternatives.polkit.in
 msgid "Authentication is required to run update-alternatives"
 msgstr "Es necesario autenticarse para ejecutar `update-alternatives'"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "opción obsoleta '--%s', utilice '--%s' en su lugar"
+# "incapaz de..." queda demasiado literal. sv
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "no se puede abrir el fichero de bloqueo %s para hacer pruebas"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "usuario desconocido `%s' en el archivo statoverride"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "grupo desconocido `%s' en el fichero statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "falta %s"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "no se admite '%.50s' para %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "basura después de %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "nombre de paquete inválido (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "«yes/no» en campo booleano"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "campo `%s', referencia a `%.255s': error en la versión"
+
+#~ msgid "empty value for %s"
+#~ msgstr "valor vacío para %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "el paquete tiene el estado «triggers-awaited» pero no hay ningún "
+#~ "disparador en espera"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "el paquete tiene el estado «triggers-pending» pero no hay disparadores "
+#~ "pendientes"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "la actualización de `available' requiere acceso de escritura al área de "
+#~ "estado\n"
+#~ "de dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "error al leer la salida de tar de dpkg-deb"
+
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "no se puede abrir el fichero de control `%s' del paquete `%s'"
+
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "no se puede ejecutar «stat» sobre el fichero de control `%s' del paquete `"
+#~ "%s'"
+
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr ""
+#~ "el fichero de control `%s' para el paquete `%s' no es un fichero normal"
+
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "error al cerrar el fichero de control `%s' del paquete `%s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr ""
+#~ "no se puede abrir el fichero de lista de ficheros del paquete `%.250s'"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "no se puede ejecutar «stat» sobre el fichero de lista de ficheros del "
+#~ "paquete `%.250s'"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "la lista de ficheros para el paquete '%.250s' no es un fichero normal"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "leyendo la lista de ficheros para el paquete '%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "fallo al cambiar a un directorio después de crearlo"
 
 # FIXME: Traducción de 'stat'
 #~ msgid "control file '%s' missing value"
@@ -6818,9 +7230,6 @@ msgstr "Es necesario autenticarse para ejecutar `update-alternatives'"
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF en la entrada estándar al preguntar sobre conffiles"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "eof inesperado en el nombre del paquete en la línea %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "eof inesperado tras el nombre del paquete en la línea %d"
 
@@ -7096,10 +7505,6 @@ msgstr "Es necesario autenticarse para ejecutar `update-alternatives'"
 #~ msgid "it is a slave of %s"
 #~ msgstr "es un esclavo de %s"
 
-# FIXME: Traducción de 'stat'
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "no se puede efectuar `stat' sobre `%s': %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "falló readlink(%s): %s"
 
@@ -7124,9 +7529,6 @@ msgstr "Es necesario autenticarse para ejecutar `update-alternatives'"
 #~ msgid "unable to close %s: %s"
 #~ msgstr "no se puede cerrar %s: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "no se puede escribir %s: %s"
-
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "no se puede renombrar el fichero '%s' a '%s'"
 
@@ -7470,9 +7872,6 @@ msgstr "Es necesario autenticarse para ejecutar `update-alternatives'"
 #~ msgid "cannot open diversions: %s"
 #~ msgstr "fallo al abrir fichero de desvíos: %s"
 
-#~ msgid "missing package"
-#~ msgstr "falta el paquete"
-
 #~ msgid "rename: rename `%s' to `%s': %s"
 #~ msgstr "rename: se renombró `%s' a `%s': %s"
 
diff --git a/po/et.po b/po/et.po
index 3ddde1515..4d276d02f 100644
--- a/po/et.po
+++ b/po/et.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:49+0200\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -145,7 +145,8 @@ msgstr "viga seadistusfaili `%.255s' lugemisel"
 msgid "error creating new backup file '%s'"
 msgstr "viga toru `%.255s' loomisel"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "`%.250s' pole võimalik eemaldada"
@@ -366,25 +367,36 @@ msgstr ""
 msgid "unable to seek to start of %.250s after padding"
 msgstr ""
 
-# FIXME! kuidas peaks "control archive" tõlkima? hetkel on tõlgitud kui juhtarhiiv
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "tõrge tmpfile avamisel funktsioonis vsnprintf"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "%.250s failideskriptori lippe pole võimalik lugeda"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
-msgstr ""
+#, fuzzy, c-format
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "sul pole õigust dpkg olekuandmebaasi lukustada"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg olekuandmebaasi pole võimalik lukustada"
 
 #: lib/dpkg/dbmodify.c
@@ -392,11 +404,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "selle toimingu jaoks on vaja superkasutaja õiguseid"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "dpkg olekupiirkonnale pole võimalik ligi pääseda"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operatsioon vajab olekupiirkonnas lugemis-/kirjutamisõigust"
 
 #: lib/dpkg/dbmodify.c
@@ -434,6 +450,191 @@ msgstr "`%.250s' uuendatud olekut pole võimalik sulgeda"
 msgid "unable to install updated status of '%.250s'"
 msgstr "`%.250s' olekut pole võimalik uuendada"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "`%.250s' olemasolu pole võimalik kontrollida"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "andmekataloogi pole võimalik lugeda"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "viga viida `%.255s' loomisel"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "viga `%s' kirjutamisel"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "loading control file '%s' for package '%s'"
+msgstr "faili %s pole võimalik asukohale %s paigaldada: %s"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "tõrge diversioonifaili avamisel"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "viga paki `%.250s' failide nimekirja sulgemisel"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg: tõsine hoiatus: pakil `%.250s' puudub failide nimekiri, oletatavalt "
+"pole pakil praegu ühtegi faili paigaldatud.\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Andmebaasi lugemine ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "hetkel on paigaldatud %d faili ja kataloogi.)\n"
+msgstr[1] "hetkel on paigaldatud %d faili ja kataloogi.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride gid %s"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride mode %s"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "enne välja `%.*s' väärtust on faililõputunnus (puudub lõpu reavahetus)"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "viga seadistusfaili `%.255s' lugemisel"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "ootamatu realõpp pakinimes real %d"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -559,62 +760,70 @@ msgid "internal error"
 msgstr "sisemine viga - vigane režiim `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s on puudu"
+#, fuzzy
+#| msgid "unable to read %s: %s"
+msgid "is missing a value"
+msgstr "faili `%s' pole võimalik lugeda: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "  %.250s is not installed.\n"
-msgid "'%.50s' is not allowed for %s"
-msgstr "  %.250s pole paigaldatud.\n"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
+msgid "has trailing junk"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "vigane pakinimi (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Pakk `%s' pole paigaldatud.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tühi faili üksikasjade väli `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "faili üksikasjade väli `%s' pole olekufailis lubatud"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: copying %s to %s failed, giving up: %s"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "%s: tõrge %s kopeerimisel kataloogi %s, annan alla: %s"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, invalid package name `%.255s': %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "väli `%s', vigane pakinimi `%.255s': %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "error in Version string `%.250s': %.250s"
+msgid "word in '%s' field: %s"
+msgstr "viga Version stringis `%.250s': %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
@@ -623,26 +832,31 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "selles kontekstis pole `status' välja väärtus lubatud"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: copying %s to %s failed, giving up: %s"
+msgid "first (want) word in '%s' field: %s"
+msgstr "%s: tõrge %s kopeerimisel kataloogi %s, annan alla: %s"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "error in Version string `%.250s': %.250s"
+msgid "second (error) word in '%s' field: %s"
+msgstr "viga Version stringis `%.250s': %.250s"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, c-format
+msgid "third (status) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "viga Version stringis `%.250s': %.250s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -651,12 +865,14 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "value for `status' field not allowed in this context"
+msgid "value for '%s' field has line starting with non-space '%c'"
+msgstr "selles kontekstis pole `status' välja väärtus lubatud"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, c-format
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -728,9 +944,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, invalid package name `%.255s': %s"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "väli `%s', vigane pakinimi `%.255s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -738,9 +955,10 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "alternatives ('|') not allowed in '%s' field"
+msgstr "faili üksikasjade väli `%s' pole olekufailis lubatud"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
@@ -779,6 +997,29 @@ msgstr "juhtandmete faili `%.250s' pole võimalik kustutada"
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "unable to read %s: %s"
+msgid "cannot stat %s"
+msgstr "faili `%s' pole võimalik lugeda: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "lähtefail `%.250s' pole lihtfail"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "faili %s pole võimalik kirjutada: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open %s"
+msgstr "diversioone pole võimalik avada: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "luku %s vabastamine pole võimalik: %s"
@@ -801,8 +1042,20 @@ msgid "unable to lock %s"
 msgstr "luku %s vabastamine pole võimalik: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open file %s"
+msgstr "diversioone pole võimalik avada: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "tõrge puhvrite tühjendamisel funktsioonis vsnprintf"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "faili `%.250s' pole võimalik eemaldada"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -826,12 +1079,12 @@ msgstr "tõrge kataloogi loomisel"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
+msgid "failed to dup for fd %d"
 msgstr ""
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
+msgid "failed to dup for std%s"
 msgstr ""
 
 #: lib/dpkg/mlib.c
@@ -970,27 +1223,30 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "korduv kasutaja poolt kirjeldatud välja `%.*s' väärtus"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "puudub %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "korduv välja `%s' väärtus"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has '%s' field but is missing architecture"
+msgstr " (pakk: "
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr " (pakk: "
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, c-format
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -999,7 +1255,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1008,11 +1265,13 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "  Pakk %s eemaldatakse.\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, c-format
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1030,8 +1289,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1225,11 +1484,6 @@ msgstr "faili `%.255s' pole võimalik luua"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "nothing after colon in version number"
@@ -1244,6 +1498,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr ""
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(kirjeldus pole saadaval)"
@@ -1327,6 +1591,67 @@ msgstr "alamprotsess %s tagastas lõpetamisel veakoodi %d"
 msgid "wait for %s subprocess failed"
 msgstr "tõrge %s järel ootamisel"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "nothing after colon in version number"
+msgid "invalid tar header size field"
+msgstr "versiooninumber lõpeb kooloniga"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "nothing after colon in version number"
+msgid "invalid tar header mtime field"
+msgstr "versiooninumber lõpeb kooloniga"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header gid field"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "nothing after colon in version number"
+msgid "invalid tar header checksum field"
+msgstr "versiooninumber lõpeb kooloniga"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "tundmatu pakkimisliik `%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
@@ -1346,12 +1671,12 @@ msgstr "andmekataloogi pole võimalik lugeda"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "lähtefaili `%.250s' pole võimalik avada"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "luku %s vabastamine pole võimalik: %s"
 
 #: lib/dpkg/trigdeferred.c
@@ -1561,11 +1886,6 @@ msgstr "viga toru `%.255s' loomisel"
 msgid "error creating device '%.255s'"
 msgstr "viga seadme `%.255s' loomisel"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "viga viida `%.255s' loomisel"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1872,10 +2192,10 @@ msgstr "arhiivile pole võimalik ligi pääseda"
 msgid "archive '%s' is not a regular file"
 msgstr "lähtefail `%.250s' pole lihtfail"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2091,6 +2411,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Kui valmis saad, sisesta `exit'.\n"
 
@@ -2454,7 +2778,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2471,6 +2798,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
@@ -2599,6 +2932,13 @@ msgstr ""
 "pole paigaldatud.\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
@@ -2641,19 +2981,6 @@ msgstr "pakk ei tohi sisaldada reavahetusi"
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "tõrge diversioonifaili avamisel"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr ""
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr ""
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2928,114 +3255,164 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "faili %s pole võimalik asukohale %s paigaldada: %s"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "viga paki `%.250s' failide nimekirja sulgemisel"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg: tõsine hoiatus: pakil `%.250s' puudub failide nimekiri, oletatavalt "
-"pole pakil praegu ühtegi faili paigaldatud.\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "paki `%.250s' failide nimekiri"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "sõltuvusprobleemid - ei eemaldata"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "sõltuvusprobleemid - ei eemaldata"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "viga paki `%.250s' failide nimekirja sulgemisel"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Andmebaasi lugemine ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "hetkel on paigaldatud %d faili ja kataloogi.)\n"
-msgstr[1] "hetkel on paigaldatud %d faili ja kataloogi.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "Hoiatus: aegunud võti `--%s'\n"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr ""
 
 #: src/help.c
 msgid "not installed"
@@ -3094,41 +3471,6 @@ msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin"
 msgstr ""
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "`%.250s' olemasolu pole võimalik kontrollida"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "andmekataloogi pole võimalik lugeda"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr ""
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "lähtefaili `%.250s' pole võimalik avada"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "viga `%s' kirjutamisel"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3138,27 +3480,27 @@ msgstr "Debiani pakihaldusprogrammi `%s' versioon %s.\n"
 #, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3318,114 +3660,6 @@ msgstr ""
 "  käskude väljund programmidele `less' või `more' !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "sõltuvusprobleemid - ei eemaldata"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "sõltuvusprobleemid - ei eemaldata"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3554,33 +3788,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr ""
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "Hoiatus: aegunud võti `--%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr ""
 
@@ -3757,6 +3964,10 @@ msgid "Description"
 msgstr "Kirjeldus"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, fuzzy, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "paki %s diversioonid"
@@ -3793,6 +4004,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "Pakk `%s' pole paigaldatud ja andmeid pole saadaval.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Arhiivifaili vaatamiseks kasuta dpkg --info (= dpkg-deb --info),\n"
+"ja selle sisu vaatamiseks kasuta dpkg --contents (= dpkg-deb --contents).\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -3819,9 +4040,12 @@ msgid "diverted by %s to: %s\n"
 msgstr ""
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Arhiivifaili vaatamiseks kasuta dpkg --info (= dpkg-deb --info),\n"
 "ja selle sisu vaatamiseks kasuta dpkg --contents (= dpkg-deb --contents).\n"
@@ -3869,16 +4093,16 @@ msgstr "Debiani pakihaldusprogrammi `%s' versioon %s.\n"
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4071,6 +4295,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr ""
@@ -4218,8 +4448,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4279,67 +4514,10 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr "hoiatus: --update on --remove puhul kasutu"
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "lähtefaili `%.250s' pole võimalik avada"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride gid %s"
-msgstr "lähtefaili `%.250s' pole võimalik avada"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride mode %s"
-msgstr "lähtefaili `%.250s' pole võimalik avada"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr ""
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "lähtefaili `%.250s' pole võimalik avada"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "enne välja `%.*s' väärtust on faililõputunnus (puudub lõpu reavahetus)"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr ""
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "viga seadistusfaili `%.255s' lugemisel"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "viga seadistusfaili `%.255s' lugemisel"
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "ootamatu realõpp pakinimes real %d"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "viga seadistusfaili `%.255s' lugemisel"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "lähtefaili `%.250s' pole võimalik avada"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Hoiatus: aegunud võti `--%s'\n"
 
 #: src/trigcmd.c
 #, fuzzy
@@ -4551,6 +4729,12 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Paki %s eemaldamine...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "conffile file contains an empty line"
+msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4688,11 +4872,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "viga dpkg-deb tar väljundi lugemisel"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "vigase failisüsteemiga tar-fail - vigane pakiarhiiv"
 
 #: src/unpack.c
@@ -4707,11 +4889,15 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s vajab argumendiks täpselt ühte Packages faili nime"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, c-format
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, c-format
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
 
 #: src/update.c
@@ -5079,16 +5265,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "tõrge kataloogi aktiveerimisel (chdir)"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "tõrge kataloogi loomisel"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "tõrge kataloogi aktiveerimisel (chdir) pärast selle loomist"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "ootamatu faililõpp pakinimes real %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "tõrge kataloogi aktiveerimisel (chdir)"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -5867,8 +6055,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6361,14 +6550,70 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+# FIXME! kuidas peaks "control archive" tõlkima? hetkel on tõlgitud kui juhtarhiiv
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Hoiatus: aegunud võti `--%s'\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "tõrge tmpfile avamisel funktsioonis vsnprintf"
 
 #, fuzzy
-#~| msgid "unable to read %s: %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "faili `%s' pole võimalik lugeda: %s"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "viga seadistusfaili `%.255s' lugemisel"
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "viga seadistusfaili `%.255s' lugemisel"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s on puudu"
+
+#, fuzzy
+#~| msgid "  %.250s is not installed.\n"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "  %.250s pole paigaldatud.\n"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "vigane pakinimi (%.250s)"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "viga dpkg-deb tar väljundi lugemisel"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "viga paki `%.250s' failide nimekirja sulgemisel"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "paki `%.250s' failide nimekiri"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "tõrge kataloogi aktiveerimisel (chdir) pärast selle loomist"
 
 #, fuzzy
 #~| msgid "unable to read %s: %s"
@@ -6434,9 +6679,6 @@ msgstr ""
 #~ msgid "unknown option `%s'"
 #~ msgstr "tundmatu võti `%s'"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "ootamatu faililõpp pakinimes real %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "ootamatu faililõpp peale pakinime real %d"
 
@@ -6672,16 +6914,6 @@ msgstr ""
 #~ "Autoriõigused (C) 2000,2001 Wichert Akkerman."
 
 #, fuzzy
-#~| msgid "unable to read %s: %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "faili `%s' pole võimalik lugeda: %s"
-
-#, fuzzy
-#~| msgid "%s: copying %s to %s failed, giving up: %s"
-#~ msgid "scan of %s failed: %s"
-#~ msgstr "%s: tõrge %s kopeerimisel kataloogi %s, annan alla: %s"
-
-#, fuzzy
 #~| msgid "failed to exec %s"
 #~ msgid "failed to execute %s: %s"
 #~ msgstr "tõrgi %s käivitamisel"
@@ -6703,11 +6935,6 @@ msgstr ""
 #~ msgstr "faili %s pole võimalik sulgeda: %s"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "faili %s pole võimalik kirjutada: %s"
-
-#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "lähtefaili `%.250s' pole võimalik avada"
 
diff --git a/po/eu.po b/po/eu.po
index 4fe09dabd..52ab5406d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:49+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo@zundan.com>\n"
 "Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
@@ -138,7 +138,8 @@ msgstr "errorea '%s' babeskopia zaharra kentzean"
 msgid "error creating new backup file '%s'"
 msgstr "errorea '%s' babeskopia berria sortzean"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "ezin da '%.250s' kendu"
@@ -343,20 +344,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "ezin da joan %.250s(r)en hasierara bete ondoren"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "ezin da blokeoaren %s fitxategia ireki probatzeko"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "ezin da '%s' direktorioaren deskriptorea lortu"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "ezin da ireki/sortu egoeraren datu-basea blokeatzeko fitxategia"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "ezin da ireki/sortu egoeraren datu-basea blokeatzeko fitxategia"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "ez duzu baimenik dpkg egoeraren datu-basea blokeatzeko"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg egoeraren datu-basea"
 
 #: lib/dpkg/dbmodify.c
@@ -364,11 +382,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "eskatutako eragiketak supererabiltzailearen baimena behar du"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "ezin da sartu dpkg egoera eremuan"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "eragiketak dpkg egoera eremuan irakurri/idazteko sarbidea behar du"
 
 #: lib/dpkg/dbmodify.c
@@ -406,6 +428,200 @@ msgstr "ezin da egoera eguneratua itxi - '%.250s'"
 msgid "unable to install updated status of '%.250s'"
 msgstr "ezin da egoera eguneratua instalatu - '%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "ezin da '%.250s' badagoen begiratu"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "ezin da informazio-direktorioan irakurri"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "errorea %.250s irekitzen saiatzean"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "informazioaren datu-basearen '%s' formatu-fitxategia hondatuta"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"informazioaren datu-basearen formatua (%d) akastuna edo berriegia da: saiatu "
+"dpkg berrigoa lortzen"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "informazioaren %s/%s fitxategia ez dago inolako paketerekin esleituta"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "errorea '%.255s' esteka gogorra sortzean"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "errorea '%s' idaztean"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"'%2$s' paketearen '%1$s' kontrol-fitxategiak amaierako lerro-jauzia falta du"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"'%2$s' paketearen '%1$s' kontrol-fitxategiak amaierako lerro-jauzia falta du"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"'%2$s' paketearen '%1$s' kontrol-fitxategiak amaierako lerro-jauzia falta du"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"'%2$s' paketearen '%1$s' kontrol-fitxategiak fitxategi-izen hutsa dauka"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read '%s' control file for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "ezin da '%2$s' paketearen '%1$s' kontrol-fitxategia irakurri"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "huts egin du desbideratzeen fitxategia irekitzean"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "fstat-ek huts egin du desbideratzeen fitxategiarekin"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "desbideratze gatazkatsuak: '%.250s' edo '%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "errorea '%.250s' paketearen fitxategi-zerrendaren fitxategiak ixtean"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"'%.250s' paketearen fitxategi-zerrendaren fitxategiak falta dira, paketeak "
+"ez duela fitxategirik instalatuta ondorioztatuko da"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"'%.250s' paketearen fitxategi-zerrendak amaierako lerro-jauzia falta du"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"'%.250s' paketearen fitxategi-zerrendaren fitxategiak fitxategiek izen hutsa "
+"daukate"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Datu-basea irakurtzen ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "fitxategi edo direktorio %d dago unean instalatuta).\n"
+msgstr[1] "%d fitxategi edo direktorio daude unean instalatuta).\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "egoera baliogabea"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "'%.250s' statoverride fitxategia irakurtzen"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "'%.250s' statoverride fitxategia irakurtzen"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "huts egin du statoverride fitxategia irekitzean"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "fstat-ek huts egin du statoverride fitxategiarekin"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "'%.250s' statoverride fitxategia irakurtzen"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "statoverride fitxategiak amaierako lerro-jauzia falta du"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statoverride fitxategiak lerro huts bat dauka"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "sintaxi-errorea statoverride fitxategian"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "ustekabeko lerro-amaiera statoverride fitxategian"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "hainbat statoverrides daude '%.250s' fitxategian"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -543,63 +759,76 @@ msgid "internal error"
 msgstr "barneko errorea (akatsa)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s falta da"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "'%s' kontrol-fitxategiari balioa falta zaio"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.50s' ez du baimenik honetarako: %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Saltatu lerro baliogabea: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "honen ondorengoak baztergarriak: %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "paketearen izena baliogabea (%.250s)"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "'%s' paketea ez dago instalatuta"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "fitxategiaren xehetasunen '%s' eremua hutsik dago"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr ""
 "fitxategiaren xehetasunen '%s' eremua ez da onartzen egoeraren fitxategian"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "fitxategiaren xehetasunen '%s' eremuan balio gehiegi (beste batzuen aldean)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "fitxategiaren xehetasunen '%s' eremuan balio gutxiegi (beste batzuen aldean)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "'yes/no' (bai/ez) eremu boolearrean"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "'%s' edo '%s' eremu zaharkitua erabili da"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "'foreign/allowed/same/no' lau egoerako eremuan"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "'%s' ez da baliozko arkitektura-izena: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "hitza 'Priority' eremuan"
 
 #: lib/dpkg/fields.c
@@ -608,25 +837,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "'%s' eremuko balioa ez da testuinguru honetan onartzen"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "'Status' eremuko lehenengo hitza ('want')"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "'Status' eremuko bigarren hitza ('error')"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "'Status' eremuko hirugarren hitza ('status')"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "errorea '%s' eremuaren '%.250s' katean"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "'%s' edo '%s' eremu zaharkitua erabili da"
 
 #: lib/dpkg/fields.c
@@ -635,13 +872,16 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "'%s' eremuaren balioak gaizki osatutako '%.*s' lerroa dauka"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "'%s'(r)en balioak zuriunea ez den '%c' karakterearekin hasten den lerroa du"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "erroko direktorioa edo direktorio nulua 'conffile' gisa zerrendatu da"
 
 #: lib/dpkg/fields.c
@@ -728,9 +968,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "'%s' eremua, honekiko erreferentzia: '%.255s': bertsioa osatu gabe"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "'%s' eremua, erreferentzia: '%.255s': errorea bertsioan"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "'%s' eremua, honekiko erreferentzia: '%.255s': bertsioak '%c' dauka"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -739,8 +980,9 @@ msgstr ""
 "'%s' eremua, sintaxi errorea'%.255s' paketearen erreferentziaren ondoren"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "aukera alternatiborik ('|') ez da onartzen %s eremuan"
 
 #: lib/dpkg/fields.c
@@ -779,6 +1021,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "ezin da helburuko '%.250s' fitxategiaren modua ezarri"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "ezin da '%s' atzitu: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "'%s' konfigurazioko fitxategia ez da fitxategi arrunta"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "ezin da %s idatzi: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "ezin zaio '%s'(r)i erantsi"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "ezin da '%s' desblokeatu"
@@ -799,8 +1065,22 @@ msgid "unable to lock %s"
 msgstr "ezin da '%s' blokeatu"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "fitxategia orrikatzailean erakusten"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "ezin zaio '%s'(r)i erantsi"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "ezin da '%s' fitxategia garbitu"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "ezin da '%s' fitxategia bere burura desbideratu"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -822,13 +1102,13 @@ msgstr "huts egin du memoria esleitzean"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "std%s: huts egin du 'dup' egitean"
+msgid "failed to dup for fd %d"
+msgstr "fd %d: huts egin du 'dup' egitean"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "fd %d: huts egin du 'dup' egitean"
+msgid "failed to dup for std%s"
+msgstr "std%s: huts egin du 'dup' egitean"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -967,27 +1247,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "balio bikoiztua erabiltzaileak definitutako '%.*s' eremuan"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "%s falta da"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s: balio hutsa"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "balio bikoiztua '%s' eremuan"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "paketeak '%s' eremua dauka, baina arkitektura falta da"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "paketeak '%s' eremua dauka, baina arkitektura 'all' da"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Paketearen 'Config-Version' egoera desegokiarekin"
 
 #: lib/dpkg/parse.c
@@ -996,8 +1282,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "paketeak %s egoera zuen baina abiarazleak espero dira"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "paketeak 'triggers-awaited' egoera du baina ez zen abiarazlerik espero"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "paketeak %s egoera zuen baina abiarazleak espero dira"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1005,11 +1293,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "paketeak %s egoera du baina abiarazleak falta dira"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "paketeak 'triggers-pending' egoera du baina ez da abiarazlerik falta"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "paketeak %s egoera du baina abiarazleak falta dira"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Instalatu gabeko egoeran konfigurazioko fitxategiak dituen paketea: ahaztu "
 "egingo dira"
@@ -1032,10 +1324,13 @@ msgstr ""
 "baten ondorioz gertatzea"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (arkitektura anitzekoa: %s) ez da '%s'(r)ekin (hainbat instantzia "
 "instalatuta dituena) batera instalagarria"
@@ -1226,13 +1521,6 @@ msgstr "ezin da '%.255s' segurtasunez kendu"
 msgid "rm command for cleanup"
 msgstr "rm komandoa garbitzeko"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-"'%s' paketearen izena anbiguoa da instalatutako instantzia bat baino "
-"gehiagorekin"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1246,6 +1534,18 @@ msgstr "eremuaren zabalera barrutitik kanpo"
 msgid "missing closing brace"
 msgstr "itxierako giltza falta da"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+"'%s' paketearen izena anbiguoa da instalatutako instantzia bat baino "
+"gehiagorekin"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(azalpena ez dago erabilgarri)"
@@ -1333,6 +1633,70 @@ msgstr "%s azpiprozesuak huts egin du itxaroteko %d egoera kodearekin"
 msgid "wait for %s subprocess failed"
 msgstr "huts egin du %s azpiprozesuari itxarotean"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "baliogabeko '%c' karakterea eremuaren zabaleran"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "baliogabeko '%c' karakterea eremuaren zabaleran"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "egoera baliogabea"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid tar header gid field"
+msgstr "'%.250s' statoverride fitxategia irakurtzen"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "baliogabeko '%c' karakterea eremuaren zabaleran"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "onartu gabeko aukerak fitxategiaren goiburuan"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "%s konpresio mota ezezaguna!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1352,12 +1716,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "kontrol-direktorioa ez da direktorio bat"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "ezin da '%.250s' abiarazleen blokeoko fitxategia ireki/sortu"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "abiarazleen area"
 
 #: lib/dpkg/trigdeferred.c
@@ -1587,11 +1954,6 @@ msgstr "errorea '%.255s' kanalizazioa sortzean"
 msgid "error creating device '%.255s'"
 msgstr "errorea '%.255s' gailua sortzean"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "errorea '%.255s' esteka gogorra sortzean"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1913,10 +2275,10 @@ msgstr "ezin da sartu artxiboan"
 msgid "archive '%s' is not a regular file"
 msgstr "'%s' konfigurazioko fitxategia ez da fitxategi arrunta"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<irteera estandarra>"
 
@@ -2101,6 +2463,10 @@ msgid "conffile difference visualizer"
 msgstr "konfigurazio-fitxategiaren diferentzien bistaratzailea"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Idatzi 'exit' amaitutakoan.\n"
 
@@ -2458,7 +2824,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2467,7 +2847,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2505,6 +2888,12 @@ msgstr ""
 "Pakete preinst/postrm script-ak beti zehaztu behar dituzte --package eta --"
 "divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2626,6 +3015,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Ez dago '%s' desbiderapenik, ez da ezabatuko\n"
 
@@ -2669,19 +3065,6 @@ msgstr "paketeak ezin du lerro-jauzirik berririk eduki"
 msgid "divert-to may not contain newlines"
 msgstr "'divert-to'-k ezin du lerro-jauzirik eduki"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "huts egin du desbideratzeen fitxategia irekitzean"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "fstat-ek huts egin du desbideratzeen fitxategiarekin"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "desbideratze gatazkatsuak: '%.250s' edo '%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2981,125 +3364,177 @@ msgstr ""
 "%s paketea mantenduta dago, ez da ukituko.  Erabili --force-hold\n"
 "gainidazteko\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "gainidazteko arazoa --force gaituta dagoelako:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Ezarri behartzeko aukera guztiak"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"'%2$s' paketearen '%1$s' kontrol-fitxategiak amaierako lerro-jauzia falta du"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Ordeztu paketea bertsio baxuago batekin"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Edozer pakete konfiguratzeak honi lagun diezaioke"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Prozesatu sor litezkeen paketeak atxikitzekoak badira ere"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Saiatu gauzak (des)instalatzen nahiz eta 'root' ez izan"
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH-ek programa garrantzitsuak falta ditu, arazoak litekeena"
+
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
 msgstr ""
-"'%2$s' paketearen '%1$s' kontrol-fitxategiak amaierako lerro-jauzia falta du"
+"Instalatu paketea nahiz eta bere autentifikazioaren egiaztapenak huts egin"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Prozesatu paketeak nahiz eta okerreko bertsiokoak izan"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"'%2$s' paketearen '%1$s' kontrol-fitxategiak amaierako lerro-jauzia falta du"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
-"'%2$s' paketearen '%1$s' kontrol-fitxategiak fitxategi-izen hutsa dauka"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "ezin da '%2$s' paketearen '%1$s' kontrol-fitxategia ireki"
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Gainidatzi pakete bateko fitxategia beste batekin"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "ezin da '%2$s' paketearen '%1$s' kontrol-fitxategiaren egoera eskuratu"
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+"Gainidatzi fitxategi desbideratu bat desbideratu gabeko bertsio batekin"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "'%2$s' paketearen '%1$s' fitxategia ez da fitxategi arrunta"
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Gainidatzi pakete baten direktorioa beste baten fitxategiekin"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "ezin da '%2$s' paketearen '%1$s' kontrol-fitxategia irakurri"
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Ez landu S/I-ko eragiketa seguruak deskonprimitzean"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "ezin da '%2$s' paketearen '%1$s' kontrol-fitxategia itxi"
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "ezin dira '%.250s' paketearen fitxategi-zerrendaren fitxategiak ireki"
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Erabili beti konfigurazio-fitxategi berriak, ez galdetu"
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Erabili beti konfigurazio-fitxategi zaharrak, ez galdetu"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"'%.250s' paketearen fitxategi-zerrendaren fitxategiak falta dira, paketeak "
-"ez duela fitxategirik instalatuta ondorioztatuko da"
+"Erabili konfigurazio-fitxategi berrien aukera lehenetsiak\n"
+"bat erabilgarri egonez gero, ez galdetu. Ezin bada lehenetsirik\n"
+"aurkitu, galdetu egingo zaizu, konfigurazio zaharraren edo\n"
+"berriaren aukeretariko bat ematen denean izan ezik"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Beti instalatu falta diren konfigurazio-fitxategiak"
+
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Eskaini konfigurazio-fitxategiak berriak ez diren bertsioekin ordeztea"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
 msgstr ""
-"ezin da '%.250s' paketearen fitxategi-zerrendaren fitxategiaren egoera "
-"eskuratu"
+"Prozesatu bahi eta paketeak okerrekoak edo arkitekturarik gabekoak izan"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "'%.250s' paketearen fitxategi-zerrenda ez da fitxategi arrunta"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Instalatu nahi eta beste paketeren bat honda dezakeen"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Baimendu gatazkan dauden paketeak instalatzea"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Bihurtu mendekotasun-arazo guztiak abisu"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Bihurtu mendekotasun-arazoak abisu"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Kendu instalatzea eskatzen duten paketeak"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Kendu funtsezko pakete bat"
+
+#: src/force.c
 #, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "'%.250s' paketearen fitxategi-zerrenda irakurtzen"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"%s behartzeko aukerak - arazoak daudenean portaera kontrolatzeko:\n"
+"  abisatu baina jarraitu:  --force-<gauza>,<gauza>,...\n"
+"  geldiarazi errorearekin:    --refuse-<gauza>,<gauza>,... | --no-force-"
+"<gauza>,...\n"
+" Gauzak behartzea:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"'%.250s' paketearen fitxategi-zerrendak amaierako lerro-jauzia falta du"
+"\n"
+"KONTUZ - [!] marka duten aukerak erabiltzeak instalazioa larriki honda "
+"dezake.\n"
+"[*] marka duten behartzeko aukerak gaituta daude lehenespenez.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
-"'%.250s' paketearen fitxategi-zerrendaren fitxategiak fitxategiek izen hutsa "
-"daukate"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "errorea '%.250s' paketearen fitxategi-zerrendaren fitxategiak ixtean"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "'%.*s' behartzeko/uko egiteko aukera ezezaguna"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Datu-basea irakurtzen ... "
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "'%s' behartzeko/uko egiteko aukera zaharkitua\n"
 
-#: src/filesdb.c
-#, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "fitxategi edo direktorio %d dago unean instalatuta).\n"
-msgstr[1] "%d fitxategi edo direktorio daude unean instalatuta).\n"
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "gainidazteko arazoa --force gaituta dagoelako:"
 
 #: src/help.c
 msgid "not installed"
@@ -3166,42 +3601,6 @@ msgstr ""
 "Oharra: supererabiltzailearen PATHak honakoak izan ohi ditu:\n"
 "/usr/local/sbin, /usr/sbin eta /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "ezin da '%.250s' badagoen begiratu"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "ezin da informazio-direktorioan irakurri"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "errorea %.250s irekitzen saiatzean"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "informazioaren datu-basearen '%s' formatu-fitxategia hondatuta"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"informazioaren datu-basearen formatua (%d) akastuna edo berriegia da: saiatu "
-"dpkg berrigoa lortzen"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "informazioaren %s/%s fitxategia ez dago inolako paketerekin esleituta"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "errorea '%s' idaztean"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3247,27 +3646,27 @@ msgstr "Debian '%s' pakete-kudeatzailearen %s bertsioa.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3510,117 +3909,6 @@ msgstr ""
 "erabiliz."
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Ezarri behartzeko aukera guztiak"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Ordeztu paketea bertsio baxuago batekin"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Edozer pakete konfiguratzeak honi lagun diezaioke"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Prozesatu sor litezkeen paketeak atxikitzekoak badira ere"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Saiatu gauzak (des)instalatzen nahiz eta 'root' ez izan"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "PATH-ek programa garrantzitsuak falta ditu, arazoak litekeena"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-"Instalatu paketea nahiz eta bere autentifikazioaren egiaztapenak huts egin"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Prozesatu paketeak nahiz eta okerreko bertsiokoak izan"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Gainidatzi pakete bateko fitxategia beste batekin"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-"Gainidatzi fitxategi desbideratu bat desbideratu gabeko bertsio batekin"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Gainidatzi pakete baten direktorioa beste baten fitxategiekin"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Ez landu S/I-ko eragiketa seguruak deskonprimitzean"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Erabili beti konfigurazio-fitxategi berriak, ez galdetu"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Erabili beti konfigurazio-fitxategi zaharrak, ez galdetu"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Erabili konfigurazio-fitxategi berrien aukera lehenetsiak\n"
-"bat erabilgarri egonez gero, ez galdetu. Ezin bada lehenetsirik\n"
-"aurkitu, galdetu egingo zaizu, konfigurazio zaharraren edo\n"
-"berriaren aukeretariko bat ematen denean izan ezik"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Beti instalatu falta diren konfigurazio-fitxategiak"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Eskaini konfigurazio-fitxategiak berriak ez diren bertsioekin ordeztea"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-"Prozesatu bahi eta paketeak okerrekoak edo arkitekturarik gabekoak izan"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Instalatu nahi eta beste paketeren bat honda dezakeen"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Baimendu gatazkan dauden paketeak instalatzea"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Bihurtu mendekotasun-arazo guztiak abisu"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Bihurtu mendekotasun-arazoak abisu"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Kendu instalatzea eskatzen duten paketeak"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Kendu funtsezko pakete bat"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Aurrerapenari buruzko informazio lagungarria"
 
@@ -3750,43 +4038,6 @@ msgstr "ezin da '%s' arkitektura kendu datu-baseak unean darabilelako"
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s behartzeko aukerak - arazoak daudenean portaera kontrolatzeko:\n"
-"  abisatu baina jarraitu:  --force-<gauza>,<gauza>,...\n"
-"  geldiarazi errorearekin:    --refuse-<gauza>,<gauza>,... | --no-force-"
-"<gauza>,...\n"
-" Gauzak behartzea:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"KONTUZ - [!] marka duten aukerak erabiltzeak instalazioa larriki honda "
-"dezake.\n"
-"[*] marka duten behartzeko aukerak gaituta daude lehenespenez.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "'%.*s' behartzeko/uko egiteko aukera ezezaguna"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "'%s' behartzeko/uko egiteko aukera zaharkitua\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "ezin izan da '%i' ireki korronterako"
 
@@ -3970,6 +4221,12 @@ msgid "Description"
 msgstr "Azalpena"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "fitxategia orrikatzailean erakusten"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "%s(e)k hemendik desbideratuta: %s\n"
@@ -4004,6 +4261,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "'%s' paketea ez dago instalatuta, eta ez dago inf. erabilgarririk"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Erabili dpkg --info (= dpkg-deb --info) artxibo-fitxategiak aztertzeko,\n"
+"eta dpkg --contents (= dpkg-deb --contents) edukia zerrendatzeko.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "'%s' paketea ez dago erabilgarri"
@@ -4029,9 +4296,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "%s(e)k hona desbideratuta: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Erabili dpkg --info (= dpkg-deb --info) artxibo-fitxategiak aztertzeko,\n"
 "eta dpkg --contents (= dpkg-deb --contents) edukia zerrendatzeko.\n"
@@ -4072,19 +4342,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "Debian %s pakete-kudeaketarako programaren %s bertsioa.\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4275,6 +4559,12 @@ msgstr ""
 "dpkg ongi funtzionatzeko"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "%.250s: huts egin du chroot egitean"
@@ -4432,12 +4722,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4506,67 +4810,11 @@ msgstr "ez dago gainidazketarik"
 msgid "--update is useless for --remove"
 msgstr "--update ezin da --remove aukerarekin erabili"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "egoera baliogabea"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "'%.250s' statoverride fitxategia irakurtzen"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "'%.250s' statoverride fitxategia irakurtzen"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "huts egin du statoverride fitxategia irekitzean"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "fstat-ek huts egin du statoverride fitxategiarekin"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "'%.250s' statoverride fitxategia irakurtzen"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "statoverride fitxategiak amaierako lerro-jauzia falta du"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "statoverride fitxategiak lerro huts bat dauka"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "sintaxi-errorea statoverride fitxategian"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "'%s' erabiltzaile ezezaguna statoverride fitxategian"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "ustekabeko lerro-amaiera statoverride fitxategian"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "'%s' talde ezezaguna statoverride fitxategian"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "hainbat statoverrides daude '%.250s' fitxategian"
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "'--%s' aukera zaharkitua, '--%s' erabili horren ordez"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4785,6 +5033,12 @@ msgstr "%s (%s) konfigurazioa kentzen, %s (%s) kendu ahal izateko...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "%s (%s) konfigurazioa kentzen...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "statoverride fitxategiak lerro huts bat dauka"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4927,11 +5181,9 @@ msgid "package filesystem archive extraction"
 msgstr "paketearen fitxategi-sistemaren artxiboa erauzketa"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "errorea dpkg-deb tar irteera irakurtzean"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 "fitxategi-sistemaren tar fitxategia hondatu da - paketearen artxiboa "
 "hondatuta dago"
@@ -4947,14 +5199,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s: gehienez pakete-fitxategiko argumentu bakarra behar du"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "ezin da dpkg egoera-area atzitu eguneratze masiboa egiteko"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr ""
-"eguneratze masiboa egiteko dpkg egoera eremuan idazteko baimena eduki behar "
-"da"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "ezin da dpkg egoera-area atzitu eguneratze masiboa egiteko"
 
 #: src/update.c
 #, c-format
@@ -5320,16 +5576,18 @@ msgid "decompressing archive member"
 msgstr "artxiboaren kidea deskonprimitzen"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "huts egin du direktoriora chdir egitean"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "huts egin du direktorioa sortzean"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "huts egin du direktoriora chdir egitean, direktorioa sortu ondoren"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "ustekabeko eof pakete-izenaren %d lerroan"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "huts egin du direktoriora chdir egitean"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6189,7 +6447,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6199,8 +6471,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6706,11 +6979,90 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "'--%s' aukera zaharkitua, '--%s' erabili horren ordez"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "ezin da blokeoaren %s fitxategia ireki probatzeko"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "'%s' erabiltzaile ezezaguna statoverride fitxategian"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "'%s' talde ezezaguna statoverride fitxategian"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s falta da"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "'%.50s' ez du baimenik honetarako: %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "honen ondorengoak baztergarriak: %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "paketearen izena baliogabea (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "'yes/no' (bai/ez) eremu boolearrean"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "'%s' eremua, erreferentzia: '%.255s': errorea bertsioan"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s: balio hutsa"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "'%s' kontrol-fitxategiari balioa falta zaio"
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "paketeak 'triggers-awaited' egoera du baina ez zen abiarazlerik espero"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "paketeak 'triggers-pending' egoera du baina ez da abiarazlerik falta"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "eguneratze masiboa egiteko dpkg egoera eremuan idazteko baimena eduki "
+#~ "behar da"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "errorea dpkg-deb tar irteera irakurtzean"
+
+#, fuzzy
+#~| msgid "cannot open '%s' control file for package '%s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "ezin da '%2$s' paketearen '%1$s' kontrol-fitxategia ireki"
+
+#, fuzzy
+#~| msgid "cannot stat '%s' control file for package '%s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "ezin da '%2$s' paketearen '%1$s' kontrol-fitxategiaren egoera eskuratu"
+
+#, fuzzy
+#~| msgid "'%s' file for package '%s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "'%2$s' paketearen '%1$s' fitxategia ez da fitxategi arrunta"
+
+#, fuzzy
+#~| msgid "cannot close '%s' control file for package '%s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "ezin da '%2$s' paketearen '%1$s' kontrol-fitxategia itxi"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr ""
+#~ "ezin dira '%.250s' paketearen fitxategi-zerrendaren fitxategiak ireki"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "ezin da '%.250s' paketearen fitxategi-zerrendaren fitxategiaren egoera "
+#~ "eskuratu"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "'%.250s' paketearen fitxategi-zerrenda ez da fitxategi arrunta"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "'%.250s' paketearen fitxategi-zerrenda irakurtzen"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "huts egin du direktoriora chdir egitean, direktorioa sortu ondoren"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "'%s' kontrol-fitxategiari balioen arteko bereizlea falta zaio"
@@ -6775,9 +7127,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF stdin-en konfigurazioko fitxategiaren gonbitean"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "ustekabeko eof pakete-izenaren %d lerroan"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "ustekabeko eof pakete-izenaren ondoren %d lerroan"
 
@@ -7040,9 +7389,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "%s(r)en morroia da"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "ezin da '%s' atzitu: %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "readlink(%s)-ek huts egin du: %s"
 
@@ -7067,9 +7413,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "ezin da %s itxi: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "ezin da %s idatzi: %s"
-
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
diff --git a/po/fr.po b/po/fr.po
index 94530eb0a..c586f3ae2 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-09-08 10:18+0200\n"
 "Last-Translator: Sébastien Poher <sbphr@volted.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -144,7 +144,8 @@ msgstr "erreur lors de la suppression de l'ancien fichier de sauvegarde « %s 
 msgid "error creating new backup file '%s'"
 msgstr "erreur pendant la création du nouveau fichier de sauvegarde « %s »"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "ne peut pas supprimer « %.250s »"
@@ -350,36 +351,43 @@ msgstr "vidage impossible de %.250s après la mise en forme"
 msgid "unable to seek to start of %.250s after padding"
 msgstr "déplacement impossible au début de %.250s après la mise en forme"
 
-# ####################################### Notes de traduction
-# trigger              : action différée
-# triggers-awaited     : « actions-différées-à-venir »
-# triggers-pending     : « actions-différées-en-attente »
-# triggers-deferred    : « action-différée-reportée »
-# awaited trigger      : action différée attendue
-# pending trigger      : action différée en attente
-# triggers deferred    : actions différées reportées
-# trigger interests    : actions différées
-# triggers are awaited : actions différées à venir
-# triggers are pending : actions différées en attente
-# #######################################: lib/dpkg/dbmodify.c:161
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "impossible d'ouvrir le fichier de verrou %s pour tests"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr ""
+"impossible d'obtenir le descripteur de fichier pour le répertoire « %s »"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr ""
+"impossible de créer/ouvrir le fichier verrou de la base de données d'état"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
 msgstr ""
 "impossible de créer/ouvrir le fichier verrou de la base de données d'état"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr ""
 "vous n'avez pas la permission de verrouiller la base de données d'état de "
 "dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "base de données d'état de dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -387,11 +395,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "l'opération demandée requiert les privilèges du superutilisateur"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "impossible d'accéder au répertoire administratif de dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 "opération demandant un accès en lecture-écriture au répertoire administratif "
 "de dpkg"
@@ -431,6 +443,208 @@ msgstr "impossible de fermer le nouvel état de « %.250s »"
 msgid "unable to install updated status of '%.250s'"
 msgstr "impossible d'installer le nouvel état de « %.250s »"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "impossible de vérifier l'existence de « %.250s »"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "ne peut pas lire le répertoire info"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "erreur survenue en essayant d'ouvrir %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr ""
+"informations corrompues dans le fichier de format de base de données « %s »"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"le format de la base de données d'informations (%d) est incorrect ou trop "
+"récent ; vous devriez essayer d'utiliser une version plus récente de dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "Le fichier d'informations %s/%s n'est associé à aucun paquet."
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "erreur pendant la création du lien physique « %.255s »"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "erreur lors de l'écriture de « %s »"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"le fichier de contrôle « %s »  pour le paquet « %s » n'a pas de retour à la "
+"ligne en fin de fichier"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"le fichier de contrôle « %s »  pour le paquet « %s » n'a pas de retour à la "
+"ligne en fin de fichier"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"le fichier de contrôle « %s »  pour le paquet « %s » n'a pas de retour à la "
+"ligne en fin de fichier"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"le fichier de contrôle « %s » pour le paquet « %s » contient un nom de "
+"fichier vide"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read '%s' control file for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "impossible de lire le fichier de contrôle « %s » du paquet « %s »"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "impossible d'ouvrir fichier des détournements"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "échec de « fstat » sur le fichier des détournements"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "détournements contradictoires impliquant « %.250s » ou « %.250s »"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr ""
+"erreur de fermeture du fichier contenant la liste des fichiers du paquet "
+"« %.250s »"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"le fichier contenant la liste des fichiers du paquet « %.250s » étant "
+"manquant, il est considéré qu'aucun fichier du paquet n'est actuellement "
+"installé"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"la liste des fichiers pour le paquet « %.250s » n'a pas de retour à la ligne "
+"en fin de fichier"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"la liste des fichiers pour le paquet « %.250s » contient un nom de fichier "
+"vide"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Lecture de la base de données... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d fichier et répertoire déjà installé.)\n"
+msgstr[1] "%d fichiers et répertoires déjà installés.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "le fichiers des permissions avec l'uid %s est non valable"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "le fichier des permissions avec le gid %s est non valable"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "le mode %s du fichier des permissions est non valable"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "impossible d'ouvrir fichier des permissions (statoverride)"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "échec de « fstat » sur le fichier des permissions (statoverride)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "lecture du fichier des permissions « %.250s »"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr ""
+"le fichier des permissions (« statoverride ») contient une ligne finale vide"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "le fichier des permissions (« statoverride ») contient une ligne vide"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "impossible d'ouvrir fichier des permissions (« statoverride »)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr ""
+"fin de ligne inattendue dans le fichier des permissions (« statoverride »)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "forçages d'état (statoverrides) multiples pour le fichier « %.250s »"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -571,62 +785,75 @@ msgid "internal error"
 msgstr "erreur interne (bogue)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s est manquant"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "il manque une valeur dans le fichier de contrôle « %s »"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "« %.50s » n'est pas autorisé pour %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Ligne non valable sautée : %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "ce qui suit %s est inutile"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "nom de paquet incorrect (%.250s)"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "paquet « %s » n'est pas installé"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "champ  « %s » vide"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "champ « %s » non autorisé dans le fichier d'états"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "trop de valeurs dans le champ du fichier « %s » (par rapport aux autres)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "trop peu de valeurs dans le champ du fichier « %s » (par rapport aux autres)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no dans un champ booléen"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "le champ « %s » ou « %s » est obsolète"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "foreign/allowed/same/no dans un champ quadstate"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "« %s » n'est pas un nom valable d'architecture : %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "mot dans le champ « Priority »"
 
 #: lib/dpkg/fields.c
@@ -635,25 +862,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "valeur du champ « %s » non autorisée dans ce contexte"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "premier mot (« want ») dans le champ « Status »"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "deuxième mot (« error ») dans le champ « Status »"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "troisième mot (« status ») dans le champ « Status »"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "erreur dans la chaîne du champ « %s » : « %.250s »"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "le champ « %s » ou « %s » est obsolète"
 
 #: lib/dpkg/fields.c
@@ -662,14 +897,17 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "le champ « %s » contient une ligne mal formée « %.*s »"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "le champ « %s » contient une ligne qui débute par un caractère autre que "
 "l'espace « %c »"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "répertoire racine ou nul déclaré comme un « conffile »"
 
 #: lib/dpkg/fields.c
@@ -756,9 +994,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "champ « %s », référence à « %.255s » : version non terminée"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "champ « %s », référence à « %.255s » : erreur dans la version"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "champ « %s », référence à « %.255s » : version contenant « %c »"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -767,8 +1006,9 @@ msgstr ""
 "champ « %s », erreur de syntaxe après la référence au paquet « %.255s »"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternative (« | ») non autorisée dans le champ « %s »"
 
 #: lib/dpkg/fields.c
@@ -807,6 +1047,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "impossible de changer les permissions du fichier cible « %.250s »"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat file '%s'"
+msgid "cannot stat %s"
+msgstr "analyse impossible du fichier « %s »"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "le fichier de configuration « %s » n'est pas vraiment un fichier"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot read %s"
+msgstr "impossible d'ajouter à « %s »"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "impossible d'ajouter à « %s »"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "impossible de déverrouiller %s"
@@ -827,8 +1091,22 @@ msgid "unable to lock %s"
 msgstr "impossible de déverrouiller %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "affichage du fichier dans l'afficheur page à page (« pager »)"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "impossible d'ajouter à « %s »"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "impossible de supprimer le fichier « %s »"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "impossible de détourner le fichier $%s vers lui-même"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -850,13 +1128,13 @@ msgstr "échec d'allocation mémoire"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "échec de « dup » sur std%s"
+msgid "failed to dup for fd %d"
+msgstr "échec de dup sur fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "échec de dup sur fd %d"
+msgid "failed to dup for std%s"
+msgstr "échec de « dup » sur std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -994,28 +1272,34 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "valeur en double pour le champ « %.*s » défini par l'utilisateur"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr " %s manque"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr " %s de valeur nulle"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "valeur en double pour le champ « %s »"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "paquet comporte le champ « %s » mais pas d'architecture"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr ""
 "paquet comporte le champ « %s » mais utilise « all » pour l'architecture"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "« Config-Version » du paquet dans un état inapproprié"
 
 #: lib/dpkg/parse.c
@@ -1024,10 +1308,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "paquet dans l'état « %s » mais des actions différées sont à venir"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"paquet dans l'état « actions-différées-à-venir » (« triggers-awaited ») mais "
-"aucune action différée n'est à venir"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "paquet dans l'état « %s » mais des actions différées sont à venir"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1035,13 +1319,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "paquet dans l'état « %s » mais aucune action différée n'est en attente"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"paquet dans l'état « actions-différées-en-attente » (« triggers-pending ») "
-"mais sans action différée en attente"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "paquet dans l'état « %s » mais aucune action différée n'est en attente"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Paquet dans l'état « non-installé » possédant des fichiers de configuration, "
 "fichiers ignorés"
@@ -1065,10 +1351,13 @@ msgstr ""
 "version non officielle de dpkg"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Multi-Arch: %s) n'est pas installable simultanément avec %s qui "
 "comporte plusieurs instances installées"
@@ -1260,11 +1549,6 @@ msgstr "impossible de supprimer « %.255s » de façon sûre"
 msgid "rm command for cleanup"
 msgstr "commande rm pour le nettoyage"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "nom de paquet « %s » ambigu avec plus d'une instance installée"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1278,6 +1562,16 @@ msgstr "largeur de champ hors limites"
 msgid "missing closing brace"
 msgstr "accolade fermante manquante"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "nom de paquet « %s » ambigu avec plus d'une instance installée"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(aucune description n'est disponible)"
@@ -1369,6 +1663,70 @@ msgstr "le sous-processus %s a échoué avec le code d'état d'attente %d"
 msgid "wait for %s subprocess failed"
 msgstr "échec de l'attente du sous-processus %s"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "caractère « %c » non valable dans la longueur du champ"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "caractère « %c » non valable dans la longueur du champ"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "le fichiers des permissions avec l'uid %s est non valable"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "le fichier des permissions avec le gid %s est non valable"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "caractère « %c » non valable dans la longueur du champ"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "options non gérées dans l'en-tête du fichier"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "type de compression « %s » inconnu"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1388,14 +1746,17 @@ msgid "treewalk root %s is not a directory"
 msgstr "le répertoire « control » n'est pas un répertoire"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr ""
 "impossible d'ouvrir ou créer le verrou du fichier des actions différées "
 "« %.255s »"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "zone des actions différées"
 
 #: lib/dpkg/trigdeferred.c
@@ -1638,11 +1999,6 @@ msgstr "erreur pendant la création du tube « %.255s »"
 msgid "error creating device '%.255s'"
 msgstr "erreur pendant la création du périphérique « %.255s »"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "erreur pendant la création du lien physique « %.255s »"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1971,10 +2327,10 @@ msgstr "ne peut pas accéder à l'archive"
 msgid "archive '%s' is not a regular file"
 msgstr "le fichier de configuration « %s » n'est pas vraiment un fichier"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<sortie standard>"
 
@@ -2165,6 +2521,10 @@ msgid "conffile difference visualizer"
 msgstr "visualisation des différences dans le fichier de configuration"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Tapez « exit » lorsque vous aurez fini.\n"
 
@@ -2529,7 +2889,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2538,7 +2912,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2577,6 +2954,12 @@ msgstr ""
 "spécifier\n"
 "--package et --divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2698,6 +3081,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Pas de détournement « %s », aucun supprimé.\n"
 
@@ -2741,19 +3131,6 @@ msgstr "le paquet ne peut pas contenir de retour chariot"
 msgid "divert-to may not contain newlines"
 msgstr "détournement-vers ne peut pas contenir de retour chariot"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "impossible d'ouvrir fichier des détournements"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "échec de « fstat » sur le fichier des détournements"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "détournements contradictoires impliquant « %.250s » ou « %.250s »"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3062,139 +3439,187 @@ msgstr ""
 "Le paquet %s est à garder (on hold), et laissé tel quel. Utilisez --force-"
 "hold pour passer outre.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "problème contourné par utilisation de --force :"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Utiliser le forçage (force) pour toutes les options"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"le fichier de contrôle « %s »  pour le paquet « %s » n'a pas de retour à la "
-"ligne en fin de fichier"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr ""
-"le fichier de contrôle « %s »  pour le paquet « %s » n'a pas de retour à la "
-"ligne en fin de fichier"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Remplacer un paquet par une version inférieure"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr ""
-"le fichier de contrôle « %s »  pour le paquet « %s » n'a pas de retour à la "
-"ligne en fin de fichier"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configurer tout paquet qui pourrait être utile à celui-ci"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Traiter les paquets incidents même s'ils sont à garder (on hold)"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Tenter d'installer ou désinstaller même sans être le superutilisateur"
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
 msgstr ""
-"le fichier de contrôle « %s » pour le paquet « %s » contient un nom de "
-"fichier vide"
+"des programmes importants sont absents dans PATH, des problèmes sont à "
+"prévoir"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Installer un paquet même si le contrôle d'authenticité échoue"
+
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Traiter même les paquets dont la version est incorrecte"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"impossible d'ouvrir le fichier de contrôle « %s » pour le paquet « %s »"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
-"impossible d'obtenir les statistiques du fichier de contrôle « %s » du "
-"paquet « %s »"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "le fichier « %s » pour le paquet « %s » n'est pas un fichier simple"
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Écraser un fichier d'un paquet par celui d'un autre"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "impossible de lire le fichier de contrôle « %s » du paquet « %s »"
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Écraser un fichier détourné pour une version non détournée"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "impossible de fermer le fichier de contrôle « %s » du paquet « %s »"
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Écraser le répertoire d'un paquet par le fichier d'un autre"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
 msgstr ""
-"impossible d'ouvrir le fichier contenant la liste des fichiers du paquet "
-"« %.250s »"
+"Ne pas effectuer d'opérations d'entrée/sortie sûres lors de la décompression"
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+"Toujours utiliser les nouveaux fichiers de configuration, ne pas demander"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+"Toujours utiliser les anciens fichiers de configuration, ne pas demander"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"le fichier contenant la liste des fichiers du paquet « %.250s » étant "
-"manquant, il est considéré qu'aucun fichier du paquet n'est actuellement "
-"installé"
+"Choisir l'option par défaut pour les nouveaux fichiers\n"
+"de si elle existe, ne pas demander. S'il n'existe pas\n"
+"d'option par défaut, la question sera posée à moins\n"
+"que l'une des options « confold » ou « confnew » ne\n"
+"soit utilisée."
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Toujours installer les fichiers de configuration manquants"
+
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
-"impossible d'ouvrir le fichier contenant la liste des fichiers du paquet "
-"« %.250s »"
+"Proposer de remplacer les fichiers de configuration sans nouvelles versions"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
 msgstr ""
-"la liste des fichiers pour le paquet « %.250s » n'est pas un simple fichier"
+"Traiter les paquets même sans architecture ou avec une architecture "
+"incorrecte"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "lecture de la liste des fichiers du paquet « %.250s »"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Installer même si cela casse un autre paquet"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Autoriser l'installation de paquets en conflit"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Changer tous les problèmes de dépendances en avertissements "
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr ""
+"Changer tous les problèmes de dépendances de versions en avertissements "
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Supprimer les paquets qui ont besoin d'installation"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Supprimer un paquet essentiel"
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"la liste des fichiers pour le paquet « %.250s » n'a pas de retour à la ligne "
-"en fin de fichier"
+"options de forçage de %s - contrôle les actions en cas de problème:\n"
+"  avertir et continuer :  --force-<option>,<option>,...\n"
+"  arrêter sur erreur :    --refuse-<option>,<option>,... | --no-force-"
+"<option>,...\n"
+" Ce qui peut être forcé:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"la liste des fichiers pour le paquet « %.250s » contient un nom de fichier "
-"vide"
+"\n"
+"AVERTISSEMENT - les options marquées avec [!] can seriously damage your "
+"installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+"ATTENTION : utiliser une option marquée [!] peut sérieusement endommager "
+"votre\n"
+"installation.\n"
+"Les options de forçage marquées [*] sont activées par défaut.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
-"erreur de fermeture du fichier contenant la liste des fichiers du paquet "
-"« %.250s »"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Lecture de la base de données... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "option de forçage/refus « %.*s » inconnue"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d fichier et répertoire déjà installé.)\n"
-msgstr[1] "%d fichiers et répertoires déjà installés.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "option de forçage/refus « %s » obsolète"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "problème contourné par utilisation de --force :"
 
 #: src/help.c
 msgid "not installed"
@@ -3260,43 +3685,6 @@ msgstr ""
 "Note : la variable PATH du superutilisateur doit normalement contenir /usr/"
 "local/sbin, /usr/sbin et /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "impossible de vérifier l'existence de « %.250s »"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "ne peut pas lire le répertoire info"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "erreur survenue en essayant d'ouvrir %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr ""
-"informations corrompues dans le fichier de format de base de données « %s »"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"le format de la base de données d'informations (%d) est incorrect ou trop "
-"récent ; vous devriez essayer d'utiliser une version plus récente de dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "Le fichier d'informations %s/%s n'est associé à aucun paquet."
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "erreur lors de l'écriture de « %s »"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3347,27 +3735,27 @@ msgstr "Programme « %s » de gestion de paquets Debian version %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3616,124 +4004,6 @@ msgstr ""
 "à travers « less » ou « more »."
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Utiliser le forçage (force) pour toutes les options"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Remplacer un paquet par une version inférieure"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Configurer tout paquet qui pourrait être utile à celui-ci"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Traiter les paquets incidents même s'ils sont à garder (on hold)"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Tenter d'installer ou désinstaller même sans être le superutilisateur"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-"des programmes importants sont absents dans PATH, des problèmes sont à "
-"prévoir"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Installer un paquet même si le contrôle d'authenticité échoue"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Traiter même les paquets dont la version est incorrecte"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Écraser un fichier d'un paquet par celui d'un autre"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Écraser un fichier détourné pour une version non détournée"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Écraser le répertoire d'un paquet par le fichier d'un autre"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-"Ne pas effectuer d'opérations d'entrée/sortie sûres lors de la décompression"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-"Toujours utiliser les nouveaux fichiers de configuration, ne pas demander"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-"Toujours utiliser les anciens fichiers de configuration, ne pas demander"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Choisir l'option par défaut pour les nouveaux fichiers\n"
-"de si elle existe, ne pas demander. S'il n'existe pas\n"
-"d'option par défaut, la question sera posée à moins\n"
-"que l'une des options « confold » ou « confnew » ne\n"
-"soit utilisée."
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Toujours installer les fichiers de configuration manquants"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-"Proposer de remplacer les fichiers de configuration sans nouvelles versions"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-"Traiter les paquets même sans architecture ou avec une architecture "
-"incorrecte"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Installer même si cela casse un autre paquet"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Autoriser l'installation de paquets en conflit"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Changer tous les problèmes de dépendances en avertissements "
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr ""
-"Changer tous les problèmes de dépendances de versions en avertissements "
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Supprimer les paquets qui ont besoin d'installation"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Supprimer un paquet essentiel"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Informations de progression en général utiles"
 
@@ -3869,46 +4139,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"options de forçage de %s - contrôle les actions en cas de problème:\n"
-"  avertir et continuer :  --force-<option>,<option>,...\n"
-"  arrêter sur erreur :    --refuse-<option>,<option>,... | --no-force-"
-"<option>,...\n"
-" Ce qui peut être forcé:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"AVERTISSEMENT - les options marquées avec [!] can seriously damage your "
-"installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-"ATTENTION : utiliser une option marquée [!] peut sérieusement endommager "
-"votre\n"
-"installation.\n"
-"Les options de forçage marquées [*] sont activées par défaut.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "option de forçage/refus « %.*s » inconnue"
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "option de forçage/refus « %s » obsolète"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "impossible d'ouvrir le flux d'entrée « %i »"
 
@@ -4091,6 +4321,12 @@ msgid "Description"
 msgstr "Description"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "affichage du fichier dans l'afficheur page à page (« pager »)"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "détournement par %s depuis : %s\n"
@@ -4127,6 +4363,17 @@ msgstr ""
 "le paquet « %s » n'est pas installé et aucune information n'est disponible"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Utilisez dpkg --info (= dpkg-deb --info) pour examiner les fichiers\n"
+"archives, et dpkg --contents (= dpkg-deb --contents) pour afficher leur\n"
+"contenu.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "le paquet « %s » n'est pas disponible"
@@ -4152,9 +4399,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "détourné par %s vers : %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Utilisez dpkg --info (= dpkg-deb --info) pour examiner les fichiers\n"
 "archives, et dpkg --contents (= dpkg-deb --contents) pour afficher leur\n"
@@ -4198,19 +4448,33 @@ msgstr ""
 "version %s\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4409,6 +4673,12 @@ msgstr ""
 "d'installation (instdir) pour que dpkg fonctionne correctement"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "impossible de changer de répertoire racine pour « %.250s »"
@@ -4568,12 +4838,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4640,68 +4924,11 @@ msgstr "pas de dérogation (« override ») présente"
 msgid "--update is useless for --remove"
 msgstr "--update est inutile pour --remove"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "le fichiers des permissions avec l'uid %s est non valable"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "le fichier des permissions avec le gid %s est non valable"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "le mode %s du fichier des permissions est non valable"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "impossible d'ouvrir fichier des permissions (statoverride)"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "échec de « fstat » sur le fichier des permissions (statoverride)"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "lecture du fichier des permissions « %.250s »"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr ""
-"le fichier des permissions (« statoverride ») contient une ligne finale vide"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "le fichier des permissions (« statoverride ») contient une ligne vide"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "impossible d'ouvrir fichier des permissions (« statoverride »)"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr ""
-"utilisateur « %s » inconnu dans le fichier des permissions (« statoverride »)"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr ""
-"fin de ligne inattendue dans le fichier des permissions (« statoverride »)"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr ""
-"groupe « %s » inconnu dans le fichier des permissions (« statoverride »)"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "forçages d'état (statoverrides) multiples pour le fichier « %.250s »"
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "option obsolète « --%s » ; veuillez utiliser « --%s » à la place"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4930,6 +5157,12 @@ msgstr "Déconfiguration de %s (%s), pour pouvoir supprimer %s (%s) ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Déconfiguration de %s (%s) ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "le fichier des permissions (« statoverride ») contient une ligne vide"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -5076,11 +5309,9 @@ msgid "package filesystem archive extraction"
 msgstr "extraction de l'archive du système de fichiers du paquet"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "erreur de lecture sur la sortie du « tar » de dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "archive du système de fichiers corrompue - archive du paquet corrompue"
 
 #: src/unpack.c
@@ -5095,15 +5326,20 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s accepte au plus un fichier « Packages » en paramètre"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "impossible d'accéder à la zone des états de dpkg pour une mise à jour massive"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"une mise à jour massive requiert un accès en écriture dans la zone des états "
-"de dpkg"
+"impossible d'accéder à la zone des états de dpkg pour une mise à jour massive"
 
 #: src/update.c
 #, c-format
@@ -5476,16 +5712,18 @@ msgid "decompressing archive member"
 msgstr "décompression du membre de l'archive"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "échec de « chdir » vers le répertoire"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "impossible de créer le répertoire"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "échec de « chdir » vers un répertoire après l'avoir créé"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "EOF inattendu dans le nom du paquet à la ligne %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "échec de « chdir » vers le répertoire"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6375,7 +6613,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6385,8 +6637,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6904,11 +7157,112 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "option obsolète « --%s » ; veuillez utiliser « --%s » à la place"
+# ####################################### Notes de traduction
+# trigger              : action différée
+# triggers-awaited     : « actions-différées-à-venir »
+# triggers-pending     : « actions-différées-en-attente »
+# triggers-deferred    : « action-différée-reportée »
+# awaited trigger      : action différée attendue
+# pending trigger      : action différée en attente
+# triggers deferred    : actions différées reportées
+# trigger interests    : actions différées
+# triggers are awaited : actions différées à venir
+# triggers are pending : actions différées en attente
+# #######################################: lib/dpkg/dbmodify.c:161
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "impossible d'ouvrir le fichier de verrou %s pour tests"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr ""
+#~ "utilisateur « %s » inconnu dans le fichier des permissions "
+#~ "(« statoverride »)"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr ""
+#~ "groupe « %s » inconnu dans le fichier des permissions (« statoverride »)"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s est manquant"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "« %.50s » n'est pas autorisé pour %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "ce qui suit %s est inutile"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "nom de paquet incorrect (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no dans un champ booléen"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "il manque une valeur dans le fichier de contrôle « %s »"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "champ « %s », référence à « %.255s » : erreur dans la version"
+
+#~ msgid "empty value for %s"
+#~ msgstr " %s de valeur nulle"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "paquet dans l'état « actions-différées-à-venir » (« triggers-awaited ») "
+#~ "mais aucune action différée n'est à venir"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "paquet dans l'état « actions-différées-en-attente » (« triggers-"
+#~ "pending ») mais sans action différée en attente"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "une mise à jour massive requiert un accès en écriture dans la zone des "
+#~ "états de dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "erreur de lecture sur la sortie du « tar » de dpkg-deb"
+
+#, fuzzy
+#~| msgid "cannot open '%s' control file for package '%s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "impossible d'ouvrir le fichier de contrôle « %s » pour le paquet « %s »"
+
+#, fuzzy
+#~| msgid "cannot stat '%s' control file for package '%s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "impossible d'obtenir les statistiques du fichier de contrôle « %s » du "
+#~ "paquet « %s »"
+
+#, fuzzy
+#~| msgid "'%s' file for package '%s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "le fichier « %s » pour le paquet « %s » n'est pas un fichier simple"
+
+#, fuzzy
+#~| msgid "cannot close '%s' control file for package '%s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "impossible de fermer le fichier de contrôle « %s » du paquet « %s »"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr ""
+#~ "impossible d'ouvrir le fichier contenant la liste des fichiers du paquet "
+#~ "« %.250s »"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "impossible d'ouvrir le fichier contenant la liste des fichiers du paquet "
+#~ "« %.250s »"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "la liste des fichiers pour le paquet « %.250s » n'est pas un simple "
+#~ "fichier"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "lecture de la liste des fichiers du paquet « %.250s »"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "échec de « chdir » vers un répertoire après l'avoir créé"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "il n'y a pas de séparateur dans le fichier de contrôle « %s »"
@@ -6979,9 +7333,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF sur l'entrée standard à l'invite de configuration"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "EOF inattendu dans le nom du paquet à la ligne %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "EOF inattendu après le nom du paquet à la ligne %d"
 
diff --git a/po/gl.po b/po/gl.po
index bb6c9ef37..40c6b8bf2 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:49+0200\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -149,7 +149,8 @@ msgstr "eliminación do antigo ficheiro diversions-old: %s"
 msgid "error creating new backup file '%s'"
 msgstr "erro ao crear a canle \"%.255s\""
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "non se pode eliminar \"%.250s\""
@@ -375,23 +376,38 @@ msgstr "non se pode ir ao comezo de %.250s despois do recheo"
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "non se pode abrir o ficheiro temporal para vsnprintf"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "non se puido ler os modificadores do descritor de ficheiros de %.250s"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr ""
 "non se pode abrir/crear o ficheiro de bloqueo da base de datos de estado"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr ""
+"non se pode abrir/crear o ficheiro de bloqueo da base de datos de estado"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "non ten permisos para bloquear a base de datos de estado de dpkg"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "non se pode bloquear a base de datos de estado de dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -399,11 +415,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "a operación solicitada precisa de privilexios de superusuario"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "non se pode acceder á área de estado de dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 "a operación precisa de acceso de lectura/escritura á área de estado de dpkg"
 
@@ -442,6 +462,204 @@ msgstr "non se pode pechar o estado actualizado de \"%.250s\""
 msgid "unable to install updated status of '%.250s'"
 msgstr "non se pode instalar o estado actualizado de \"%.250s\""
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "non se pode comprobar a existencia de \"%.250s\""
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "non se pode ler o directorio de información"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "erro ao tentar abrir %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "non se pode abrir o ficheiro orixe \"%.250s\""
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "o ficheiro de configuración \"%.250s\" non aparece no paquete"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "erro ao crear a ligazón dura \"%.255s\""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "erro ao gravar \"%s\""
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr ""
+"non se pode ler o directorio de ficheiros de configuración \"%.250s\" (de "
+"\"%.250s\")"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "non se puido abrir o ficheiro de desvíos"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "non se atopou o ficheiro de desvíos"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "hai desvíos en conflicto que involucran a \"%.250s\" ou \"%.250s\""
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "erro ao pechar a lista de ficheiros do paquete \"%.250s\""
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg: aviso grave: a lista de ficheiros do paquete \"%.250s\" non aparece, "
+"suponse que o paquete non ten ficheiros instalados actualmente.\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(A ler a base de datos ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "hai %d ficheiros e directorios instalados actualmente.)\n"
+msgstr[1] "hai %d ficheiros e directorios instalados actualmente.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "modo de actualización non válido"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "ficheiro \"statoverride\" \"%.250s\""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "ficheiro \"statoverride\" \"%.250s\""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "non se puido abrir o ficheiro \"statoverride\""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "non se atopou o ficheiro \"statoverride\""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "ficheiro \"statoverride\" \"%.250s\""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "o ficheiro \"statoverride\" contén unha liña baleira"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "o ficheiro \"statoverride\" contén unha liña baleira"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "non se puido abrir o ficheiro \"statoverride\""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "fin de liña inesperada no nome do paquete na liña %d"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "ficheiro \"statoverride\" \"%.250s\""
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -581,68 +799,76 @@ msgid "internal error"
 msgstr "erro interno - modo \"%s\" incorrecto"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "falla %s"
+#, fuzzy
+#| msgid "cannot stat old name `%s': %s"
+msgid "is missing a value"
+msgstr "non se atopa o nome antigo \"%s\": %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "non se permite \"%.*s\" para %s"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "lixo despois de %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "nome de paquete non válido (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "O paquete \"%s\" non está instalado.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "campo de detalles de ficheiro \"%s\" baleiro"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr ""
 "non se permite o campo de detalles de ficheiro \"%s\" no ficheiro de estado"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "hai valores de máis no campo de detalles de ficheiro \"%s\" (comparado con "
 "outros)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "hai valores de menos no campo de detalles de ficheiro \"%s\" (comparado con "
 "outros)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "si/non nun campo booleano"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "emprégase un campo obsoleto \"Revision\" ou \"Package-Revision\""
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "campo \"%s\", referencia a \"%.255s\": erro na versión: %.255s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "palabra no campo \"priority\""
 
 #: lib/dpkg/fields.c
@@ -652,33 +878,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "non se admite o valor do campo \"status\" neste contexto"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "primeira palabra (want) no campo \"status\""
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "segunda palabra (error) no campo \"status\""
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "terceira palabra (status) no campo \"status\""
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "erro na cadea do campo Version \"%.250s\": %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "emprégase un campo obsoleto \"Revision\" ou \"Package-Revision\""
 
 #: lib/dpkg/fields.c
@@ -690,13 +916,15 @@ msgstr "o valor de \"conffiles\" ten unha liña mal formada \"%.*s\""
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "o valor de \"conffiles\" ten unha liña que comeza por algo distinto dun "
 "espacio \"%c\""
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "lístase coma ficheiro de configuración o directorio raíz ou un nulo"
 
 #: lib/dpkg/fields.c
@@ -785,9 +1013,9 @@ msgstr "campo \"%s\", referencia a \"%.255s\": versión sen rematar"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "campo \"%s\", referencia a \"%.255s\": erro na versión: %.255s"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "campo \"%s\", referencia a \"%.255s\": a versión contén \"%c\""
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -795,8 +1023,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "campo \"%s\", erro de sintaxe trala referencia ao paquete \"%.255s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "non se admiten alternativas (\"|\") no campo %s"
 
 #: lib/dpkg/fields.c
@@ -839,6 +1068,29 @@ msgstr ""
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat %s"
+msgstr "non se atopa o nome antigo \"%s\": %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "aviso, o ficheiro de configuración \"%s\" non é un ficheiro normal\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "non se pode escribir en %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open %s"
+msgstr "non se puido abrir o ficheiro de desvíos: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "non se pode desbloquear %s: %s"
@@ -861,8 +1113,20 @@ msgid "unable to lock %s"
 msgstr "non se pode desbloquear %s: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open file %s"
+msgstr "non se puido abrir o ficheiro de desvíos: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "non se pode baleirar o buffer en vsnprintf"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "Non se poden desviar directorios"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -885,13 +1149,13 @@ msgstr "non se puido reservar memoria"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "a chamada a dup2 fallou para std%s"
+msgid "failed to dup for fd %d"
+msgstr "a chamada a dup2 fallou para o descritor %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "a chamada a dup2 fallou para o descritor %d"
+msgid "failed to dup for std%s"
+msgstr "a chamada a dup2 fallou para std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1030,30 +1294,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "valor duplicado para o campo definido polo usuario \"%.*s\""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "falla %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "valor baleiro para %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "valor duplicado para o campo \"%s\""
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has '%s' field but is missing architecture"
+msgstr "o paquete ten estado %s pero hai disparadores en espera"
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
 #| msgid "package has status %s but triggers are awaited"
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "o paquete ten estado %s pero hai disparadores en espera"
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Configured-Version para un paquete con Status non apropiado"
 
 #: lib/dpkg/parse.c
@@ -1062,9 +1329,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "o paquete ten estado %s pero hai disparadores en espera"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"o paquete ten estado triggers-awaited pero non hai disparadores en espera"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "o paquete ten estado %s pero hai disparadores en espera"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1072,12 +1340,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "o paquete ten estado %s pero hai disparadores pendentes"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"o paquete ten estado triggers-pending pero non hai disparadores pendentes"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "o paquete ten estado %s pero hai disparadores pendentes"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Un paquete en estado \"non instalado\" ten ficheiros de configuración; "
 "esquécense"
@@ -1097,8 +1368,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1304,11 +1575,6 @@ msgstr "non se pode crear \"%.255s\""
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1325,6 +1591,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "falla o nome alternativo"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(non hai unha descrición dispoñible)"
@@ -1412,6 +1688,68 @@ msgstr "o subproceso %s fallou co código de estado de espera %d"
 msgid "wait for %s subprocess failed"
 msgstr "a espera de %s fallou"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "carácter \"%c\" non válido na anchura do campo\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "carácter \"%c\" non válido na anchura do campo\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "modo de actualización non válido"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header gid field"
+msgstr "ficheiro \"statoverride\" \"%.250s\""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "carácter \"%c\" non válido na anchura do campo\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "tipo de compresión \"%s\" descoñecido"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -1430,15 +1768,16 @@ msgid "treewalk root %s is not a directory"
 msgstr "non se pode ler o directorio de información"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr ""
 "non se pode abrir/crear o ficheiro de bloqueo de disparadores \"%.250s\""
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
 #| msgid "triggered"
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "disparado"
 
 #: lib/dpkg/trigdeferred.c
@@ -1675,11 +2014,6 @@ msgstr "erro ao crear a canle \"%.255s\""
 msgid "error creating device '%.255s'"
 msgstr "erro ao crear o dispositivo \"%.255s\""
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "erro ao crear a ligazón dura \"%.255s\""
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -2022,10 +2356,10 @@ msgstr "non se pode acceder ao arquivo"
 msgid "archive '%s' is not a regular file"
 msgstr "aviso, o ficheiro de configuración \"%s\" non é un ficheiro normal\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2247,6 +2581,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Escriba \"exit\" cando teña rematado.\n"
 
@@ -2633,7 +2971,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2674,6 +3015,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -2810,6 +3157,13 @@ msgstr ""
 "instalado.\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
@@ -2858,19 +3212,6 @@ msgstr "o nome do paquete non pode conter saltos de liña"
 msgid "divert-to may not contain newlines"
 msgstr "o destino do desvío non pode conter saltos de liña"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "non se puido abrir o ficheiro de desvíos"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "non se atopou o ficheiro de desvíos"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "hai desvíos en conflicto que involucran a \"%.250s\" ou \"%.250s\""
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3176,128 +3517,167 @@ msgid ""
 msgstr ""
 "O paquete %s está retido, non se toca. Empregue --force-hold para o facer.\n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
-"dpkg - aviso, omítese o problema porque --force está activado:\n"
-" "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
 msgstr ""
-"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Configure any package which may help this one"
 msgstr ""
-"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
 msgstr ""
-"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "non se puido abrir a lista de ficheiros do paquete \"%.250s\""
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "non se puido abrir a lista de ficheiros do paquete \"%.250s\""
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
 msgstr ""
-"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
 msgstr ""
-"non se pode ler o directorio de ficheiros de configuración \"%.250s\" (de "
-"\"%.250s\")"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "erro ao pechar a lista de ficheiros do paquete \"%.250s\""
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "non se puido abrir a lista de ficheiros do paquete \"%.250s\""
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg: aviso grave: a lista de ficheiros do paquete \"%.250s\" non aparece, "
-"suponse que o paquete non ten ficheiros instalados actualmente.\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "non se puido abrir a lista de ficheiros do paquete \"%.250s\""
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
-"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "lista de ficheiros do paquete \"%.250s\""
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+#: src/force.c
+msgid "Install even if it would break another package"
 msgstr ""
-"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "problemas de dependencias - non se elimina"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "problemas de dependencias - non se elimina"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro baleiro"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "erro ao pechar a lista de ficheiros do paquete \"%.250s\""
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(A ler a base de datos ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "opción de forzar/rexeitar \"%.*s\" descoñecida"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "hai %d ficheiros e directorios instalados actualmente.)\n"
-msgstr[1] "hai %d ficheiros e directorios instalados actualmente.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "Aviso: opción de forzado/rexeitado \"%s\" obsoleta\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"dpkg - aviso, omítese o problema porque --force está activado:\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3360,42 +3740,6 @@ msgstr ""
 "Non se atoparon %d programa(s) esperados na variable PATH.\n"
 "Nota: o PATH de root debería conter /usr/local/sbin, /usr/sbin e /sbin."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "non se pode comprobar a existencia de \"%.250s\""
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "non se pode ler o directorio de información"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "erro ao tentar abrir %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "non se pode abrir o ficheiro orixe \"%.250s\""
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "o ficheiro de configuración \"%.250s\" non aparece no paquete"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "erro ao gravar \"%s\""
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3435,27 +3779,27 @@ msgstr "Programa de xestión de paquetes \"%s\" de Debian versión %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3713,114 +4057,6 @@ msgstr ""
 "\"."
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "problemas de dependencias - non se elimina"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "problemas de dependencias - non se elimina"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3953,33 +4189,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "opción de forzar/rexeitar \"%.*s\" descoñecida"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "Aviso: opción de forzado/rexeitado \"%s\" obsoleta\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "non se puido abrir \"%i\" para fluxo"
 
@@ -4167,6 +4376,10 @@ msgid "Description"
 msgstr "Descrición"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "desvío feito por %s desde: %s\n"
@@ -4205,6 +4418,17 @@ msgstr ""
 "O paquete \"%s\" non está instalado e non hai información dispoñible.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Empregue dpkg --info (= dpkg-deb --info) para examinar os arquivos,\n"
+"e dpkg --contents (= dpkg-deb --contents) para ver unha lista do seu "
+"contido.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4231,9 +4455,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "desviado por %s a: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Empregue dpkg --info (= dpkg-deb --info) para examinar os arquivos,\n"
 "e dpkg --contents (= dpkg-deb --contents) para ver unha lista do seu "
@@ -4282,16 +4509,16 @@ msgstr "Programa de xestión de paquetes \"%s\" de Debian versión %s.\n"
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4497,6 +4724,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "non se puido facer chroot a \"%.250s\""
@@ -4649,8 +4882,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4728,70 +4966,10 @@ msgstr "Non hai unha substitución presente."
 msgid "--update is useless for --remove"
 msgstr "aviso: --update é inútil con --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "modo de actualización non válido"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "ficheiro \"statoverride\" \"%.250s\""
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "ficheiro \"statoverride\" \"%.250s\""
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "non se puido abrir o ficheiro \"statoverride\""
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "non se atopou o ficheiro \"statoverride\""
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "ficheiro \"statoverride\" \"%.250s\""
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "o ficheiro \"statoverride\" contén unha liña baleira"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "o ficheiro \"statoverride\" contén unha liña baleira"
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "non se puido abrir o ficheiro \"statoverride\""
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "non se puido abrir o ficheiro \"statoverride\""
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "fin de liña inesperada no nome do paquete na liña %d"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "non se puido abrir o ficheiro \"statoverride\""
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "ficheiro \"statoverride\" \"%.250s\""
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Aviso: opción \"--%s\" obsoleta\n"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5051,6 +5229,12 @@ msgstr "A desconfigurar %s, para poder eliminar %s ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "A desconfigurar %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "o ficheiro \"statoverride\" contén unha liña baleira"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -5205,11 +5389,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "erro ao ler a saída de tar de dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 "arquivo tar do sistema de ficheiros corrompido - arquivo de paquete "
 "corrompido"
@@ -5227,16 +5409,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s precisa de exactamente un argumento de ficheiro Packages"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "non se pode acceder a área de estado de dpkg para actualizar os dispoñibles "
 "en bruto"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"a actualización en bruto de dispoñibles require acceso de escritura na área "
-"de estado de dpkg"
+"non se pode acceder a área de estado de dpkg para actualizar os dispoñibles "
+"en bruto"
 
 #: src/update.c
 #, c-format
@@ -5630,16 +5818,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "non se puido cambiar ao directorio"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "non se puido crear o directorio"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "non se puido cambiar ao directorio despois de o crear"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "fin de ficheiro inesperada no nome do paquete na liña %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "non se puido cambiar ao directorio"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6572,8 +6762,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -7096,13 +7287,99 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Aviso: opción \"--%s\" obsoleta\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "non se pode abrir o ficheiro temporal para vsnprintf"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "non se atopa o nome antigo \"%s\": %s"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "non se puido abrir o ficheiro \"statoverride\""
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "non se puido abrir o ficheiro \"statoverride\""
+
+#~ msgid "%s is missing"
+#~ msgstr "falla %s"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "non se permite \"%.*s\" para %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "lixo despois de %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "nome de paquete non válido (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "si/non nun campo booleano"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "campo \"%s\", referencia a \"%.255s\": erro na versión: %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr "valor baleiro para %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "o paquete ten estado triggers-awaited pero non hai disparadores en espera"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "o paquete ten estado triggers-pending pero non hai disparadores pendentes"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "a actualización en bruto de dispoñibles require acceso de escritura na "
+#~ "área de estado de dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "erro ao ler a saída de tar de dpkg-deb"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "non se puido abrir a lista de ficheiros do paquete \"%.250s\""
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "non se puido abrir a lista de ficheiros do paquete \"%.250s\""
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr ""
+#~ "a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro "
+#~ "baleiro"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "erro ao pechar a lista de ficheiros do paquete \"%.250s\""
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "non se puido abrir a lista de ficheiros do paquete \"%.250s\""
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "non se puido abrir a lista de ficheiros do paquete \"%.250s\""
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "a lista de ficheiros do paquete \"%.250s\" contén un nome de ficheiro "
+#~ "baleiro"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "lista de ficheiros do paquete \"%.250s\""
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "non se puido cambiar ao directorio despois de o crear"
 
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
@@ -7182,9 +7459,6 @@ msgstr ""
 #~ "fin de ficheiro na entrada estándar na pregunta do ficheiro de "
 #~ "configuración"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "fin de ficheiro inesperada no nome do paquete na liña %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "fin de ficheiro inesperada tralo nome do paquete na liña %d"
 
@@ -7492,11 +7766,6 @@ msgstr ""
 #~ msgstr " escravo %s: %s"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "non se atopa o nome antigo \"%s\": %s"
-
-#, fuzzy
 #~| msgid "%s: copying %s to %s failed, giving up: %s"
 #~ msgid "scan of %s failed: %s"
 #~ msgstr "%s: fallou a copia de %s a %s, abórtase: %s"
@@ -7523,11 +7792,6 @@ msgstr ""
 #~ msgstr "non se pode pechar %s: %s"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "non se pode escribir en %s: %s"
-
-#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "non se pode cambiar o nome de %s a %s: %s"
diff --git a/po/hu.po b/po/hu.po
index ddf0f756b..b7fc7ca1b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-06-26 16:11+0200\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -148,7 +148,8 @@ msgstr "régi diversions-old eltávoltása: %s"
 msgid "error creating new backup file '%s'"
 msgstr "hiba az alábbi cső létrehozásakor: `%.255s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "nem törölhető: `%.250s'"
@@ -371,22 +372,36 @@ msgstr "nem tudok %.250s elejére menni a behúzás után"
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "nem nyitható tmpfile a vsnprintf-hez"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "%.250s fájl-leíró kapcsolói olvasása sikerelen"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "a dpkg állapot adatbázis lezáró fájl kinyitása/lezárása sikertelen"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "a dpkg állapot adatbázis lezáró fájl kinyitása/lezárása sikertelen"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "nincs jogod lezárni a dpkg állapot adatbázist"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "a dpkg állapot adatbázis lezárása sikertelen"
 
 #: lib/dpkg/dbmodify.c
@@ -394,11 +409,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "a kért művelet rendszergazda jogokat igényel"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "nem érem el a dpkg állapot területet"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "a művelet olvasás/írás jogot kér a dpkg állapot területhez"
 
 #: lib/dpkg/dbmodify.c
@@ -436,6 +455,195 @@ msgstr "`%.250s' frissített állapotának lezárása sikertelen"
 msgid "unable to install updated status of '%.250s'"
 msgstr "`%.250s' frissített állapotának telepítése sikertelen"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "nem ellenőrizhető `%.250s' léte"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "az info könyvtár nem olvasható"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "hiba %.250s megnyitásakor"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "e forrásfájl nem megnyitható: `%.250s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "úgy fest, `%.250s' konffájl nincs a csomagban"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "hiba az alábbi merev lánc létrehozásakor: `%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "hiba `%s' írásakor"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "olvashatatlan `%.250s' konfig fájl könyvtár (innen: `%.250s')"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "eltérítés fájl megnyitása sikertelen"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "eltérítés fájl fstat sikertelen"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "`%.250s'-t vagy `%.250s'-t érintő ütköző eltérítések"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "nem sikerült lezárni a fájllista fájlt e csomaghoz: `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg: Figyelmeztetés: nincs fájllista fájl e csomaghoz: `%.250s', "
+"feltételezem, hogy a csomagnak most nincsenek telepített fájljai\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Adatbázis olvasása ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "Most %d fájl és könyvtár telepített.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride uid %s"
+msgstr "statoverride fájl: `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "statoverride fájl: `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "statoverride fájl: `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "nem sikerült megnyitni a statoverride fájlt"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "nem sikerült fstat-olni a statoverride fájlt"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "statoverride fájl: `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "a statoverride fájl üres sort tartalmaz"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "a statoverride fájl üres sort tartalmaz"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "nem sikerült megnyitni a statoverride fájlt"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "váratlan sorvég a csomagnévben a %d. sorban"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "statoverride fájl: `%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -565,63 +773,71 @@ msgid "internal error"
 msgstr "belső hiba - rossz `%s' mód"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s hiányzik"
+#, fuzzy
+#| msgid "cannot stat old name `%s': %s"
+msgid "is missing a value"
+msgstr "a régi `%s' név nem található: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "`%.*s' tilos %s számára"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "szemét %s után"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "hibás csomagnév (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "A(z) `%s' csomag nincs telepítve.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "üres `%s' fájl részletek mező"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "`%s' fájl részletek mező tilos az állapot fájlban"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "túl sok érték `%s' fájl részletek mezőben (más mezőkhöz képest)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "kevés érték `%s' fájl részletek mezőben (más mezőkhöz képest)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no a logikai mezőben"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "elavult `Revision' vagy `Package-Revision' mező"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "`%s' mező, hivatkozás erre: `%.255s': hibás verzió: %.255s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "szó a `priority' mezőben"
 
 #: lib/dpkg/fields.c
@@ -631,33 +847,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "érték a `status' mezőben tilos e környezetben"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "1. (kért) szó a `status' mezőben"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "2. (hiba) szó a `status' mezőben"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "3. (állapot) word in `status' field"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "hiba a `%.250s' Verzió szövegben: %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "elavult `Revision' vagy `Package-Revision' mező"
 
 #: lib/dpkg/fields.c
@@ -669,11 +885,13 @@ msgstr "érték a `conffiles'-hoz rossz `%.*s' sort tartalmaz"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "érték a `conffiles'-hoz nem-szóköz `%c' karaktert tartalmaz"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "gyökér vagy üres könyvtár konffájlként listázva"
 
 #: lib/dpkg/fields.c
@@ -757,9 +975,9 @@ msgstr "`%s' mező, hivatkozás erre: `%.255s': lezáratlan verzió"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "`%s' mező, hivatkozás erre: `%.255s': hibás verzió: %.255s"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "`%s' mező, hivatkozás erre: `%.255s': a verzió `%c'-t tartalmaz"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -767,8 +985,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "`%s' mező, nyelvtani hiba e csomaghivatkozás után: `%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternatíva (`|') tilos e mezőben: %s"
 
 #: lib/dpkg/fields.c
@@ -808,6 +1027,29 @@ msgstr "`%.250s' új terjesztői beállítófájl módja nem állítható be"
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat %s"
+msgstr "a régi `%s' név nem található: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "figyelem, `%s' konffájl nem sima fájl\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "%s írása sikertelen: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "%s: can't open %s: %s"
+msgid "cannot open %s"
+msgstr "%s: %s nem nyitható meg: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "nem tudom kioldani %s-t: %s"
@@ -830,8 +1072,20 @@ msgid "unable to lock %s"
 msgstr "nem tudom kioldani %s-t: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: can't open %s: %s"
+msgid "cannot open file %s"
+msgstr "%s: %s nem nyitható meg: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "nem lehet kiüríteni a vsnprintf-ben"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "Könyvtárak eltérítése sikertelen"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -855,12 +1109,12 @@ msgstr "sikertelen könyvtár létrehozás"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
+msgid "failed to dup for fd %d"
 msgstr ""
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
+msgid "failed to dup for std%s"
 msgstr ""
 
 #: lib/dpkg/mlib.c
@@ -999,29 +1253,31 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "kettős érték e felhasználói mezőben: `%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "hiányzik: %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "üres érték ehhez: %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "kettős érték e mezőben: `%s'"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has '%s' field but is missing architecture"
+msgstr " (csomag: "
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr " (csomag: "
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Configured-Version van hibás állapotú csomaghoz"
 
 #: lib/dpkg/parse.c
@@ -1030,7 +1286,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1039,11 +1296,14 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "  %.s eltávolításra jelölt.\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "nem-telepített csomaghoz konfigurációs fájlok vannak, elfelejtem őket"
 
 #: lib/dpkg/parse.c
@@ -1061,8 +1321,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1259,11 +1519,6 @@ msgstr "`%.255s' nem hozható létre"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1280,6 +1535,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "hiányzó altname"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(nincs leírás)"
@@ -1364,6 +1629,69 @@ msgstr "%s alfolyamat meghiúsult %d állapot kódra várva"
 msgid "wait for %s subprocess failed"
 msgstr "%s kódra várakozás meghiúsult"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "érvénytelen `%c' karakter a mező szélességben\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "érvénytelen `%c' karakter a mező szélességben\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header uid field"
+msgstr "statoverride fájl: `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header gid field"
+msgstr "statoverride fájl: `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "érvénytelen `%c' karakter a mező szélességben\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "ismeretlen tömörítés: `%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -1383,12 +1711,12 @@ msgstr "az info könyvtár nem olvasható"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "e forrásfájl nem megnyitható: `%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "nem tudom kioldani %s-t: %s"
 
 #: lib/dpkg/trigdeferred.c
@@ -1599,11 +1927,6 @@ msgstr "hiba az alábbi cső létrehozásakor: `%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "hiba az alábbi eszköz létrehozásakor: `%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "hiba az alábbi merev lánc létrehozásakor: `%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1923,10 +2246,10 @@ msgstr "az archívum nem elérhető"
 msgid "archive '%s' is not a regular file"
 msgstr "figyelem, `%s' konffájl nem sima fájl\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2143,6 +2466,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Írd be az `exit'-et, ha kész vagy.\n"
 
@@ -2517,7 +2844,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2549,6 +2879,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -2681,6 +3017,13 @@ msgstr ""
 "telepítve.\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
@@ -2729,19 +3072,6 @@ msgstr "csomag nem tartalmazhat újsorokat"
 msgid "divert-to may not contain newlines"
 msgstr "divert-to nem tartalmazhat újsorokat"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "eltérítés fájl megnyitása sikertelen"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "eltérítés fájl fstat sikertelen"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "`%.250s'-t vagy `%.250s'-t érintő ütköző eltérítések"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3038,116 +3368,167 @@ msgstr ""
 "Visszafogásban lévő csomag: %s, nem módosítom. Használd a --force-hold-ot a "
 "felülbíráláshoz.\n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
-"dpkg - figyelem, felülbírálom a hibát, mivel a --force érvényes:\n"
-" "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "olvashatatlan `%.250s' konfig fájl könyvtár (innen: `%.250s')"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "nem sikerült lezárni a fájllista fájlt e csomaghoz: `%.250s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg: Figyelmeztetés: nincs fájllista fájl e csomaghoz: `%.250s', "
-"feltételezem, hogy a csomagnak most nincsenek telepített fájljai\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "fájllista e csomaghoz: `%.250s'"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "függőségek vannak - nem törlöm"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "függőségek vannak - nem törlöm"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "nem sikerült lezárni a fájllista fájlt e csomaghoz: `%.250s'"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Adatbázis olvasása ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "ismeretlen `%.*s' kényszerítő/elutasító opció"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "Most %d fájl és könyvtár telepített.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "Figyelem: elavult `--%s' kényszerítő/elutasító opció\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"dpkg - figyelem, felülbírálom a hibát, mivel a --force érvényes:\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3211,42 +3592,6 @@ msgstr ""
 "Megj.: a root felhasználó PATH változója általában tartalmazza a /usr/local/"
 "sbin, a /usr/sbin és a /sbin könyvtárakat."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "nem ellenőrizhető `%.250s' léte"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "az info könyvtár nem olvasható"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "hiba %.250s megnyitásakor"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "e forrásfájl nem megnyitható: `%.250s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "úgy fest, `%.250s' konffájl nincs a csomagban"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "hiba `%s' írásakor"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3256,27 +3601,27 @@ msgstr "Debian `%s' csomagkezelő program %s verzió.\n"
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3492,114 +3837,6 @@ msgstr ""
 "`less' vagy `more' parancson keresztül!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "függőségek vannak - nem törlöm"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "függőségek vannak - nem törlöm"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3732,33 +3969,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "ismeretlen `%.*s' kényszerítő/elutasító opció"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "Figyelem: elavult `--%s' kényszerítő/elutasító opció\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "`%i' nem nyitható meg az áramoltatásra"
 
@@ -3944,6 +4154,10 @@ msgid "Description"
 msgstr "Leírás"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, fuzzy, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "eltérítve %s által ide: %s\n"
@@ -3980,6 +4194,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "Az alábbi csomag: `%s' nincs telepítve és nincs információ róla.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"A dpkg --info (= dpkg-deb --info) kiírja az archívum fájlokat,\n"
+"a dpkg --contents (= dpkg-deb --contents) a tartalmukat.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4006,9 +4230,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "eltérítve %s által ide: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "A dpkg --info (= dpkg-deb --info) kiírja az archívum fájlokat,\n"
 "a dpkg --contents (= dpkg-deb --contents) a tartalmukat.\n"
@@ -4056,16 +4283,16 @@ msgstr "Debian `%s' csomagkezelő program %s verzió.\n"
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4261,6 +4488,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "meghiúsult a chroot ide: `%.250s'"
@@ -4411,8 +4644,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4489,71 +4727,10 @@ msgstr "Nincs felülbírálás."
 msgid "--update is useless for --remove"
 msgstr "figyelem: a --update értelmetlen --remove esetén"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride uid %s"
-msgstr "statoverride fájl: `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "statoverride fájl: `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "statoverride fájl: `%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "nem sikerült megnyitni a statoverride fájlt"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "nem sikerült fstat-olni a statoverride fájlt"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "statoverride fájl: `%.250s'"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "a statoverride fájl üres sort tartalmaz"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "a statoverride fájl üres sort tartalmaz"
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "nem sikerült megnyitni a statoverride fájlt"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "nem sikerült megnyitni a statoverride fájlt"
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "váratlan sorvég a csomagnévben a %d. sorban"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "nem sikerült megnyitni a statoverride fájlt"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "statoverride fájl: `%.250s'"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Figyelem: elavult lehetőség `--%s'\n"
 
 #: src/trigcmd.c
 #, fuzzy
@@ -4783,6 +4960,12 @@ msgstr "%s dekonfigurálása, így %s eltávolíthatóvá válik...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Eltávolítás: %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "a statoverride fájl üres sort tartalmaz"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4924,11 +5107,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "hiba a dpkg-deb tar kimenet olvasásakor"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "hibás fájlrendszer tarfájl -- hibás csomag archívum"
 
 #: src/unpack.c
@@ -4944,15 +5125,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s pontosan 1 Packages fájl argumentumot vár"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "nem tudok hozzáférni a dpkg állapot területhez a tömeges available "
 "frissítéshez"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"a tömeges available frissítés a dpkg állapot területhez írási jogot igényel"
+"nem tudok hozzáférni a dpkg állapot területhez a tömeges available "
+"frissítéshez"
 
 #: src/update.c
 #, c-format
@@ -5328,16 +5516,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "hiba a könyvtárváltáskor"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "sikertelen könyvtár létrehozás"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "hiba a könyvtárba lépéskor létrehozása után"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "váratlan eof a csomagnévben a %d. sorban"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "hiba a könyvtárváltáskor"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6164,8 +6354,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6680,13 +6871,87 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Figyelem: elavult lehetőség `--%s'\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "nem nyitható tmpfile a vsnprintf-hez"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "a régi `%s' név nem található: %s"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "nem sikerült megnyitni a statoverride fájlt"
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "nem sikerült megnyitni a statoverride fájlt"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s hiányzik"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "`%.*s' tilos %s számára"
+
+#~ msgid "junk after %s"
+#~ msgstr "szemét %s után"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "hibás csomagnév (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no a logikai mezőben"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "`%s' mező, hivatkozás erre: `%.255s': hibás verzió: %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr "üres érték ehhez: %s"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "a tömeges available frissítés a dpkg állapot területhez írási jogot "
+#~ "igényel"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "hiba a dpkg-deb tar kimenet olvasásakor"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "nem sikerült lezárni a fájllista fájlt e csomaghoz: `%.250s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "nem tudom megnyitni a fájllista fájlt e csomaghoz: `%.250s'"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "e csomag: `%.250s' fájllista fájlja üres fájlnevet tartalmaz"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "fájllista e csomaghoz: `%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "hiba a könyvtárba lépéskor létrehozása után"
 
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
@@ -6761,9 +7026,6 @@ msgstr ""
 #~ msgid "unexpected eof reading `%.250s'"
 #~ msgstr "váratlan fájl vége jel itt: %.250s"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "váratlan eof a csomagnévben a %d. sorban"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "váratlan eof a csomagnév után a %d. sorban"
 
@@ -7046,11 +7308,6 @@ msgstr ""
 #~ msgstr " %s szolga: %s"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "a régi `%s' név nem található: %s"
-
-#, fuzzy
 #~| msgid "%s: copying %s to %s failed, giving up: %s"
 #~ msgid "scan of %s failed: %s"
 #~ msgstr "%s: %s másolása ide: %s sikertelen, feladom: %s"
@@ -7077,11 +7334,6 @@ msgstr ""
 #~ msgstr "nem tudom lezárni %s-t: %s"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "%s írása sikertelen: %s"
-
-#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "nem tudom átnevezni %s-t erre: %s: %s"
diff --git a/po/id.po b/po/id.po
index 9e091cfdd..20fe8a900 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.15\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-06-26 16:12+0200\n"
 "Last-Translator: Arief S Fitrianto <arief@gurame.fisika.ui.ac.id>\n"
 "Language-Team: Indonesian <debian-l10n-indonesian@lists.debian.org>\n"
@@ -151,7 +151,8 @@ msgstr "ada galat saat membuang berkas 'diversions-old' yang lama"
 msgid "error creating new backup file '%s'"
 msgstr "Ada kesalahan saat membuat pipe '%.255s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "tidak dapat membuang '%.250s'"
@@ -376,22 +377,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "Gagal mencoba memulai %.250s setelah padding"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "Gagal membuka berkas pengunci %s untuk ujicoba"
+#, fuzzy, c-format
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "gagal membaca tanda deskriptor berkas untuk %.250s"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "gagal membuka/membuat berkas kunci(lock) basis data status"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "gagal membuka/membuat berkas kunci(lock) basis data status"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "Anda tidak memiliki izin untuk mengunci basis data status dpkg"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "gagal mengunci basis data status dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -399,11 +415,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "operasi yang diminta membutuhkan kewenangan superuser"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "gagal mengakses area status dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operasi ini membutuhkan akses baca/tulis ke area status dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -441,6 +461,199 @@ msgstr "gagal menutup status terbaru dari '%.250s'"
 msgid "unable to install updated status of '%.250s'"
 msgstr "gagal memasang status terbaru dari '%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "gagal memeriksa keberadaan '%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "gagal membaca direktori 'info'"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "Ada kesalahan saat membuka %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+#| msgid "unable to write file '%s'"
+msgid "corrupt info database format file '%s'"
+msgstr "gagal menulis ke berkas '%s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "berkas 'conffile' '%.250s' tidak ada dalam paket"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "ada kesalahan saat membuat 'hard link' '%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "Ada galat saat menulis '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "berkas daftar berkas untuk paket '%.250s' berisi nama berkas kosong"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "gagal membaca dir berkas konfigurasi '%.250s' (dari '%.250s')"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "gagal membuka berkas 'diversions'"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "Gagal menata status berkas 'diversions'"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "berkas 'diversions' yang bentrok melibatkan '%.250s' atau '%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "ada kesalahan saat menutup berkas daftar berkas untuk paket '%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid ""
+#| "files list file for package `%.250s' missing, assuming package has no "
+#| "files currently installed."
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"berkas daftar berkas untuk paket '%.250s' hilang; \n"
+"anggap paket tidak memiliki berkas yang sudah terpasang."
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "berkas daftar berkas untuk paket '%.250s' berisi nama berkas kosong"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Sedang membaca basis data ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] " %d berkas atau direktori telah terpasang.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "status tidak sah"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "berkas 'statoverride' '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "berkas 'statoverride' '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "gagal membuka berkas 'statoverride'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "Gagal menjalankan 'fstat' pada berkas 'statoverride'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "berkas 'statoverride' '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "berkas 'statoverride' tidak ada baris-baru penutup"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "berkas 'statoverride' berisi baris kosong"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "salah sintaks dalam berkas 'statoverride'"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "akhir baris tak terduga dalam berkas 'statoverride'"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "banyak berkas 'statoverride' terdaftar untuk berkas '%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version number"
@@ -585,65 +798,74 @@ msgid "internal error"
 msgstr "%s: ada galat internal saat membaca gzip"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s hilang"
+#, fuzzy
+#| msgid "cannot stat file '%s'"
+msgid "is missing a value"
+msgstr "gagal menata status '%s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.*s' tidak diperkenankan untuk %s"
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Hindari baris tidak sah: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "rongsokan setelah %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "nama paket (%.250s) tidak sah."
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Paket '%s' tidak terpasang. \n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "ruas 'file details' '%s' kosong"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "ruas 'file details' '%s' tidak diizinkan dalam berkas status"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "terlalu banyak nilai dalam ruas 'file details' '%s' (dibandingkan lainnya)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "terlalu sedikit nilai dalam ruas 'file details' '%s' (dibandingkan lainnya)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "ya/tidak dalam ruas boolean"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "Ruas 'Revision' atau 'Package-Revision' yang sudah usang digunakan"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': error in version"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "ruas '%s', yang mengacu ke '%.255s': ada galat dalam versi"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "kata dalam ruas 'prioritas'"
 
 #: lib/dpkg/fields.c
@@ -653,33 +875,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "nilai untuk ruas 'status' tidak diizinkan dalam konteks ini"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "kalimat (ingin) pertama dalam ruas 'status'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "kalimat (galat) kedua dalam ruas 'status'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "kalimat (status) ketiga dalam ruas `status'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string '%.250s'"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "Ada galat dalam string 'Version' '%.250s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "Ruas 'Revision' atau 'Package-Revision' yang sudah usang digunakan"
 
 #: lib/dpkg/fields.c
@@ -691,11 +913,13 @@ msgstr "nilai untuk 'conffiles' mengandung baris yang salah bentuk: '%.*s'"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "nilai untuk 'conffiles' beisi baris yang diawali tanpa-spasi: '%c'"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr ""
 "direktori kosong atau root terdaftar sebagai sebuah berkas konfig (conffile)"
 
@@ -783,9 +1007,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "ruas '%s', yang mengacu ke '%.255s': versi tidak diakhiri"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "ruas '%s', yang mengacu ke '%.255s': ada galat dalam versi"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "ruas '%s', yang mengacu ke '%.255s': versi berisi '%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -793,8 +1018,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "ruas '%s', salah syntaks setelah mengacu ke paket '%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternatif ('|') tidak diizinkan dalam ruas %s"
 
 #: lib/dpkg/fields.c
@@ -834,6 +1060,30 @@ msgstr "gagal menata modus berkas target '%.250s'"
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "gagal menata status %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "berkas konfig '%s' bukan berkas biasa"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "gagal menulis %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot open %s"
+msgstr "gagal menambahkan ke %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to close %s: %s"
 msgid "unable to unlock %s"
 msgstr "gagal menutup %s: %s"
@@ -856,10 +1106,22 @@ msgid "unable to lock %s"
 msgstr "gagal menutup %s: %s"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot open file %s"
+msgstr "gagal menambahkan ke %s: %s"
+
+#: lib/dpkg/file.c
 #, fuzzy
-#| msgid "long filenames"
-msgid "showing file on pager"
-msgstr "nama-berkas panjang"
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "gagal mengosongkan berkas '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "gagal mengalihkan berkas '%s' ke dirinya sendiri"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -882,13 +1144,13 @@ msgstr "gagal mengalokasikan memori"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "gagal melakukan 'dup' untuk std%s"
+msgid "failed to dup for fd %d"
+msgstr "gagal melakukan 'dup' untuk fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "gagal melakukan 'dup' untuk fd %d"
+msgid "failed to dup for std%s"
+msgstr "gagal melakukan 'dup' untuk std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1028,30 +1290,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "nilai ganda untuk ruas definisi pengguna '%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "%s hilang"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "nilai kosong untuk %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "nilai ganda untuk ruas '%s'"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has '%s' field but is missing architecture"
+msgstr "paket berstatus %s, tetapi ada pemicu yang ditunggu"
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
 #| msgid "package has status %s but triggers are awaited"
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "paket berstatus %s, tetapi ada pemicu yang ditunggu"
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Configured-Version untuk paket dengan Status tak sesuai"
 
 #: lib/dpkg/parse.c
@@ -1060,8 +1325,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "paket berstatus %s, tetapi ada pemicu yang ditunggu"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "paket berstatus tunggu-pemicu tetapi tidak ada pemicu yang ditunggu"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "paket berstatus %s, tetapi ada pemicu yang ditunggu"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1069,11 +1336,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "paket berstatus %s tetapi ada pemicu yang tertunda"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "paket berstatus tunda-pemicu tetapi tidak ada pemicu yang tertunda"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "paket berstatus %s tetapi ada pemicu yang tertunda"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Paket dengan status 'tak-terpasang' memiliki berkas konfig, abaikan saja"
 
@@ -1092,8 +1363,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1292,11 +1563,6 @@ msgstr "gagal secara hati-hati membuang '%.255s'"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1311,6 +1577,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr ""
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(tidak ada keterangan yang tersedia)"
@@ -1400,6 +1676,70 @@ msgstr "subproses %s gagal dengan kode status tunggu %d"
 msgid "wait for %s subprocess failed"
 msgstr "gagal menunggu subproses %s"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "aksara '%c' tidak sah dalam lebar ruas\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "aksara '%c' tidak sah dalam lebar ruas\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "status tidak sah"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header gid field"
+msgstr "berkas 'statoverride' '%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "aksara '%c' tidak sah dalam lebar ruas\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "generated corrupt ar header for '%s'"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "membuat header 'ar' terkorupsi untuk '%s'"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "jenis kompresi '%s' tidak dikenal!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1419,14 +1759,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "direktori 'control' bukan sebuah direktori"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "gagal membuka/membuat berkas-kunci pemicu '%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
 #| msgid "triggered"
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "dipicu"
 
 #: lib/dpkg/trigdeferred.c
@@ -1652,11 +1993,6 @@ msgstr "Ada kesalahan saat membuat pipe '%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "Ada kesalahan saat membuat piranti '%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "ada kesalahan saat membuat 'hard link' '%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1999,10 +2335,10 @@ msgstr "gagal mengakses arsip"
 msgid "archive '%s' is not a regular file"
 msgstr "berkas konfig '%s' bukan berkas biasa"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<keluaran standar>"
 
@@ -2224,6 +2560,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Ketik 'exit' bila telah selesai.\n"
 
@@ -2596,7 +2936,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2605,7 +2959,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2639,6 +2996,12 @@ msgstr ""
 "digunakan.\n"
 "Script preinst/postrm paket harus selalu menentukan --package dan --divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2764,6 +3127,13 @@ msgstr "mengabaikan permintaan untuk membuang %.250s yang tak terpasang."
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Tidak ada pengalihan '%s', tak ada yang dibuang.\n"
 
@@ -2808,19 +3178,6 @@ msgstr "Paket mungkin tidak berisi baris-baru"
 msgid "divert-to may not contain newlines"
 msgstr "nama-pengalih tidak boleh berisi baris-baru"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "gagal membuka berkas 'diversions'"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "Gagal menata status berkas 'diversions'"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "berkas 'diversions' yang bentrok melibatkan '%.250s' atau '%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3127,122 +3484,165 @@ msgstr ""
 "Paket %s sedang dicekal, tidak akan disentuh. \n"
 "Gunakan '--force-hold' untuk memprosesnya.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "ada masalah penimpaan karena --force dihidupkan:"
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "berkas daftar berkas untuk paket '%.250s' berisi nama berkas kosong"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "gagal membuka berkas daftar berkas untuk paket '%.250s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to stat files list file for package '%.250s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "gagal menata status berkas daftar berkas untuk paket '%.250s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "gagal membaca dir berkas konfigurasi '%.250s' (dari '%.250s')"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "ada kesalahan saat menutup berkas daftar berkas untuk paket '%.250s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "gagal membuka berkas daftar berkas untuk paket '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid ""
-#| "files list file for package `%.250s' missing, assuming package has no "
-#| "files currently installed."
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"berkas daftar berkas untuk paket '%.250s' hilang; \n"
-"anggap paket tidak memiliki berkas yang sudah terpasang."
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "gagal menata status berkas daftar berkas untuk paket '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "daftar berkas untuk paket '%.250s'"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "ada masalah ketergantungan - tidak dibuang"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "ada masalah ketergantungan - tidak dibuang"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "berkas daftar berkas untuk paket '%.250s' berisi nama berkas kosong"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "ada kesalahan saat menutup berkas daftar berkas untuk paket '%.250s'"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Sedang membaca basis data ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] " %d berkas atau direktori telah terpasang.)\n"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "Pilihan force/refuse '%.*s' tak dikenal"
+
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "pilihan force/refuse '--%s' sudah usang \n"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "ada masalah penimpaan karena --force dihidupkan:"
 
 #: src/help.c
 msgid "not installed"
@@ -3315,43 +3715,6 @@ msgstr ""
 "   atau tidak dapat dieksekusi.\n"
 "PS: PATH root harus selalu berisi /usr/local/sbin, /usr/sbin, dan /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "gagal memeriksa keberadaan '%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "gagal membaca direktori 'info'"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "Ada kesalahan saat membuka %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-#| msgid "unable to write file '%s'"
-msgid "corrupt info database format file '%s'"
-msgstr "gagal menulis ke berkas '%s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "berkas 'conffile' '%.250s' tidak ada dalam paket"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "Ada galat saat menulis '%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3391,27 +3754,27 @@ msgstr "Program pengelolaan paket Debian '%s' versi %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3680,114 +4043,6 @@ msgstr ""
 "atau 'more'!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "ada masalah ketergantungan - tidak dibuang"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "ada masalah ketergantungan - tidak dibuang"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3921,34 +4176,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "Pilihan force/refuse '%.*s' tak dikenal"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "pilihan force/refuse '--%s' sudah usang \n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "gagal membuka '%i' untuk stream"
 
@@ -4136,6 +4363,12 @@ msgid "Description"
 msgstr "Keterangan"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "long filenames"
+msgid "showing package list on pager"
+msgstr "nama-berkas panjang"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "Dialihkan oleh %s dari: %s\n"
@@ -4172,6 +4405,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "Paket '%s' tidak terpasang dan tidak ada info yang tersedia.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Gunakan dpkg --info (= dpkg-deb --info) untuk meneliti berkas arsip,\n"
+"dan dpkg --contents (=dpkg-deb --contents) untuk melihat isinya.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4198,9 +4441,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "Dialihkan oleh %s ke: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Gunakan dpkg --info (= dpkg-deb --info) untuk meneliti berkas arsip,\n"
 "dan dpkg --contents (=dpkg-deb --contents) untuk melihat isinya.\n"
@@ -4259,16 +4505,16 @@ msgstr "Perkakas pencarian program pengelola paket Debian %s versi %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4471,6 +4717,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "gagal memindahkan root ke '%.250s'"
@@ -4646,8 +4898,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4722,70 +4979,11 @@ msgstr "Tidak ada berkas 'override'."
 msgid "--update is useless for --remove"
 msgstr "--update tidak berguna bersama --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "status tidak sah"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "berkas 'statoverride' '%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "berkas 'statoverride' '%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "gagal membuka berkas 'statoverride'"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "Gagal menjalankan 'fstat' pada berkas 'statoverride'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "berkas 'statoverride' '%.250s'"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "berkas 'statoverride' tidak ada baris-baru penutup"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "berkas 'statoverride' berisi baris kosong"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "salah sintaks dalam berkas 'statoverride'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "syntax error: unknown user '%s' in statoverride file"
-msgid "unknown user '%s' in statoverride file"
-msgstr "galat sintaks: pengguna '%s' tidak dikenal dalam berkas 'statoverride'"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "akhir baris tak terduga dalam berkas 'statoverride'"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "syntax error: unknown group '%s' in statoverride file"
-msgid "unknown group '%s' in statoverride file"
-msgstr "salah sintaks: grup '%s' tidak dikenal dalam berkas 'statoverride'"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "banyak berkas 'statoverride' terdaftar untuk berkas '%.250s'"
+#| msgid "obsolete option '--%s', please use '--%s' instead."
+msgid "deprecated --%s option; use --%s instead"
+msgstr "pilihan '--%s' sudah usang, mohon gunakan '--%s'. "
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5043,6 +5241,12 @@ msgstr "Sedang dekonfigurasi %s, agar dapat membuang %s ... \n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Sedang dekonfigurasi %s ... \n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "berkas 'statoverride' berisi baris kosong"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 #| msgid "conffile name '%.50s...' is too long, or missing final newline"
@@ -5191,11 +5395,9 @@ msgid "package filesystem archive extraction"
 msgstr "dpkg-deb penguraian ruas isian"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "ada kesalahan saat membaca keluaran tar dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "berkas tar dari sistem berkas terkorupsi - arsip paket terkorupsi"
 
 #: src/unpack.c
@@ -5211,15 +5413,20 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s butuh tepat satu argumen berkas paket"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "gagal mengakses area status dpkg untuk pembaharuan massal paket yang tersedia"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"pembaharuan massal paket yang tersedia memerlukan akses tulis ke area status "
-"dpkg"
+"gagal mengakses area status dpkg untuk pembaharuan massal paket yang tersedia"
 
 #: src/update.c
 #, c-format
@@ -5603,16 +5810,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "gagal berpindah ke direktori"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "gagal membuat direktori"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "gagal berpindah ke direktori setelah membuatnya"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "EOF tak terduga dalam nama paket pada baris %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "gagal berpindah ke direktori"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6557,8 +6766,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -7099,15 +7309,98 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "Gagal membuka berkas pengunci %s untuk ujicoba"
+
 #, fuzzy
-#~| msgid "obsolete option '--%s', please use '--%s' instead."
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "pilihan '--%s' sudah usang, mohon gunakan '--%s'. "
+#~| msgid "syntax error: unknown user '%s' in statoverride file"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr ""
+#~ "galat sintaks: pengguna '%s' tidak dikenal dalam berkas 'statoverride'"
 
 #, fuzzy
-#~| msgid "cannot stat file '%s'"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "gagal menata status '%s'"
+#~| msgid "syntax error: unknown group '%s' in statoverride file"
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "salah sintaks: grup '%s' tidak dikenal dalam berkas 'statoverride'"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s hilang"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "'%.*s' tidak diperkenankan untuk %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "rongsokan setelah %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "nama paket (%.250s) tidak sah."
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "ya/tidak dalam ruas boolean"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "ruas '%s', yang mengacu ke '%.255s': ada galat dalam versi"
+
+#~ msgid "empty value for %s"
+#~ msgstr "nilai kosong untuk %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "paket berstatus tunggu-pemicu tetapi tidak ada pemicu yang ditunggu"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr "paket berstatus tunda-pemicu tetapi tidak ada pemicu yang tertunda"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "pembaharuan massal paket yang tersedia memerlukan akses tulis ke area "
+#~ "status dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "ada kesalahan saat membaca keluaran tar dpkg-deb"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "gagal membuka berkas daftar berkas untuk paket '%.250s'"
+
+#, fuzzy
+#~| msgid "unable to stat files list file for package '%.250s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "gagal menata status berkas daftar berkas untuk paket '%.250s'"
+
+#, fuzzy
+#~| msgid "files list file for package '%.250s' is missing final newline"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr ""
+#~ "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "ada kesalahan saat menutup berkas daftar berkas untuk paket '%.250s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "gagal membuka berkas daftar berkas untuk paket '%.250s'"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "gagal menata status berkas daftar berkas untuk paket '%.250s'"
+
+#, fuzzy
+#~| msgid "files list file for package '%.250s' is missing final newline"
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "berkas daftar berkas untuk paket '%.250s' tidak ada baris-baru penutup"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "daftar berkas untuk paket '%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "gagal berpindah ke direktori setelah membuatnya"
 
 #, fuzzy
 #~| msgid "cannot stat file '%s'"
@@ -7182,9 +7475,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "Ada EOF pada stdin di prompt 'conffile'"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "EOF tak terduga dalam nama paket pada baris %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "eof tak terduga setelah nama paket pada baris %d"
 
@@ -7430,9 +7720,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "ini adalah tiruan dari %s"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "gagal menata status %s: %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "proses readlink(%s) gagal: %s"
 
@@ -7457,9 +7744,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "gagal menutup %s: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "gagal menulis %s: %s"
-
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
diff --git a/po/it.po b/po/it.po
index d1a589673..3e4581407 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,5 +1,5 @@
 # Italian translation of dpkg
-# Copyright (C) 2000-2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+# Copyright (C) 2000-2011, 2012, 2013, 2014, 2017, 2018 Free Software Foundation, Inc.
 # This file is distributed under the same license as the dpkg package.
 # Lele Gaifax <lele@seldati.it>, 2000, 2001, 2002, 2003, 2004, 2005, 2006.
 # Stefano Canepa <sc@linux.it>, 2004, 2005.
@@ -19,23 +19,22 @@
 # Collegamento utile
 #
 # https://lists.ubuntu.com/archives/ubuntu-devel/2007-January/023212.html
-# Milo Casagrande <milo@milo.name>, 2009, 2010, 2011, 2012, 2013, 2014.
+# Milo Casagrande <milo@milo.name>, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.17.22\n"
+"Project-Id-Version: dpkg 1.19.3\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2017-07-07 01:30+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
+"PO-Revision-Date: 2018-12-04 12:15+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
-"Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Launchpad-Export-Date: 2012-07-01 14:32+0000\n"
-"X-Generator: Poedit 1.6.10\n"
+"X-Generator: Poedit 2.1.1\n"
 
 #: lib/dpkg/ar.c
 msgid "failed to fstat archive"
@@ -157,7 +156,8 @@ msgstr "errore nel rimuovere il vecchio file di backup \"%s\""
 msgid "error creating new backup file '%s'"
 msgstr "errore nel creare il nuvo file di backup \"%s\""
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "impossibile rimuovere \"%.250s\""
@@ -362,20 +362,39 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "impossibile spostarsi all'inizio di %.250s dopo il riempimento"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "impossibile aprire il file di blocco %s per la verifica"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "impossibile ottenere il descrittore del file per la directory \"%s\""
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create frontend lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "impossibile aprire/creare il file di blocco per il frontend"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
 msgstr "impossibile aprire/creare il file di blocco per il database di stato"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "permessi insufficienti per bloccare il database di stato di dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg frontend"
+msgid "dpkg frontend lock"
+msgstr "frontend dpkg"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "database di stato di dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -383,11 +402,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "l'operazione richiesta necessita dei privilegi di super-utente"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "impossibile accedere all'area di stato di dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 "l'operazione necessita dei permessi di lettura/scrittura all'area di stato "
 "di dpkg"
@@ -427,11 +450,198 @@ msgstr "impossibile chiudere lo stato aggiornato di \"%.250s\""
 msgid "unable to install updated status of '%.250s'"
 msgstr "impossibile installare lo stato aggiornato di \"%.250s\""
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "impossibile verificare l'esistenza di \"%.250s\""
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "impossibile leggere la directory info"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "errore nel cercare di aprire %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "formato file \"%s\" del database danneggiato"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"formato (%d) del database di informazioni è errato o troppo recente, provare "
+"con una versione aggiornata di dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "file d'informazioni %s/%s non associato ad alcun pacchetto"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "errore nel creare il collegamento fisico \"%.255s\""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "errore durante la scrittura di \"%s\""
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"al file di controllo \"%s\" per il pacchetto \"%s\" manca il newline finale"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "al file di controllo \"%s\" per il pacchetto \"%s\" manca il valore"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"al file di controllo \"%s\" per il pacchetto \"%s\" manca il separatore del "
+"valore"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"il file di controllo \"%s\" per il pacchetto \"%s\" contiene un nome file "
+"vuoto"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "loading control file '%s' for package '%s'"
+msgstr "caricamento file di controllo \"%s\" per il pacchetto \"%s\""
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "apertura del file con le deviazioni non riuscita"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "esecuzione di fstat sul file con le deviazioni non riuscita"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "conflitti con le deviazioni relative a \"%.250s\" o \"%.250s\""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "loading files list file for package '%s'"
+msgstr "caricamento elenco file per il pacchetto \"%s\""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"file con l'elenco dei file del pacchetto \"%.250s\" mancante, il pacchetto "
+"viene considerato senza alcun file attualmente installato"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"al file con l'elenco dei file del pacchetto \"%.250s\" manca il newline "
+"finale"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"il file con l'elenco dei file del pacchetto \"%.250s\" contiene un nome file "
+"vuoto"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Lettura del database... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d file o directory attualmente installato.)\n"
+msgstr[1] "%d file e directory attualmente installati.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "uid statoverride %s non valido"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "gid statoverride %s non valido"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "modalità statoverride %s non valida"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "apertura del file statoverride non riuscita"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "esecuzione di fstat sul file statoverride non riuscita"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "lettura file statoverride \"%.250s\""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "il file statoverride non contiene il newline finale"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "il file statoverride contiene una riga vuota"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "errore di sintassi nel file statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "EOL inatteso nel file statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "presenti molteplici statoverride per il file \"%.250s\""
+
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty major component"
 msgid "format version with too big major component"
-msgstr "versione del formato con componente major vuoto"
+msgstr "versione del formato con componente major troppo grande"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty major component"
@@ -442,10 +652,8 @@ msgid "format version has no dot"
 msgstr "versione del formato senza punto"
 
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty minor component"
 msgid "format version with too big minor component"
-msgstr "versione del formato con componente minor vuoto"
+msgstr "versione del formato con componente minor troppo grande"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty minor component"
@@ -508,26 +716,20 @@ msgid ""
 "%s%s%s: %s%s:%s\n"
 " %s\n"
 msgstr ""
+"%s%s%s: %s%s:%s\n"
+" %s\n"
 
 #: lib/dpkg/ehandle.c
 msgid "out of memory for new error context"
 msgstr "memoria esaurita per il nuovo contesto di errore"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid ""
-#| "%s: error while cleaning up:\n"
-#| " %s\n"
 msgid "error while cleaning up"
-msgstr ""
-"%s: errore durante la pulizia:\n"
-" %s\n"
+msgstr "errore durante la pulizia"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid "%s: too many nested errors during error recovery!!\n"
 msgid "too many nested errors during error recovery"
-msgstr "%s: troppi errori correlati durante la gestione dell'errore.\n"
+msgstr "troppi errori correlati durante la gestione dell'errore"
 
 #: lib/dpkg/ehandle.c
 msgid "out of memory for new cleanup entry"
@@ -538,91 +740,91 @@ msgid "out of memory for new cleanup entry with many arguments"
 msgstr "memoria esaurita per la nuova voce di cleanup con molti argomenti"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid ""
-#| "%s: unrecoverable fatal error, aborting:\n"
-#| " %s\n"
 msgid "unrecoverable fatal error, aborting"
-msgstr ""
-"%s: errore fatale non recuperabile, uscita:\n"
-" %s\n"
+msgstr "errore fatale non recuperabile, uscita"
 
 # (ndt) hmmm....
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid ""
-#| "%s: outside error context, aborting:\n"
-#| " %s\n"
 msgid "outside error context, aborting"
-msgstr ""
-"%s: contesto di errore esterno, uscita:\n"
-" %s\n"
+msgstr "contesto di errore esterno, uscita"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid "internal error (bug)"
 msgid "internal error"
-msgstr "errore interno (bug)"
+msgstr "errore interno"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
+#, fuzzy
+#| msgid "%s is missing"
+msgid "is missing a value"
 msgstr "manca %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "\"%.50s\" non è consentito per %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Salta riga non valida: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "%s è seguito da cose inutili"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "nome del pacchetto non valido (%.250s)"
+#, fuzzy, c-format
+#| msgid "package name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "il nome del pacchetto \"%s\" non è valido: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
-msgstr "il campo dei dettagli \"%s\" del file è vuoto"
+#, fuzzy, c-format
+#| msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
+msgstr "il campo dei dettagli \"%s\" dell'archivio è vuoto"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "archive details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr ""
-"il campo dei dettagli \"%s\" del file non è consentito nel file di stato"
+"il campo dei dettagli \"%s\" dell'archivio non è consentito nel file di stato"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in archive details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
-"troppi valori nel campo dei dettagli \"%s\" del file (rispetto agli altri)"
+"troppi valori nel campo dei dettagli \"%s\" dell'archivio (rispetto agli "
+"altri)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in archive details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
-"troppo pochi valori nel campo dei dettagli \"%s\" del file (rispetto agli "
-"altri)"
+"troppo pochi valori nel campo dei dettagli \"%s\" dell'archivio (rispetto "
+"agli altri)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no in un campo booleano"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "usati i campi obsoleti \"%s\" o \"%s\""
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "foreign/allowed/same/no nel campo quadstate"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "\"%s\" non è un nome di architettura valido: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "parola nel campo \"Priority\""
 
 #: lib/dpkg/fields.c
@@ -631,25 +833,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "valore per il campo \"%s\" non consentito in questo contesto"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "la prima parola (want) nel campo \"Status\""
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "la seconda parola (error) nel campo \"Status\""
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "la terza parola (status) nel campo \"Status\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "errore nel campo stringa \"%s\" \"%.250s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "usati i campi obsoleti \"%s\" o \"%s\""
 
 #: lib/dpkg/fields.c
@@ -658,14 +868,17 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "il valore per \"%s\" contiene una riga con un formato errato \"%.*s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "il valore per \"%s\" contiene una riga che inizia con un carattere \"%c\" "
 "diverso da spazio"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "la directory root oppure un nome nullo è indicato come un \"conffile\""
 
 #: lib/dpkg/fields.c
@@ -751,9 +964,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "campo \"%s\", riferimento a \"%.255s\": versione non terminata"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "campo \"%s\", riferimento a \"%.255s\": errore nella versione"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "campo \"%s\", riferimento a \"%.255s\": la versione contiene \"%c\""
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -762,8 +976,9 @@ msgstr ""
 "campo \"%s\", errore di sintassi dopo il riferimento al pacchetto \"%.255s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternative (\"|\") non consentite nel campo %s"
 
 #: lib/dpkg/fields.c
@@ -803,6 +1018,26 @@ msgstr "impossibile impostare la modalità del file \"%.250s\""
 
 #: lib/dpkg/file.c
 #, c-format
+msgid "cannot stat %s"
+msgstr "impossibile eseguire stat su %s"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "%s is not a regular file"
+msgstr "%s non è un file regolare"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot read %s"
+msgstr "impossibile leggere %s"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot open %s"
+msgstr "impossibile aprire %s"
+
+#: lib/dpkg/file.c
+#, c-format
 msgid "unable to unlock %s"
 msgstr "impossibile sbloccare %s"
 
@@ -822,8 +1057,18 @@ msgid "unable to lock %s"
 msgstr "impossibile bloccare %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "viene mostrato il file sul pager"
+#, c-format
+msgid "cannot open file %s"
+msgstr "Impossibile aprire il file %s"
+
+#: lib/dpkg/file.c
+msgid "pager to show file"
+msgstr "pager per mostrare file"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot write file %s into the pager"
+msgstr "impossibile scrivere il file %s nel pager"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -845,13 +1090,13 @@ msgstr "allocazione della memoria non riuscita"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "esecuzione di dup per std%s non riuscita"
+msgid "failed to dup for fd %d"
+msgstr "esecuzione di dup per fd %d non riuscita"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "esecuzione di dup per fd %d non riuscita"
+msgid "failed to dup for std%s"
+msgstr "esecuzione di dup per std%s non riuscita"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -960,16 +1205,14 @@ msgid "invalid integer for --%s: '%.250s'"
 msgstr "numero intero per --%s non valido: \"%.250s\""
 
 #: lib/dpkg/options.c
-#, fuzzy, c-format
-#| msgid "invalid integer for --%s: '%.250s'"
+#, c-format
 msgid "invalid integer for -%c: '%.250s'"
-msgstr "numero intero per --%s non valido: \"%.250s\""
+msgstr "numero intero per -%c non valido: \"%.250s\""
 
 #: lib/dpkg/options.c
-#, fuzzy, c-format
-#| msgid "obsolete option '--%s'\n"
+#, c-format
 msgid "obsolete option '--%s'"
-msgstr "opzione \"--%s\" obsoleta\n"
+msgstr "opzione \"--%s\" obsoleta"
 
 #: lib/dpkg/options.c
 #, c-format
@@ -992,27 +1235,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "valore duplicato per il campo definito dall'utente \"%.*s\""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "%s mancante"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "valore vuoto per %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "valore duplicato per il campo \"%s\""
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "il pacchetto ha il campo \"%s\", ma l'architettura non è presente"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "il pacchetto ha il campo \"%s\", ma l'architettura è \"all\""
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Status inappropriato come valore di Config-Version del pacchetto"
 
 #: lib/dpkg/parse.c
@@ -1021,8 +1270,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "lo stato del pacchetto è %s, ma sono attesi dei trigger"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "lo stato del pacchetto è triggers-awaited, ma nessun trigger atteso"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "lo stato del pacchetto è %s, ma sono attesi dei trigger"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1030,11 +1281,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "lo stato del pacchetto è %s, ma dei trigger sono imminenti"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "lo stato del pacchetto è triggers-pending, ma nessun trigger imminente"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "lo stato del pacchetto è %s, ma dei trigger sono imminenti"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "Il pacchetto non installato ha dei file di configurazione, ignorati"
 
 #: lib/dpkg/parse.c
@@ -1054,10 +1309,13 @@ msgstr ""
 "molto probabilmente a causa di un aggiornamento da un dpkg non ufficiale"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Multi-Arch: %s) non è co-installabile con %s che ha molteplici "
 "istanze installate"
@@ -1099,10 +1357,9 @@ msgid "field name '%.*s' cannot start with hyphen"
 msgstr "il campo nome \"%.*s\" non può iniziare con un trattino"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "EOF after field name `%.*s'"
+#, c-format
 msgid "end of file after field name '%.*s'"
-msgstr "EOF dopo il nome del campo \"%.*s\""
+msgstr "fine del file dopo il nome del campo \"%.*s\""
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1110,10 +1367,9 @@ msgid "newline in field name '%.*s'"
 msgstr "newline nel nome del campo \"%.*s\""
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "MSDOS EOF (^Z) in field name `%.*s'"
+#, c-format
 msgid "MSDOS end of file (^Z) in field name '%.*s'"
-msgstr "EOF MSDOS (^Z) nel nome del campo \"%.*s\""
+msgstr "fine file MSDOS (^Z) nel nome del campo \"%.*s\""
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1121,16 +1377,16 @@ msgid "field name '%.*s' must be followed by colon"
 msgstr "il nome del campo \"%.*s\" deve essere seguito dai due punti"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "EOF before value of field `%.*s' (missing final newline)"
+#, c-format
 msgid "end of file before value of field '%.*s' (missing final newline)"
-msgstr "EOF prima del valore per il campo \"%.*s\" (newline finale mancante)"
+msgstr ""
+"fine del file prima del valore per il campo \"%.*s\" (newline finale "
+"mancante)"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
+#, c-format
 msgid "MSDOS end of file (^Z) in value of field '%.*s' (missing newline?)"
-msgstr "EOF MSDOS nel valore del campo \"%.*s\" (newline mancante?)"
+msgstr "fine file MSDOS nel valore del campo \"%.*s\" (newline mancante?)"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1138,10 +1394,9 @@ msgid "blank line in value of field '%.*s'"
 msgstr "riga vuota nel valore del campo \"%.*s\""
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "EOF during value of field `%.*s' (missing final newline)"
+#, c-format
 msgid "end of file during value of field '%.*s' (missing final newline)"
-msgstr "EOF nel valore del campo \"%.*s\" (newline finale mancante)"
+msgstr "fine del file nel valore del campo \"%.*s\" (newline finale mancante)"
 
 # (ndt) sembra essere il nome del file
 #: lib/dpkg/parse.c
@@ -1195,10 +1450,8 @@ msgid "version string has embedded spaces"
 msgstr "la stringa di versione presenta degli spazi"
 
 #: lib/dpkg/parsehelp.c
-#, fuzzy
-#| msgid "epoch in version is negative"
 msgid "epoch in version is empty"
-msgstr "il valore epoch nella versione è negativo"
+msgstr "il valore epoch nella versione è vuoto"
 
 #: lib/dpkg/parsehelp.c
 msgid "epoch in version is not number"
@@ -1217,16 +1470,12 @@ msgid "nothing after colon in version number"
 msgstr "non è presente nulla dopo i due punti nel numero di versione"
 
 #: lib/dpkg/parsehelp.c
-#, fuzzy
-#| msgid "version string is empty"
 msgid "revision number is empty"
-msgstr "la stringa di versione è vuota"
+msgstr "il numero di revisione è vuoto"
 
 #: lib/dpkg/parsehelp.c
-#, fuzzy
-#| msgid "version string is empty"
 msgid "version number is empty"
-msgstr "la stringa di versione è vuota"
+msgstr "il numero di versione è vuoto"
 
 #: lib/dpkg/parsehelp.c
 msgid "version number does not start with digit"
@@ -1249,11 +1498,6 @@ msgstr "impossibile rimuovere in sicurezza \"%.255s\""
 msgid "rm command for cleanup"
 msgstr "comando rm per la pulizia"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "nome del pacchetto \"%s\" ambiguo con più di una istanza installata"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1267,13 +1511,22 @@ msgstr "larghezza del campo oltre l'intervallo"
 msgid "missing closing brace"
 msgstr "parentesi di chiusura mancante"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "nome del pacchetto \"%s\" ambiguo con più di una istanza installata"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(nessuna descrizione disponibile)"
 
 #: lib/dpkg/pkg-show.c
-#, fuzzy, c-format
-#| msgid "version '%s' has bad syntax: %s"
+#, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "sintassi della versione \"%s\" errata: %s"
 
@@ -1323,20 +1576,17 @@ msgid "fork failed"
 msgstr "fork non riuscita"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s returned error exit status %d"
+#, c-format
 msgid "%s subprocess returned error exit status %d"
 msgstr "il sottoprocesso %s ha restituito lo stato di errore %d"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was interrupted"
+#, c-format
 msgid "%s subprocess was interrupted"
-msgstr "sottoprocesso %s interrotto"
+msgstr "il sottoprocesso %s è stato interrotto"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was killed by signal (%s)%s"
+#, c-format
 msgid "%s subprocess was killed by signal (%s)%s"
 msgstr "il sottoprocesso %s è stato terminato dal segnale (%s)%s"
 
@@ -1348,42 +1598,104 @@ msgstr ", eseguito un core dump"
 # (ndt) usare fallito o non riuscito in questo caso non mi
 # convince del tutto...
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s failed with wait status code %d"
+#, c-format
 msgid "%s subprocess failed with wait status code %d"
 msgstr "il sottoprocesso %s è terminato con un codice di wait %d"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "wait for subprocess %s failed"
+#, c-format
 msgid "wait for %s subprocess failed"
 msgstr "wait del sottoprocesso %s non riuscita"
 
-#: lib/dpkg/treewalk.c
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "carattere \"%c\" non valido nella larghezza del campo"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "carattere \"%c\" non valido nella larghezza del campo"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "uid statoverride %s non valido"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "gid statoverride %s non valido"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "carattere \"%c\" non valido nella larghezza del campo"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
 #, fuzzy, c-format
-#| msgid "cannot stat file '%s'"
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "opzioni non supportate nell'header del file"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "tipo di compressione \"%s\" sconosciuto"
+
+#: lib/dpkg/treewalk.c
+#, c-format
 msgid "cannot stat pathname '%s'"
-msgstr "impossibile eseguire stat sul file \"%s\""
+msgstr "impossibile eseguire stat del percorso \"%s\""
 
 #: lib/dpkg/treewalk.c
-#, fuzzy, c-format
-#| msgid "cannot scan directory '%.255s'"
+#, c-format
 msgid "cannot open directory '%s'"
-msgstr "impossibile analizzare la directory \"%.255s\""
+msgstr "impossibile aprire la directory \"%s\""
 
 #: lib/dpkg/treewalk.c
-#, fuzzy, c-format
-#| msgid "control directory is not a directory"
+#, c-format
 msgid "treewalk root %s is not a directory"
-msgstr "la directory di controllo non è una directory"
+msgstr "la directory di partenza %s non è una directory"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "impossibile aprire/creare il file di blocco dei trigger \"%.250s\""
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "area dei trigger"
 
 #: lib/dpkg/trigdeferred.c
@@ -1403,13 +1715,12 @@ msgstr ""
 "impossibile aprire/creare il nuovo file dei trigger rinviati \"%.250s\""
 
 #: lib/dpkg/trigdeferred.c
-#, fuzzy, c-format
-#| msgid "syntax error in triggers deferred file '%.250s' at character '%s'%s"
+#, c-format
 msgid ""
 "syntax error in triggers deferred file '%.250s' at line %d character %zd '%s'"
 msgstr ""
-"errore di sintassi nel file dei trigger rinviati \"%.250s\" al carattere \"%s"
-"\"%s"
+"errore di sintassi nel file dei trigger rinviati \"%.250s\" alla riga %d "
+"carattere %zd \"%s\""
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
@@ -1556,10 +1867,9 @@ msgid "too-long line or missing newline in '%.250s'"
 msgstr "riga troppo lunga o newline mancante in \"%.250s\""
 
 #: lib/dpkg/utils.c
-#, fuzzy, c-format
-#| msgid "unexpected end of file in %.250s"
+#, c-format
 msgid "unexpected end of file reading '%.250s'"
-msgstr "fine del file inattesa in %.250s"
+msgstr "fine del file inattesa leggendo \"%.250s\""
 
 #: lib/dpkg/varbuf.c
 msgid "error formatting string into varbuf variable"
@@ -1615,11 +1925,6 @@ msgstr "errore nel creare la pipe \"%.255s\""
 msgid "error creating device '%.255s'"
 msgstr "errore nel creare il device \"%.255s\""
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "errore nel creare il collegamento fisico \"%.255s\""
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1683,10 +1988,9 @@ msgstr ""
 "\"%.250s\" per \"%.250s\" non riuscita"
 
 #: src/archives.c
-#, fuzzy, c-format
-#| msgid "cannot open archive part file '%.250s'"
+#, c-format
 msgid "newline not allowed in archive object name '%.255s'"
-msgstr "impossibile aprire la porzione di archivio \"%.250s\""
+msgstr "newline non consentito nel nome dell'oggetto dell'archivio \"%.250s\""
 
 #: src/archives.c
 #, c-format
@@ -1944,21 +2248,19 @@ msgid "--%s needs at least one package archive file argument"
 msgstr "--%s richiede almeno un archivio di pacchetto come argomento"
 
 #: src/archives.c src/unpack.c
-#, fuzzy, c-format
-#| msgid "cannot access archive"
+#, c-format
 msgid "cannot access archive '%s'"
-msgstr "impossibile accedere all'archivio"
+msgstr "impossibile accedere all'archivio \"%s\""
 
 #: src/archives.c
-#, fuzzy, c-format
-#| msgid "conffile '%s' is not a plain file"
+#, c-format
 msgid "archive '%s' is not a regular file"
-msgstr "il file di configurazione \"%s\" non è un file normale"
+msgstr "l'archivio \"%s\" non è un file normale"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<standard output>"
 
@@ -2141,16 +2443,18 @@ msgid "read error on stdin at conffile prompt"
 msgstr "errore di lettura da stdin al prompt per il file di configurazione"
 
 #: src/configure.c
-#, fuzzy
-#| msgid "read error on stdin at conffile prompt"
 msgid "end of file on stdin at conffile prompt"
-msgstr "errore di lettura da stdin al prompt per il file di configurazione"
+msgstr "fine file da stdin al prompt per il file di configurazione"
 
 #: src/configure.c
 msgid "conffile difference visualizer"
 msgstr "visualizzatore differenze file di configurazione"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr "Variabili d'ambiente utili:\n"
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Digitare \"exit\" una volta terminato.\n"
 
@@ -2280,7 +2584,7 @@ msgid ""
 "%s: dependency problems, but configuring anyway as you requested:\n"
 "%s"
 msgstr ""
-"%s: problemi con le dipendenze, ma viene configurato ugualmente:\n"
+"%s: problemi con le dipendenze, ma viene configurato comunque:\n"
 "%s"
 
 #: src/configure.c
@@ -2392,7 +2696,7 @@ msgstr "  %.250s sta per essere rimosso.\n"
 #: src/depcon.c
 #, c-format
 msgid "  %.250s is to be deconfigured.\n"
-msgstr "  %.250s sta per essere deconfigurato.\n"
+msgstr "  %.250s sta per essere de-configurato.\n"
 
 #: src/depcon.c
 #, c-format
@@ -2432,7 +2736,7 @@ msgstr "  %.250s fornisce %.250s, ma sta per essere rimosso.\n"
 #: src/depcon.c
 #, c-format
 msgid "  %.250s provides %.250s but is to be deconfigured.\n"
-msgstr "  %.250s fornisce %.250s, ma sta per essere deconfigurato.\n"
+msgstr "  %.250s fornisce %.250s, ma sta per essere de-configurato.\n"
 
 #: src/depcon.c
 #, c-format
@@ -2523,7 +2827,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2537,11 +2844,15 @@ msgstr ""
 "diversificate\n"
 "  --divert <deviato-a>     Il nome usato dalle altre versioni dei pacchetti\n"
 "  --rename                 Sposta il file\n"
+"  --no-rename              Non sposta il file (predefinito)\n"
 "  --admindir <directory>   Imposta la directory con il file delle "
 "deviazioni\n"
+"  --instdir <directory>    Imposta la directory di root, ma non quella di "
+"admin\n"
+"  --root <directory>       Imposta la directory del file system di root\n"
 "  --test                   Non fa nulla, sola dimostrazione\n"
-"  --quiet                  Operazione silenziosa, output minimo\n"
-"  --help                   Mostra questo messaggio d'aiuto\n"
+"  --quiet                  Modalità silenziosa, output minimo\n"
+"  --help                   Mostra questo messaggio di aiuto\n"
 "  --version                Mostra la versione\n"
 "\n"
 
@@ -2560,6 +2871,14 @@ msgstr ""
 "Gli script preinst/postrm dovrebbero sempre specificare --package e --"
 "divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+"specificare --no-rename esplicitamente, il comportamento predefinito "
+"cambierà in --rename dalla versione 1.20.x"
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2682,6 +3001,15 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+"deviare il file \"%s\" da un pacchetto Essential e rinominarlo è pericoloso, "
+"usare --no-rename"
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Nessuna deviazione \"%s\", nessuna rimossa.\n"
 
@@ -2726,19 +3054,6 @@ msgstr "pacchetto non può contenere newline"
 msgid "divert-to may not contain newlines"
 msgstr "divert-to non può contenere newline"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "apertura del file con le deviazioni non riuscita"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "esecuzione di fstat sul file con le deviazioni non riuscita"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "conflitti con le deviazioni relative a \"%.250s\" o \"%.250s\""
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2934,52 +3249,44 @@ msgstr ""
 "impossibile soddisfare le pre-dipendenze per %.250s (richiesto da %.250s)"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one package name argument"
+#, c-format
 msgid "--%s takes one <pkgname> argument"
-msgstr "--%s accetta il nome di un pacchetto come argomento"
+msgstr "--%s accetta un argomento <nomepacchetto>"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "package '%s' is not installed"
+#, c-format
 msgid "package name '%s' is invalid: %s"
-msgstr "il pacchetto \"%s\" non è installato"
+msgstr "il nome del pacchetto \"%s\" non è valido: %s"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one package name argument"
+#, c-format
 msgid "--%s takes one <trigname> argument"
-msgstr "--%s accetta il nome di un pacchetto come argomento"
+msgstr "--%s accetta un argomento <nometrig>"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "trigger name contains invalid character"
+#, c-format
 msgid "trigger name '%s' is invalid: %s"
-msgstr "il nome del trigger contiene caratteri non validi"
+msgstr "il nome del trigger \"%s\" non è valido: %s"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one package name argument"
+#, c-format
 msgid "--%s takes one <archname> argument"
-msgstr "--%s accetta il nome di un pacchetto come argomento"
+msgstr "--%s accetta un argomento <nomearch>"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "architecture '%s' is illegal: %s"
+#, c-format
 msgid "architecture name '%s' is invalid: %s"
-msgstr "l'architettura \"%s\" non è consentita: %s"
+msgstr "il nome dell'architettura \"%s\" non è valido: %s"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes no arguments"
+#, c-format
 msgid "--%s takes one <version> argument"
-msgstr "--%s non accetta alcun argomento"
+msgstr "--%s accetta un argomento <versione>"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "version '%s' has bad syntax: %s"
+#, c-format
 msgid "version '%s' has bad syntax"
-msgstr "sintassi della versione \"%s\" errata: %s"
+msgstr "sintassi della versione \"%s\" errata"
 
 #: src/enquiry.c
 msgid ""
@@ -2994,7 +3301,7 @@ msgstr "--compare-versions operatore errato"
 #: src/enquiry.c
 #, c-format
 msgid "--%s used with obsolete relation operator '%s'"
-msgstr ""
+msgstr "--%s utilizzato con l'operatore di relazione obsoleto \"%s\""
 
 #: src/errors.c
 #, c-format
@@ -3047,134 +3354,177 @@ msgstr ""
 "Il pacchetto %s è bloccato, non viene considerato. Usare --force-hold per "
 "sovrascrivere.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "viene ignorato il problema poiché è usata l'opzione --force:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Imposta tutte le opzioni di forzatura"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"al file di controllo \"%s\" per il pacchetto \"%s\" manca il newline finale"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr ""
-"al file di controllo \"%s\" per il pacchetto \"%s\" manca il newline finale"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Sostituisce un pacchetto con una versione precedente"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr ""
-"al file di controllo \"%s\" per il pacchetto \"%s\" manca il newline finale"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configura qualsiasi pacchetto che potrebbe essere di aiuto a questo"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr ""
-"il file di controllo \"%s\" per il pacchetto \"%s\" contiene un nome file "
-"vuoto"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Elabora i pacchetti occasionali anche se sono trattenuti"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "impossibile aprire il file di controllo \"%s\" per il pacchetto \"%s\""
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Tenta di installare/rimuovere i pacchetti anche se non è root"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr ""
-"impossibile eseguire stat sul file di controllo \"%s\" per il pacchetto \"%s"
-"\""
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH non contiene programmi necessari"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "il file \"%s\" per il pacchetto \"%s\" non è un file regolare"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Installa un pacchetto anche se il controllo di autenticità non riesce"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr ""
-"impossibile leggere il file di controllo \"%s\" per il pacchetto \"%s\""
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Elabora anche i pacchetti con versioni errate"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"impossibile chiudere il file di controllo \"%s\" per il pacchetto \"%s\""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
-"impossibile aprire il file con l'elenco dei file del pacchetto \"%.250s\""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Sovrascrive un file da un pacchetto con un altro"
+
+# (ndt) non è un granché...
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Sovrascrive un file che diverge con uno che non diverge"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Sovrascrive la directory di un pacchetto con quella di un altro file"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Non esegue operazioni sicure di I/O quando estrae un pacchetto"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr "Non esegue chroot nell'ambiente dello script del responsabile"
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Usa sempre i nuovi file di configurazione, non chiede nulla"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Usa sempre i vecchi file di configurazione, non chiede nulla"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"file con l'elenco dei file del pacchetto \"%.250s\" mancante, il pacchetto "
-"viene considerato senza alcun file attualmente installato"
+"Usa l'opzione predefinita per i nuovi file di\n"
+"configurazione se ne è disponibile una, senza chiedere\n"
+"nulla. Se non può essere trovato alcun valore\n"
+"predefinito, viene chiesto a meno che non sia usata\n"
+"una delle opzioni confold o confnew."
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr ""
-"impossibile eseguire stat sul file con l'elenco dei file del pacchetto "
-"\"%.250s\""
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Installa sempre i file di configurazione mancanti"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
+# (ndt) non molto chiara
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
-"il file con l'elenco dei file del pacchetto \"%.250s\" non è un file regolare"
+"Chiede di sostituire i file di configurazione con nessuna nuova versione"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "elenco dei file per il pacchetto \"%.250s\""
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Elabora anche i pacchetti con architettura errata o senza architettura"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Installa comunque anche se danneggia un altro pacchetto"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Consente l'installazione di pacchetti in conflitto"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Rende avvisi tutti i problemi di dipendenze"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Rende avvisti tutti i problemi di versione di dipendenze"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Rimuove i pacchetti che richiedono installazione"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Rimuove un pacchetto essenziale"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"al file con l'elenco dei file del pacchetto \"%.250s\" manca un newline "
-"finale"
+"Opzioni di forzatura di %s - Comportamento in caso di problemi:\n"
+"  Avvisa ma continua:  --force-<elemento>,<elemento>,...\n"
+"  Ferma con un errore: --refuse-<elemento>,<elemento>,... | --no-force-"
+"<elemento>,...\n"
+" Elementi di forzatura:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"il file con l'elenco dei file del pacchetto \"%.250s\" contiene un nome file "
-"vuoto"
+"\n"
+"Attenzione: l'uso di opzioni indicate con [!] può danneggiare seriamente\n"
+"l'installazione. Le opzioni di forzatura indicate con [*] sono abilitate in\n"
+"modo predefinito.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
-"errore nel chiudere il file con l'elenco dei file del pacchetto \"%.250s\""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Lettura del database... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "opzione force/refuse \"%.*s\" sconosciuta"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d file o directory attualmente installato.)\n"
-msgstr[1] "%d file e directory attualmente installati.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "opzione force/refuse \"%s\" obsoleta"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "viene ignorato il problema poiché è usata l'opzione --force:"
 
 #: src/help.c
 msgid "not installed"
@@ -3245,42 +3595,6 @@ msgstr ""
 "Nota: la variabile PATH di root dovrebbe contenere /usr/local/sbin, /usr/"
 "sbin e /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "impossibile verificare l'esistenza di \"%.250s\""
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "impossibile leggere la directory info"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "errore nel cercare di aprire %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "formato file \"%s\" del database danneggiato"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"formato (%d) del database di informazioni è errato o troppo recente, provare "
-"con una versione aggiornata di dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "file d'informazioni %s/%s non associato ad alcun pacchetto"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "errore durante la scrittura di \"%s\""
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3314,39 +3628,45 @@ msgstr "Debian \"%s\", programma di gestione dei pacchetti versione %s.\n"
 #| "  -l|--list [<pattern> ...]        List packages concisely.\n"
 #| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
 #| "  -C|--audit [<package> ...]       Check for broken package(s).\n"
+#| "  --yet-to-unpack                  Print packages selected for "
+#| "installation.\n"
+#| "  --predep-package                 Print pre-dependencies to unpack.\n"
 #| "  --add-architecture <arch>        Add <arch> to the list of "
 #| "architectures.\n"
 #| "  --remove-architecture <arch>     Remove <arch> from the list of "
 #| "architectures.\n"
 #| "  --print-architecture             Print dpkg architecture.\n"
 #| "  --print-foreign-architectures    Print allowed foreign architectures.\n"
+#| "  --assert-<feature>               Assert support for the specified "
+#| "feature.\n"
+#| "  --validate-<thing> <string>      Validate a <thing>'s <string>.\n"
 #| "  --compare-versions <a> <op> <b>  Compare version numbers - see below.\n"
 #| "  --force-help                     Show help on forcing.\n"
 #| "  -Dh|--debug=help                 Show help on debugging.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3394,6 +3714,10 @@ msgstr ""
 "  -S|--search <modello> ...          Trova i pacchetti contenenti i file\n"
 "  -C|--audit [<pacchetto> ...]       Verifica la presenza di pacchetti\n"
 "                                     difettosi\n"
+"  --yet-to-unpack                    Stampa i pacchetti selezionati per "
+"essere\n"
+"                                     installati\n"
+"  --predep-package                   Stampa le pre-dipendenze da installare\n"
 "  --add-architecture <arch>          Aggiunge <arch> all'elenco delle\n"
 "                                     architetture\n"
 "  --remove-architecture <arch>       Rimuove <arch> dall'elenco delle\n"
@@ -3401,6 +3725,9 @@ msgstr ""
 "  --print-architecture               Mostra l'architettura di dpkg\n"
 "  --print-foreign-architectures      Stampa le architetture \"foreign\"\n"
 "                                     consentite\n"
+"  --assert-<funzionalità>            Verifica la disponibilità della\n"
+"                                     funzionalità specificata\n"
+"  --validate-<elemento> <stringa>    Valida la <stringa> di <elemento>\n"
 "  --compare-versions <a> <op> <b>    Confronta numeri di versione - "
 "consultare\n"
 "                                     sotto\n"
@@ -3421,22 +3748,15 @@ msgstr ""
 "\n"
 
 #: src/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
-#| "  --assert-working-epoch | --assert-long-filenames | --assert-multi-"
-#| "conrep |\n"
-#| "  --assert-multi-arch | --assert-versioned-provides.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Assertable features: support-predepends, working-epoch, long-filenames,\n"
 "  multi-conrep, multi-arch, versioned-provides.\n"
 "\n"
 msgstr ""
-"Per uso interno: dpkg --assert-support-predepends | --predep-package |\n"
-"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep "
-"|\n"
-"  --assert-multi-arch | --assert-versioned-provides.\n"
+"Funzionalità verificabili: support-predepends, working-epoch, long-"
+"filenames,\n"
+"  multi-conrep, multi-arch, versioned-provides.\n"
 "\n"
 
 #: src/main.c
@@ -3445,14 +3765,11 @@ msgid ""
 "Validatable things: pkgname, archname, trigname, version.\n"
 "\n"
 msgstr ""
+"Elementi che possono essere validati: pkgname, archname, trigname, version.\n"
+"\n"
 
 #: src/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
-#| " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --"
-#| "help).\n"
-#| "\n"
+#, c-format
 msgid ""
 "Use dpkg with -b, --build, -c, --contents, -e, --control, -I, --info,\n"
 "  -f, --field, -x, --extract, -X, --vextract, --ctrl-tarfile, --fsys-"
@@ -3460,9 +3777,10 @@ msgid ""
 "on archives (type %s --help).\n"
 "\n"
 msgstr ""
-"Usare dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
-" -x|--extract|-X|--vextract|--fsys-tarfile sugli archivi (digitare %s --"
-"help).\n"
+"Usare dpkg con -b, --build, -c, --contents, -e, --control, -I, --info,\n"
+"  -f, --field, -x, --extract, -X, --vextract, --ctrl-tarfile, --fsys-"
+"tarfile\n"
+"sugli archivi (digitare %s --help).\n"
 "\n"
 
 #: src/main.c
@@ -3592,118 +3910,6 @@ msgstr ""
 "\"less\" o \"more\"."
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Imposta tutte le opzioni di forzatura"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Sostituisce un pacchetto con una versione precedente"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Configura qualsiasi pacchetto che potrebbe essere di aiuto a questo"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Elabora i pacchetti occasionali anche se sono trattenuti"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Tenta di installare/rimuovere i pacchetti anche se non è root"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "PATH non contiene programmi necessari"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Installa un pacchetto anche se il controllo di autenticità non riesce"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Elabora anche i pacchetti con versioni errate"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Sovrascrive un file da un pacchetto con un altro"
-
-# (ndt) non è un granché...
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Sovrascrive un file che diverge con uno che non diverge"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Sovrascrive la directory di un pacchetto con quella di un altro file"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Non esegue operazioni sicure di I/O quando estrae un pacchetto"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Usa sempre i nuovi file di configurazione, non chiede nulla"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Usa sempre i vecchi file di configurazione, non chiede nulla"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Usa l'opzione predefinita per i nuovi file di\n"
-"configurazione se ne è disponibile una, senza chiedere\n"
-"nulla. Se non può essere trovato alcun valore\n"
-"predefinito, viene chiesto a meno che non sia usata\n"
-"una delle opzioni confold o confnew."
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Installa sempre i file di configurazione mancanti"
-
-# (ndt) non molto chiara
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-"Chiede di sostituire i file di configurazione con nessuna nuova versione"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Elabora anche i pacchetti con architettura errata o senza architettura"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Installa comunque anche se danneggia un altro pacchetto"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Consente l'installazione di pacchetti in conflitto"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Rende avvisi tutti i problemi di dipendenze"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Rende avvisti tutti i problemi di versione di dipendenze"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Rimuove i pacchetti che richiedono installazione"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Rimuove un pacchetto essenziale"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Informazioni generali di avanzamento"
 
@@ -3837,51 +4043,13 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"Opzioni di forzatura di %s - Comportamento in caso di problemi:\n"
-"  Avvisa ma continua:  --force-<elemento>,<elemento>,...\n"
-"  Ferma con un errore: --refuse-<elemento>,<elemento>,... | --no-force-"
-"<elemento>,...\n"
-" Elementi di forzatura:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"Attenzione: l'uso di opzioni indicate con [!] può danneggiare seriamente\n"
-"l'installazione. Le opzioni di forzatura indicate con [*] sono abilitate in\n"
-"modo predefinito.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "opzione force/refuse \"%.*s\" sconosciuta"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "opzione force/refuse \"%s\" obsoleta\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "impossibile aprire \"%i\" per ricevere il flusso"
 
 #: src/main.c
-#, fuzzy, c-format
-#| msgid "unexpected eof before end of line %d"
+#, c-format
 msgid "unexpected end of file before end of line %d"
-msgstr "eof non attesa prima della fine della riga %d"
+msgstr "fine file inattesa prima della fine della riga %d"
 
 #: src/main.c src/querycmd.c src/statcmd.c dpkg-deb/main.c dpkg-split/main.c
 msgid "need an action option"
@@ -3889,7 +4057,7 @@ msgstr "necessaria un'opzione che indichi un'azione"
 
 #: src/main.c
 msgid "cannot set primary group ID to root"
-msgstr ""
+msgstr "impossibile impostare l'ID del gruppo primario a root"
 
 #: src/main.c src/script.c
 msgid "unable to setenv for subprocesses"
@@ -4059,6 +4227,10 @@ msgid "Description"
 msgstr "Descrizione"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr "viene mostrato l'elenco pacchetti sul pager"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "deviazione di %s da: %s\n"
@@ -4094,6 +4266,12 @@ msgstr ""
 "il pacchetto \"%s\" non è installato e non è disponibile alcuna informazione"
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Usare \"dpkg --info\" (= \"dpkg-deb --info\") per esaminare gli archivi.\n"
+"\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "il pacchetto \"%s\" non è disponibile"
@@ -4120,11 +4298,10 @@ msgstr "diverge da %s in: %s\n"
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
-"Usare \"dpkg --info\" (= \"dpkg-deb --info\") per esaminare gli archivi e\n"
-"\"dpkg --contents\" (= \"dpkg-deb --contents\") per elencarne il contenuto.\n"
+"Usare \"dpkg --contents\" (= \"dpkg-deb --contents\") per elencare il "
+"contenuto degli archivi.\n"
 
 #: src/querycmd.c dpkg-deb/info.c
 #, c-format
@@ -4167,37 +4344,38 @@ msgstr ""
 #, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
 "Comandi:\n"
-"  -s|--status <pacchetto> ...      Visualizza dettagli sullo stato del "
+"  -s, --status [<pacchetto>...]      Visualizza dettagli sullo stato del "
 "pacchetto\n"
-"  -p|--print-avail <pacchetto> ... Visualizza dettagli sulla versione\n"
-"  -L|--listfiles <pacchetto> ...   Elenca i file del pacchetto\n"
-"  -l|--list [<modello> ...]        Elenca brevemente i pacchetti\n"
-"  -W|--show <modello> ...          Mostra informazioni sui pacchetti\n"
-"  -S|--search <modello> ...        Trova i pacchetti a cui appartengono i "
+"  -p, --print-avail [<pacchetto>...] Visualizza dettagli sulla versione\n"
+"  -L, --listfiles [<pacchetto>...]   Elenca i file del pacchetto\n"
+"  -l, --list [<modello>...]          Elenca brevemente i pacchetti\n"
+"  -W, --show [<modello>...]          Mostra informazioni sui pacchetti\n"
+"  -S, --search <modello>...          Trova i pacchetti a cui appartengono i "
 "file\n"
-"     --control-list <pacchetto>    Stampa l'elenco del file di controllo "
+"      --control-list <pacchetto>     Stampa l'elenco del file di controllo "
 "del\n"
-"                                   pacchetto\n"
-"     --control-show <pacchetto> <file>\n"
-"                                   Mostra il file di controllo del "
+"                                     pacchetto\n"
+"      --control-show <pacchetto> <file>\n"
+"                                     Mostra il file di controllo del "
 "pacchetto\n"
-"  -c|--control-path <pachetto> [<file>]\n"
-"                                   Stampa il percorso del file di controllo\n"
-"                                   del pacchetto\n"
+"  -c, --control-path <pachetto> [<file>]\n"
+"                                     Stampa il percorso del file di "
+"controllo\n"
+"                                     del pacchetto\n"
 "\n"
 
 #: src/querycmd.c
@@ -4346,8 +4524,7 @@ msgstr ""
 "\"%.250s\")"
 
 #: src/remove.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+#, c-format
 msgid "cannot read config file directory '%.250s' (from '%.250s')"
 msgstr ""
 "impossibile leggere la directory del file di configurazione \"%.250s\" (da "
@@ -4380,6 +4557,14 @@ msgstr ""
 "correttamente"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+"privilegi non sufficienti per cambiare directory di root con --force-not-"
+"root, usare --force-script-chrootless."
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "esecuzione di chroot a \"%.250s\" non riuscita"
@@ -4400,10 +4585,9 @@ msgstr ""
 "del responsabile"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "installed %s script"
+#, c-format
 msgid "installed %s package %s script"
-msgstr "installato script di %s"
+msgstr "installato pacchetto %s script %s"
 
 #: src/script.c
 #, c-format
@@ -4411,16 +4595,14 @@ msgid "unable to stat %s '%.250s'"
 msgstr "impossibile eseguire stat su %s \"%.250s\""
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "new %s script"
+#, c-format
 msgid "new %s package %s script"
-msgstr "nuovo script %s"
+msgstr "nuovo pacchetto %s script %s"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "old %s script"
+#, c-format
 msgid "old %s package %s script"
-msgstr "vecchio script di %s"
+msgstr "vecchio pacchetto %s script %s"
 
 #: src/script.c
 #, c-format
@@ -4440,10 +4622,9 @@ msgid "... it looks like that went OK"
 msgstr "... sembra tutto sia andato correttamente"
 
 #: src/select.c
-#, fuzzy, c-format
-#| msgid "unexpected end of line in package name at line %d"
+#, c-format
 msgid "unexpected end of file in package name at line %d"
-msgstr "fine riga inattesa nel nome del pacchetto alla riga %d"
+msgstr "fine file inatteso nel nome del pacchetto alla riga %d"
 
 #: src/select.c
 #, c-format
@@ -4451,10 +4632,9 @@ msgid "unexpected end of line in package name at line %d"
 msgstr "fine riga inattesa nel nome del pacchetto alla riga %d"
 
 #: src/select.c
-#, fuzzy, c-format
-#| msgid "unexpected end of line after package name at line %d"
+#, c-format
 msgid "unexpected end of file after package name at line %d"
-msgstr "fine riga inatteso dopo il nome del pacchetto alla riga %d"
+msgstr "fine file inatteso dopo il nome del pacchetto alla riga %d"
 
 #: src/select.c
 #, c-format
@@ -4472,10 +4652,11 @@ msgid "illegal package name at line %d: %.250s"
 msgstr "nome di pacchetto non valido alla riga %d: %.250s"
 
 #: src/select.c
-#, fuzzy, c-format
-#| msgid "package not in database at line %d: %.250s"
+#, c-format
 msgid "package not in status nor available database at line %d: %.250s"
-msgstr "pacchetto non nel database alla riga %d: %.250s"
+msgstr ""
+"pacchetto non presente nel database di stato né di disponibilità alla riga "
+"%d: %.250s"
 
 #: src/select.c
 #, c-format
@@ -4487,10 +4668,6 @@ msgid "read error on standard input"
 msgstr "errore di lettura sullo standard input"
 
 #: src/select.c
-#, fuzzy
-#| msgid ""
-#| "found unknown packages; this might mean the available database\n"
-#| "is outdated, and needs to be updated through a frontend method"
 msgid ""
 "found unknown packages; this might mean the available database\n"
 "is outdated, and needs to be updated through a frontend method;\n"
@@ -4498,7 +4675,8 @@ msgid ""
 msgstr ""
 "trovati pacchetti sconosciuti: ciò potrebbe indicare che il\n"
 "database dei pacchetti non è aggiornato e deve essere eseguito\n"
-"l'aggiornamento con un metodo a interfaccia grafica"
+"l'aggiornamento con un metodo a interfaccia grafica. Per \n"
+"maggiori informazioni: https://wiki.debian.org/Teams/Dpkg/FAQ"
 
 #: src/selinux.c
 msgid "cannot open security status notification channel"
@@ -4538,12 +4716,29 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --instdir <directory>    set the root directory, but not the admin "
+#| "dir.\n"
+#| "  --root <directory>       set the directory of the root filesystem.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4551,9 +4746,12 @@ msgid ""
 msgstr ""
 "Opzioni:\n"
 "  --admindir <directory>   Imposta la directory con il file di statoverride\n"
+"  --instdir <directory>    Imposta la directory di root, ma non quella di "
+"admin\n"
+"  --root <directory>       Imposta la directory del file system di root\n"
 "  --update                 Aggiorna immediatamente i permessi di <percorso>\n"
 "  --force                  Forza un'azione anche se il controllo non riesce\n"
-"  --quiet                  Operazione silenziosa, output minimo\n"
+"  --quiet                  Modalità silenziosa, output minimo\n"
 "  --help                   Mostra questo messaggio di aiuto\n"
 "  --version                Mostra la versione\n"
 "\n"
@@ -4563,16 +4761,14 @@ msgid "stripping trailing /"
 msgstr "vengono tolti gli / in coda"
 
 #: src/statcmd.c
-#, fuzzy, c-format
-#| msgid "control file '%s' does not exist"
+#, c-format
 msgid "user '%s' does not exist"
-msgstr "il file di controllo \"%s\" non esiste"
+msgstr "l'utente \"%s\" non esiste"
 
 #: src/statcmd.c
-#, fuzzy, c-format
-#| msgid "control file '%s' does not exist"
+#, c-format
 msgid "group '%s' does not exist"
-msgstr "il file di controllo \"%s\" non esiste"
+msgstr "il gruppo \"%s\" non esiste"
 
 #: src/statcmd.c
 #, c-format
@@ -4609,67 +4805,10 @@ msgstr "nessun override presente"
 msgid "--update is useless for --remove"
 msgstr "--update è inutile per --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "stato non valido"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "lettura file statoverride \"%.250s\""
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "lettura file statoverride \"%.250s\""
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "apertura del file statoverride non riuscita"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "esecuzione di fstat sul file statoverride non riuscita"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "lettura file statoverride \"%.250s\""
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "il file statoverride non contiene il newline finale"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "il file statoverride contiene una riga vuota"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "errore di sintassi nel file statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "utente \"%s\" sconosciuto nel file statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "EOL inatteso nel file statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "gruppo \"%s\" sconosciuto nel file statoverride"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "presenti molteplici statoverride per il file \"%.250s\""
+msgid "deprecated --%s option; use --%s instead"
+msgstr ""
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4796,8 +4935,7 @@ msgid ""
 "%s: dependency problems, but processing triggers anyway as you requested:\n"
 "%s"
 msgstr ""
-"%s: problemi con le dipendenze, ma i trigger vengono elaborati come "
-"richiesto:\n"
+"%s: problemi con le dipendenze, ma i trigger vengono elaborati comunque:\n"
 "%s"
 
 #: src/trigproc.c
@@ -4887,6 +5025,10 @@ msgstr "De-configurazione di %s (%s) per poter rimuovere %s (%s)...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "De-configurazione di %s (%s)...\n"
 
+#: src/unpack.c
+msgid "conffile file contains an empty line"
+msgstr "il file conffile contiene una riga vuota"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -5037,11 +5179,9 @@ msgid "package filesystem archive extraction"
 msgstr "estrazione file system del pacchetto"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "errore nel leggere il file tar creato da dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "file tar  - l'archivio del pacchetto è danneggiato"
 
 #: src/unpack.c
@@ -5056,16 +5196,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s accetta al massimo un file Packages come argomento"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "impossibile accedere all'area di stato di dpkg per l'aggiornamento massivo "
 "delle disponibilità"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"l'aggiornamento massivo delle disponibilità necessita dei permessi di "
-"scrittura sull'area di stato di dpkg"
+"impossibile accedere all'area di stato di dpkg per l'aggiornamento massivo "
+"delle disponibilità"
 
 #: src/update.c
 #, c-format
@@ -5103,10 +5249,9 @@ msgid "control member"
 msgstr "elemento controllo"
 
 #: dpkg-deb/build.c
-#, fuzzy, c-format
-#| msgid "newline in field name '%.*s'"
+#, c-format
 msgid "newline not allowed in pathname '%s'"
-msgstr "newline nel nome del campo \"%.*s\""
+msgstr "newline non consentito nel nome del percorso \"%s\""
 
 #: dpkg-deb/build.c
 msgid "data member"
@@ -5193,10 +5338,8 @@ msgstr ""
 "minuscoli né \"-+.\""
 
 #: dpkg-deb/build.c
-#, fuzzy
-#| msgid "package architecture"
 msgid "package architecture is missing or empty"
-msgstr "architettura pacchetto"
+msgstr "l'architettura del pacchetto è vuota o mancante"
 
 #: dpkg-deb/build.c
 #, c-format
@@ -5216,20 +5359,17 @@ msgid "unable to check for existence of archive '%.250s'"
 msgstr "impossibile verificare l'esistenza dell'archivio \"%.250s\""
 
 #: dpkg-deb/build.c
-#, fuzzy
-#| msgid "compressing data member"
 msgid "compressing tar member"
-msgstr "elemento dati compressione"
+msgstr "compressione membro tar"
 
 #: dpkg-deb/build.c
 msgid "<compress> from tar -cf"
 msgstr "<compress> da tar -cf"
 
 #: dpkg-deb/build.c dpkg-split/split.c
-#, fuzzy, c-format
-#| msgid "unable to create '%.255s'"
+#, c-format
 msgid "unable to parse timestamp '%.255s'"
-msgstr "impossibile creare \"%.255s\""
+msgstr "impossibile leggere l'orario \"%.255s\""
 
 #: dpkg-deb/build.c utils/update-alternatives.c
 #, c-format
@@ -5247,16 +5387,14 @@ msgid "not checking contents of control area"
 msgstr "non viene eseguita la verifica dei contenuti dell'area di controllo"
 
 #: dpkg-deb/build.c
-#, fuzzy, c-format
-#| msgid "dpkg-deb: building an unknown package in '%s'.\n"
+#, c-format
 msgid "building an unknown package in '%s'."
-msgstr "dpkg-deb: generazione di un pacchetto sconosciuto in \"%s\".\n"
+msgstr "generazione di un pacchetto sconosciuto in \"%s\"."
 
 #: dpkg-deb/build.c
-#, fuzzy, c-format
-#| msgid "dpkg-deb: building package '%s' in '%s'.\n"
+#, c-format
 msgid "building package '%s' in '%s'."
-msgstr "dpkg-deb: generazione del pacchetto \"%s\" in \"%s\".\n"
+msgstr "generazione del pacchetto \"%s\" in \"%s\"."
 
 #: dpkg-deb/build.c
 #, c-format
@@ -5319,11 +5457,11 @@ msgstr ""
 "dell'archivio errato"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "file '%.250s' is not a debian binary archive (try dpkg-split?)"
+#, c-format
 msgid "file '%.250s' is not a Debian binary archive (try dpkg-split?)"
 msgstr ""
-"il file \"%.250s\" non è un archivio nel formato debian (provare dpkg-split?)"
+"il file \"%.250s\" non è un archivio binario nel formato Debian (provare "
+"dpkg-split?)"
 
 # (ndt) mah...
 #: dpkg-deb/extract.c
@@ -5372,15 +5510,12 @@ msgstr ""
 "annullata"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " new debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd bytes.\n"
+#, c-format
 msgid ""
 " new Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
 msgstr ""
-" nuovo pacchetto debian, versione %d.%d.\n"
+" nuovo pacchetto Debian, versione %d.%d.\n"
 " dimensione %jd byte: archivio di controllo=%jd byte.\n"
 
 #: dpkg-deb/extract.c
@@ -5400,15 +5535,12 @@ msgstr ""
 "impossibile saltare il componente dell'archivio di controllo da \"%s\": %s"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " old debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd, main archive=%jd.\n"
+#, c-format
 msgid ""
 " old Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgstr ""
-" vecchio pacchetto debian, versione %d.%d.\n"
+" vecchio pacchetto Debian, versione %d.%d.\n"
 " dimensione %jd byte: archivio di controllo=%jd, archivio principale=%jd.\n"
 
 #: dpkg-deb/extract.c
@@ -5420,10 +5552,9 @@ msgstr ""
 "per essere stato scaricato in modalità ASCII"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "'%.255s' is not a debian format archive"
+#, c-format
 msgid "'%.255s' is not a Debian format archive"
-msgstr "\"%.255s\" non è un archivio in formato debian"
+msgstr "\"%.255s\" non è un archivio in formato Debian"
 
 #: dpkg-deb/extract.c
 #, c-format
@@ -5441,16 +5572,17 @@ msgid "decompressing archive member"
 msgstr "estrazione componente dell'archivio"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "esecuzione di chdir sulla directory non riuscita"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "creazione di una directory non riuscita"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "esecuzione di chdir sulla directory dopo averla creata non riuscita"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr "percorse pre-esistente %s inatteso"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "esecuzione di chdir sulla directory non riuscita"
 
 # (ndt) comprimere -> decomprimere...
 #: dpkg-deb/extract.c
@@ -5494,7 +5626,7 @@ msgstr ""
 #: dpkg-deb/extract.c
 #, c-format
 msgid "--%s does not support (yet) reading the .deb from standard input"
-msgstr ""
+msgstr "--%s non supporta ancora la lettura di .deb dallo standard input"
 
 #: dpkg-deb/info.c
 #, c-format
@@ -5552,10 +5684,8 @@ msgid "     not a plain file          %.255s\n"
 msgstr "     non un file normale       %.255s\n"
 
 #: dpkg-deb/info.c
-#, fuzzy
-#| msgid "(no 'control' file in control archive!)\n"
 msgid "no 'control' file in control archive!"
-msgstr "(nessun file \"control\" nell'archivio di controllo)\n"
+msgstr "nessun file \"control\" nell'archivio di controllo."
 
 #: dpkg-deb/main.c
 #, c-format
@@ -5611,35 +5741,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  -v, --verbose                    Enable verbose output.\n"
-#| "  -D, --debug                      Enable debugging output.\n"
-#| "      --showformat=<format>        Use alternative format for --show.\n"
-#| "      --deb-format=<format>        Select archive format.\n"
-#| "                                     Allowed values: 0.939000, 2.0 "
-#| "(default).\n"
-#| "      --old                        Legacy alias for '--deb-"
-#| "format=0.939000'.\n"
-#| "      --new                        Legacy alias for '--deb-format=2.0'.\n"
-#| "      --nocheck                    Suppress control file check (build "
-#| "bad\n"
-#| "                                     packages).\n"
-#| "      --uniform-compression        Use the compression params on all "
-#| "members.\n"
-#| "  -z#                              Set the compression level when "
-#| "building.\n"
-#| "  -Z<type>                         Set the compression type used when "
-#| "building.\n"
-#| "                                     Allowed types: gzip, xz, bzip2, "
-#| "none.\n"
-#| "  -S<strategy>                     Set the compression strategy when "
-#| "building.\n"
-#| "                                     Allowed values: none; extreme (xz);\n"
-#| "                                     filtered, huffman, rle, fixed "
-#| "(gzip).\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  -v, --verbose                    Enable verbose output.\n"
@@ -5670,25 +5772,24 @@ msgstr ""
 "      --deb-format=<formato>       Seleziona il formato dell'archivio.\n"
 "                                   Valori ammessi:\n"
 "                                     0.939000, 2.0 (predefinito)\n"
-"      --old                        Alias legacy per \"--deb-"
-"format=0.939000\"\n"
-"      --new                        Alias legacy per \"--deb-format=2.0\"\n"
 "      --nocheck                    Disattiva la verifica del file di "
 "controllo\n"
 "                                   (crea pacchetti scadenti)\n"
-"      --uniform-compression        Usa i parametri di compressioni su tutti "
-"i                                   membri\n"
+"      --root-owner-group           Forza il proprietario e il gruppo a root\n"
+"      --[no-]uniform-compression   Usa i parametri di compressione su "
+"tutti \n"
+"                                   i membri\n"
 "  -z#                              Imposta il livello di compressione usato\n"
 "                                   nella generazione del pacchetto\n"
 "  -Z<tipo>                         Imposta il tipo di compressione usato\n"
 "                                   nella generazione del pacchetto\n"
-"                                   Valori ammessi: gzip, xz, bzip2, none\n"
+"                                   Valori ammessi: gzip, xz, none\n"
 "  -S<strategia>                    Imposta la strategia di compressione per "
 "la\n"
-"                                   generazione\n"
+"                                   generazione del pacchetto\n"
 "                                   Valori ammessi: none, extreme (xz), "
 "filtered\n"
-"                                   huffman, rle, fixed (gzip)\n"
+"                                   huffman, ile, fide (gzip)\n"
 "\n"
 
 #: dpkg-deb/main.c
@@ -5740,16 +5841,14 @@ msgid "unknown compression type '%s'!"
 msgstr "tipo di compressione \"%s\" sconosciuto"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid "deprecated compression type '%s'; use xz instead"
+#, c-format
 msgid "obsolete compression type '%s'; use xz instead"
-msgstr "tipo di compressione \"%s\" deprecato: utilizzare xz"
+msgstr "tipo di compressione \"%s\" obsoleto: utilizzare xz"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid "deprecated compression type '%s'; use xz or gzip instead"
+#, c-format
 msgid "obsolete compression type '%s'; use xz or gzip instead"
-msgstr "tipo di compressione \"%s\" deprecato: utilizzare xz o gzip"
+msgstr "tipo di compressione \"%s\" obsoleto: utilizzare xz o gzip"
 
 #: dpkg-deb/main.c
 #, c-format
@@ -6216,7 +6315,7 @@ msgstr "estrazione campo valore del pacchetto"
 
 #: dpkg-split/split.c
 msgid "<dpkg-deb --info pipe>"
-msgstr ""
+msgstr "<dpkg-deb --info pipe>"
 
 #: dpkg-split/split.c
 #, c-format
@@ -6331,7 +6430,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6341,8 +6454,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6505,16 +6619,13 @@ msgid "unable to flush file '%s'"
 msgstr "impossibile eseguire il flush del file \"%s\""
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "Current 'best' version is '%s'."
+#, c-format
 msgid "  link best version is %s"
-msgstr "La versione \"best\" attuale è \"%s\"."
+msgstr "  la versione migliore del collegamento è %s"
 
 #: utils/update-alternatives.c
-#, fuzzy
-#| msgid "No versions available."
 msgid "  link best version not available"
-msgstr "Nessuna versione disponibile."
+msgstr "  versione migliore del collegamento non disponibile"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6526,16 +6637,14 @@ msgid "  link currently absent"
 msgstr "  il collegamento è attualmente assente"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "  %.250s is %s.\n"
+#, c-format
 msgid "  link %s is %s"
-msgstr "  %.250s è %s.\n"
+msgstr "  il collegamento %s è %s"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "  slave %s: %s"
+#, c-format
 msgid "  slave %s is %s"
-msgstr "  slave %s: %s"
+msgstr "  slave %s è %s"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6571,9 +6680,7 @@ msgid "Status"
 msgstr "Stato"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Press enter to keep the current choice[*], or type selection number: "
+#, c-format
 msgid "Press <enter> to keep the current choice[*], or type selection number: "
 msgstr ""
 "Premere Invio per mantenere il valore predefinito[*] o digitare il numero "
@@ -6849,83 +6956,44 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "opzione \"--%s\" obsoleta, usare \"--%s\" al suo posto"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "al file di controllo \"%s\" manca un valore"
-
-#~ msgid "control file '%s' missing value separator"
-#~ msgstr "al file di controllo \"%s\" manca il separatore di valore"
-
-#~ msgid "unable to fstat part file '%.250s'"
-#~ msgstr "impossibile eseguire fstat sulla porzione \"%.250s\""
-
-#~ msgid "unexpected end of file in %.250s"
-#~ msgstr "fine del file inattesa in %.250s"
-
-#~ msgid "%s: error: %s\n"
-#~ msgstr "%s: errore: %s\n"
-
-#~ msgid "%s:%s:%d:%s: internal error: %s\n"
-#~ msgstr "%s:%s:%d:%s: errore interno: %s\n"
-
-#~ msgid "%s: warning: %s\n"
-#~ msgstr "%s: attenzione: %s\n"
-
-#~ msgid "truncated triggers deferred file '%.250s'"
-#~ msgstr "file dei trigger rinviati \"%.250s\" troncato"
-
-#~ msgid "find for dpkg --recursive"
-#~ msgstr "find per dpkg --recursive"
-
-#~ msgid "failed to fdopen find's pipe"
-#~ msgstr "fdopen della pipe di find non riuscita"
-
-#~ msgid "error reading find's pipe"
-#~ msgstr "errore nel leggere la pipe di find"
-
-#~ msgid "error closing find's pipe"
-#~ msgstr "errore nel chiudere la pipe di find"
-
-#~ msgid "find for --recursive returned unhandled error %i"
-#~ msgstr "find per --recursive ha restituito l'errore non gestito %i"
-
-#~ msgid "unable to stat file name '%.250s'"
-#~ msgstr "impossibile eseguire stat sul nome di file \"%.250s\""
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "impossibile aprire il file di blocco %s per la verifica"
 
-#~ msgid "compressing control member"
-#~ msgstr "elemento controllo compressione"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "utente \"%s\" sconosciuto nel file statoverride"
 
-#~ msgid "Call %s."
-#~ msgstr "Esegue %s."
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "gruppo \"%s\" sconosciuto nel file statoverride"
 
-#~ msgid "syntax error: invalid uid in statoverride file"
-#~ msgstr "errore di sintassi: UID non valido nel file statoverride"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "\"%.50s\" non è consentito per %s"
 
-#~ msgid "syntax error: invalid gid in statoverride file"
-#~ msgstr "errore di sintassi: GID non valido nel file statoverride"
+#~ msgid "junk after %s"
+#~ msgstr "%s è seguito da cose inutili"
 
-#~ msgid "syntax error: invalid mode in statoverride file"
-#~ msgstr "errore di sintassi: modalità errata nel file statoverride"
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "nome del pacchetto non valido (%.250s)"
 
-#~ msgid "unknown option `%s'"
-#~ msgstr "opzione \"%s\" sconosciuta"
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no in un campo booleano"
 
-#~ msgid "unexpected eof reading `%.250s'"
-#~ msgstr "eof non attesa in \"%.250s\""
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "campo \"%s\", riferimento a \"%.255s\": errore nella versione"
 
-#~ msgid "EOF on stdin at conffile prompt"
-#~ msgstr "EOF su stdin al prompt per il file di configurazione"
+#~ msgid "empty value for %s"
+#~ msgstr "valore vuoto per %s"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "eof non attesa nel nome del pacchetto alla riga %d"
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "lo stato del pacchetto è triggers-awaited, ma nessun trigger atteso"
 
-#~ msgid "unexpected eof after package name at line %d"
-#~ msgstr "eof non attesa dopo il nome del pacchetto alla riga %d"
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "lo stato del pacchetto è triggers-pending, ma nessun trigger imminente"
 
-#~ msgid "failed to chdir to `/' for cleanup"
-#~ msgstr "esecuzione di chdir su \"/\" per la pulizia non riuscita"
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "l'aggiornamento massivo delle disponibilità necessita dei permessi di "
+#~ "scrittura sull'area di stato di dpkg"
 
-#~ msgid "cannot extract package field value from '%s': %s"
-#~ msgstr "impossibile estrarre il valore del campo pacchetto da \"%s\": %s"
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "errore nel leggere il file tar creato da dpkg-deb"
diff --git a/po/ja.po b/po/ja.po
index 0f7faf809..5ff6e1cc1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.18.3\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2016-04-01 16:07+0900\n"
 "Last-Translator: Takuma Yamada <tyamada@takumayamada.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -151,7 +151,8 @@ msgstr "古いバックアップファイル '%s' の削除中にエラーが発
 msgid "error creating new backup file '%s'"
 msgstr "新しいバックアップファイル '%s' の作成中にエラーが発生しました"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "`%.250s' を削除できません"
@@ -354,20 +355,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "文字の補充後に %.250s の最初に戻れません"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "テストのためのロックファイル %s をオープンできません"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "ディレクトリ '%s' のファイル記述子を取得できません"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "ステータスデータベースのロックファイルをオープン/作成できません。"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "ステータスデータベースのロックファイルをオープン/作成できません。"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "あなたには dpkg ステータスデータベースをロックする権限がありません"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg ステータスデータベース"
 
 #: lib/dpkg/dbmodify.c
@@ -375,11 +393,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "要求した操作はスーパーユーザの権限が必要です"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "dpkg ステータスエリアにアクセスできません"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "操作は dpkg ステータスエリアへの読み書きの権限が必要です"
 
 #: lib/dpkg/dbmodify.c
@@ -417,6 +439,196 @@ msgstr "更新した `%.250s' のステータスをクローズできません"
 msgid "unable to install updated status of '%.250s'"
 msgstr "更新した `%.250s' のステータスをインストールできません"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "`%.250s' の存在を確認できません"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "情報ディレクトリを読み取れません"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "%.250s のオープン時にエラーが発生しました"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "壊れた情報データベース形式ファイル '%s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"情報データベース形式 (%d) が偽物か新しすぎます。より新しい dpkg を取得してみ"
+"てください"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "情報ファイル %s/%s がどのパッケージにも関連付けられていません"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "ハードリンク `%.255s' の作成中にエラーが発生しました"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "'%s' の書き込み中にエラーが発生しました"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"パッケージ '%2$s' のコントロールファイル '%1$s' に最後の改行がありません"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"パッケージ '%2$s' のコントロールファイル '%1$s' に最後の改行がありません"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"パッケージ '%2$s' のコントロールファイル '%1$s' に最後の改行がありません"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"パッケージ '%2$s' のコントロールファイル '%1$s' が空のファイル名を含んでいま"
+"す"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read '%s' control file for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "パッケージ '%2$s' のコントロールファイル '%1$s' を読めません"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "diversions ファイルのオープンに失敗しました"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "diversions ファイルの状態を取得できませんでした (fstat に失敗)"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "`%.250s' か `%.250s' が関係する退避操作 (diversion) は競合しています"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr ""
+"パッケージ `%.250s' のファイル一覧ファイルのクローズ中にエラーが発生しました"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"パッケージ '%.250s' のファイル一覧ファイルがありません。このパッケージには、"
+"現在インストールされているファイルがないものとします"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "パッケージ '%.250s' のファイル一覧ファイルに最後の改行がありません"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"パッケージ `%.250s' のファイル一覧ファイルが空のファイル名を含んでいます"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(データベースを読み込んでいます ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "現在 %d 個のファイルとディレクトリがインストールされています。)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "statoverride のユーザ ID %s は無効です"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "statoverride のグループ ID %s は無効です"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "statoverride のモード %s は無効です"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "statoverride ファイルのオープンに失敗しました"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "statoverride ファイルの状態を取得できませんでした (fstat に失敗)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "statoverride ファイル '%.250s' を読み込んでいます"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "statoverride ファイルの最後の行に改行がありません"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statoverride ファイルが空行を含んでいます"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "statoverride ファイルに文法エラーがあります"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "statoverride ファイルに予期せぬ eof があります"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "複数の statoverrides が ファイル '%.250s' に対して提供されています"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -555,62 +767,75 @@ msgid "internal error"
 msgstr "内部エラー (バグ)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s がありません"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "コントロールファイル '%s' に値がありません"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "`%.50s' は %s 用に許可されていません"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "無効な行をスキップします: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "%s 後のゴミ"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "無効なパッケージ名 (%.250s) です"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "パッケージ '%s' はまだインストールされていません"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "ファイル記述フィールド `%s' が空です"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "ファイル記述フィールド `%s' はステータスファイルでは許可されていません"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "ファイル記述フィールド `%s' の値が (ほかのフィールドに比べて) 多すぎます"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "ファイル記述フィールド `%s' の値が (ほかのフィールドに比べて) 少なすぎます"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "真偽フィールドにおける yes/no"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "古い '%s' あるいは '%s' フィールドが使われています"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "4状態フィールドにおける foreign/allowed/same/no"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "'%s' は有効なアーキテクチャ名ではありません: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "'Priority' フィールドのワード"
 
 #: lib/dpkg/fields.c
@@ -619,25 +844,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "'%s' フィールドの値はこのコンテキストでは許可されていません"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "'Status' フィールドの第 1 ワード (要望)"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "'Status' フィールドの第 2 ワード (エラー)"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "'Status' フィールドの第 3 ワード (状態)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "'%s' フィールドの文字列 '%.250s' にエラー"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "古い '%s' あるいは '%s' フィールドが使われています"
 
 #: lib/dpkg/fields.c
@@ -646,12 +879,15 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "'%s' の値に不正な形式を持つ行 '%.*s' があります"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "'%s' の値に空白以外の文字 `%c' で始まる行があります"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr ""
 "ルートディレクトリあるいは空のディレクトリが設定ファイルとして指定されていま"
 "す"
@@ -739,9 +975,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "`%2$.255s' の `%1$s' フィールド: バージョンが完結していません"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "`%2$.255s' を参照する `%1$s' フィールド: バージョンにエラー"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "`%2$.255s' の `%1$s' フィールド: バージョンが `%3$c' を含んでいます"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -749,8 +986,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "`%s' フィールド、パッケージ `%.255s' 参照後の構文エラー"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "選択記号 (`|') は %s フィールド内では許可されていません"
 
 #: lib/dpkg/fields.c
@@ -789,6 +1027,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "ターゲットファイル '%.250s' のモードを設定できません"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat file '%s'"
+msgid "cannot stat %s"
+msgstr "ファイル '%s' の状態を取得できません"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "設定ファイル '%s' がプレーンファイルではありません"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot read %s"
+msgstr "'%s' に追加できません"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "'%s' に追加できません"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "%s をロック解除できません"
@@ -809,8 +1071,22 @@ msgid "unable to lock %s"
 msgstr "%s をロックできません"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "ファイルをページャで表示しています"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "'%s' に追加できません"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "ファイル '%s' をフラッシュできません"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "ファイル '%s' をそれ自身に退避することはできません"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -832,13 +1108,13 @@ msgstr "メモリの割り当てに失敗しました"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "std%s の複製に失敗しました"
+msgid "failed to dup for fd %d"
+msgstr "ファイル記述子 %d の複製に失敗しました"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "ファイル記述子 %d の複製に失敗しました"
+msgid "failed to dup for std%s"
+msgstr "std%s の複製に失敗しました"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -977,30 +1253,36 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "ユーザ定義フィールド `%.*s' の値が重複しています"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "%s が見つかりません"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s の空の値"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "`%s' フィールドの値が重複しています"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr ""
 "パッケージは '%s' というフィールドを持っていますが、アーキテクチャが見つかり"
 "ません"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr ""
 "パッケージは '%s' というフィールドを持っていますが、アーキテクチャは all です"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "不適切な Status を持つパッケージの Config-Version"
 
 #: lib/dpkg/parse.c
@@ -1009,8 +1291,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "パッケージは状態 %s ですが、トリガを待ち受けています"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "パッケージはトリガ待ち受けの状態ですが、待ち受けトリガはありません"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "パッケージは状態 %s ですが、トリガを待ち受けています"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1018,11 +1302,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "パッケージは状態 %s ですが、トリガは保留されています"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "パッケージはトリガ保留の状態ですが、保留トリガはありません"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "パッケージは状態 %s ですが、トリガは保留されています"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "現在インストールされていないパッケージ (ステータス not-installed) が "
 "conffiles を持っているので、それらの情報を無視します"
@@ -1044,10 +1332,13 @@ msgstr ""
 "混在して提供されています。おそらく非公式の dpkg からの更新によるものです"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (マルチアーキテクチャ: %s) は、複数のインストール済み実体を持つ %s と共"
 "存インストールできません"
@@ -1230,11 +1521,6 @@ msgstr "'%.255s' を安全に削除できません"
 msgid "rm command for cleanup"
 msgstr "クリーンアップ用の rm コマンド"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "1つ以上のインストール済み実体がある、あいまいなパッケージ名 '%s' です"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1248,6 +1534,16 @@ msgstr "フィールド幅が範囲外です"
 msgid "missing closing brace"
 msgstr "閉じブレースがありません"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "1つ以上のインストール済み実体がある、あいまいなパッケージ名 '%s' です"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(説明 (description) がありません)"
@@ -1335,6 +1631,70 @@ msgstr "サブプロセス %s が wait ステータスコード %d を返して�
 msgid "wait for %s subprocess failed"
 msgstr "サブプロセス %s の待機に失敗しました"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "フィールド幅に無効な文字 `%c' があります"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "フィールド幅に無効な文字 `%c' があります"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "statoverride のユーザ ID %s は無効です"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "statoverride のグループ ID %s は無効です"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "フィールド幅に無効な文字 `%c' があります"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "ファイルヘッダにサポートされていないオプションがあります"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "`%s' は不明な圧縮形式です!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1354,12 +1714,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "コントロールディレクトリがディレクトリではありません"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "トリガロックファイル `%.250s' をオープンおよび作成できません"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "トリガ領域"
 
 #: lib/dpkg/trigdeferred.c
@@ -1581,11 +1944,6 @@ msgstr "パイプ `%.255s' の作成中にエラーが発生しました"
 msgid "error creating device '%.255s'"
 msgstr "デバイス `%.255s' の作成中にエラーが発生しました"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "ハードリンク `%.255s' の作成中にエラーが発生しました"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1904,10 +2262,10 @@ msgstr "アーカイブにアクセスできません"
 msgid "archive '%s' is not a regular file"
 msgstr "設定ファイル '%s' がプレーンファイルではありません"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<標準出力>"
 
@@ -2097,6 +2455,10 @@ msgid "conffile difference visualizer"
 msgstr "設定ファイル差分の可視化"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "終了したら `exit' と入力してください。\n"
 
@@ -2453,7 +2815,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2462,7 +2838,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2497,6 +2876,12 @@ msgstr ""
 "パッケージの preinst/postrm スクリプトは --package と --divert を常に指定すべ"
 "きです。\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2618,6 +3003,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "退避先 '%s' がないので、何も削除されません。\n"
 
@@ -2661,19 +3053,6 @@ msgstr "パッケージは改行を含んではなりません"
 msgid "divert-to may not contain newlines"
 msgstr "退避先は改行を含んではなりません"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "diversions ファイルのオープンに失敗しました"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "diversions ファイルの状態を取得できませんでした (fstat に失敗)"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "`%.250s' か `%.250s' が関係する退避操作 (diversion) は競合しています"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2975,122 +3354,174 @@ msgstr ""
 "パッケージ %s は保持されているため、手をつけません。上書きするには --force-"
 "hold を使ってください。\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "--force が有効なので、問題を無視します:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "すべての強制オプションをセットする"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"パッケージ '%2$s' のコントロールファイル '%1$s' に最後の改行がありません"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "パッケージをより古いバージョンで置き換える"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "これが助けになるかもしれないパッケージを設定する"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "保持していても付帯パッケージを処理する"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "root でなくてもインストール/削除の実行を試みる"
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
 msgstr ""
-"パッケージ '%2$s' のコントロールファイル '%1$s' に最後の改行がありません"
+"PATH に重要なプログラムを見つけられなくても実行する。問題が起きる可能性が高い"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "正当性チェックに失敗してもパッケージをインストールする"
+
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "パッケージのバージョンがおかしくても処理する"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"パッケージ '%2$s' のコントロールファイル '%1$s' に最後の改行がありません"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
-"パッケージ '%2$s' のコントロールファイル '%1$s' が空のファイル名を含んでいま"
-"す"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "パッケージ '%2$s' のコントロールファイル '%1$s' をオープンできません"
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "あるパッケージから提供されているファイルを別のもので上書きする"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "パッケージ '%2$s' のコントロールファイル '%1$s' の状態を取得できません"
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "退避されているファイルを退避されていないバージョンで上書きする"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "パッケージ '%2$s' のファイル '%1$s' は通常ファイルではありません"
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "あるパッケージのディレクトリを別のファイルで上書きする"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "パッケージ '%2$s' のコントロールファイル '%1$s' を読めません"
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "展開時に安全な I/O 操作を行わない"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "パッケージ '%2$s' のコントロールファイル '%1$s' をクローズできません"
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "パッケージ `%.250s' のファイル一覧ファイルをオープンできません"
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "常に新しい設定ファイルを使用し、問い合わせない"
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "常に古い設定ファイルを使用し、問い合わせない"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"パッケージ '%.250s' のファイル一覧ファイルがありません。このパッケージには、"
-"現在インストールされているファイルがないものとします"
+"新しい設定ファイルに、もし利用できるなら問い合わせせず\n"
+"にデフォルトオプションを使用する。デフォルトが見つから\n"
+"ない場合は、confold または confnew オプションが与えられ\n"
+"ていない限り、問い合わせが行われる"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "パッケージ '%.250s' のファイル一覧ファイルの状態を取得できません"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "見つからなかった設定ファイルを常にインストールする"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "パッケージ '%.250s' のファイル一覧ファイルが通常ファイルではありません"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "設定ファイルを新しいバージョンでないもので置き換えるか尋ねる"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "パッケージ '%.250s' のファイル一覧を読み込んでいます"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "パッケージがおかしい、あるいはアーキテクチャがなくても処理する"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "別のパッケージを壊す可能性があってもインストールする"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "競合するパッケージのインストールを許可する"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "すべての依存関係の問題を警告に切り替える"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "依存バージョンの問題を警告に切り替える"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "インストールに必要なパッケージを削除する"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "不可欠パッケージを削除する"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "パッケージ '%.250s' のファイル一覧ファイルに最後の改行がありません"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"%s 強制オプション - 問題が発生したときの挙動を制御する:\n"
+"  警告するが継続:  --force-<事象>,<事象>,...\n"
+"  エラーで停止:    --refuse-<事象>,<事象>,... | --no-force-<事象>,...\n"
+" 事象の強制:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"パッケージ `%.250s' のファイル一覧ファイルが空のファイル名を含んでいます"
+"\n"
+"警告: [!] と記されているオプションの使用は、あなたのシステムに深刻な傷害を与"
+"える\n"
+"可能性があります。[*] と記されているオプションの強制はデフォルトで有効で"
+"す。\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
-"パッケージ `%.250s' のファイル一覧ファイルのクローズ中にエラーが発生しました"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(データベースを読み込んでいます ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "不明な強制・拒否 (force/refuse) オプション `%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "現在 %d 個のファイルとディレクトリがインストールされています。)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "時代遅れの強制・拒否 (force/refuse) オプション `%s'"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "--force が有効なので、問題を無視します:"
 
 #: src/help.c
 msgid "not installed"
@@ -3153,42 +3584,6 @@ msgstr ""
 "(注): root の PATH は通常、/usr/local/sbin、/usr/sbin、/sbin を含んでいるはず"
 "です"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "`%.250s' の存在を確認できません"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "情報ディレクトリを読み取れません"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "%.250s のオープン時にエラーが発生しました"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "壊れた情報データベース形式ファイル '%s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"情報データベース形式 (%d) が偽物か新しすぎます。より新しい dpkg を取得してみ"
-"てください"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "情報ファイル %s/%s がどのパッケージにも関連付けられていません"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "'%s' の書き込み中にエラーが発生しました"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3239,27 +3634,27 @@ msgstr "Debian `%s' パッケージ管理プログラム バージョン %s。\n
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3483,115 +3878,6 @@ msgstr ""
 "してください!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "すべての強制オプションをセットする"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "パッケージをより古いバージョンで置き換える"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "これが助けになるかもしれないパッケージを設定する"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "保持していても付帯パッケージを処理する"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "root でなくてもインストール/削除の実行を試みる"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-"PATH に重要なプログラムを見つけられなくても実行する。問題が起きる可能性が高い"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "正当性チェックに失敗してもパッケージをインストールする"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "パッケージのバージョンがおかしくても処理する"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "あるパッケージから提供されているファイルを別のもので上書きする"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "退避されているファイルを退避されていないバージョンで上書きする"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "あるパッケージのディレクトリを別のファイルで上書きする"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "展開時に安全な I/O 操作を行わない"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "常に新しい設定ファイルを使用し、問い合わせない"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "常に古い設定ファイルを使用し、問い合わせない"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"新しい設定ファイルに、もし利用できるなら問い合わせせず\n"
-"にデフォルトオプションを使用する。デフォルトが見つから\n"
-"ない場合は、confold または confnew オプションが与えられ\n"
-"ていない限り、問い合わせが行われる"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "見つからなかった設定ファイルを常にインストールする"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "設定ファイルを新しいバージョンでないもので置き換えるか尋ねる"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "パッケージがおかしい、あるいはアーキテクチャがなくても処理する"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "別のパッケージを壊す可能性があってもインストールする"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "競合するパッケージのインストールを許可する"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "すべての依存関係の問題を警告に切り替える"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "依存バージョンの問題を警告に切り替える"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "インストールに必要なパッケージを削除する"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "不可欠パッケージを削除する"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "一般に有用な進行情報"
 
@@ -3722,42 +4008,6 @@ msgstr "データベースで現在使用中のアーキテクチャ '%s' を削
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s 強制オプション - 問題が発生したときの挙動を制御する:\n"
-"  警告するが継続:  --force-<事象>,<事象>,...\n"
-"  エラーで停止:    --refuse-<事象>,<事象>,... | --no-force-<事象>,...\n"
-" 事象の強制:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"警告: [!] と記されているオプションの使用は、あなたのシステムに深刻な傷害を与"
-"える\n"
-"可能性があります。[*] と記されているオプションの強制はデフォルトで有効で"
-"す。\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "不明な強制・拒否 (force/refuse) オプション `%.*s'"
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "時代遅れの強制・拒否 (force/refuse) オプション `%s'"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "`%i' をストリームとしてオープンできませんでした"
 
@@ -3939,6 +4189,12 @@ msgid "Description"
 msgstr "説明"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "ファイルをページャで表示しています"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "%s による退避 (divert) 元: %s\n"
@@ -3973,6 +4229,17 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "パッケージ '%s' はまだインストールされておらず情報の利用は不可能です"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"アーカイブファイルを調べるためには dpkg --info (= dpkg-deb --info) を、\n"
+"その内容一覧を表示するには dpkg --contents (= dpkg-deb --contents) を使いま"
+"す。\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "パッケージ '%s' はまだ利用可能でありません"
@@ -3998,9 +4265,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "%s により退避 (divert) された: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "アーカイブファイルを調べるためには dpkg --info (= dpkg-deb --info) を、\n"
 "その内容一覧を表示するには dpkg --contents (= dpkg-deb --contents) を使いま"
@@ -4042,19 +4312,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "Debian `%s' パッケージ管理プログラム照会ツールバージョン %s。\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4240,6 +4524,12 @@ msgstr ""
 "dpkg が正しく動作するためには、admindir は instdir の中になければなりません"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "`%.255s' への chroot に失敗しました"
@@ -4393,12 +4683,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4461,64 +4765,11 @@ msgstr "override が提供されていません"
 msgid "--update is useless for --remove"
 msgstr "--update は --remove には無意味です"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "statoverride のユーザ ID %s は無効です"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "statoverride のグループ ID %s は無効です"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "statoverride のモード %s は無効です"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "statoverride ファイルのオープンに失敗しました"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "statoverride ファイルの状態を取得できませんでした (fstat に失敗)"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "statoverride ファイル '%.250s' を読み込んでいます"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "statoverride ファイルの最後の行に改行がありません"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "statoverride ファイルが空行を含んでいます"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "statoverride ファイルに文法エラーがあります"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "statoverride ファイルに未知のユーザ '%s' があります"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "statoverride ファイルに予期せぬ eof があります"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "statoverride ファイルに未知のグループ '%s' があります"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "複数の statoverrides が ファイル '%.250s' に対して提供されています"
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "オプション '--%s' は時代遅れです。'--%s' を代わりに使ってください"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4736,6 +4987,12 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "%s (%s) を設定削除しています ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "statoverride ファイルが空行を含んでいます"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4874,11 +5131,9 @@ msgid "package filesystem archive extraction"
 msgstr "パッケージファイルシステムアーカイブの抽出"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "dpkg-deb tar 出力の読み取り時にエラーが発生しました"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 "壊れているファイルシステム上の tar ファイル - パッケージアーカイブが壊れてい"
 "ます"
@@ -4894,14 +5149,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s は引数に Packages ファイルを最大 1 つ必要とします"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "利用可能の更新が多すぎるため dpkg ステータスエリアにアクセスできません"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr ""
-"大部分の利用可能な更新は dpkg ステータスエリアへの書き込みアクセスを必要とし"
-"ます"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "利用可能の更新が多すぎるため dpkg ステータスエリアにアクセスできません"
 
 #: src/update.c
 #, c-format
@@ -5258,16 +5517,17 @@ msgid "decompressing archive member"
 msgstr "アーカイブメンバーを伸張しています"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "以下のディレクトリへの移動に失敗しました"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "ディレクトリの作成に失敗しました"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "ディレクトリ作成後、そのディレクトリに移動できません"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr ""
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "以下のディレクトリへの移動に失敗しました"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6109,7 +6369,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6119,8 +6393,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6628,11 +6903,88 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "オプション '--%s' は時代遅れです。'--%s' を代わりに使ってください"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "テストのためのロックファイル %s をオープンできません"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "statoverride ファイルに未知のユーザ '%s' があります"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "statoverride ファイルに未知のグループ '%s' があります"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s がありません"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "`%.50s' は %s 用に許可されていません"
+
+#~ msgid "junk after %s"
+#~ msgstr "%s 後のゴミ"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "無効なパッケージ名 (%.250s) です"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "真偽フィールドにおける yes/no"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "`%2$.255s' を参照する `%1$s' フィールド: バージョンにエラー"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s の空の値"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "パッケージはトリガ待ち受けの状態ですが、待ち受けトリガはありません"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr "パッケージはトリガ保留の状態ですが、保留トリガはありません"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "大部分の利用可能な更新は dpkg ステータスエリアへの書き込みアクセスを必要と"
+#~ "します"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "dpkg-deb tar 出力の読み取り時にエラーが発生しました"
+
+#, fuzzy
+#~| msgid "cannot open '%s' control file for package '%s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "パッケージ '%2$s' のコントロールファイル '%1$s' をオープンできません"
+
+#, fuzzy
+#~| msgid "cannot stat '%s' control file for package '%s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "パッケージ '%2$s' のコントロールファイル '%1$s' の状態を取得できません"
+
+#, fuzzy
+#~| msgid "'%s' file for package '%s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "パッケージ '%2$s' のファイル '%1$s' は通常ファイルではありません"
+
+#, fuzzy
+#~| msgid "cannot close '%s' control file for package '%s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "パッケージ '%2$s' のコントロールファイル '%1$s' をクローズできません"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "パッケージ `%.250s' のファイル一覧ファイルをオープンできません"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "パッケージ '%.250s' のファイル一覧ファイルの状態を取得できません"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "パッケージ '%.250s' のファイル一覧ファイルが通常ファイルではありません"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "パッケージ '%.250s' のファイル一覧を読み込んでいます"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "コントロールファイル '%s' に値がありません"
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "ディレクトリ作成後、そのディレクトリに移動できません"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "コントロールファイル '%s' に値の区切り子がありません"
diff --git a/po/km.po b/po/km.po
index 570efbd21..f8a34f507 100644
--- a/po/km.po
+++ b/po/km.po
@@ -1,6 +1,6 @@
-# translation of dpkg_po_km.po to
-# Copyright (C) YEAR Software in the Public Interest, Inc.
-# This file is distributed under the same license as the PACKAGE package.
+# translation of dpkg to Khmer
+# Copyright © 2006 Dpkg Developers
+# This file is distributed under the same license as the dpkg package.
 #
 # Khoem Sokhem <khoemsokhem@khmeros.info>, 2006.
 # Poch Sokun  <sokun_poch@khmeros.info>, 2006.
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:50+0200\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -145,7 +145,8 @@ msgstr "យក​ការ​បង្វែរ​ចាស់​ចេញ ៖
 msgid "error creating new backup file '%s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​បំពង់ `%.255s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "មិន​អាច​យក `%.250s' ចេញ"
@@ -367,22 +368,36 @@ msgstr "មិន​អាច​ស្វែងរក​ដើម្បី​ច
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "មិន​អាច​បើក tmpfile សម្រាប់ vsnprintf"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "មិនអាច​អាន​ទង់​កម្មវិធី​ពណ៌នា​ឯកសារ សម្រាប់ %.250s បានឡើយ"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "មិន​អាច​បើក/បង្កើត​ឯកសារ​ជាប់សោ​មូលដ្ឋាន​ទិន្នន័យ​ស្ថានភាព"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "មិន​អាច​បើក/បង្កើត​ឯកសារ​ជាប់សោ​មូលដ្ឋាន​ទិន្នន័យ​ស្ថានភាព"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "អ្នក​គ្មាន​សិទ្ធិ​ដើម្បី​ចាក់សោ​មូលដ្ឋាន​ទិន្នន័យ​ស្ថានភាព​របស់ dpkg បាន​ទេ"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "មិន​អាច​ចាក់សោ​មូលដ្ឋាន​ទិន្នន័យ​ស្ថានភាព​របស់ dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -390,11 +405,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "ប្រតិបត្តិការ​​ដែ​លបាន​ស្នើ​ត្រូវការ​សិទ្ធិ​ជា​អ្នក​ប្រើ​ជាន់ខ្ពស់"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "មិន​អាច​ចូលដំណើរកា​រ​​ទៅក្នុង​​​តំបន់ស្ថានភាពរបស់ dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "ប្រតិបត្តិការ​ត្រូវការសិទ្ធិ​អាន​​/សរសេរ​ទៅ​កាន់តំប​ន់ស្ថានភាពរបស់ dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -432,6 +451,197 @@ msgstr "មិនអាចបិទស្ថានភាពដែលបានធ
 msgid "unable to install updated status of '%.250s'"
 msgstr "មិនអាចដំឡើងស្ថានភាពដែលបានធ្វើឲ្យទាន់សម័យរបស់`%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "មិន​អាច​ពិនិត្យ​មើល​ភាព​មាន​ស្រាប់​របស់`%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "មិន​អាច​អាន​ថត​ព័ត៌មាន"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "កំហុស​ក្នុង​ការ​ព្យាយាម​បើក %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "conffile `%.250s' មិន​បង្ហាញ​នៅ​ក្នុង​កញ្ចប់"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "កំហុស​ក្នុង​ការ​បង្កើត​តំណរឹង `%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "កំហុស​​ក្នុង​ការសរសេរ `%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "មិន​អាច​អាន​ថត​ឯកសារ​កំណត់​រចនាម្ព័ន្ធ `%.250s' (ពី `%.250s')"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ​បង្វែរ"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "បានបរាជ័យលើឯកសារបង្ខែរ fstat"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "ប៉ះទង្គិចការបង្វែរដែលពាក់ព័ន្ធនឹង `%.250s' ឬ `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "កំហុស​ក្នុង​ការ​បិទ​ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg ៖ ការ​ព្រមាន​ដ៏ធ្ងន់ធ្ងរ ៖ ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​បាត់ សន្មត់​ថា​កញ្ចប់​"
+"គ្មាន​ឯកសារ​ដែល​បាន​ដំឡើង​ថ្មីៗ ។\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(កំពុង​អាន​មូលដ្ឋាន​ទិន្នន័យ​ ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d ឯកសារ និង​ថត​បាន​ដំឡើង​ថ្មីៗ ។)\n"
+msgstr[1] "%d ឯកសារ និង​ថត​បាន​ដំឡើង​ថ្មីៗ ។)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride uid %s"
+msgstr "ឯកសារ statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "ឯកសារ statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "ឯកសារ statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "បានបរាជ័យលើឯកសារ fstat statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "ឯកសារ statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "ឯកសារ statoverride មាន​បន្ទាត់​ទទេ"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "ឯកសារ statoverride មាន​បន្ទាត់​ទទេ"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "ចុង​បន្ទាត់​ដែល​មិន​រំពឹង​​ទុកក្នុង​ឈ្មោះ​កញ្ចប់​នៅ​បន្ទាត់ %d"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "ឯកសារ statoverride `%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -562,63 +772,71 @@ msgid "internal error"
 msgstr "កំហុស​ខាង​ក្នុង - របៀប​មិន​ត្រឹមត្រូវ `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "បាត់ %s "
+#, fuzzy
+#| msgid "cannot stat old name `%s': %s"
+msgid "is missing a value"
+msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "`%.*s' មិន​ត្រូវបា​នអនុ​ញ្ញាតសម្រាប់ %s"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "ឥតបានការ​បន្ទាប់ពី %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ឈ្មោះ​កញ្ចប់​មិន​ត្រឹមត្រូវ (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "កញ្ចប់ `%s' មិន​ត្រូវ​បាន​ដំឡើង ។\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "សម្អាត​វាល​លម្អិត​ឯកសារ `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "វាល​លម្អិត​ឯកសារ `%s' មិន​បាន​អនុញ្ញាត​ក្នុង​ឯកសារ​ស្ថានភាព"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "មាន​តម្លៃ​ច្រើន​ពេក​នៅក្នុង​វាល​លម្អិត​ឯកសារ `%s' (បាន​ប្រៀបធៀប​ទៅនឹងអា​ា​ផ្សេងទៀត)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "មាន​តម្លៃ​មួយ​ចំនួន​នៅ​ក្នុង​វាល​លម្អិត​ឯកសារ `%s' (បាន​ប្រៀបធៀប​នឹងអា​ផ្សេង​ទៀត)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "បាទ ចាស/ទេ នៅក្នុង​វាល​ប៊ូលីន​"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "វាល​ដែលហួសសម័យ `ការពិនិត្យ​ឡើងវិញ' ឬ `កញ្ចប់​ពិនិត្យ​ឡើងវិញ' បានប្រើ"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "វាល `%s' សំអាង​លើ `%.255s' ៖ កំហុស​នៅ​ក្នុង​កំណែ ៖ %.255s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "ពាក្យ​នៅ​​​ក្នុងវាល​ `អាទិភាព'"
 
 #: lib/dpkg/fields.c
@@ -628,33 +846,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "តម្លៃ​សម្រា​ប់វាល `ស្ថានភាព' មិន​បាន​អនុញ្ញាត​នៅ​ក្នុង​បរិបទ​នេះ"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "ទី ១ (ចង់បាន) ពាក្យនៅក្នុងវាល `ស្ថានភាព'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "ទី ២ (កំហុស) ពាក្យ​នៅ​ក្នុង​វាល `ស្ថានភាព'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "ទី ៣ (ស្ថានភាព) ពាក្យ​នៅក្នុង​វាល `ស្ថានភាព'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "កំហុស​នៅ​ក្នុង​ខ្សែ​អក្សរ​កំណែ `%.250s' ៖ %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "វាល​ដែលហួសសម័យ `ការពិនិត្យ​ឡើងវិញ' ឬ `កញ្ចប់​ពិនិត្យ​ឡើងវិញ' បានប្រើ"
 
 #: lib/dpkg/fields.c
@@ -666,11 +884,13 @@ msgstr "តម្លៃ​សម្រាប់ `conffiles' មាន​បន�
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "តម្លៃ​សម្រាប់ `conffiles' មាន​បន្ទាត់​ដែលចាប់ផ្ដើម​ជាមួយ​ `%c' ដែលគ្មាន​ចន្លោះ"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "ថត​មេ ឬ ថតទទេដែលត្រូវបាន​រាយ​ជា​ conffile"
 
 #: lib/dpkg/fields.c
@@ -754,9 +974,9 @@ msgstr "វាល `%s' សំអាង​លើ `%.255s' ៖ កំណែ​ម
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "វាល `%s' សំអាង​លើ `%.255s' ៖ កំហុស​នៅ​ក្នុង​កំណែ ៖ %.255s"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "វាល `%s' សំអាង​លើ `%.255s' ៖ កំណែ​មាន `%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -764,8 +984,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "វាល `%s' កំហុស​វាក្យ​សម្ព័ន្ធ​បន្ទាប់​ពី​យោង​លើ​កញ្ចប់ `%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "សញ្ញា (`|') ជំនួស​មិន​បាន​អនុញ្ញាត​នៅ​ក្នុង​វាល %s"
 
 #: lib/dpkg/fields.c
@@ -805,6 +1026,29 @@ msgstr "មិនអាច​កំណទ់​របៀប​របស់ dist
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat %s"
+msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "ការព្រមាន conffile `%s' គ្មានឯកសារអត្ថបទធម្មតា\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "មិន​អាច​សរសេរ %s ៖ %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open %s"
+msgstr "មិន​អាច​បើក​ការ​បង្វែរ ៖ %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "មិន​អាច​ដោះសោ %s ៖ %s"
@@ -827,8 +1071,20 @@ msgid "unable to lock %s"
 msgstr "មិន​អាច​ដោះសោ %s ៖ %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open file %s"
+msgstr "មិន​អាច​បើក​ការ​បង្វែរ ៖ %s"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "មិន​អាច​បង្ហូរ​ចូល​ក្នុងឯកសារ​ vsnprintf"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "មិន​អាច​បង្វែរ​ថត"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -852,13 +1108,13 @@ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "បានបរាជ័យ​ក្នុងការ​ចម្លង​សម្រាប់ std %s"
+msgid "failed to dup for fd %d"
+msgstr "បរាជ័យ​ dup សម្រាប់​ fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "បរាជ័យ​ dup សម្រាប់​ fd %d"
+msgid "failed to dup for std%s"
+msgstr "បានបរាជ័យ​ក្នុងការ​ចម្លង​សម្រាប់ std %s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -996,29 +1252,31 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "តម្លៃ​ស្ទួន​សម្រាប់​អ្នកប្រើ-វាល​ដែល​បាន​កំណត់ `%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "បាត់ %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "តម្លៃ​ទទេ​សម្រាប់​ %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "តម្លៃ​ស្ទួ​នស​ម្រាប់វាល `%s'"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has '%s' field but is missing architecture"
+msgstr " (កញ្ចប់ ៖ "
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr " (កញ្ចប់ ៖ "
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "កំណែ​ដែល​បាន​កំណត់​រចនាសម្ព័ន្ធ​សម្រាប់​កញ្ចប់​ដែល​មាន​ស្ថានភាព​មិន​ត្រឹមត្រូវ"
 
 #: lib/dpkg/parse.c
@@ -1027,7 +1285,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1036,11 +1295,14 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "  កញ្ចប់ %s ត្រូវតែបានយកចេញ ។\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "កញ្ចប់​ដែល​ឋិត​នៅក្នុង​ស្ថានភាព​មិនទាន់​បានដំឡើង មាន conffiles បំភ្លេចពួកវា"
 
 #: lib/dpkg/parse.c
@@ -1058,8 +1320,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1256,11 +1518,6 @@ msgstr "មិន​អាច​បង្កើត​ `%.255s'"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1277,6 +1534,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "បាត់ altname"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(គ្មាន​សេច​ក្តីពិពណ៌នា)"
@@ -1361,6 +1628,69 @@ msgstr "ដំណើរការរង %s បានបរាជ័យដោយ�
 msgid "wait for %s subprocess failed"
 msgstr "រង់ចាំ​ %s បាន​បរាជ័យ​"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "តួអក្សរ​មិន​ត្រឹមត្រូវ `%c' នៅ​ក្នុង​ទទឹង​វាល\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "តួអក្សរ​មិន​ត្រឹមត្រូវ `%c' នៅ​ក្នុង​ទទឹង​វាល\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header uid field"
+msgstr "ឯកសារ statoverride `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header gid field"
+msgstr "ឯកសារ statoverride `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "តួអក្សរ​មិន​ត្រឹមត្រូវ `%c' នៅ​ក្នុង​ទទឹង​វាល\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "មិនស្គាល់​ប្រភេទ​បង្ហាប់ `%s' !"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -1380,12 +1710,12 @@ msgstr "មិន​អាច​អាន​ថត​ព័ត៌មាន"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "មិន​អាច​ដោះសោ %s ៖ %s"
 
 #: lib/dpkg/trigdeferred.c
@@ -1596,11 +1926,6 @@ msgstr "កំហុស​ក្នុង​ការ​បង្កើត​ប
 msgid "error creating device '%.255s'"
 msgstr "កំហុស​ក្នុង​ការ​បង្កើត​ឧបករណ៍ `%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "កំហុស​ក្នុង​ការ​បង្កើត​តំណរឹង `%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1913,10 +2238,10 @@ msgstr "មិន​អាច​ចូល​ដំណើរការ​ប័ណ
 msgid "archive '%s' is not a regular file"
 msgstr "ការព្រមាន conffile `%s' គ្មានឯកសារអត្ថបទធម្មតា\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2134,6 +2459,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "វាយ `exit' នៅ​ពេល​ដែល​អ្នក​បាន​ធ្វើ​រួចរាល់ ។\n"
 
@@ -2508,7 +2837,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2548,6 +2880,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -2678,6 +3016,13 @@ msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 msgstr "dpkg - ព្រមាន ៖ មិ​នអើពើ​សំណើ​ដើម្បី​យក %.250s ចេញ ដែល​មិន​ត្រូវ​បាន​ដំឡើង ។\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
@@ -2724,19 +3069,6 @@ msgstr "កញ្ចប់​មិនអាច​មាន​បន្ទាត
 msgid "divert-to may not contain newlines"
 msgstr "បង្វែរ​មិន​អាច​មាន​បន្ទាត់​ថ្មី"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ​បង្វែរ"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "បានបរាជ័យលើឯកសារបង្ខែរ fstat"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "ប៉ះទង្គិចការបង្វែរដែលពាក់ព័ន្ធនឹង `%.250s' ឬ `%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3026,118 +3358,167 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "កញ្ចប់ %s កំពុង​រង់ចាំ មិន​ប៉ះពាល់​វា ។  ប្រើ --force-ដើម្បី​បដិសេធ ។\n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
-"dpkg - ព្រមាន បដិសេធបញ្ហាពីព្រោះ --force បានអនុញ្ញាត ៖\n"
-" "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "មិន​អាច​អាន​ថត​ឯកសារ​កំណត់​រចនាម្ព័ន្ធ `%.250s' (ពី `%.250s')"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "កំហុស​ក្នុង​ការ​បិទ​ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg ៖ ការ​ព្រមាន​ដ៏ធ្ងន់ធ្ងរ ៖ ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​បាត់ សន្មត់​ថា​កញ្ចប់​"
-"គ្មាន​ឯកសារ​ដែល​បាន​ដំឡើង​ថ្មីៗ ។\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "រាយ​កញ្ចប់​​ឯកសារ​ `%.250s'"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "បញ្ហា​ភាព​អាស្រ័យ - មិន​យក​ចេញ"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "បញ្ហា​ភាព​អាស្រ័យ - មិន​យក​ចេញ"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "កំហុស​ក្នុង​ការ​បិទ​ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(កំពុង​អាន​មូលដ្ឋាន​ទិន្នន័យ​ ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "ជម្រើស​បង្ខំ/បដិសេធ​ដែល​មិនស្គាល់ `%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d ឯកសារ និង​ថត​បាន​ដំឡើង​ថ្មីៗ ។)\n"
-msgstr[1] "%d ឯកសារ និង​ថត​បាន​ដំឡើង​ថ្មីៗ ។)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "ព្រមាន ៖ ជម្រើស​បង្ខំ/បដិសេធ ដែល​លែង​ប្រើ `%s'\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"dpkg - ព្រមាន បដិសេធបញ្ហាពីព្រោះ --force បានអនុញ្ញាត ៖\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3201,42 +3582,6 @@ msgstr ""
 "រក​មិន​ឃើញ​កម្មវិធី​ដែល​បាន​រំពឹង​ទុក %d នៅ​លើ PATH ។\n"
 "NB ៖ PATH របស់ root តាម​ធម្មតា​គួរ​មាន /usr/local/sbin, /usr/sbin and /sbin ។"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "មិន​អាច​ពិនិត្យ​មើល​ភាព​មាន​ស្រាប់​របស់`%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "មិន​អាច​អាន​ថត​ព័ត៌មាន"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "កំហុស​ក្នុង​ការ​ព្យាយាម​បើក %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "មិន​អាច​បើក​ឯកសារ​ប្រភព `%.250s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "conffile `%.250s' មិន​បង្ហាញ​នៅ​ក្នុង​កញ្ចប់"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "កំហុស​​ក្នុង​ការសរសេរ `%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3246,27 +3591,27 @@ msgstr "កម្មវិធី​គ្រប់គ្រង​កញ្ចប
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3471,114 +3816,6 @@ msgstr ""
 "ជម្រើស​បាន​សម្គាល់ [*] បង្កើត​ទិន្នផល​ជា​ច្រើន - បំពង់​ដែល​វា​ឆ្លង​កាត់ `តិច' ឬ `ច្រើន' !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "បញ្ហា​ភាព​អាស្រ័យ - មិន​យក​ចេញ"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "បញ្ហា​ភាព​អាស្រ័យ - មិន​យក​ចេញ"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3709,33 +3946,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "ជម្រើស​បង្ខំ/បដិសេធ​ដែល​មិនស្គាល់ `%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "ព្រមាន ៖ ជម្រើស​បង្ខំ/បដិសេធ ដែល​លែង​ប្រើ `%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "មិនអាចបើក​ `%i' សម្រាប់​ស្ទ្រីម​"
 
@@ -3921,6 +4131,10 @@ msgid "Description"
 msgstr "សេចក្តី​ពិពណ៌នា"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, fuzzy, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "បាន​បង្វែរ​ដោយ %s ទៅ ៖ %s\n"
@@ -3957,6 +4171,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "កញ្ចប់ `%s' មិន​ត្រូវ​បាន​ដំឡើង និង​គ្មាន​ព័ត៌មាន​អាច​ប្រើបាន ។\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"ប្រើ dpkg --info (= dpkg-deb --info) ដើម្បី​ពិនិត្យ​មើល​ឯកសារ​ប័ណ្ណសារ\n"
+"និង dpkg --contents (= dpkg-deb --contents) ដើម្បី​រាយ​មាតិកា​របស់​ពួកវា ។\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -3983,9 +4207,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "បាន​បង្វែរ​ដោយ %s ទៅ ៖ %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "ប្រើ dpkg --info (= dpkg-deb --info) ដើម្បី​ពិនិត្យ​មើល​ឯកសារ​ប័ណ្ណសារ\n"
 "និង dpkg --contents (= dpkg-deb --contents) ដើម្បី​រាយ​មាតិកា​របស់​ពួកវា ។\n"
@@ -4033,16 +4260,16 @@ msgstr "កម្មវិធី​គ្រប់គ្រង​កញ្ចប
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4236,6 +4463,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "បាន​បរាជ័យ​ដើម្បី chroot ទៅ `%.250s'"
@@ -4386,8 +4619,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4464,71 +4702,10 @@ msgstr "គ្មាន​ការ​បដិសេធ​លេច​ឡើង
 msgid "--update is useless for --remove"
 msgstr "ព្រមាន ៖ --update គឺ​គ្មាន​ប្រយោជន៍​សម្រាប់ --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride uid %s"
-msgstr "ឯកសារ statoverride `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "ឯកសារ statoverride `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "ឯកសារ statoverride `%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "បានបរាជ័យលើឯកសារ fstat statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "ឯកសារ statoverride `%.250s'"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "ឯកសារ statoverride មាន​បន្ទាត់​ទទេ"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "ឯកសារ statoverride មាន​បន្ទាត់​ទទេ"
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "ចុង​បន្ទាត់​ដែល​មិន​រំពឹង​​ទុកក្នុង​ឈ្មោះ​កញ្ចប់​នៅ​បន្ទាត់ %d"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "ឯកសារ statoverride `%.250s'"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "ព្រមាន ៖ ជម្រើសលែងប្រើ `--%s'\n"
 
 #: src/trigcmd.c
 #, fuzzy
@@ -4763,6 +4940,12 @@ msgstr "មិន​កំពុង​កំណត់​រចនាសម្ព
 msgid "De-configuring %s (%s) ...\n"
 msgstr "កំពុងយក %s ចេញ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "ឯកសារ statoverride មាន​បន្ទាត់​ទទេ"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4900,11 +5083,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "កំហុស​ក្នុង​ការ​អាន​លទ្ធផល dpkg-deb tar"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "ឯកសារ tar របស់​ប្រព័ន្ធ​ឯកសារ​ដែល​ខូច - ប័ណ្ណសារ​កញ្ចប់​ដែល​ខូច"
 
 #: src/unpack.c
@@ -4920,12 +5101,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s ត្រូវការ​អាគុយម៉ង់​ឯកសារ​កញ្ចប់​ជាក់លាក់​មួយ"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "មិន​អាច​ចូល​ដំណើរការ​ផ្ទៃ​ស្ថានភាព dpkg សម្រាប់​បន្ទុក​​ដែ​លមាន​ការធ្វើឲ្យ​ទាន់សម័យ"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr "បន្ទុក​ដែ​លមាន​ការ​ធ្វើឲ្យ​ទាន់​សម័យ​ត្រូវការ​សិទ្ធិ​ចូល​ដំណើរការ​ទៅ​ផ្ទៃ​ស្ថានភាព​របស់ dpkg"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "មិន​អាច​ចូល​ដំណើរការ​ផ្ទៃ​ស្ថានភាព dpkg សម្រាប់​បន្ទុក​​ដែ​លមាន​ការធ្វើឲ្យ​ទាន់សម័យ"
 
 #: src/update.c
 #, c-format
@@ -5300,16 +5487,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "បាន​បរាជ័យ chdir ទៅ​ថត"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បង្កើត​ថត"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "បាន​បរាជ័យ chdir ទៅ​ថត បន្ទាប់​ពី​បង្កើត​វា"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "ចុង​ឯកសារ​ដែល​មិន​រំពឹងទុក​ក្នុង​ឈ្មោះ​កញ្ចប់​នៅ​បន្ទាត់ %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "បាន​បរាជ័យ chdir ទៅ​ថត"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6166,8 +6355,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6675,13 +6865,85 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "ព្រមាន ៖ ជម្រើសលែងប្រើ `--%s'\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "មិន​អាច​បើក tmpfile សម្រាប់ vsnprintf"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "បាត់ %s "
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "`%.*s' មិន​ត្រូវបា​នអនុ​ញ្ញាតសម្រាប់ %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "ឥតបានការ​បន្ទាប់ពី %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "ឈ្មោះ​កញ្ចប់​មិន​ត្រឹមត្រូវ (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "បាទ ចាស/ទេ នៅក្នុង​វាល​ប៊ូលីន​"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "វាល `%s' សំអាង​លើ `%.255s' ៖ កំហុស​នៅ​ក្នុង​កំណែ ៖ %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr "តម្លៃ​ទទេ​សម្រាប់​ %s"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr "បន្ទុក​ដែ​លមាន​ការ​ធ្វើឲ្យ​ទាន់​សម័យ​ត្រូវការ​សិទ្ធិ​ចូល​ដំណើរការ​ទៅ​ផ្ទៃ​ស្ថានភាព​របស់ dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "កំហុស​ក្នុង​ការ​អាន​លទ្ធផល dpkg-deb tar"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "កំហុស​ក្នុង​ការ​បិទ​ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "រាយ​កញ្ចប់​​ឯកសារ​ `%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "បាន​បរាជ័យ chdir ទៅ​ថត បន្ទាប់​ពី​បង្កើត​វា"
 
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
@@ -6761,9 +7023,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF នៅលើ stdin នៅប្រអប់​បញ្ចូល conffile"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "ចុង​ឯកសារ​ដែល​មិន​រំពឹងទុក​ក្នុង​ឈ្មោះ​កញ្ចប់​នៅ​បន្ទាត់ %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "មិន​រំពឹង​ទុក​ថា​ ចុង​ឯកសារ​បន្ទាប់​ពី មានឈ្មោះ​កញ្ចប់​ពេល​បញ្ចប់​​ %d"
 
@@ -7051,11 +7310,6 @@ msgstr ""
 #~ msgstr " កូនចៅ %s ៖ %s"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
-
-#, fuzzy
 #~| msgid "%s: copying %s to %s failed, giving up: %s"
 #~ msgid "scan of %s failed: %s"
 #~ msgstr "%s ៖ ចម្លង %s ទៅ %s បាន​បរាជ័យ បោះបង់ ៖ %s"
@@ -7082,11 +7336,6 @@ msgstr ""
 #~ msgstr "មិន​អាច​បិទ %s ៖ %s"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "មិន​អាច​សរសេរ %s ៖ %s"
-
-#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "មិន​អាច​ប្ដូរ​ឈ្មោះ %s ទៅ​ជា %s ៖ %s"
diff --git a/po/ko.po b/po/ko.po
index 73fb7ffe5..51923d6f4 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-06-26 16:12+0200\n"
 "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
 "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n"
@@ -149,7 +149,8 @@ msgstr "오래된 diversions-old를 제거하는데 오류가 발생했습니다
 msgid "error creating new backup file '%s'"
 msgstr "`%.255s' 파이프를 만드는데 오류가 발생했습니다"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "`%.250s'을(를) 지울 수 없습니다"
@@ -372,22 +373,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "채운 뒤에 %.250s 파일의 시작으로 이동할 수 없습니다"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "테스트를 위해 %s 잠금 파일을 열 수 없습니다"
+#, fuzzy, c-format
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "`%.250s 파일의 파일디스크립터 플래그 값을 읽을 수 없습니다"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "상태 데이터베이스의 잠금 파일의 열기/만들기를 할 수 없습니다"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "상태 데이터베이스의 잠금 파일의 열기/만들기를 할 수 없습니다"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "dpkg 상태 데이터베이스를 잠글 수 있는 권한이 없습니다"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg 상태 데이터베이스를 잠글 수 없습니다"
 
 #: lib/dpkg/dbmodify.c
@@ -395,11 +411,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "요청한 작업을 하려면 수퍼유저 권한이 필요합니다"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "dpkg 상태 영역에 접근할 수 없습니다"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "이 작업은 dpkg 상태 영역에 읽기/쓰기 권한이 필요합니다"
 
 #: lib/dpkg/dbmodify.c
@@ -437,6 +457,200 @@ msgstr "`%.250s'의 업데이트 상태를 닫을 수 없습니다"
 msgid "unable to install updated status of '%.250s'"
 msgstr "`%.250s'의 업데이트 상태를 설치할 수 없습니다"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "`%.250s' 파일이 있는 지 여부를 검사할 수 없습니다"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "정보 디렉터리를 읽을 수 없습니다"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "%.250s을(를) 열기 시도하는데 오류가 발생했습니다"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+#| msgid "unable to write file '%s'"
+msgid "corrupt info database format file '%s'"
+msgstr "'%s' 파일에 쓸 수 없습니다"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "`%.250s' 설정 파일이 패키지 안에 없습니다"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "`%.255s' 하드 링크를 만드는데 오류가 발생했습니다"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "`%s' 파일을 쓰는데 오류가 발생했습니다"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "`%.250s' 패키지의 파일 목록에 빈 파일 이름이 있습니다"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "설정 파일 디렉터리 `%.250s' 디렉터리를 읽을 수 없습니다 (`%.250s'에서)"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "diversions 파일을 여는데 실패했습니다"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "diversions 파일의 정보를 읽는데 실패했습니다"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr ""
+"전환 파일과 관련해 발생한 충돌이 `%.250s' 혹은 `%.250s'에 관련되었습니다"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "`%.250s' 패키지의 파일 목록 파일을 닫는데 오류가 발생했습니다."
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid ""
+#| "files list file for package `%.250s' missing, assuming package has no "
+#| "files currently installed."
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"`%.250s' 패키지의 파일 목록 파일이 없습니다, 패키지에 설치된 파일이 하나도 없"
+"다고 가정합니다."
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "`%.250s' 패키지의 파일 목록에 빈 파일 이름이 있습니다"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(데이터베이스 읽는중 ..."
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "현재 %d개의 파일과 디렉터리가 설치되어 있습니다.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "잘못된 상태"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "statoverride 파일 `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "statoverride 파일 `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "statoverride 파일을 여는데 실패했습니다"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "statoverride 파일의 정보를 읽는데 실패했습니다"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "statoverride 파일 `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "statoverride 파일에 마지막 줄바꿈이 빠졌습니다"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statoverride 파일에 빈 줄이 들어 있습니다"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "statoverride 파일에 문법 오류가 있습니다"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "statoverride 파일에서 갑작스레 줄이 끝났습니다"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "'%.250s' 파일에 대한 statoverrides 파일이 여러 개 있습니다"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version number"
@@ -583,63 +797,73 @@ msgid "internal error"
 msgstr "%s: 내부 gzip 읽기 오류"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s이(가) 빠졌습니다"
+#, fuzzy
+#| msgid "cannot stat file '%s'"
+msgid "is missing a value"
+msgstr "'%s' 파일의 정보를 읽을 수 없습니다"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "`%.*s'은(는) %s에 쓸 수 없습니다"
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "잘못된 줄을 건너 뜁니다: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "%s 뒤에 쓰레기 데이터가 있습니다"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "패키지 이름이 잘못되었습니다 (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "`%s' 패키지는 설치하지 않았습니다.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "파일 상세 필드 `%s'이(가) 비어 있습니다"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "파일 상세 필드 `%s'은(는) 상태 파일에서 쓸 수 없습니다"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "파일 상세 필드 `%s'에 너무 값이 많습니다 (다른 필드에 비해)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "파일 상세 필드 `%s'에 너무 값이 적습니다 (다른 필드에 비해)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "불리언 필드에서는 예/아니오만 가능합니다"
-
-#: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
 msgstr ""
+"더 이상 사용하지 않는 `Revision' 이나 `Package-Revision' 필드를 사용했습니다"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' is not a valid architecture name: %s"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': error in version"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "'%s' 필드, '%.255s' 참조: 버전에 오류가 있습니다"
+
+#: lib/dpkg/fields.c
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "`priority' 필드에 단어가 있습니다"
 
 #: lib/dpkg/fields.c
@@ -649,33 +873,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "`status' 필드의 값은 이 경우에 쓸 수 없습니다"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "`status' 필드 내에 첫 번째 (요청) 단어가 있습니다"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "`status' 필드 내에 두 번째 (오류) 단어가 있습니다"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "`status' 필드 내에 세 번째 (상태) 단어가 있습니다"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string '%.250s'"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "Version 문자열 '%.250s'에 오류가 발생했습니다"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr ""
 "더 이상 사용하지 않는 `Revision' 이나 `Package-Revision' 필드를 사용했습니다"
 
@@ -688,12 +912,14 @@ msgstr "`conffiles'의 값에 잘못된 줄, `%.*s'이(가) 있습니다"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "`conffiles' 필드의 값에 공백이 아닌 `%c'(으)로 시작하는 줄이 들어 있습니다"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "conffile에 루트 혹은 빈 디렉터리가 들어 있습니다"
 
 #: lib/dpkg/fields.c
@@ -780,9 +1006,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "`%s' 필드, `%.255s' 참조: 버전이 끝나지 않았습니다"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "'%s' 필드, '%.255s' 참조: 버전에 오류가 있습니다"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "`%s' 필드, `%.255s' 참조: 버전에 `%c'(이)가 들어 있습니다"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -790,8 +1017,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "`%s' 필드, `%.255s' 패키지 참조 후 구문 오류가 있습니다"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "%s 필드에는 대신할 패키지 표시를 (`|') 쓸 수 없습니다"
 
 #: lib/dpkg/fields.c
@@ -831,6 +1059,30 @@ msgstr "대상 파일 '%.250s'의 모드를 설정할 수 없습니다"
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "'%s'의 정보를 읽을 수 없습니다 : %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "'%.250s' 설정 파일이 일반 파일이 아닙니다"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "%s에 쓸 수 없습니다: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot open %s"
+msgstr "%s 파일에 붙일 수 없습니다: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to close %s: %s"
 msgid "unable to unlock %s"
 msgstr "%s 닫을 수 없습니다: %s"
@@ -853,10 +1105,22 @@ msgid "unable to lock %s"
 msgstr "%s 닫을 수 없습니다: %s"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot open file %s"
+msgstr "%s 파일에 붙일 수 없습니다: %s"
+
+#: lib/dpkg/file.c
 #, fuzzy
-#| msgid "long filenames"
-msgid "showing file on pager"
-msgstr "긴 파일 이름"
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "'%s' 파일을 플러시할 수 없습니다"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "'%s' 파일을 해당 파일로 전환할 수는 없습니다"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -879,13 +1143,13 @@ msgstr "메모리를 할당하는데 실패했습니다"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "std%s에 dup이 실패했습니다"
+msgid "failed to dup for fd %d"
+msgstr "fd %d에 dup이 실패했습니다"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "fd %d에 dup이 실패했습니다"
+msgid "failed to dup for std%s"
+msgstr "std%s에 dup이 실패했습니다"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1026,30 +1290,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "사용자 정의 필드 `%.*s'의 값이 중복되었습니다"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "%s 빠졌습니다"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s의 값이 비어 있습니다"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "`%s' 필드의 값이 중복되었습니다"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has '%s' field but is missing architecture"
+msgstr "패키지의 상태가 %s이지만 트리거가 대기하고 있습니다"
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
 #| msgid "package has status %s but triggers are awaited"
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "패키지의 상태가 %s이지만 트리거가 대기하고 있습니다"
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "적당하지 않은 Status의 패키지에 대한 Configured-Version"
 
 #: lib/dpkg/parse.c
@@ -1058,8 +1325,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "패키지의 상태가 %s이지만 트리거가 대기하고 있습니다"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "패키지의 상태가 트리거 대기이지만 대기하는 트리거가 하나도 없습니다"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "패키지의 상태가 %s이지만 트리거가 대기하고 있습니다"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1067,11 +1336,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "패키지의 상태가 %s이지만 트리거가 밀려 있습니다"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "패키지의 상태가 트리거 밀림이지만 밀린 트리거가 하나도 없습니다"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "패키지의 상태가 %s이지만 트리거가 밀려 있습니다"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "설치되지 않은 상태의 패키지에 설정 파일이 있습니다. 잊어버립니다"
 
 #: lib/dpkg/parse.c
@@ -1089,8 +1362,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1293,11 +1566,6 @@ msgstr "'%.255s'을(를) 안전하게 제거할 수 없습니다"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1312,6 +1580,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr ""
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(설명 없음)"
@@ -1401,6 +1679,70 @@ msgstr "하위 프로세스 %s이(가) 지연 상태 코드 %d을(를) 갖고 �
 msgid "wait for %s subprocess failed"
 msgstr "%s 하위 프로세스를 wait하는데 실패했습니다"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "필드 너비에 쓸 수 없는 `%c' 문자가 들어 있습니다\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "필드 너비에 쓸 수 없는 `%c' 문자가 들어 있습니다\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "잘못된 상태"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header gid field"
+msgstr "statoverride 파일 `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "필드 너비에 쓸 수 없는 `%c' 문자가 들어 있습니다\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "generated corrupt ar header for '%s'"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "'%s'에 대해 생성한 ar 헤더가 망가졌습니다"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "알 수 없는 압축 종류 `%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1420,14 +1762,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "컨트롤 디렉터리가 디렉터리가 아닙니다"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "트리거 잠금 파일을 (`%.250s') 열거나 만들 수 없습니다"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
 #| msgid "triggered"
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "트리거"
 
 #: lib/dpkg/trigdeferred.c
@@ -1651,11 +1994,6 @@ msgstr "`%.255s' 파이프를 만드는데 오류가 발생했습니다"
 msgid "error creating device '%.255s'"
 msgstr "`%.255s' 장치를 만드는데 오류가 발생했습니다"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "`%.255s' 하드 링크를 만드는데 오류가 발생했습니다"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -2003,10 +2341,10 @@ msgstr "아카이브에 접근할 수 없습니다"
 msgid "archive '%s' is not a regular file"
 msgstr "'%.250s' 설정 파일이 일반 파일이 아닙니다"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<표준 출력>"
 
@@ -2227,6 +2565,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "다 끝나면 `exit'를 입력하십시오.\n"
 
@@ -2597,7 +2939,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2606,7 +2962,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2638,6 +2997,12 @@ msgstr ""
 "일치해야 합니다. 패키지의 preinst, postrm 스크립트는 언제나 --package와\n"
 "--divert 옵션을 지정하는 것이 좋습니다.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2763,6 +3128,13 @@ msgstr "설치하지 않은 %.250s 패키지의 지우기 요청을 무시합니
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "'%s' 전환 파일이 없으므로 아무것도 안 지웠습니다.\n"
 
@@ -2807,20 +3179,6 @@ msgstr "패키지에 줄바꿈이 있으면 안 됩니다"
 msgid "divert-to may not contain newlines"
 msgstr "<전환할파일>에는 줄바꿈이 있으면 안 됩니다"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "diversions 파일을 여는데 실패했습니다"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "diversions 파일의 정보를 읽는데 실패했습니다"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr ""
-"전환 파일과 관련해 발생한 충돌이 `%.250s' 혹은 `%.250s'에 관련되었습니다"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3122,122 +3480,165 @@ msgstr ""
 "%s 패키지는 고정 상태로 건드리지 않습니다.  무시하려면 --force-hold 옵션을 사"
 "용하십시오.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "--force 옵션이 켜져 있으므로 문제를 무시합니다:"
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "`%.250s' 패키지의 파일 목록에 빈 파일 이름이 있습니다"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "`%.250s' 패키지에 대한 파일 목록을 열 수 없습니다"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to stat files list file for package '%.250s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "'%.250s' 패키지의 파일 목록 파일의 정보를 읽을 수 없습니다"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "설정 파일 디렉터리 `%.250s' 디렉터리를 읽을 수 없습니다 (`%.250s'에서)"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "`%.250s' 패키지의 파일 목록 파일을 닫는데 오류가 발생했습니다."
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "`%.250s' 패키지에 대한 파일 목록을 열 수 없습니다"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid ""
-#| "files list file for package `%.250s' missing, assuming package has no "
-#| "files currently installed."
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"`%.250s' 패키지의 파일 목록 파일이 없습니다, 패키지에 설치된 파일이 하나도 없"
-"다고 가정합니다."
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "'%.250s' 패키지의 파일 목록 파일의 정보를 읽을 수 없습니다"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "`%.250s' 패키지의 파일 목록"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "의존성 문제 - 지우지 않습니다"
 
-#: src/filesdb.c
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "의존성 문제 - 지우지 않습니다"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "`%.250s' 패키지의 파일 목록에 빈 파일 이름이 있습니다"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "`%.250s' 패키지의 파일 목록 파일을 닫는데 오류가 발생했습니다."
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(데이터베이스 읽는중 ..."
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "현재 %d개의 파일과 디렉터리가 설치되어 있습니다.)\n"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "알 수 없는 force/refuse 옵션 `%.*s'"
+
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "'%s' force/refuse 옵션은 더 이상 사용하지 않습니다\n"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "--force 옵션이 켜져 있으므로 문제를 무시합니다:"
 
 #: src/help.c
 msgid "not installed"
@@ -3309,43 +3710,6 @@ msgstr ""
 "%d개의 필요한 프로그램이 PATH에 없거나 실행 파일이 아닙니다.\n"
 "root의 PATH에는 보통 /usr/local/sbin, /usr/sbin, /sbin이 들어 있어야 합니다."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "`%.250s' 파일이 있는 지 여부를 검사할 수 없습니다"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "정보 디렉터리를 읽을 수 없습니다"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "%.250s을(를) 열기 시도하는데 오류가 발생했습니다"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-#| msgid "unable to write file '%s'"
-msgid "corrupt info database format file '%s'"
-msgstr "'%s' 파일에 쓸 수 없습니다"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "`%.250s' 설정 파일이 패키지 안에 없습니다"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "`%s' 파일을 쓰는데 오류가 발생했습니다"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3385,27 +3749,27 @@ msgstr "데비안 '%s' 패키지 관리 프로그램 버전 %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3675,114 +4039,6 @@ msgstr ""
 "[*] 표시된 옵션은 표시하는 내용이 많습니다. - `less'나 `more'를 이용하십시오!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "의존성 문제 - 지우지 않습니다"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "의존성 문제 - 지우지 않습니다"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3916,34 +4172,6 @@ msgstr ""
 msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr ""
 
-#: src/main.c
-#, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "알 수 없는 force/refuse 옵션 `%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "'%s' force/refuse 옵션은 더 이상 사용하지 않습니다\n"
-
 # fdopen() 실패 상황
 #: src/main.c
 #, c-format
@@ -4134,6 +4362,12 @@ msgid "Description"
 msgstr "설명"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "long filenames"
+msgid "showing package list on pager"
+msgstr "긴 파일 이름"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "%2$s 패키지가 %1$s 패키지에서 전환\n"
@@ -4170,6 +4404,17 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "`%s' 패키지는 설치하지 않았으며 정보도 없습니다.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"아카이브 파일 정보를 보려면 dpkg --info를 실행하시고 (= dpkg-deb --info)\n"
+"아카이브 내용을 보려면 dpkg --contents를 실행하십시오 (= dpkg-deb --"
+"contents)\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4196,9 +4441,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "%s 패키지가 이 패키지를 전환: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "아카이브 파일 정보를 보려면 dpkg --info를 실행하시고 (= dpkg-deb --info)\n"
 "아카이브 내용을 보려면 dpkg --contents를 실행하십시오 (= dpkg-deb --"
@@ -4258,16 +4506,16 @@ msgstr "데비안 '%s' 패키지 관리 쿼리 프로그램 버전 %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4472,6 +4720,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "`%.250s'(으)로 chroot가 실패했습니다"
@@ -4649,8 +4903,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4724,70 +4983,11 @@ msgstr "override가 없습니다."
 msgid "--update is useless for --remove"
 msgstr "--remove 명령에서는 --update 옵션이 무의미합니다"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "잘못된 상태"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "statoverride 파일 `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "statoverride 파일 `%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "statoverride 파일을 여는데 실패했습니다"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "statoverride 파일의 정보를 읽는데 실패했습니다"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "statoverride 파일 `%.250s'"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "statoverride 파일에 마지막 줄바꿈이 빠졌습니다"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "statoverride 파일에 빈 줄이 들어 있습니다"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "statoverride 파일에 문법 오류가 있습니다"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "syntax error: unknown user '%s' in statoverride file"
-msgid "unknown user '%s' in statoverride file"
-msgstr "문법 오류: statoverride 파일에서 알 수 없는 사용자 '%s'"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "statoverride 파일에서 갑작스레 줄이 끝났습니다"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "syntax error: unknown group '%s' in statoverride file"
-msgid "unknown group '%s' in statoverride file"
-msgstr "문법 오류: statoverride 파일에서 알 수 없는 그룹 '%s'"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "'%.250s' 파일에 대한 statoverrides 파일이 여러 개 있습니다"
+#| msgid "obsolete option '--%s', please use '--%s' instead."
+msgid "deprecated --%s option; use --%s instead"
+msgstr "'--%s' 옵션은 더 이상 사용하지 않습니다. '--%s' 옵션을 사용하십시오."
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5046,6 +5246,12 @@ msgstr "%2$s을(를) 지우기 위해 %1$s을(를) 설정 해제하는 중입니
 msgid "De-configuring %s (%s) ...\n"
 msgstr "%s 패키지를 지우는 중입니다 ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "statoverride 파일에 빈 줄이 들어 있습니다"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 #| msgid "conffile name '%.50s...' is too long, or missing final newline"
@@ -5194,11 +5400,9 @@ msgid "package filesystem archive extraction"
 msgstr "dpkg-deb 필드 값을 빼 내기"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "dpkg-deb tar 출력을 읽는데 오류가 발생했습니다"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "망가진 파일 시스템 tar 파일 - 망가진 패키지 아카이브"
 
 #: src/unpack.c
@@ -5214,13 +5418,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s 옵션은 정확히 하나의 Packages 파일 인수만을 받습니다"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "사용 가능 목록을 업데이트하려는데 dpkg 상태 영역에 접근할 수 없습니다"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr ""
-"사용 가능 목록을 업데이트하려면 dpkg 상태 영역에 쓰기 권한이 있어야 합니다"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "사용 가능 목록을 업데이트하려는데 dpkg 상태 영역에 접근할 수 없습니다"
 
 #: src/update.c
 #, c-format
@@ -5609,16 +5818,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "디렉터리로 이동하는데 실패했습니다"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "디렉터리를 만드는데 실패했습니다"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "디렉터리를 만든 다음에 거기로 이동하는데 실패했습니다"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "%d번째 줄에 있는 패키지 이름에 예상치 못하게 파일이 끝났습니다"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "디렉터리로 이동하는데 실패했습니다"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6572,8 +6783,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -7115,16 +7327,93 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "테스트를 위해 %s 잠금 파일을 열 수 없습니다"
+
+#, fuzzy
+#~| msgid "syntax error: unknown user '%s' in statoverride file"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "문법 오류: statoverride 파일에서 알 수 없는 사용자 '%s'"
+
 #, fuzzy
-#~| msgid "obsolete option '--%s', please use '--%s' instead."
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
+#~| msgid "syntax error: unknown group '%s' in statoverride file"
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "문법 오류: statoverride 파일에서 알 수 없는 그룹 '%s'"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s이(가) 빠졌습니다"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "`%.*s'은(는) %s에 쓸 수 없습니다"
+
+#~ msgid "junk after %s"
+#~ msgstr "%s 뒤에 쓰레기 데이터가 있습니다"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "패키지 이름이 잘못되었습니다 (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "불리언 필드에서는 예/아니오만 가능합니다"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "'%s' 필드, '%.255s' 참조: 버전에 오류가 있습니다"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s의 값이 비어 있습니다"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "패키지의 상태가 트리거 대기이지만 대기하는 트리거가 하나도 없습니다"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr "패키지의 상태가 트리거 밀림이지만 밀린 트리거가 하나도 없습니다"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
 #~ msgstr ""
-#~ "'--%s' 옵션은 더 이상 사용하지 않습니다. '--%s' 옵션을 사용하십시오."
+#~ "사용 가능 목록을 업데이트하려면 dpkg 상태 영역에 쓰기 권한이 있어야 합니다"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "dpkg-deb tar 출력을 읽는데 오류가 발생했습니다"
 
 #, fuzzy
-#~| msgid "cannot stat file '%s'"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "'%s' 파일의 정보를 읽을 수 없습니다"
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "`%.250s' 패키지에 대한 파일 목록을 열 수 없습니다"
+
+#, fuzzy
+#~| msgid "unable to stat files list file for package '%.250s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "'%.250s' 패키지의 파일 목록 파일의 정보를 읽을 수 없습니다"
+
+#, fuzzy
+#~| msgid "files list file for package '%.250s' is missing final newline"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "`%.250s' 패키지의 파일 목록 파일을 닫는데 오류가 발생했습니다."
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "`%.250s' 패키지에 대한 파일 목록을 열 수 없습니다"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "'%.250s' 패키지의 파일 목록 파일의 정보를 읽을 수 없습니다"
+
+#, fuzzy
+#~| msgid "files list file for package '%.250s' is missing final newline"
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "`%.250s' 패키지의 파일 목록"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "디렉터리를 만든 다음에 거기로 이동하는데 실패했습니다"
 
 #, fuzzy
 #~| msgid "cannot stat file '%s'"
@@ -7198,9 +7487,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "설정 파일 프롬프트에서 표준 입력에 파일이 끝났습니다"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "%d번째 줄에 있는 패키지 이름에 예상치 못하게 파일이 끝났습니다"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "%d번째 줄에 있는 패키지 이름 뒤에 예상치 못하게 파일이 끝났습니다"
 
@@ -7446,9 +7732,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "%s의 슬레이브입니다"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "'%s'의 정보를 읽을 수 없습니다 : %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "readlink(%s) 실패: %s"
 
@@ -7473,9 +7756,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "%s 닫을 수 없습니다: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "%s에 쓸 수 없습니다: %s"
-
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
diff --git a/po/ku.po b/po/ku.po
index ae25e1e97..a091e0953 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -1,13 +1,13 @@
 # Kurdish translation for dpkg
-# Copyright (c) (c) 2006 Canonical Ltd, and Rosetta Contributors 2006
+# Copyright © 2006 Canonical Ltd, and Rosetta Contributors 2006
 # This file is distributed under the same license as the dpkg package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2006.
+# Erdal Ronahi <erdal.ronahi@gmail.com>, 2006-2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:50+0200\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <ku@li.org>\n"
@@ -138,7 +138,8 @@ msgstr "%s nayê xebitandin"
 msgid "error creating new backup file '%s'"
 msgstr "%s nayê xebitandin"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "`%.250s' nayê rakirin"
@@ -344,21 +345,32 @@ msgstr ""
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "tmpfile bo vsnpritif nayê vekirin"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "afirandina peldankê biserneket"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "%s nayê xebitandin"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "%s nayê xebitandin"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, c-format
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "nikarî danegeha rewşa dpkg biqifilîne"
 
 #: lib/dpkg/dbmodify.c
@@ -366,11 +378,13 @@ msgid "requested operation requires superuser privilege"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
-msgstr ""
+#, fuzzy, c-format
+msgid "unable to access the dpkg database directory %s"
+msgstr "afirandina peldankê biserneket"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, c-format
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
@@ -408,6 +422,183 @@ msgstr ""
 msgid "unable to install updated status of '%.250s'"
 msgstr ""
 
+#: lib/dpkg/db-ctrl-access.c
+#, fuzzy, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "afirandina peldankê biserneket"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "peldanka agahiyê nayê xwendin"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "%s nayê xebitandin"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+msgid "error while writing '%s'"
+msgstr "di xwendina %.250s de çewtî"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "loading control file '%s' for package '%s'"
+msgstr "di xwendina %s de çewtî"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "loading files list file for package '%s'"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Danegeh tê xwendin ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d pel û peldank niha sazkirî ne.)\n"
+msgstr[1] "%d pel û peldank niha sazkirî ne.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride gid %s"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride mode %s"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -523,61 +714,65 @@ msgid "internal error"
 msgstr "%s: çewtiya hundirî ya gzip: `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s kêm e"
+#, fuzzy
+msgid "is missing a value"
+msgstr "di xwendina %s de çewtî"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%.50s' is not allowed for %s"
+msgid "has invalid value '%.50s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
+msgid "has trailing junk"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "navê pakêtê yê nederbasdar (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Pakêta `%s' ne sazkirî ye.\n"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
-msgstr ""
+#, fuzzy, c-format
+msgid "archive details '%s' field not allowed in status file"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
+#, c-format
+msgid "boolean (yes/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "navê pakêtê yê nederbasdar (%.250s)"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "error reading %.250s"
+msgid "word in '%s' field: %s"
+msgstr "di xwendina %.250s de çewtî"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -585,26 +780,30 @@ msgid "value for '%s' field not allowed in this context"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, c-format
+msgid "first (want) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "error reading %.250s"
+msgid "second (error) word in '%s' field: %s"
+msgstr "di xwendina %.250s de çewtî"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, c-format
+msgid "third (status) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error reading %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "di xwendina %.250s de çewtî"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -614,11 +813,12 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, c-format
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -690,7 +890,7 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
+msgid "'%s' field, reference to '%.255s': version '%s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -700,7 +900,7 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -740,6 +940,26 @@ msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+msgid "cannot stat %s"
+msgstr "di xwendina %s de çewtî"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot read %s"
+msgstr "di xwendina %s de çewtî"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot open %s"
+msgstr "di xwendina %s de çewtî"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 msgid "unable to unlock %s"
 msgstr "%s nayê xebitandin"
 
@@ -760,8 +980,19 @@ msgid "unable to lock %s"
 msgstr "%s nayê xebitandin"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+msgid "cannot open file %s"
+msgstr "di xwendina %s de çewtî"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "%s nayê xebitandin"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "pelê `%.250s' nayê rakirin"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -784,12 +1015,12 @@ msgstr "afirandina peldankê biserneket"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
+msgid "failed to dup for fd %d"
 msgstr ""
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
+msgid "failed to dup for std%s"
 msgstr ""
 
 #: lib/dpkg/mlib.c
@@ -930,26 +1161,27 @@ msgstr ""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "missing %s"
+msgid "missing '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "empty value for %s"
+msgid "empty value for '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has '%s' field but is missing architecture"
+msgstr " (pakêt: "
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr " (pakêt: "
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, c-format
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -958,7 +1190,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -967,11 +1200,13 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "  Pakêta %s dê were rakirin.\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, c-format
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -989,8 +1224,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1174,11 +1409,6 @@ msgstr "afirandina peldankê biserneket"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 msgid "invalid character '%c' in field width"
@@ -1192,6 +1422,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr ""
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(rave ne amade ye)"
@@ -1275,6 +1515,63 @@ msgstr "dpkg: hişyarî - %s rewşa derketina bi çewtiyê %d vegerand\n"
 msgid "wait for %s subprocess failed"
 msgstr ""
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header size field"
+msgstr "hejmare versiyonê"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header mtime field"
+msgstr "hejmare versiyonê"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header gid field"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header checksum field"
+msgstr "hejmare versiyonê"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unknown tar header type '%c'"
+msgstr ""
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 msgid "cannot stat pathname '%s'"
@@ -1291,13 +1588,13 @@ msgid "treewalk root %s is not a directory"
 msgstr "peldanka agahiyê nayê xwendin"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
-msgstr ""
+#, fuzzy, c-format
+msgid "unable to open/create triggers lock file '%.250s'"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "nikarî danegeha rewşa dpkg biqifilîne"
 
 #: lib/dpkg/trigdeferred.c
@@ -1506,11 +1803,6 @@ msgstr ""
 msgid "error creating device '%.255s'"
 msgstr ""
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr ""
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1804,10 +2096,10 @@ msgstr "arşîv nayê gihîştin"
 msgid "archive '%s' is not a regular file"
 msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2020,6 +2312,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Dema xelas kir `exit' binivîse\n"
 
@@ -2359,7 +2655,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2376,6 +2675,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 msgid "cannot stat file '%s'"
@@ -2502,6 +2807,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
@@ -2540,19 +2852,6 @@ msgstr ""
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr ""
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr ""
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr ""
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2808,108 +3107,164 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "di xwendina %s de çewtî"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "di xwendina %s de çewtî"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "di xwendina %s de çewtî"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "pirsgirêkên bindestiyê - nayê rakirin"
 
-#: src/filesdb.c
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "pirsgirêkên bindestiyê - nayê rakirin"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Danegeh tê xwendin ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d pel û peldank niha sazkirî ne.)\n"
-msgstr[1] "%d pel û peldank niha sazkirî ne.)\n"
+#: src/force.c
+#, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr ""
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr ""
 
 #: src/help.c
 msgid "not installed"
@@ -2968,40 +3323,6 @@ msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin"
 msgstr ""
 
-#: src/infodb-access.c
-#, fuzzy, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "afirandina peldankê biserneket"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "peldanka agahiyê nayê xwendin"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr ""
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "%s nayê xebitandin"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-msgid "error while writing '%s'"
-msgstr "di xwendina %.250s de çewtî"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3011,27 +3332,27 @@ msgstr ""
 #, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3154,114 +3475,6 @@ msgid ""
 msgstr ""
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "pirsgirêkên bindestiyê - nayê rakirin"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "pirsgirêkên bindestiyê - nayê rakirin"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3386,33 +3599,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr ""
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr ""
 
@@ -3587,6 +3773,10 @@ msgid "Description"
 msgstr "Rave"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr ""
@@ -3623,6 +3813,10 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "Pakêta `%s' ne sazkirî ye û agahî tune.\n"
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -3650,8 +3844,7 @@ msgstr ""
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 
 #: src/querycmd.c dpkg-deb/info.c
@@ -3694,16 +3887,16 @@ msgstr ""
 #, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -3862,6 +4055,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr ""
@@ -4004,8 +4203,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4059,65 +4263,11 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride gid %s"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride mode %s"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr ""
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr ""
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr ""
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr ""
-
-#: src/statdb.c
+#: src/statcmd.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
+msgid "deprecated --%s option; use --%s instead"
 msgstr ""
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4323,6 +4473,11 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "%s tê rakirin ...\n"
 
+#: src/unpack.c
+#, fuzzy
+msgid "conffile file contains an empty line"
+msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4456,11 +4611,7 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr ""
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 
 #: src/unpack.c
@@ -4474,11 +4625,15 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr ""
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, c-format
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, c-format
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
 
 #: src/update.c
@@ -4812,15 +4967,16 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr ""
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "afirandina peldankê biserneket"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr ""
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
 msgstr ""
 
 #: dpkg-deb/extract.c
@@ -5528,8 +5684,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6002,10 +6159,40 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "control file '%s' missing value"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "tmpfile bo vsnpritif nayê vekirin"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s kêm e"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "navê pakêtê yê nederbasdar (%.250s)"
+
+#, fuzzy
+#~ msgid "cannot open control file '%s' for package '%s'"
 #~ msgstr "di xwendina %s de çewtî"
 
 #, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#, fuzzy
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "di xwendina %s de çewtî"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
+
+#, fuzzy
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "di xwendina %s de çewtî"
 
@@ -6123,14 +6310,6 @@ msgstr ""
 #~ msgstr "Copyright (C) 1994-1996 Ian Jackson.\n"
 
 #, fuzzy
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "di xwendina %s de çewtî"
-
-#, fuzzy
-#~ msgid "cannot write %s: %s"
-#~ msgstr "di xwendina %s de çewtî"
-
-#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "%s nayê xebitandin"
 
diff --git a/po/lt.po b/po/lt.po
index 1a755b792..6aefcc2a0 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:50+0200\n"
 "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -144,7 +144,8 @@ msgstr "nepavyko atverti statoverride failo"
 msgid "error creating new backup file '%s'"
 msgstr "klaida kuriant duomenų srautą `%.255s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "nepavyko pašalinti „%.250s“"
@@ -363,22 +364,36 @@ msgstr "po užpildymo nepavyko sugrįžti į %.250s pradžią"
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "nepavyko atverti laikino failo programai vsnprintf"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "nepavyko nuskaityti %.250s failo aprašymo žymės"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "nepavyko sukurti/atverti būsenos duomenų bazės užrakinimo failo"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "nepavyko sukurti/atverti būsenos duomenų bazės užrakinimo failo"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "jūs neturite teisių dpkg būsenos duomenų bazei užrakinti"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "nepavyksta užrakinti dpkg būsenos duomenų bazės"
 
 #: lib/dpkg/dbmodify.c
@@ -386,11 +401,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "prašomas veiksmas reikalauja administratoriaus privilegijų"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "nepavyksta pasiekti dpkg būsenos vietos"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operacijai reikalingas priėjimas"
 
 #: lib/dpkg/dbmodify.c
@@ -428,6 +447,195 @@ msgstr "neįmanoma uždaryti atnaujintos `%.250s' būsenos"
 msgid "unable to install updated status of '%.250s'"
 msgstr "neįmanoma įdiegti atnaujintos `%.250s' būsenos"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "nepavyko patikrinti ar egzistuoja `%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "negaliu perskaityti informacijos aplanko"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "klaida bandant atidaryti %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "nepavyko užverti %s: %s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "konfigūracijos failo „%.250s“ nėra pakete"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "klaida kuriant tvirtają nuorodą `%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "klaida `%s' rašyme"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "nepavyksta atverti konfigūracijos failų aplanko `%.250s' (iš `%.250s')"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "klaida uždarant paketo `%.250s' failo sąrašo failą"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg: rimtas įspėjimas: failų sąrašo failas paketui „%.250s“ nerastas; "
+"daroma prielaida, kad nėra įdiegtų paketo failų.\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Skaitoma duomenų bazė ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "šiuo metu įdiegta %d failų ir aplankų.)\n"
+msgstr[1] "šiuo metu įdiegta %d failų ir aplankų.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride gid %s"
+msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride mode %s"
+msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "nepavyko atverti statoverride failo"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr ""
+"failo pabaigos žymė prieš laukelio `%.*s' reikšmę (trūksta paskutinės naujos "
+"eilutės žymės)"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "nepavyko atverti statoverride failo"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "netikėta eilutės pabaigos žymė paketo varde, %d eilutėje"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -553,63 +761,71 @@ msgid "internal error"
 msgstr "%s: vidinė gzip klaida: `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "trūksta %s"
+#, fuzzy
+#| msgid "unable to read %s: %s"
+msgid "is missing a value"
+msgstr "nepavyko nuskaityti %s: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "`%.*s' yra neleidžiamas naudojant %s"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "šiukšlės už %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "klaidingas paketo pavadinimas (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Paketas „%s“ neįdiegtas.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tuščias failo detalių laukelis `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "failo detalių laukelis `%s' neleidžiamas būsenos faile"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "per daug reikšmių failo detalių laukelyje `%s' (palyginus su kitais)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "per mažai reikšmių failo detalių laukelyje `%s' (palyginus su kitais)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "taip/ne boolean laukelyje"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "panaudotas pasenęs `Revision' arba `Package-Revision' laukas"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "laukelyje`%s', nuorodoje į `%.255s': klaida versijoje: %.255s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "panaudotas žodis laukelyje `priority'"
 
 #: lib/dpkg/fields.c
@@ -619,33 +835,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "šitame kontekste, `status' laukelyje yra neleidžiama reikšmė"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "pirmas (trūkumas) žodis \"būsena\" lauke"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "antras (klaida) žodis \"būsena\" lauke"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "trečias (būsena) žodis \"būsena\" lauke"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "klaida versijos sekoje `%.250s': %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "panaudotas pasenęs `Revision' arba `Package-Revision' laukas"
 
 #: lib/dpkg/fields.c
@@ -657,11 +873,13 @@ msgstr "`conffiles' reikšmė turi netaisyklingą eilutę `%.*s'"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "`conffiles' reikšmėje yra eilutė prasidedanti be tarpo `%c'"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "kaip konfigūracijos failas nurodytas šakninis arba tuščias aplankas"
 
 #: lib/dpkg/fields.c
@@ -748,9 +966,9 @@ msgstr "laukelyje`%s', nuorodoje į `%.255s': neužbaigta versija"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "laukelyje`%s', nuorodoje į `%.255s': klaida versijoje: %.255s"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "laukelyje`%s', nuorodoje į `%.255s': versija `%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -758,8 +976,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "laukelyje `%s', po nuorodos į paketą `%.255s' yra sintaksės klaida"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "laukelyje %s neleistinas alternatyvus (`|')"
 
 #: lib/dpkg/fields.c
@@ -799,6 +1018,30 @@ msgstr "nepavyko nustatyti režimo naujam konfigūracijos failui „%.250s“"
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "unable to read %s: %s"
+msgid "cannot stat %s"
+msgstr "nepavyko nuskaityti %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr ""
+"įspėjimas: konfigūracijos failas „%s“ nėra paprastas tekstinis failas\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "nepavyko rašyti %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to read %s: %s"
+msgid "cannot open %s"
+msgstr "nepavyko nuskaityti %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to close %s: %s"
 msgid "unable to unlock %s"
 msgstr "nepavyko užverti %s: %s"
@@ -821,8 +1064,20 @@ msgid "unable to lock %s"
 msgstr "nepavyko užverti %s: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "unable to read %s: %s"
+msgid "cannot open file %s"
+msgstr "nepavyko nuskaityti %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "neįmanoma išvalyti vsnprintf"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "nepavyko pašalinti failo „%.250s“"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -846,13 +1101,13 @@ msgstr "nepavyko sukurti aplanko"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "nepavyko ivykdyti dup su std%s"
+msgid "failed to dup for fd %d"
+msgstr "nepavyko ivykdyti dup su fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "nepavyko ivykdyti dup su fd %d"
+msgid "failed to dup for std%s"
+msgstr "nepavyko ivykdyti dup su std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -990,29 +1245,32 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "pasikartojanti reikšmė vartotojo nurodytame `%.*s' laukelyje"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "trūksta %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s be reikšmės"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "pasikartojanti `%s' laukelio reikšmė"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "package architecture (%s) does not match system (%s)"
+msgid "package has '%s' field but is missing architecture"
+msgstr "paketo architektūra (%s) netinka jūsų sistemai (%s)"
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr ""
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Sukonfigūruota versija paketui su nepriimtina būsena"
 
 #: lib/dpkg/parse.c
@@ -1021,7 +1279,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1030,11 +1289,13 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "  Paketas %s bus pašalintas.\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, c-format
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1052,8 +1313,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1257,11 +1518,6 @@ msgstr "nepavyko sukurti `%.255s'"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1276,6 +1532,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr ""
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(aprašymas neprieinamas)"
@@ -1360,6 +1626,66 @@ msgstr "sub-procesas %s nepavyko su laukimo būsenos kodu %d"
 msgid "wait for %s subprocess failed"
 msgstr "%s laukimas nepavyko"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "Laukelyje klaidingas simbolis `%c'\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "Laukelyje klaidingas simbolis `%c'\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header gid field"
+msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "Laukelyje klaidingas simbolis `%c'\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unknown tar header type '%c'"
+msgstr ""
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
@@ -1378,12 +1704,12 @@ msgstr "negaliu perskaityti informacijos aplanko"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "nepavyksta pasiekti dpkg būsenos vietos"
 
 #: lib/dpkg/trigdeferred.c
@@ -1593,11 +1919,6 @@ msgstr "klaida kuriant duomenų srautą `%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "klaida kuriant įrenginį `%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "klaida kuriant tvirtają nuorodą `%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1914,10 +2235,10 @@ msgid "archive '%s' is not a regular file"
 msgstr ""
 "įspėjimas: konfigūracijos failas „%s“ nėra paprastas tekstinis failas\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2135,6 +2456,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Įveskite `exit' kai baigsite.\n"
 
@@ -2504,7 +2829,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2521,6 +2849,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
@@ -2653,6 +2987,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
@@ -2693,19 +3034,6 @@ msgstr ""
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr ""
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr ""
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr ""
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3002,118 +3330,167 @@ msgid ""
 msgstr ""
 "Paketas %s sulaikytas, neliečiu jo.  Naudokite --force-hold kad apdoroti.\n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
-"dpkg: įspėjimas: problema ignoruojama, nes nurodyta --force:\n"
-" "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "nepavyksta atverti konfigūracijos failų aplanko `%.250s' (iš `%.250s')"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "klaida uždarant paketo `%.250s' failo sąrašo failą"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg: rimtas įspėjimas: failų sąrašo failas paketui „%.250s“ nerastas; "
-"daroma prielaida, kad nėra įdiegtų paketo failų.\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "Paketo „%.250s“ failų sąrašas"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "priklausomybių problemos - nešalinamas"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "priklausomybių problemos - nešalinamas"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "klaida uždarant paketo `%.250s' failo sąrašo failą"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Skaitoma duomenų bazė ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "nežinomas priversti/atsisakyti parametras `%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "šiuo metu įdiegta %d failų ir aplankų.)\n"
-msgstr[1] "šiuo metu įdiegta %d failų ir aplankų.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "Įspėjimas: nebenaudotinas priversti/atsisakyti parametras „%s“\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"dpkg: įspėjimas: problema ignoruojama, nes nurodyta --force:\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3178,42 +3555,6 @@ msgstr ""
 "NB: root naudotojo kintamajame PATH turėtų būti /usr/local/sbin, /usr/sbin "
 "ir /sbin."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "nepavyko patikrinti ar egzistuoja `%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "negaliu perskaityti informacijos aplanko"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "klaida bandant atidaryti %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "nepavyko užverti %s: %s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "konfigūracijos failo „%.250s“ nėra pakete"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "klaida `%s' rašyme"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3223,27 +3564,27 @@ msgstr "Debian `%s' package management program version %s.\n"
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3468,114 +3809,6 @@ msgstr ""
 "`less' arba `more' !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "priklausomybių problemos - nešalinamas"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "priklausomybių problemos - nešalinamas"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3706,33 +3939,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "nežinomas priversti/atsisakyti parametras `%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "Įspėjimas: nebenaudotinas priversti/atsisakyti parametras „%s“\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "nepavyko atverti `%i' srautui sukurti"
 
@@ -3920,6 +4126,10 @@ msgid "Description"
 msgstr "Aprašymas"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr ""
@@ -3958,6 +4168,18 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "Paketas „%s“ neįdiegtas, todėl informacijos nėra.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Naudokite dpkg --info (= dpkg-deb --info) jei norite peržiūrėti archyvo "
+"informaciją,\n"
+"ir dpkg --contents (= dpkg-deb --contents) jei norite peržiūrėti archyvo "
+"turinį.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -3984,9 +4206,12 @@ msgid "diverted by %s to: %s\n"
 msgstr ""
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Naudokite dpkg --info (= dpkg-deb --info) jei norite peržiūrėti archyvo "
 "informaciją,\n"
@@ -4036,16 +4261,16 @@ msgstr "Debian `%s' package management program version %s.\n"
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4248,6 +4473,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "nepavyko pakeisti šakninio aplanko į „%.250s“"
@@ -4398,8 +4629,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4455,69 +4691,10 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride gid %s"
-msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride mode %s"
-msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "nepavyko atverti statoverride failo"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr ""
-"failo pabaigos žymė prieš laukelio `%.*s' reikšmę (trūksta paskutinės naujos "
-"eilutės žymės)"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr ""
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "nepavyko atverti statoverride failo"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "nepavyko atverti statoverride failo"
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "netikėta eilutės pabaigos žymė paketo varde, %d eilutėje"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "nepavyko atverti statoverride failo"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Įspėjimas: parametras „--%s“ nebenaudotinas\n"
 
 #: src/trigcmd.c
 #, fuzzy
@@ -4734,6 +4911,12 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Dekonfigūruojamas %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+msgid "conffile file contains an empty line"
+msgstr ""
+"įspėjimas: „%s“ nustatymų failo pavadinimas baigiasi seka iš tarpo simbolių\n"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4882,11 +5065,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "klaida skaitant dpkg-deb tar išvestį"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "pažeistas failų sistemos tar failas - pažeistas paketų archyvas"
 
 #: src/unpack.c
@@ -4902,12 +5083,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s reikia lygiai vieno paketų failo pavadinimo"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "atnaujinimo paketui nepavyko pasiekti dpkg būsenos įrašo"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr "atnaujinimo paketui reikalinga rašymo teisė į dpkg būsenos įrašą"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "atnaujinimo paketui nepavyko pasiekti dpkg būsenos įrašo"
 
 #: src/update.c
 #, c-format
@@ -5287,16 +5474,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "nepavyko atverti aplanko"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "nepavyko sukurti aplanko"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "sukūrus aplanką nepavyko jo atverti"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "netikėta failo pabaigos žymė paketo varde, %d eilutėje"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "nepavyko atverti aplanko"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6044,8 +6233,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6526,13 +6716,85 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Įspėjimas: parametras „--%s“ nebenaudotinas\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "nepavyko atverti laikino failo programai vsnprintf"
 
 #, fuzzy
-#~| msgid "unable to read %s: %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "nepavyko nuskaityti %s: %s"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "nepavyko atverti statoverride failo"
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "nepavyko atverti statoverride failo"
+
+#~ msgid "%s is missing"
+#~ msgstr "trūksta %s"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "`%.*s' yra neleidžiamas naudojant %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "šiukšlės už %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "klaidingas paketo pavadinimas (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "taip/ne boolean laukelyje"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "laukelyje`%s', nuorodoje į `%.255s': klaida versijoje: %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s be reikšmės"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr "atnaujinimo paketui reikalinga rašymo teisė į dpkg būsenos įrašą"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "klaida skaitant dpkg-deb tar išvestį"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "klaida uždarant paketo `%.250s' failo sąrašo failą"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "paketo `%.250s' failų sąrašo faile yra tuščias failo vardas"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "Paketo „%.250s“ failų sąrašas"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "sukūrus aplanką nepavyko jo atverti"
 
 #, fuzzy
 #~| msgid "unable to read %s: %s"
@@ -6611,9 +6873,6 @@ msgstr ""
 #~ "failo pabaigos žymė standartinėje įvestyje prieš konfigūracinio failo "
 #~ "užklausą"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "netikėta failo pabaigos žymė paketo varde, %d eilutėje"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "netikėta failo pabaigos žymė po paketo vardo, %d eilutėje"
 
@@ -6841,11 +7100,6 @@ msgstr ""
 #~ msgstr "nepavyko atverti statoverride failo"
 
 #, fuzzy
-#~| msgid "unable to read %s: %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "nepavyko nuskaityti %s: %s"
-
-#, fuzzy
 #~| msgid "failed to exec %s"
 #~ msgid "failed to execute %s: %s"
 #~ msgstr "nepavyko įvykdyti %s"
@@ -6864,11 +7118,6 @@ msgstr ""
 #~ msgstr "nepavyko užverti %s: %s"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "nepavyko rašyti %s: %s"
-
-#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "nepavyko užverti %s: %s"
 
diff --git a/po/mr.po b/po/mr.po
index 9a966f856..cdda2647e 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:51+0200\n"
 "Last-Translator: Priti Patil <prithisd@gmail.com>\n"
 "Language-Team: Marathi <janabhaaratii@cdacmumbai.in>\n"
@@ -140,7 +140,8 @@ msgstr "जुने वळण-जुने: %s काढून टाका"
 msgid "error creating new backup file '%s'"
 msgstr "`%.255s' पाइप बनवताना त्रुटी"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "%.250s काढणे अशक्य"
@@ -364,22 +365,36 @@ msgstr "पँडिंगनंतर %.250s च्या सुरूवात
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "व्हीएसएनप्रिंटएफ़ साठी टीएमपीफाईल उघडता येत नाही"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "%.250s साठी फाईलडीस्क्रिप्टर फ्लॅग वाचणे जमत नाही"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "डीपीकेजी सद्यस्थिती डेटाबेस लोॅकफ़ाईल उघडता/बनवता येत नाही"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "डीपीकेजी सद्यस्थिती डेटाबेस लोॅकफ़ाईल उघडता/बनवता येत नाही"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "आपणांस डीपीकेजी सद्यस्थिती डेटाबेसला टाळे लावण्याची परवानगी नाही"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "डीपीकेजी सद्यस्थिती डेटाबेसला टाळे लावता येत नाही"
 
 #: lib/dpkg/dbmodify.c
@@ -387,11 +402,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "या संक्रियेसाठी सुपरयुझरचे हक्क आवश्यक आहेत"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "डीपीकेजी दर्जा स्थानात प्रवेश मिळत नाही"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "या संक्रियेसाठी डीपीकेजी दर्जा स्थानाचे वाचन/लेखन हक्क आवश्यक आहेत"
 
 #: lib/dpkg/dbmodify.c
@@ -429,6 +448,197 @@ msgstr "%.250s' ची सुधारित स्थिती बंद कर
 msgid "unable to install updated status of '%.250s'"
 msgstr "%.250s' ची सुधारित स्थिती अधिष्ठापित करता येत नाही"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "%.250s'चे अस्तित्व तपासण्यास असमर्थ"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "माहितीची डिरेक्टरी वाचू शकत नाही"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "समस्या %.250s उघडण्याचा प्रयत्न करत आहे"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "उगम फाइल `%.250s' उघडता येत नाही"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "कोॅन्फफाईल `%.250s' पॅकेजमधे आढळत नाही"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "`%.255s' हार्ड साखळी बनवताना त्रुटी"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "`%s' लिहिताना त्रुटी"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "कॉन्फिग फाइल डिआयआर `%.250s' हि  (`%.250s'मधून) वाचू शकत नाही"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "डाइव्हर्जन्स फाइल उघडण्यास अयशस्वी"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "डाइव्हर्जन्स फाइल एफस्टॅट होण्यास अयशस्वी"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "`%.250s' किंवा `%.250s' यामध्ये सामावलेले परस्परविरोधी डाइव्हर्जन्स"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "दोषामुळे पॅकेज `%.250s'साठी फाइलची सुची असलेली फाइल बंद होत आहे"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"डिपिकेजी: गंभीर ताकिद: पॅकेज `%.250s'साठी फाइल्सची सुची असलेली फाइल हरवली आहे, असे "
+"गृहित धरुया कि पॅकेजमध्ये स्थापन केलेली कोणतीही फाइल नाही.\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(डेटाबेस वाचत आहे ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d फाइल्स आणि डिरेक्टरीज यांची सध्या स्थापना झालेली आहे.)\n"
+msgstr[1] "%d फाइल्स आणि डिरेक्टरीज यांची सध्या स्थापना झालेली आहे.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride uid %s"
+msgstr "स्टॅटओवरराइड फाइल `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "स्टॅटओवरराइड फाइल `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "स्टॅटओवरराइड फाइल `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "स्टॅटओवरराइड फाइल एफस्टॅट होण्यास अयशस्वी"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "स्टॅटओवरराइड फाइल `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "स्टॅटओवरराइड फाइलमध्ये रिकामी ओळ/लाइन आहे"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "स्टॅटओवरराइड फाइलमध्ये रिकामी ओळ/लाइन आहे"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "%d ओळीवर पॅकेजच्या नावामध्ये अनपेक्षित उद्भवलेला ओळीचा शेवट/एण्ड ऑफ लाइन"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "स्टॅटओवरराइड फाइल `%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -559,62 +769,71 @@ msgid "internal error"
 msgstr "अंतर्गत त्रुटी - खराब पद्धत `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s हरवले आहे"
+#, fuzzy
+#| msgid "cannot stat old name `%s': %s"
+msgid "is missing a value"
+msgstr "जुनी नावे `%s': %s स्टॅट करता येत नाहीत"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "%s साठी `%.*s' ला अनुमती नाही"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "%s नंतर अडगळ"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "पॅकेजचे नाव अयोग्य (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "पॅकेज `%s' ची स्थापना केलेली नाही\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "फाइलचे विवरण क्षेत्र रिकामे `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "सद्यस्थितीदर्शक फाइलमधे फाइल विवरण क्षेत्र `%s' ला अनुमती नाही"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "फाइल विवरण क्षेत्र `%s' मधे खुपच अधिक मूल्ये (इतरांच्या तुलनेत)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "फाइल विवरण क्षेत्र `%s' मधे खुपच कमी मूल्ये (इतरांच्या तुलनेत)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "बुलियन क्षेत्रामधे हो/नाही"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "कालबाह्य `उजळणी' किंवा `पॅकेज-उजळणी' क्षेत्र वापरले"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "`%s' क्षेत्र, संदर्भ `%.255s': आवृत्तीत त्रुटी: %.255s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr " `अग्रक्रम' क्षेत्रामधे शब्द"
 
 #: lib/dpkg/fields.c
@@ -624,33 +843,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "येथील संदर्भात `सद्यस्थिती' क्षेत्रासाठी मूल्य ठरवण्याची अनुमती नाही"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "`सद्यस्थिती' क्षेत्रातील पहिला (जरुर) शब्द"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "`सद्यस्थिती' क्षेत्रातील दुसरा (चूक) शब्द"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "`सद्यस्थिती' क्षेत्रातील तिसरा (सद्यस्थितीदर्शक) शब्द"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "आवृत्ती श्रृंखला `%.250s': %.250s मधे त्रुटी"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "कालबाह्य `उजळणी' किंवा `पॅकेज-उजळणी' क्षेत्र वापरले"
 
 #: lib/dpkg/fields.c
@@ -662,11 +881,13 @@ msgstr "`विन्यासफाईल' च्या मूल्याम�
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "`विन्यासफाईल' च्या मूल्यामध्ये रिक्त जागेने न सुरू होणारी ओळ आहे `%c'"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "विन्यासफाईल म्हणून मूल किंवा रिक्त निर्देशिकेची नोंद केली आहे"
 
 #: lib/dpkg/fields.c
@@ -746,9 +967,9 @@ msgstr "`%s' क्षेत्र, संदर्भ `%.255s': आवृत्
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "`%s' क्षेत्र, संदर्भ `%.255s': आवृत्तीत त्रुटी: %.255s"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "`%s' क्षेत्र, संदर्भ `%.255s': आवृत्तीत `%c' चा समावेश आहे"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -756,8 +977,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "`%s' क्षेत्र, पॅकेज `%.255s' संदर्भात नियमबाह्य लेखन त्रुटी "
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "%s क्षेत्रात (`|') पर्यायांना अनुमती नाही"
 
 #: lib/dpkg/fields.c
@@ -797,6 +1019,29 @@ msgstr "नवीन डिस्ट कॉनफाइल `%.250s'चा मो
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat %s"
+msgstr "जुनी नावे `%s': %s स्टॅट करता येत नाहीत"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "धोक्याची सूचना, कोॅन्फफाईल `%s' ही निव्वळ मजकूर फाइल नाही\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "%s: %s लिहिता येत नाही"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open %s"
+msgstr "वळवलेले: %s उघडता येत नाही"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "%s चे टाळे उघडता येत नाही: %s"
@@ -819,8 +1064,20 @@ msgid "unable to lock %s"
 msgstr "%s चे टाळे उघडता येत नाही: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open file %s"
+msgstr "वळवलेले: %s उघडता येत नाही"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "व्हीएसएनप्रिंटएफ़मधे फ़्लश? करणे जमत नाही"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "निर्देशिका वळवता येत नाहीत"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -844,13 +1101,13 @@ msgstr "निर्देशिका बनवता आली नाही"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "एसटीडी%s साठी डीयुपी करणे अयशस्वी"
+msgid "failed to dup for fd %d"
+msgstr "एफ़डी %d साठी डीयुपी करणे अयशस्वी"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "एफ़डी %d साठी डीयुपी करणे अयशस्वी"
+msgid "failed to dup for std%s"
+msgstr "एसटीडी%s साठी डीयुपी करणे अयशस्वी"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -988,29 +1245,31 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "वापरकर्त्याने ठरविलेेल्या क्षेत्रात `%.*s' मूल्य पुनरावृत्ती"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "%s गायब"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s साठी रिक्त मूल्य"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "`%s' क्षेत्रासाठी मूल्य पुनरावृत्ती"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has '%s' field but is missing architecture"
+msgstr "(पॅकेज: "
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "(पॅकेज: "
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "पॅकेजची संरचित आवृत्ती अनुचित स्थितीत"
 
 #: lib/dpkg/parse.c
@@ -1019,7 +1278,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1028,11 +1288,14 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr " %s पॅकेज काढण्यात यावे.\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "अधिष्ठापन न केलेल्या पॅकेजमधे कोॅन्फफाइल आहेत, त्यांच्याकडे दुर्लक्ष"
 
 #: lib/dpkg/parse.c
@@ -1050,8 +1313,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1248,11 +1511,6 @@ msgstr "`%.255s' ची रचना करता येत नाही"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1269,6 +1527,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "पर्यायीनाव गायब"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(वर्णन उपलब्ध नाही)"
@@ -1352,6 +1620,69 @@ msgstr "थांबणे स्थिती कोड %d नुसार उ�
 msgid "wait for %s subprocess failed"
 msgstr "%s साठी वाट पहाणे अयशस्वी झाले"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "क्षेत्र रुंदीत `%c' अयोग्य \n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "क्षेत्र रुंदीत `%c' अयोग्य \n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header uid field"
+msgstr "स्टॅटओवरराइड फाइल `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header gid field"
+msgstr "स्टॅटओवरराइड फाइल `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "क्षेत्र रुंदीत `%c' अयोग्य \n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "अपरिचीत संकोच प्रकार `%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -1371,12 +1702,12 @@ msgstr "माहितीची डिरेक्टरी वाचू शक
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "उगम फाइल `%.250s' उघडता येत नाही"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "%s चे टाळे उघडता येत नाही: %s"
 
 #: lib/dpkg/trigdeferred.c
@@ -1587,11 +1918,6 @@ msgstr "`%.255s' पाइप बनवताना त्रुटी"
 msgid "error creating device '%.255s'"
 msgstr "`%.255s' उपकरण बनवताना त्रुटी"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "`%.255s' हार्ड साखळी बनवताना त्रुटी"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1907,10 +2233,10 @@ msgstr "आर्काइव्हमध्ये प्रवेश करण�
 msgid "archive '%s' is not a regular file"
 msgstr "धोक्याची सूचना, कोॅन्फफाईल `%s' ही निव्वळ मजकूर फाइल नाही\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2127,6 +2453,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "तुमचे झाल्यावर 'एग्झिट' टाइप करा.\n"
 
@@ -2504,7 +2834,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2544,6 +2877,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -2674,6 +3013,13 @@ msgstr ""
 "दुर्लक्ष करित आहे.\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
@@ -2722,19 +3068,6 @@ msgstr "पॅकेज मधे न्युलाइनस् नसेल"
 msgid "divert-to may not contain newlines"
 msgstr "वळवा-कडे मधे न्युलाइनस् नसेल"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "डाइव्हर्जन्स फाइल उघडण्यास अयशस्वी"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "डाइव्हर्जन्स फाइल एफस्टॅट होण्यास अयशस्वी"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "`%.250s' किंवा `%.250s' यामध्ये सामावलेले परस्परविरोधी डाइव्हर्जन्स"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3032,116 +3365,165 @@ msgstr ""
 "%s हे तात्पुरता थांबलेले आहे, त्याला हात लावत नाही. दुर्लक्ष करण्यासाठी --फोर्स-होल्ड "
 "वापरा.\n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
-msgstr "डिपिकेजी - ताकिद, समस्येवर दुर्लक्ष करित आहे कारण --फोर्स कार्यक्षम करतो:\n"
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "कॉन्फिग फाइल डिआयआर `%.250s' हि  (`%.250s'मधून) वाचू शकत नाही"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "दोषामुळे पॅकेज `%.250s'साठी फाइलची सुची असलेली फाइल बंद होत आहे"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"डिपिकेजी: गंभीर ताकिद: पॅकेज `%.250s'साठी फाइल्सची सुची असलेली फाइल हरवली आहे, असे "
-"गृहित धरुया कि पॅकेजमध्ये स्थापन केलेली कोणतीही फाइल नाही.\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "पॅकेज `%.250s'साठी असलेली फाइलची सुची"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "अवलंबुन असलेल्या समस्या - काढून टाकत नाही"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "अवलंबुन असलेल्या समस्या - काढून टाकत नाही"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "दोषामुळे पॅकेज `%.250s'साठी फाइलची सुची असलेली फाइल बंद होत आहे"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(डेटाबेस वाचत आहे ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr " अज्ञात फोर्स/रिफ्युज पर्याय `%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d फाइल्स आणि डिरेक्टरीज यांची सध्या स्थापना झालेली आहे.)\n"
-msgstr[1] "%d फाइल्स आणि डिरेक्टरीज यांची सध्या स्थापना झालेली आहे.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "ताकिद: अप्रचलित फोर्स/रिफ्युज पर्याय `%.*s'\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr "डिपिकेजी - ताकिद, समस्येवर दुर्लक्ष करित आहे कारण --फोर्स कार्यक्षम करतो:\n"
 
 #: src/help.c
 msgid "not installed"
@@ -3205,42 +3587,6 @@ msgstr ""
 "%d अपेक्षित प्रोग्रॅम(स) पाथवर सापडला नाही.\n"
 "एनबी: रूट/मूळ पाथमध्ये /usr/local/sbin, /usr/sbin and /sbin हे असायला पाहिजेत."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "%.250s'चे अस्तित्व तपासण्यास असमर्थ"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "माहितीची डिरेक्टरी वाचू शकत नाही"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "समस्या %.250s उघडण्याचा प्रयत्न करत आहे"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "उगम फाइल `%.250s' उघडता येत नाही"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "कोॅन्फफाईल `%.250s' पॅकेजमधे आढळत नाही"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "`%s' लिहिताना त्रुटी"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3250,27 +3596,27 @@ msgstr "डेबिअन `%s' पॅकेज व्यवस्थापन �
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3479,114 +3825,6 @@ msgstr ""
 "लावा!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "अवलंबुन असलेल्या समस्या - काढून टाकत नाही"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "अवलंबुन असलेल्या समस्या - काढून टाकत नाही"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3717,33 +3955,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr " अज्ञात फोर्स/रिफ्युज पर्याय `%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "ताकिद: अप्रचलित फोर्स/रिफ्युज पर्याय `%.*s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "स्ट्रीमसाठी `%i' उघडू शकत नाही"
 
@@ -3929,6 +4140,10 @@ msgid "Description"
 msgstr "वर्णन"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, fuzzy, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "%sनी वळवले आहे: %s\n"
@@ -3965,6 +4180,17 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "पॅकेज `%s' ची स्थापना केलेली नाही आणि त्याबद्दल कोणतीही माहिती उपलब्ध नाही.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"डिपिकेजी --इन्फो (= डिपिकेजी-डेब --इन्फो) आर्काइव्ह फाइल तपासण्यासाठी,\n"
+"आणि डिपिकेजी --कन्टेन्टस (= डिपिकेजी-डेब --कन्टेन्टस) त्यांचा मजकूर दाखवण्यासाठी वापर "
+"करा.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -3991,9 +4217,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "%sनी वळवले आहे: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "डिपिकेजी --इन्फो (= डिपिकेजी-डेब --इन्फो) आर्काइव्ह फाइल तपासण्यासाठी,\n"
 "आणि डिपिकेजी --कन्टेन्टस (= डिपिकेजी-डेब --कन्टेन्टस) त्यांचा मजकूर दाखवण्यासाठी वापर "
@@ -4042,16 +4271,16 @@ msgstr "डेबिअन `%s' पॅकेज व्यवस्थापन �
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4246,6 +4475,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "`%.250s'ला  सिएचरूट करण्यास अयशस्वी"
@@ -4396,8 +4631,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4475,71 +4715,10 @@ msgstr "अोव्हरराइड अस्तित्वात नाह�
 msgid "--update is useless for --remove"
 msgstr "धोक्याची सूचना: --काढा साठी --सुधारा निरुपयोगी आहे"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride uid %s"
-msgstr "स्टॅटओवरराइड फाइल `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "स्टॅटओवरराइड फाइल `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "स्टॅटओवरराइड फाइल `%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "स्टॅटओवरराइड फाइल एफस्टॅट होण्यास अयशस्वी"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "स्टॅटओवरराइड फाइल `%.250s'"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "स्टॅटओवरराइड फाइलमध्ये रिकामी ओळ/लाइन आहे"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "स्टॅटओवरराइड फाइलमध्ये रिकामी ओळ/लाइन आहे"
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "%d ओळीवर पॅकेजच्या नावामध्ये अनपेक्षित उद्भवलेला ओळीचा शेवट/एण्ड ऑफ लाइन"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "स्टॅटओवरराइड फाइल `%.250s'"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "ताकिद: अप्रचलित पर्याय `--%s'\n"
 
 #: src/trigcmd.c
 #, fuzzy
@@ -4758,6 +4937,12 @@ msgstr "%sची अजुळवणी करत आहे, जेणे कर�
 msgid "De-configuring %s (%s) ...\n"
 msgstr "%s काढून टाकत आहे...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "स्टॅटओवरराइड फाइलमध्ये रिकामी ओळ/लाइन आहे"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4900,11 +5085,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "डिपिकेजी-डेब टार आउट्पुट/उत्पादन वाचनाची समस्या"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "दुषित फाइलप्रणाली टारफाइल - दुषित आर्काइव्ह पॅकेज"
 
 #: src/unpack.c
@@ -4920,16 +5103,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%sला नेमका एक पॅकेजेस फाइल आर्ग्युमेन्ट/पर्याय लागतो"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "मोठ्या प्रमाणात उपलब्ध असलेल्या अद्ययावत माहितीसाठी डिपिकेज़ि दर्जाच्या क्षेत्रात प्रवेश करु "
 "शकत नाही"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"मोठ्या प्रमाणात उपलब्ध असलेल्या अद्ययावत महितीसाठी डिपिकेजि दर्जाच्या क्षेत्रात "
-"लिहिण्याची परवानगी लागते"
+"मोठ्या प्रमाणात उपलब्ध असलेल्या अद्ययावत माहितीसाठी डिपिकेज़ि दर्जाच्या क्षेत्रात प्रवेश करु "
+"शकत नाही"
 
 #: src/update.c
 #, c-format
@@ -5302,16 +5491,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "निर्देशिकेत सीएचडिआयआर करता आले नाही"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "निर्देशिका बनवता आली नाही"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "निर्देशिका बनवल्यानंतर तिच्यात सीएचडिआयआर करता आले नाही"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "%d ओळीवर पॅकेजच्या नावामध्ये अनपेक्षित इओएफ"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "निर्देशिकेत सीएचडिआयआर करता आले नाही"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6134,8 +6325,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6648,13 +6840,86 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "ताकिद: अप्रचलित पर्याय `--%s'\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "व्हीएसएनप्रिंटएफ़ साठी टीएमपीफाईल उघडता येत नाही"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "जुनी नावे `%s': %s स्टॅट करता येत नाहीत"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s हरवले आहे"
+
+#, fuzzy
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "%s साठी `%.*s' ला अनुमती नाही"
+
+#~ msgid "junk after %s"
+#~ msgstr "%s नंतर अडगळ"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "पॅकेजचे नाव अयोग्य (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "बुलियन क्षेत्रामधे हो/नाही"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "`%s' क्षेत्र, संदर्भ `%.255s': आवृत्तीत त्रुटी: %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s साठी रिक्त मूल्य"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "मोठ्या प्रमाणात उपलब्ध असलेल्या अद्ययावत महितीसाठी डिपिकेजि दर्जाच्या क्षेत्रात "
+#~ "लिहिण्याची परवानगी लागते"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "डिपिकेजी-डेब टार आउट्पुट/उत्पादन वाचनाची समस्या"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "दोषामुळे पॅकेज `%.250s'साठी फाइलची सुची असलेली फाइल बंद होत आहे"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "पॅकेज `%.250s'साठी असलेली फाइलची सुची"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "निर्देशिका बनवल्यानंतर तिच्यात सीएचडिआयआर करता आले नाही"
 
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
@@ -6734,9 +6999,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "कॉनफाइल प्रॉम्प्टच्या एसटिडीइनवरची EOF "
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "%d ओळीवर पॅकेजच्या नावामध्ये अनपेक्षित इओएफ"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "%d ओळीवर पॅकेजच्या नावानंतर अनपेक्षित उद्भवलेले इओएफ"
 
@@ -7021,11 +7283,6 @@ msgstr ""
 #~ msgstr " गुलाम %s: %s"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "जुनी नावे `%s': %s स्टॅट करता येत नाहीत"
-
-#, fuzzy
 #~| msgid "%s: copying %s to %s failed, giving up: %s"
 #~ msgid "scan of %s failed: %s"
 #~ msgstr "%s: %s ची %s मधे नक्कल बनवता आली नाही, सोडून देत आहे: %s"
@@ -7052,11 +7309,6 @@ msgstr ""
 #~ msgstr "%s: %s बंद करता येत नाही"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "%s: %s लिहिता येत नाही"
-
-#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "%s चे %s मधे पुनर्नामांकन करता येत नाही: %s"
diff --git a/po/nb.po b/po/nb.po
index 22acc86ab..5da963a94 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:51+0200\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -150,7 +150,8 @@ msgstr "feil ved fjerning av gammel diversions-old"
 msgid "error creating new backup file '%s'"
 msgstr "feil ved oppretting av rør «%.255s»"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "klarte ikke fjerne «%.250s»"
@@ -377,22 +378,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "klarte ikke søke til starten av %.250s etter etterfylling"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "klarte ikke åpne låsefila %s for testing"
+#, fuzzy, c-format
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "klarte ikke lese fildeskriptorflagg for %.250s"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "klarte ikke åpne/opprette låsefila til statusdatabasen"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "klarte ikke åpne/opprette låsefila til statusdatabasen"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "du har ikke tillatelse til å låse dpkg-statusdatabasen"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "klarte ikke låse dpkg-statusdatabasen"
 
 #: lib/dpkg/dbmodify.c
@@ -400,11 +416,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "den ønskede handlingen krever superbrukertilgang"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "får ikke tilgang til dpkg-statusområdet"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operasjonen krever lese- og skrivetilgang til dpkg-statusområdet"
 
 #: lib/dpkg/dbmodify.c
@@ -442,6 +462,199 @@ msgstr "klarte ikke lukke oppdatert status for «%.250s»"
 msgid "unable to install updated status of '%.250s'"
 msgstr "klarte ikke installere oppdatert status for «%.250s»"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "klarte ikke sjekke om «%.250s» finnes"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "klarte ikke lese infokatalogen"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "feil ved åpning av %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+#| msgid "unable to write file '%s'"
+msgid "corrupt info database format file '%s'"
+msgstr "klarte ikke å skrive fila «%s»"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "oppsettsfila «%.250s» finnes ikke i pakken"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "feil ved oppretting av hard lenke «%.255s»"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "feil ved skriving av «%s»"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "fillistefila for pakken «%.250s» inneholder et tomt filnavn"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "klarte ikke lese oppsettsfilkatalogen «%.250s» (fra «%.250s»)"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "klarte ikke åpne omdirigeringsfil"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "klarte ikke utføre «fstat» på omdirigeringsfila"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr ""
+"omdirigeringer i konflikt med hverandre, involverer «%.250s» eller «%.250s»"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid ""
+#| "files list file for package `%.250s' missing, assuming package has no "
+#| "files currently installed."
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"fillistefila for pakken «%.250s» mangler. Går ut fra at pakken for "
+"øyeblikket ikke har noen filer installert."
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "fillistefila for pakken «%.250s» inneholder et tomt filnavn"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Leser database ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d fil eller kataloger er for øyeblikket installert.)\n"
+msgstr[1] "%d filer og kataloger er for øyeblikket installerte.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "ugyldig status"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride gid %s"
+msgstr "«statoverride»-fil «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride mode %s"
+msgstr "«statoverride»-fil «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "klarte ikke åpne «statoverride»-fila"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "klarte ikke utføre «fstat» på «statoverride»-fila"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "«statoverride»-fil «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "statoverride-fila mangler et avsluttende linjeskift"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "«statoverride»-fila inneholder en tom linje"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "syntaksfeil i statoverrid-fila"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "uventet slutt på linje i statoverride-fila"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "flere statustilsidesettelser tilstede for fila «%.250s»"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version number"
@@ -586,63 +799,72 @@ msgid "internal error"
 msgstr "intern feil - feil modus «%s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s mangler"
+#, fuzzy
+#| msgid "missing package"
+msgid "is missing a value"
+msgstr "mangler pakke"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "«%.*s» er ikke tillatt for %s"
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Hoppet over ugyldig linje: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "søppel etter %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ugyldig pakkenavn (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Pakken «%s» er ikke installert.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tomt fildetaljfelt «%s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "fildetaljfeltet «%s» kan ikke brukes i statusfila"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "for mange verdier i fildetaljfeltet «%s» (sammenliknet med andre)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "for få verdier i fildetaljfeltet «%s» (sammenliknet med andre)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "ja/nei i boolsk felt"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "foreldet «Revision»- eller «Package-Revision»-felt brukt"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': error in version"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "«%s»-felt, referanse til «%.255s»: feil i versjon"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "ord i «priority»-felt"
 
 #: lib/dpkg/fields.c
@@ -652,33 +874,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "verdi i «status»-felt kan ikke brukes i denne sammenhengen"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "første ord (ønsker) i «status»-felt"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "andre ord (feil) i «status»-felt"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "tredje ord (status) i «status»-felt"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string '%.250s'"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "feil i Version-tekst «%.250s»"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "foreldet «Revision»- eller «Package-Revision»-felt brukt"
 
 #: lib/dpkg/fields.c
@@ -690,11 +912,13 @@ msgstr "verdien for «conffiles» har en linje med ugyldig format «%.*s»"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "verdien for «conffiles» har en linje som starter uten mellomrom «%c»"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "rot- eller null-katalog er nevnt som oppsettsfil"
 
 #: lib/dpkg/fields.c
@@ -780,9 +1004,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "«%s»-felt, referanse til «%.255s»: versjon ikke avsluttet"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "«%s»-felt, referanse til «%.255s»: feil i versjon"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "«%s»-felt, referanse til «%.255s»: versjon inneholder «%c»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -790,8 +1015,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "«%s»-felt, syntaksfeil etter referanse til pakken «%.255s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternativ («|») kan ikke brukes i %s-feltet"
 
 #: lib/dpkg/fields.c
@@ -831,6 +1057,30 @@ msgstr "klarte ikke sette modus på målfila «%.250s»"
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "fant ikke %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "oppsettsfila «%s» er ikke en vanlig fil"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "klarte ikke skrive %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot open %s"
+msgstr "klarte ikke legge til i %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "klarte ikke fjerne lås på %s: %s"
@@ -853,10 +1103,22 @@ msgid "unable to lock %s"
 msgstr "klarte ikke fjerne lås på %s: %s"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot open file %s"
+msgstr "klarte ikke legge til i %s: %s"
+
+#: lib/dpkg/file.c
 #, fuzzy
-#| msgid "long filenames"
-msgid "showing file on pager"
-msgstr "lange filnavn"
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "klarte ikke tømme fila «%s»"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "kan ikke omdirigere fil «%s» til seg selv"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -879,13 +1141,13 @@ msgstr "klarte ikke allokere minne"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "klarte ikke utføre «dup» for std%s"
+msgid "failed to dup for fd %d"
+msgstr "klarte ikke utføre «dup» for fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "klarte ikke utføre «dup» for fd %d"
+msgid "failed to dup for std%s"
+msgstr "klarte ikke utføre «dup» for std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1025,30 +1287,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "det brukerdefinerte feltet «%.*s» fins mer enn én gang"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "mangler %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "tom verdi for %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "verdien for feltet «%s» finnes mer enn én gang"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has '%s' field but is missing architecture"
+msgstr "pakken har status %s, men har ventende utløsere"
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
 #| msgid "package has status %s but triggers are awaited"
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "pakken har status %s, men har ventende utløsere"
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Oppsatt versjon for pakke med status som ikke passer"
 
 #: lib/dpkg/parse.c
@@ -1057,8 +1322,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "pakken har status %s, men har ventende utløsere"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "pakken har status utløsere-ventende, men ingen ventende utløsere"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "pakken har status %s, men har ventende utløsere"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1066,11 +1333,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "pakken har status %s, men har utestående utløsere"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "pakken har status utløsere-utestående, men ingen utestående utløsere"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "pakken har status %s, men har utestående utløsere"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "En pakke som ikke er installert har oppsettsfiler.De blir ignorert"
 
 #: lib/dpkg/parse.c
@@ -1088,8 +1359,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1295,11 +1566,6 @@ msgstr "klarte ikke sikkert fjerne «%.255s»"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1316,6 +1582,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "mangler alternativt navn"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(ingen beskrivelse tilgjengelig)"
@@ -1405,6 +1681,69 @@ msgstr "underprosessen %s mislyktes med ventestatuskode %d"
 msgid "wait for %s subprocess failed"
 msgstr "klarte ikke vente på underprosessen %s"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "ugyldig tegn «%c» i feltbredden\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "ugyldig tegn «%c» i feltbredden\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "ugyldig status"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header gid field"
+msgstr "«statoverride»-fil «%.250s»"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "ugyldig tegn «%c» i feltbredden\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "generated corrupt ar header for '%s'"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "genererte korrupt ar-hode for «%s»"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "ukjent koprimeringstype «%s»!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1424,14 +1763,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "kontrollmappa er ikke ei mappe"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "klarte ikke åpne/opprette låsefila «%.250s» for utløsere"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
 #| msgid "triggered"
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "utløst"
 
 #: lib/dpkg/trigdeferred.c
@@ -1652,11 +1992,6 @@ msgstr "feil ved oppretting av rør «%.255s»"
 msgid "error creating device '%.255s'"
 msgstr "feil ved oppretting av enhet «%.255s»"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "feil ved oppretting av hard lenke «%.255s»"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -2000,10 +2335,10 @@ msgstr "får ikke tilgang til arkivet"
 msgid "archive '%s' is not a regular file"
 msgstr "oppsettsfila «%s» er ikke en vanlig fil"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<standard utdata>"
 
@@ -2222,6 +2557,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Skriv «exit» når du er ferdig.\n"
 
@@ -2591,7 +2930,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2600,7 +2953,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2633,6 +2989,12 @@ msgstr ""
 "Når man fjerner må --package eller --local og --divert stemme hvis oppgitt.\n"
 "Pakke preinst/postrm skript skal alltid oppgi --package og --divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2758,6 +3120,13 @@ msgstr "ignorerer ønsket om å fjerne %.250s som ikke er installert."
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Ingen omdirigering «%s», ingenting fjernet.\n"
 
@@ -2802,20 +3171,6 @@ msgstr "pakke kan ikke inneholde linjeskift"
 msgid "divert-to may not contain newlines"
 msgstr "omdirigering kan ikke inneholde linjeskift"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "klarte ikke åpne omdirigeringsfil"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "klarte ikke utføre «fstat» på omdirigeringsfila"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr ""
-"omdirigeringer i konflikt med hverandre, involverer «%.250s» eller «%.250s»"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3122,123 +3477,165 @@ msgstr ""
 "Pakken %s er holdt tilbake, og blir ikke rørt. Bruk --force-hold for å "
 "tvinge gjennom behandling.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "overstyrer problemet fordi --force er slått på:"
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "fillistefila for pakken «%.250s» inneholder et tomt filnavn"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "klarte ikke åpne fillistefila for pakken «%.250s»"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to stat files list file for package '%.250s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "klarte ikke finne fillistefila for pakken «%.250s»"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "klarte ikke lese oppsettsfilkatalogen «%.250s» (fra «%.250s»)"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "klarte ikke åpne fillistefila for pakken «%.250s»"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid ""
-#| "files list file for package `%.250s' missing, assuming package has no "
-#| "files currently installed."
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"fillistefila for pakken «%.250s» mangler. Går ut fra at pakken for "
-"øyeblikket ikke har noen filer installert."
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "klarte ikke finne fillistefila for pakken «%.250s»"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "filliste for pakken «%.250s»"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "kravproblem - fjerner ikke"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "kravproblem - fjerner ikke"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "fillistefila for pakken «%.250s» inneholder et tomt filnavn"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Leser database ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d fil eller kataloger er for øyeblikket installert.)\n"
-msgstr[1] "%d filer og kataloger er for øyeblikket installerte.)\n"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "ukjent tvangs-/avvisningsvalg «%.*s»"
+
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "foreldet tvang/nekt alternativ «%s»\n"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "overstyrer problemet fordi --force er slått på:"
 
 #: src/help.c
 msgid "not installed"
@@ -3312,43 +3709,6 @@ msgstr ""
 "%d forventet program ble ikke funnet i PATH eller ikke kjørbart.\n"
 "NB: For root bør PATH inneholde /usr/local/sbin, /usr/sbin og /sbin."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "klarte ikke sjekke om «%.250s» finnes"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "klarte ikke lese infokatalogen"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "feil ved åpning av %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-#| msgid "unable to write file '%s'"
-msgid "corrupt info database format file '%s'"
-msgstr "klarte ikke å skrive fila «%s»"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "oppsettsfila «%.250s» finnes ikke i pakken"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "feil ved skriving av «%s»"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3388,27 +3748,27 @@ msgstr "Debian «%s» brukergrensesnitt for pakkehåndtering versjon %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3684,114 +4044,6 @@ msgstr ""
 "informasjonen!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "kravproblem - fjerner ikke"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "kravproblem - fjerner ikke"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3926,34 +4178,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "ukjent tvangs-/avvisningsvalg «%.*s»"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "foreldet tvang/nekt alternativ «%s»\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "klarte ikke åpne «%i» for strøm"
 
@@ -4140,6 +4364,12 @@ msgid "Description"
 msgstr "Beskrivelse"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "long filenames"
+msgid "showing package list on pager"
+msgstr "lange filnavn"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "omdirigert av %s fra: %s\n"
@@ -4177,6 +4407,16 @@ msgstr ""
 "Pakken «%s» er ikke installert og det finnes ingen informasjon om den.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Bruk dpkg --info (= dpkg-deb --info) for å undersøke arkivfiler,\n"
+"og dpkg --contents (= dpkg-deb --contents) for å vise innholdet i dem.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4203,9 +4443,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "omdirigert av %s til:%s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Bruk dpkg --info (= dpkg-deb --info) for å undersøke arkivfiler,\n"
 "og dpkg --contents (= dpkg-deb --contents) for å vise innholdet i dem.\n"
@@ -4264,16 +4507,16 @@ msgstr "Debian %s pakkehåndteringsprogram spørreverktøy versjon %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4475,6 +4718,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "klarte ikke skifte filrot til «%.250s»"
@@ -4650,8 +4899,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4726,68 +4980,11 @@ msgstr "Ingen tilsidesettelse tilstede."
 msgid "--update is useless for --remove"
 msgstr "--update er meningsløs for --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "ugyldig status"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride gid %s"
-msgstr "«statoverride»-fil «%.250s»"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride mode %s"
-msgstr "«statoverride»-fil «%.250s»"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "klarte ikke åpne «statoverride»-fila"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "klarte ikke utføre «fstat» på «statoverride»-fila"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "«statoverride»-fil «%.250s»"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "statoverride-fila mangler et avsluttende linjeskift"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "«statoverride»-fila inneholder en tom linje"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "syntaksfeil i statoverrid-fila"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "syntax error: unknown user '%s' in statoverride file"
-msgid "unknown user '%s' in statoverride file"
-msgstr "syntaksfeil: ukjent bruker «%s» i statoverride-fil"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "uventet slutt på linje i statoverride-fila"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "syntax error: unknown group '%s' in statoverride file"
-msgid "unknown group '%s' in statoverride file"
-msgstr "syntaksfeil: ukjent gruppe «%s» i statoverride-fil"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "flere statustilsidesettelser tilstede for fila «%.250s»"
+#| msgid "obsolete option '--%s', please use '--%s' instead."
+msgid "deprecated --%s option; use --%s instead"
+msgstr "foreldet valg  «--%s», bruk «--%s» istedenfor."
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5045,6 +5242,12 @@ msgstr "Fjerner oppsettet av %s, slik at %s kan fjernes ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Fjerner oppsettet av %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "«statoverride»-fila inneholder en tom linje"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 #| msgid "conffile name '%.50s...' is too long, or missing final newline"
@@ -5190,11 +5393,9 @@ msgid "package filesystem archive extraction"
 msgstr "dpkg-deb feltuttrekking"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "feil ved lesing av tar-utdata fra dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "ødelagt filsystem-tarfil - ødelagt pakkearkiv"
 
 #: src/unpack.c
@@ -5210,15 +5411,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s trenger akkurat én «Packages»-fil som parameter"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "klarte ikke få tilgang til dpkg-statusområdet for rå "
 "tilgjengelighetsoppdatering"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"rå tilgjengelighetsoppdatering krever skrivetilgang til dpkg-statusområdet"
+"klarte ikke få tilgang til dpkg-statusområdet for rå "
+"tilgjengelighetsoppdatering"
 
 #: src/update.c
 #, c-format
@@ -5602,16 +5810,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "klarte ikke skifte til katalog"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "klarte ikke opprette katalog"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "klarte ikke skifte til katalogen etter å ha opprettet den"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "uventet slutt på fil i pakkenavnet på linje %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "klarte ikke skifte til katalog"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6556,8 +6766,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -7099,10 +7310,94 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "klarte ikke åpne låsefila %s for testing"
+
+#, fuzzy
+#~| msgid "syntax error: unknown user '%s' in statoverride file"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "syntaksfeil: ukjent bruker «%s» i statoverride-fil"
+
 #, fuzzy
-#~| msgid "obsolete option '--%s', please use '--%s' instead."
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "foreldet valg  «--%s», bruk «--%s» istedenfor."
+#~| msgid "syntax error: unknown group '%s' in statoverride file"
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "syntaksfeil: ukjent gruppe «%s» i statoverride-fil"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s mangler"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "«%.*s» er ikke tillatt for %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "søppel etter %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "ugyldig pakkenavn (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "ja/nei i boolsk felt"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "«%s»-felt, referanse til «%.255s»: feil i versjon"
+
+#~ msgid "empty value for %s"
+#~ msgstr "tom verdi for %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "pakken har status utløsere-ventende, men ingen ventende utløsere"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "pakken har status utløsere-utestående, men ingen utestående utløsere"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "rå tilgjengelighetsoppdatering krever skrivetilgang til dpkg-statusområdet"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "feil ved lesing av tar-utdata fra dpkg-deb"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "klarte ikke åpne fillistefila for pakken «%.250s»"
+
+#, fuzzy
+#~| msgid "unable to stat files list file for package '%.250s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "klarte ikke finne fillistefila for pakken «%.250s»"
+
+#, fuzzy
+#~| msgid "files list file for package '%.250s' is missing final newline"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "klarte ikke åpne fillistefila for pakken «%.250s»"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "klarte ikke finne fillistefila for pakken «%.250s»"
+
+#, fuzzy
+#~| msgid "files list file for package '%.250s' is missing final newline"
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "filliste for pakken «%.250s»"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "klarte ikke skifte til katalogen etter å ha opprettet den"
 
 #, fuzzy
 #~| msgid "cannot stat file '%s'"
@@ -7181,9 +7476,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "slutt på fil ved standard-inn ved oppsettsfilprompt"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "uventet slutt på fil i pakkenavnet på linje %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "uventet slutt på fil etter pakkenavnet på linje %d"
 
@@ -7443,9 +7735,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "det er en slave av %s"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "fant ikke %s: %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "readlink(%s) feilet: %s"
 
@@ -7470,9 +7759,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "klarte ikke lukke %s: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "klarte ikke skrive %s: %s"
-
 #, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -7797,9 +8083,6 @@ msgstr ""
 #~ msgid "cannot open diversions: %s"
 #~ msgstr "klarte ikke åpne omdirigeringer: %s"
 
-#~ msgid "missing package"
-#~ msgstr "mangler pakke"
-
 #~ msgid "rename: rename `%s' to `%s': %s"
 #~ msgstr "rename: endre navnet på «%s» til «%s»: %s"
 
diff --git a/po/ne.po b/po/ne.po
index 6d8cc5483..81a753043 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:51+0200\n"
 "Last-Translator: Nabin Gautam <nabin@mpp.org.np>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -146,7 +146,8 @@ msgstr "पुरानो डाइभर्सन हटाउनुहोस�
 msgid "error creating new backup file '%s'"
 msgstr "पाइप `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "`%.250s' हटाउन सक्दैन"
@@ -370,22 +371,36 @@ msgstr "गद्दा पछि %.250s को सुरू खोज्न अ
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "vsnprintf का लागि tmpfile (अस्थाइ फाइल) खोल्न अक्षम"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "%.250s का लागि फाँट स्क्रिप्टर झण्डाहरू पढ्न अक्षम"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "वस्तुस्थिति डेटावेश ताल्चा मारेको फाइल खोल्न/सिर्जना गर्न अक्षम"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "वस्तुस्थिति डेटावेश ताल्चा मारेको फाइल खोल्न/सिर्जना गर्न अक्षम"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "dpkg वस्तुस्थिति डेटावेश ताल्चा लगाउन तपाईँसंग अनुमति छैन"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg वस्तुस्थिति डेटावेश ताल्चा लगाउन अक्षम"
 
 #: lib/dpkg/dbmodify.c
@@ -393,11 +408,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "अनुरोध गरिएको सञ्चालनलाई सुपर प्रयोगकर्ता विशेषाधिकार चाहिन्छ"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "dpkg स्थिति क्षेत्र पहुँच गर्न अक्षम"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "सञ्चालनलाई dpkg स्थिति क्षेत्रलाई पढ्न/लेख्न पहुँच आवश्यक पर्दछ"
 
 #: lib/dpkg/dbmodify.c
@@ -435,6 +454,196 @@ msgstr "`%.250s'को अद्यावधिक वस्तुस्थि�
 msgid "unable to install updated status of '%.250s'"
 msgstr "`%.250s'को अद्यावधिक वस्तुस्थिति स्थापना गर्न अक्षम"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "`%.250s'को अवस्थिति जाँच गर्न अक्षम"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "सूचना डाइरेक्टरी पढ्न सक्दैन"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "%.250s खोल्न प्रयास गर्दा त्रुटि"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "कन्फफाइल `%.250s' प्याकेजमा देखा पर्दैन"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "हार्ड लिङ्क `%.255s' सिर्जना गर्दा त्रुटि"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "लेख्दै गर्दा त्रुटि `%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "कन्फिग फाइल डाइरेक्टरी `%.250s' (from `%.250s') पढ्न सक्दैन"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "diversions फाइल खोल्न असफल"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "diversions फाइल fstat गर्न असफल"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "द्धन्दात्मक diversionsले`%.250s' or `%.250s' संलग्र गर्दै"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल बन्द गर्दा त्रुटि"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg: गम्भिर चेतावनी: प्याकेज`%.250s'का लगि फाइलको सूची फाइल हराइरहेको छ, मानिएको "
+"प्याकेज सँग हालमा स्थापित फाइलहरू छैन ।\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(डेटावेश पढ्दै ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d फाइलहरू र डाइरेक्टरीहरू हालैमा स्थापना भयो ।)\n"
+msgstr[1] "%d फाइलहरू र डाइरेक्टरीहरू हालैमा स्थापना भयो ।)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "अवैध अद्यावधिक मोड"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "statoverride फाइल `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "statoverride फाइल `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "statoverride फाइल खोल्न असफल"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "statoverride फाइल fstat गर्न असफल"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "statoverride फाइल `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "statoverride फाइलले रित्तो लाइन समावेश गर्दछ"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statoverride फाइलले रित्तो लाइन समावेश गर्दछ"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "statoverride फाइल खोल्न असफल"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "लाइन %d को प्याकेजमा अप्रत्यासित लाइनको समाप्ती"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "statoverride फाइल `%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -565,63 +774,71 @@ msgid "internal error"
 msgstr "आन्तरिक त्रुटि: खराब मोड: `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s हराइरेहेको छ"
+#, fuzzy
+#| msgid "cannot stat old name `%s': %s"
+msgid "is missing a value"
+msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "`%.*s'  %s का लागि अनुमति प्राप्त छैन"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr " %s पछि रद्दी"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "अवैध प्याकेज नाम (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "प्याकेज `%s' स्थापित छैन ।\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "रित्तो फाइल विवरण फाँट `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "फाइल विवरण फाँट `%s' लाई वस्तुस्थिति फाइलमा अनुमति छैन"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "फाइल विवरण फाँटमा धेरै मानहरू `%s' (अन्यसंग दाजेमा)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "फाइल विवरण फाँटमा धेरै थोरै मानहरू `%s' (अन्यसंग दाजेमा)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "बोलेइन फाँटमा हो/होइन"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "अप्रचलित `Revision' वा `Package-Revision' फाँट प्रयोग"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "`%s' फाँट, %.255s' लाई सन्दर्भ: संस्करणमा त्रुटि: %.255s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "`प्राथमिकता' फाँटमा शब्द भित्र"
 
 #: lib/dpkg/fields.c
@@ -631,33 +848,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "`वस्तुस्थिति' का लागि मान फाँट प्रंसगमा अनुमति दिइदैन ।"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "पहिलो (चाहनुहुन्छ) word in `status' फाँट"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "सेकेण्ड (त्रुटि) word in `status' फाँट"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "तेस्रो (वस्तुस्थिति) word in `status' फाँट"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "संस्करण स्ट्रिङ`%.250s': %.250s मा त्रुटि"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "अप्रचलित `Revision' वा `Package-Revision' फाँट प्रयोग"
 
 #: lib/dpkg/fields.c
@@ -669,11 +886,13 @@ msgstr "`conffiles' का लागि मानसंग नराम्रो
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "`conffiles' का लागि मानसंग खाली स्थान नभएको`%c' बाट लाइन सुरू छ ।"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "मूल वा शुन्य डाइरेक्टरी कन्फफाइलको रुपमा सूचिबद्ध गरिन्छ ।"
 
 #: lib/dpkg/fields.c
@@ -757,9 +976,9 @@ msgstr "`%s' फाँट, `%.255s' लाई सन्दर्भ: समा�
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "`%s' फाँट, %.255s' लाई सन्दर्भ: संस्करणमा त्रुटि: %.255s"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "`%s' फाँट, `%.255s' लाई सन्दर्भ: संस्करण '%c' समाहित गर्दछ"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -767,8 +986,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "`%s' फाँट, प्याकेज `%.255s' लाई सन्दर्भ पछि वाक्य संरचना त्रुटि"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "फाँट %s मा वैकल्पिकहरू (`|') लाई अनुमति दिदैन"
 
 #: lib/dpkg/fields.c
@@ -808,6 +1028,29 @@ msgstr "नयाँ वितरण कन्फफाइल `%.250s'को म
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat %s"
+msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "चेतावनी, कन्फफाइल `%s' सादा फाइल होइन\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "%s लेख्न अक्षम: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open %s"
+msgstr "diversions खोल्न असफल: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "%s ताल्चा खोल्न अक्षम: %s"
@@ -830,8 +1073,20 @@ msgid "unable to lock %s"
 msgstr "%s ताल्चा खोल्न अक्षम: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "cannot open diversions: %s"
+msgid "cannot open file %s"
+msgstr "diversions खोल्न असफल: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "vsnprintf मा फ्लस गर्न अक्षम"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "डाइरेक्टरी फेर्न सकिदैन"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -855,13 +1110,13 @@ msgstr "डाइरेक्टरी सिर्जना गर्न अस
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "std%s का लागि dup गर्न असफल"
+msgid "failed to dup for fd %d"
+msgstr "fd %d का लागि dub गर्न असफल"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "fd %d का लागि dub गर्न असफल"
+msgid "failed to dup for std%s"
+msgstr "std%s का लागि dup गर्न असफल"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1000,29 +1255,31 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "प्रयोगकर्ता-परिभाषित फाँट`%.*s' का लागि नक्कल प्रति मान"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "हराइरहेको %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr " %s का लागि रित्तो मान"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "फाँट`%s' का लागि नक्कल प्रति मान"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has '%s' field but is missing architecture"
+msgstr " (प्याकेज: "
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr " (प्याकेज: "
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "अनुपयुक्त वस्तुस्थितिसंग प्याकेजका लागि कन्फिगर गरिएको-संस्करण"
 
 #: lib/dpkg/parse.c
@@ -1031,7 +1288,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1040,11 +1298,14 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "  प्याकेज %s हटाइनु पर्दछ ।\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "स्थापना बिहिन अवस्थामा रहेको प्याकेजमा कन्फफाइल छ, तिनिहरुलाई बिर्सदैछ"
 
 #: lib/dpkg/parse.c
@@ -1062,8 +1323,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1260,11 +1521,6 @@ msgstr "`%.255s' सिर्जना गर्न अक्षम"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1281,6 +1537,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "हराइरहेको अल्टनाम"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(कुनै वर्णन उपलब्ध छैन)"
@@ -1365,6 +1631,68 @@ msgstr "उपप्रक्रियाहरू %s पर्खने स्�
 msgid "wait for %s subprocess failed"
 msgstr " %s का लागि पर्खने असफल भयो"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "क्यारेक्टर`%c' फाँट चौडाइमा अवैध\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "क्यारेक्टर`%c' फाँट चौडाइमा अवैध\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "अवैध अद्यावधिक मोड"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header gid field"
+msgstr "statoverride फाइल `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "क्यारेक्टर`%c' फाँट चौडाइमा अवैध\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "अज्ञात सङ्कुचन प्रकार `%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -1384,12 +1712,12 @@ msgstr "सूचना डाइरेक्टरी पढ्न सक्द
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "%s ताल्चा खोल्न अक्षम: %s"
 
 #: lib/dpkg/trigdeferred.c
@@ -1599,11 +1927,6 @@ msgstr "पाइप `%.255s' सिर्जना गर्दा त्रु
 msgid "error creating device '%.255s'"
 msgstr "यन्त्र `%.255s' सिर्जना गर्दा त्रुटि"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "हार्ड लिङ्क `%.255s' सिर्जना गर्दा त्रुटि"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1920,10 +2243,10 @@ msgstr "सङ्ग्रहमा पहुँच गर्न सकिदै
 msgid "archive '%s' is not a regular file"
 msgstr "चेतावनी, कन्फफाइल `%s' सादा फाइल होइन\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2140,6 +2463,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "तपाईँले गरिसके पछि 'exit' टाइप गर्नुहोस् ।\n"
 
@@ -2512,7 +2839,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2552,6 +2882,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -2682,6 +3018,13 @@ msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 msgstr "dpkg - चेतावनी:  %.250s हटाउने अनुरोध अवज्ञा गर्दैछ जुन स्थापित छैन ।\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
@@ -2728,19 +3071,6 @@ msgstr "प्याकेजले नयाँरेखा समावेश
 msgid "divert-to may not contain newlines"
 msgstr "यसमा फेर्नेले नयाँरेखाहरू समावेश नगर्न सक्छ"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "diversions फाइल खोल्न असफल"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "diversions फाइल fstat गर्न असफल"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "द्धन्दात्मक diversionsले`%.250s' or `%.250s' संलग्र गर्दै"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3036,118 +3366,167 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "प्याकेज %s पर्खाइमा छ, यसलाई नछोइकन ।  अधिलेखन गर्न Use --force-hold \n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
-"dpkg - चेतावनी, अधिलेखन गर्दा त्रुटि किनभने--force सक्षम:\n"
-" "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "कन्फिग फाइल डाइरेक्टरी `%.250s' (from `%.250s') पढ्न सक्दैन"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल बन्द गर्दा त्रुटि"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg: गम्भिर चेतावनी: प्याकेज`%.250s'का लगि फाइलको सूची फाइल हराइरहेको छ, मानिएको "
-"प्याकेज सँग हालमा स्थापित फाइलहरू छैन ।\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "निर्भरता समस्याहरू - हट्दैन"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "निर्भरता समस्याहरू - हट्दैन"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल बन्द गर्दा त्रुटि"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(डेटावेश पढ्दै ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "अज्ञात दवाब/अविस्कार विकल्प `%.*s"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d फाइलहरू र डाइरेक्टरीहरू हालैमा स्थापना भयो ।)\n"
-msgstr[1] "%d फाइलहरू र डाइरेक्टरीहरू हालैमा स्थापना भयो ।)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "चेतावनी: अप्रचलित दवाव/अस्विकार विकल्प `%s'\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"dpkg - चेतावनी, अधिलेखन गर्दा त्रुटि किनभने--force सक्षम:\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3211,42 +3590,6 @@ msgstr ""
 "%d आशातित कार्यक्रम(हरू) PATH मा फेला परेन ।\n"
 "NB: मूलको PATH ले अक्सर /usr/local/sbin, /usr/sbin and /sbin समावेश गर्दछ ।"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "`%.250s'को अवस्थिति जाँच गर्न अक्षम"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "सूचना डाइरेक्टरी पढ्न सक्दैन"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "%.250s खोल्न प्रयास गर्दा त्रुटि"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "स्रोत फाइल `%.250s' खोल्न अक्षम"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "कन्फफाइल `%.250s' प्याकेजमा देखा पर्दैन"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "लेख्दै गर्दा त्रुटि `%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3256,27 +3599,27 @@ msgstr "डेवियन `%s' प्याकेज ब्यवस्था�
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3503,114 +3846,6 @@ msgstr ""
 "यसलाई पाइप गर्नुहोस् !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "निर्भरता समस्याहरू - हट्दैन"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "निर्भरता समस्याहरू - हट्दैन"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3741,33 +3976,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "अज्ञात दवाब/अविस्कार विकल्प `%.*s"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "चेतावनी: अप्रचलित दवाव/अस्विकार विकल्प `%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "प्रवाहका लागि`%i' खोोल्न सकेन"
 
@@ -3954,6 +4162,10 @@ msgid "Description"
 msgstr "बर्णन"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, fuzzy, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "%s द्धारा %s मा फेरिएको\n"
@@ -3990,6 +4202,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "प्याकेज `%s' स्थापना गरेको छैन र सूचना उपलब्ध छ ।\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"dpkg प्रयोग गर्नुहोस् --सूचना (= dpkg-deb --info) सङ्ग्रह फाइल परिक्ष गर्न,\n"
+"र dpkg --समावेशल गर्दछ (= dpkg-deb --contents) त्यसको समावेश सङ्ग्रह गर्न\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4016,9 +4238,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "%s द्धारा %s मा फेरिएको\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "dpkg प्रयोग गर्नुहोस् --सूचना (= dpkg-deb --info) सङ्ग्रह फाइल परिक्ष गर्न,\n"
 "र dpkg --समावेशल गर्दछ (= dpkg-deb --contents) त्यसको समावेश सङ्ग्रह गर्न\n"
@@ -4066,16 +4291,16 @@ msgstr "डेवियन `%s' प्याकेज ब्यवस्था�
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4271,6 +4496,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "`%.250s' लाई chroot गर्न असफल"
@@ -4421,8 +4652,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4499,70 +4735,10 @@ msgstr "अधिलेखन अवस्थित छैन"
 msgid "--update is useless for --remove"
 msgstr "चेतावनी:--हटाउन--अद्यावधिक उपयोगि छैन"
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "अवैध अद्यावधिक मोड"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "statoverride फाइल `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "statoverride फाइल `%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "statoverride फाइल खोल्न असफल"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "statoverride फाइल fstat गर्न असफल"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "statoverride फाइल `%.250s'"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "statoverride फाइलले रित्तो लाइन समावेश गर्दछ"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "statoverride फाइलले रित्तो लाइन समावेश गर्दछ"
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "statoverride फाइल खोल्न असफल"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "statoverride फाइल खोल्न असफल"
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "लाइन %d को प्याकेजमा अप्रत्यासित लाइनको समाप्ती"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "statoverride फाइल खोल्न असफल"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "statoverride फाइल `%.250s'"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "चेतावनी: अप्रचलित विकल्प `--%s'\n"
 
 #: src/trigcmd.c
 #, fuzzy
@@ -4799,6 +4975,12 @@ msgstr "%s डि-कन्फीगर गर्नुहोस्, जसल�
 msgid "De-configuring %s (%s) ...\n"
 msgstr "हटाउँदैछ %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "statoverride फाइलले रित्तो लाइन समावेश गर्दछ"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4939,11 +5121,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "dpkg-deb टार निर्गत पढ्दा त्रुटि"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "दुषित फाइलप्रणाली टारफाइल - दुषित प्याकेज सङ्ग्रह"
 
 #: src/unpack.c
@@ -4959,12 +5139,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s लाई यथार्थमा एउटा प्याकेज फाइल तर्क आवश्यक पर्दछ"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "bulk उपलब्ध अद्यावधिकका लागि dpkg स्थिति क्षेत्र पहुँच गर्न अक्षम"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr "bulk उपलब्ध अद्यावधिकलाई dpkg स्थिति क्षेत्रमा लेख्य पहुँच आवश्यक पर्दछ"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "bulk उपलब्ध अद्यावधिकका लागि dpkg स्थिति क्षेत्र पहुँच गर्न अक्षम"
 
 #: src/update.c
 #, c-format
@@ -5340,16 +5526,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "डाइरेक्टरीलाई chdir गर्न असफल"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "डाइरेक्टरी सिर्जना गर्न असफल"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "डाइरेक्टरी सिर्जना गरे पछि डाइरेक्टरीलाई chdir गर्न असफल"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "लाइन %d को प्याकेज नाममा eof अप्रत्यासित"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "डाइरेक्टरीलाई chdir गर्न असफल"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6218,8 +6406,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6729,13 +6918,85 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "चेतावनी: अप्रचलित विकल्प `--%s'\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "vsnprintf का लागि tmpfile (अस्थाइ फाइल) खोल्न अक्षम"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "statoverride फाइल खोल्न असफल"
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "statoverride फाइल खोल्न असफल"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s हराइरेहेको छ"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "`%.*s'  %s का लागि अनुमति प्राप्त छैन"
+
+#~ msgid "junk after %s"
+#~ msgstr " %s पछि रद्दी"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "अवैध प्याकेज नाम (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "बोलेइन फाँटमा हो/होइन"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "`%s' फाँट, %.255s' लाई सन्दर्भ: संस्करणमा त्रुटि: %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr " %s का लागि रित्तो मान"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr "bulk उपलब्ध अद्यावधिकलाई dpkg स्थिति क्षेत्रमा लेख्य पहुँच आवश्यक पर्दछ"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "dpkg-deb टार निर्गत पढ्दा त्रुटि"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल बन्द गर्दा त्रुटि"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "प्याकेज `%.250s' का लागि फाइलको सूची"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "डाइरेक्टरी सिर्जना गरे पछि डाइरेक्टरीलाई chdir गर्न असफल"
 
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
@@ -6815,9 +7076,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF को stdin मा कन्फफाइल प्रोम्ट"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "लाइन %d को प्याकेज नाममा eof अप्रत्यासित"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "लाइन %d को प्याकेज नाम पछि अप्रत्यासित eof"
 
@@ -7108,11 +7366,6 @@ msgstr ""
 #~ msgstr "स्लेभ %s: %s"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
-
-#, fuzzy
 #~| msgid "%s: copying %s to %s failed, giving up: %s"
 #~ msgid "scan of %s failed: %s"
 #~ msgstr "%s: %s मा %s प्रतिलिपि गर्न असफल, छोड्दैछ: %s"
@@ -7139,11 +7392,6 @@ msgstr ""
 #~ msgstr "%s बन्द गर्न अक्षम: %s"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "%s लेख्न अक्षम: %s"
-
-#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "%s लाई %s मा पुन: नामकरण गर्न अक्षम: %s"
diff --git a/po/nl.po b/po/nl.po
index 993efb168..fe5dad5e9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,14 +1,14 @@
 # Dutch translation of dpkg.
 # Copyright © 1994-2016 Dpkg Developers
 # This file is distributed under the same license as the dpkg package.
-# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2015, 2016, 2017.
+# Frans Spiesschaert <Frans.Spiesschaert@yucom.be>, 2015, 2016, 2017, 2018, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.18.22\n"
+"Project-Id-Version: dpkg 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2017-02-11 17:49+0100\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
+"PO-Revision-Date: 2019-03-07 11:40+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
 "Language: nl\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 2.91.7\n"
 
 #: lib/dpkg/ar.c
 msgid "failed to fstat archive"
@@ -137,7 +137,8 @@ msgstr "fout bij het verwijderen van oud back-upbestand '%s'"
 msgid "error creating new backup file '%s'"
 msgstr "fout bij het aanmaken van nieuw back-upbestand '%s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "kan '%.250s' niet verwijderen"
@@ -343,37 +344,48 @@ msgstr "kan niet naar het begin van %.250s gaan na opvulling"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "kan het vergrendelingsbestand %s niet openen om te testen"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr ""
+"kan het vergrendelingsbestand voor de dpkg-databasemap %s niet controleren"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "kan de frontend-vergrendeling voor map %s niet openen/aanmaken"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, c-format
+msgid "unable to open/create dpkg database lock file for directory %s"
 msgstr ""
-"kan het vergrendelingsbestand van de statusdatabase niet openen/aanmaken"
+"kan het dpkg-databasevergrendelingsbestand voor map %s niet openen/aanmaken"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, c-format
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr ""
-"u heeft niet de benodigde rechten om de statusdatabase van dpkg te "
-"vergrendelen"
+"u heeft niet de benodigde rechten om de dpkg-databasemap %s te vergrendelen"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
-msgstr "statusdatabase van dpkg"
+msgid "dpkg frontend lock"
+msgstr "dpkg-frontendvergrendeling"
+
+#: lib/dpkg/dbmodify.c
+msgid "dpkg database lock"
+msgstr "dpkg-databasevergrendeling"
 
 #: lib/dpkg/dbmodify.c
 msgid "requested operation requires superuser privilege"
 msgstr "deze bewerking kan alleen uitgevoerd worden door de systeembeheerder"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
-msgstr "kan niet binnen bij het statusgebied van dpkg"
+#, c-format
+msgid "unable to access the dpkg database directory %s"
+msgstr "kan dpkg-databasemap %s niet benaderen"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
-msgstr ""
-"voor deze bewerking zijn lees- en schrijfrechten nodig in het statusgebied "
-"van dpkg"
+#, c-format
+msgid "required read/write access to the dpkg database directory %s"
+msgstr "lees- en schrijftoegang tot de dpkg-databasemap %s is vereist"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
@@ -410,11 +422,203 @@ msgstr "kan de nieuwe status van '%.250s' niet afsluiten"
 msgid "unable to install updated status of '%.250s'"
 msgstr "kan de nieuwe status van '%.250s' niet installeren"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "kan het bestaan van '%.250s' niet verifiëren"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "kan infomap niet lezen"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "fout bij openen van %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "beschadigd opmaakbestand '%s' van de infodatabase"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"opmaak van infodatabase (%d) bevat fouten of is te nieuw; probeer het met "
+"een nieuwere versie van dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "infobestand %s/%s aan geen enkel pakket gekoppeld"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "fout bij het maken van de vaste koppeling '%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "fout bij schrijven naar '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "controlebestand '%s' voor pakket '%s' heeft geen afsluitend regeleinde"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "controlebestand '%s' voor pakket '%s' heeft een ontbrekende waarde"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"controlebestand '%s' voor pakket '%s' heeft een ontbrekend "
+"waardescheidingsteken"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "controlebestand '%s' voor pakket '%s' bevat een lege bestandsnaam"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "loading control file '%s' for package '%s'"
+msgstr "controlebestand '%s' voor pakket '%s' wordt geladen"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "kon omleidingenbestand niet openen"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "kon de status van het omleidingenbestand niet opvragen"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "tegenstrijdige omleidingen waarbij '%.250s' of '%.250s' betrokken zijn"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "loading files list file for package '%s'"
+msgstr "bestand met de bestandenlijst van pakket '%s' wordt geladen"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"bestand met de lijst bestanden van pakket'%.250s' ontbreekt; aangenomen\n"
+"wordt dat het pakket momenteel geen geïnstalleerde bestanden heeft"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"bestand met de lijst bestanden van pakket '%.250s' heeft geen afsluitend "
+"regeleinde"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"bestand met de lijst bestanden van pakket '%.250s' bevat een lege "
+"bestandsnaam"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Database wordt ingelezen ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d bestand of map momenteel geïnstalleerd.)\n"
+msgstr[1] "%d bestanden en mappen momenteel geïnstalleerd.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "ongeldige statusmodificatie-uid %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "ongeldige statusmodificatie-gid %s "
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "ongeldige statusmodificatie-modus %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "kan statusmodificatie-bestand niet openen"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "kan de status van het statusmodificatie-bestand niet opvragen"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "statusmodificatie-bestand '%.250s' wordt gelezen"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "het afsluitende regeleinde ontbreekt in het statusmodificatie-bestand"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statusmodificatie-bestand bevat een lege regel"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "syntaxisfout in het statusmodificatie-bestand"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+"onbekende systeemgebruiker '%s' in het statusmodificatie-bestand; de\n"
+"systeemgebruiker werd voor de modificatie verwijderd. Dit is\n"
+"hoogstwaarschijnlijk een verpakkingsbug. Om de zaak te herstellen kunt u\n"
+"de modificatie handmatig verwijderen met %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "onverwacht regeleinde in het statusmodificatie-bestand"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+"onbekende systeemgroep '%s' in het statusmodificatie-bestand; de\n"
+"systeemgroep werd voor de modificatie verwijderd. Dit is\n"
+"hoogstwaarschijnlijk een verpakkingsbug. Om de zaak te herstellen kunt u de "
+"modificatie handmatig verwijderen met %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "er zijn meerdere statusmodificaties voor bestand '%.250s'"
+
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty major component"
 msgid "format version with too big major component"
-msgstr "formaat van het versienummer bevat een lege hoofdversiecomponent"
+msgstr "formaat van het versienummer bevat een te hoge hoofdversiecomponent"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty major component"
@@ -425,10 +629,8 @@ msgid "format version has no dot"
 msgstr "formaat van het versienummer bevat geen punt"
 
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty minor component"
 msgid "format version with too big minor component"
-msgstr "formaat van het versienummer bevat een lege onderversiecomponent"
+msgstr "formaat van het versienummer bevat een te hoge onderversiecomponent"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty minor component"
@@ -526,64 +728,64 @@ msgid "internal error"
 msgstr "interne fout"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s ontbreekt"
+msgid "is missing a value"
+msgstr "mist een waarde"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.50s' is niet toegestaan voor %s"
+msgid "has invalid value '%.50s'"
+msgstr "heeft de ongeldige waarde '%.50s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "rommel na %s"
+msgid "has trailing junk"
+msgstr "heeft rommel achteraan"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ongeldige pakketnaam (%.250s)"
+msgid "invalid package name in '%s' field: %s"
+msgstr "ongeldige pakketnaam in veld '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
-msgstr "leeg veld '%s' voor bestandsdetails"
+msgid "empty archive details '%s' field"
+msgstr "leeg veld '%s' met archiefdetails"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "file details field '%s' not allowed in status file"
-msgstr "veld '%s' voor bestandsdetails niet toegestaan in statusbestand"
+msgid "archive details '%s' field not allowed in status file"
+msgstr "veld '%s' met de archiefdetails niet toegestaan in statusbestand"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
-"te veel waarden in veld '%s' voor bestandsdetails (vergeleken met andere)"
+"te veel waarden in veld '%s' met de archiefdetails (vergeleken met andere)"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
-"te weinig waarden in het veld '%s' voor bestandsdetails (vergeleken met "
-"andere)"
+"te weinig waarden in veld '%s' met de archiefdetails (vergeleken met andere)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no in booleaans veld"
+#, c-format
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "booleaans (yes/no) veld '%s': %s"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
-msgstr "foreign/allowed/same/no in vierstatusveld"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
+msgstr "vierstatusveld (foreign/allowed/same/no) '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr "'%s' is geen geldige naam voor een architectuur: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "'%s' is geen geldige naam voor een architectuur in veld '%s': %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
-msgstr "woord in het veld 'Priority'"
+#, c-format
+msgid "word in '%s' field: %s"
+msgstr "woord in het veld '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -591,26 +793,29 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "waarde voor veld '%s' is niet toegestaan in deze context"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
-msgstr "eerste woord (want) in het veld 'Status'"
+#, c-format
+msgid "first (want) word in '%s' field: %s"
+msgstr "eerste woord (want) in het veld '%s': %s"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
-msgstr "tweede woord (error) in het veld 'Status'"
+#, c-format
+msgid "second (error) word in '%s' field: %s"
+msgstr "tweede woord (error) in het veld '%s': %s"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
-msgstr "derde woord (status) in het veld 'Status'"
+#, c-format
+msgid "third (status) word in '%s' field: %s"
+msgstr "derde woord (status) in het veld '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "error in '%s' field string '%.250s'"
-msgstr "fout in tekenreeks '%.250s' voor veld '%s'"
+msgid "'%s' field value '%.250s'"
+msgstr "waarde '%.250s' voor veld '%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "obsolete '%s' or '%s' field used"
-msgstr "verouderd veld '%s' of '%s' gebruikt"
+msgid "obsolete '%s' field used"
+msgstr "verouderd veld '%s' gebruikt"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -619,12 +824,15 @@ msgstr "waarde voor veld '%s' heeft een verkeerd opgemaakte regel '%.*s'"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
-msgstr "waarde voor '%s' heeft een regel die niet begint met een spatie '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
+msgstr ""
+"waarde voor veld '%s' heeft een regel die niet begint met een spatie '%c'"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
-msgstr "hoofd- of null-map wordt genoemd als een configuratiebestand"
+#, c-format
+msgid "root or empty directory listed as a conffile in '%s' field"
+msgstr ""
+"hoofd- of lege map wordt genoemd als een configuratiebestand in veld '%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -710,8 +918,8 @@ msgstr "veld '%s', verwijzing naar '%.255s': versie niet afgesloten"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "veld '%s', verwijzing naar '%.255s': fout in versie"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "veld '%s', verwijzing naar '%.255s': versie '%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -720,8 +928,8 @@ msgstr "veld '%s', syntaxisfout na verwijzing naar pakket '%.255s'"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "alternatives ('|') not allowed in %s field"
-msgstr "alternatieven ('|') niet toegestaan in veld %s"
+msgid "alternatives ('|') not allowed in '%s' field"
+msgstr "alternatieven ('|') niet toegestaan in veld '%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -760,6 +968,26 @@ msgstr "kan de modus van het doelbestand '%.250s' niet instellen"
 
 #: lib/dpkg/file.c
 #, c-format
+msgid "cannot stat %s"
+msgstr "kan de status van %s niet opvragen"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "%s is not a regular file"
+msgstr "%s is geen gewoon bestand"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot read %s"
+msgstr "kan %s niet lezen"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot open %s"
+msgstr "kan %s niet openen"
+
+#: lib/dpkg/file.c
+#, c-format
 msgid "unable to unlock %s"
 msgstr "kan %s niet ontgrendelen"
 
@@ -779,8 +1007,18 @@ msgid "unable to lock %s"
 msgstr "kan %s niet vergrendelen"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "bestand wordt pagina per pagina getoond"
+#, c-format
+msgid "cannot open file %s"
+msgstr "kan bestand %s niet openen"
+
+#: lib/dpkg/file.c
+msgid "pager to show file"
+msgstr "pagineringsprogramma om bestand weer te geven"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot write file %s into the pager"
+msgstr "kan bestand %s niet naar het pagineringsprogramma schrijven"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -802,13 +1040,13 @@ msgstr "geheugen toewijzen is mislukt"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "dup op std%s is mislukt"
+msgid "failed to dup for fd %d"
+msgstr "dup op bestandsindicator %d is mislukt"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "dup op bestandsindicator %d is mislukt"
+msgid "failed to dup for std%s"
+msgstr "dup op std%s is mislukt"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -946,27 +1184,28 @@ msgstr "dubbele waarde voor door gebruiker gedefinieerd veld '%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "missing %s"
-msgstr "ontbrekende %s"
+msgid "missing '%s' field"
+msgstr "ontbrekend veld '%s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "empty value for %s"
-msgstr "lege waarde voor %s"
+msgid "empty value for '%s' field"
+msgstr "lege waarde voor veld '%s'"
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "pakket bevat veld '%s' maar de architectuur ontbreekt"
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is architecture all"
-msgstr "pakket bevat veld '%s' maar is van het architectuurtype all"
+msgid "package has '%s' field but is architecture '%s'"
+msgstr "pakket bevat veld '%s' maar is van het architectuurtype '%s'"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
-msgstr "Config-Version voor pakket met ongepaste Status"
+#, c-format
+msgid "'%s' field present for package with inappropriate '%s' field"
+msgstr "veld '%s' aanwezig voor pakket met ongepast veld '%s'"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -974,10 +1213,9 @@ msgid "package has status %s but triggers are awaited"
 msgstr "de status van het pakket is %s maar er wordt op triggers gewacht"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"de status van het pakket zegt dat op triggers gewacht wordt, maar er worden "
-"geen triggers verwacht"
+#, c-format
+msgid "package has status %s but no triggers awaited"
+msgstr "de status van het pakket is %s maar er wordt niet op triggers gewacht"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -985,16 +1223,16 @@ msgid "package has status %s but triggers are pending"
 msgstr "de status van het pakket is %s maar er staan triggers in de wacht"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"de status van het pakket zegt dat triggers in de wacht staan, maar dat is "
-"niet zo"
+#, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "de status van het pakket is %s maar er staan geen triggers in de wacht"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, c-format
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
-"Pakket in niet-geïnstalleerde toestand heeft configuratiebestanden. Ze "
-"worden vergeten"
+"het pakket heeft status %s en het heeft configuratiebestanden. Ze worden "
+"vergeten"
 
 #: lib/dpkg/parse.c
 msgid ""
@@ -1017,11 +1255,11 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
-"%s %s (Multi-Arch: %s) mag niet samen geïnstalleerd worden met %s waarvan "
-"meerdere exemplaren geïnstalleerd zijn"
+"pakket %s (%s) met veld '%s: %s' mag niet samen geïnstalleerd worden met %s "
+"waarvan meerdere exemplaren geïnstalleerd zijn"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1204,11 +1442,6 @@ msgstr "kan '%.255s' niet op een veilige manier verwijderen"
 msgid "rm command for cleanup"
 msgstr "commando rm om op te schonen"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "dubbelzinnige pakketnaam '%s' met meer dan een geïnstalleerd exemplaar"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1222,6 +1455,18 @@ msgstr "veldgrootte valt buiten het bereik"
 msgid "missing closing brace"
 msgstr "afsluitende accolade ontbreekt"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+"kan laatste wijzigingstijd in het bestandssysteem niet verkrijgen voor "
+"pakket %s"
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "dubbelzinnige pakketnaam '%s' met meer dan een geïnstalleerd exemplaar"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(geen beschrijving beschikbaar)"
@@ -1277,20 +1522,17 @@ msgid "fork failed"
 msgstr "afsplitsen van nieuw proces is mislukt"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s returned error exit status %d"
+#, c-format
 msgid "%s subprocess returned error exit status %d"
-msgstr "subproces %s gaf een foutwaarde %d terug"
+msgstr "subproces %s gaf de foutwaarde %d terug"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was interrupted"
+#, c-format
 msgid "%s subprocess was interrupted"
 msgstr "subproces %s werd onderbroken"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was killed by signal (%s)%s"
+#, c-format
 msgid "%s subprocess was killed by signal (%s)%s"
 msgstr "subproces %s werd gedood door signaal (%s)%s"
 
@@ -1299,17 +1541,67 @@ msgid ", core dumped"
 msgstr ", core gedumpt"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s failed with wait status code %d"
+#, c-format
 msgid "%s subprocess failed with wait status code %d"
 msgstr "subproces %s is mislukt met wachtstatuscode %d"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "wait for subprocess %s failed"
+#, c-format
 msgid "wait for %s subprocess failed"
 msgstr "wachten op subproces %s is mislukt"
 
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header size field"
+msgstr "ongeldig veld met de grootte van de tar-archiefkop"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header mtime field"
+msgstr "ongeldig veld met de 'mtime' van de tar-archiefkop"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header uid field"
+msgstr "ongeldig veld met de 'uid' van de tar-archiefkop"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header gid field"
+msgstr "ongeldig veld met de 'guid' van de tar-archiefkop"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum field"
+msgstr "ongeldig veld met de checksum van de tar-archiefkop"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr "ongeldige checksum van de tar-archiefkop"
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr "tar-archiefkop gedeeltelijk gelezen"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr "ongeldige tar-archiefkop met leeg naamveld"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr "niet-ondersteund GNU tar-archiefkoptype '%c'"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "niet-ondersteund Solaris tar-archiefkoptype '%c'"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr "niet-ondersteund PAX tar-archiefkoptype '%c'"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unknown tar header type '%c'"
+msgstr "onbekend tar-archiefkoptype '%c'"
+
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot stat pathname '%s'"
@@ -1327,12 +1619,12 @@ msgstr "hoofdmap %s voor het doorlopen van de boomstructuur is geen map"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
-msgstr "kan grendelbestand '%.250s' voor triggers niet openen/aanmaken"
+msgid "unable to open/create triggers lock file '%.250s'"
+msgstr "kan vergrendelingsbestand '%.250s' voor triggers niet openen/aanmaken"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
-msgstr "triggergebied"
+msgid "triggers database lock"
+msgstr "triggersdatabankvergrendeling"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
@@ -1557,11 +1849,6 @@ msgstr "fout bij het aanmaken van de pijp '%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "fout bij het aanmaken van het apparaatbestand '%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "fout bij het maken van de vaste koppeling '%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1891,10 +2178,10 @@ msgstr "krijg geen toegang tot archief '%s'"
 msgid "archive '%s' is not a regular file"
 msgstr "archief '%s' is geen gewoon bestand"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<standaarduitvoer>"
 
@@ -2031,10 +2318,10 @@ msgid ""
 "      Z     : start a shell to examine the situation\n"
 msgstr ""
 "   Wat wilt u er aan doen ?  De volgende keuzes zijn mogelijk:\n"
-"    Y of I  : installeer de versie van de pakketbeheerder\n"
-"    N of O  : behoud de huidige geïnstalleerde versie\n"
-"      D     : toon de verschillen tussen de versies\n"
-"      Z     : start een shell om de situatie te onderzoeken\n"
+"    Y of I  : de versie van de pakketbeheerder installeren\n"
+"    N of O  : de huidige geïnstalleerde versie behouden\n"
+"      D     : de verschillen tussen de versies tonen\n"
+"      Z     : een shell starten om de situatie te onderzoeken\n"
 
 #: src/configure.c
 #, c-format
@@ -2077,6 +2364,10 @@ msgid "conffile difference visualizer"
 msgstr "hulpmiddel voor het weergeven van verschillen in configuratiebestanden"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr "Handige omgevingsvariabelen:\n"
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Typ 'exit' als u klaar bent.\n"
 
@@ -2429,11 +2720,11 @@ msgid ""
 "\n"
 msgstr ""
 "Commando's:\n"
-"  [--add] <bestand>        voeg een omleiding toe.\n"
-"  --remove <bestand>       verwijder de omleiding.\n"
-"  --list [<glob-patroon>]  toon bestandsomleidingen.\n"
-"  --listpackage <bestand>  toon welk pakket het bestand omleidt.\n"
-"  --truename <bestand>     vermeld wat het omgeleide bestand is.\n"
+"  [--add] <bestand>        een omleiding toevoegen.\n"
+"  --remove <bestand>       de omleiding verwijderen.\n"
+"  --list [<glob-patroon>]  bestandsomleidingen tonen.\n"
+"  --listpackage <bestand>  tonen welk pakket het bestand omleidt.\n"
+"  --truename <bestand>     vermelden wat het omgeleide bestand is.\n"
 "\n"
 
 #: src/divertcmd.c
@@ -2446,7 +2737,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2456,16 +2750,21 @@ msgstr ""
 "Opties:\n"
 "  --package <pakket>       naam van het pakket wiens exemplaar van "
 "<bestand>\n"
-"                           niet omgeleid zal worden.\n"
+"                             niet omgeleid zal worden.\n"
 "  --local                  alle versies van pakketten worden omgeleid.\n"
 "  --divert <omleiden-naar> de naam die door de versies van andere pakketten\n"
-"                           gebruikt wordt.\n"
-"  --rename                 eigenlijk het bestand weg- (of terug-)zetten.\n"
-"  --admindir <map>         stel de map met het omleidingenbestand in.\n"
-"  --test                   doe niets, toon enkel wat zou gebeuren.\n"
+"                             gebruikt wordt.\n"
+"  --rename                 het bestand werkelijk weg- (of terug-)zetten.\n"
+"  --no-rename              het bestand niet weg- (of terug-)zetten.\n"
+"                             (standaard).\n"
+"  --admindir <map>         de map met het omleidingenbestand instellen.\n"
+"  --instdir <map>          de hoofdmap (root) instellen,\n"
+"                             maar niet de beheersmap (admindir).\n"
+"  --root <map>             de map van het hoofdbestandssysteem instellen.\n"
+"  --test                   niets doen, enkel tonen wat zou gebeuren.\n"
 "  --quiet                  stille verwerking, minimale uitvoer.\n"
-"  --help                   toon deze hulptekst.\n"
-"  --version                toon de versie.\n"
+"  --help                   deze hulptekst tonen.\n"
+"  --version                de versie tonen.\n"
 "\n"
 
 #: src/divertcmd.c
@@ -2483,6 +2782,14 @@ msgstr ""
 "De preinst/postrm-scripts van pakketten moeten altijd --package en --divert "
 "opgeven.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+"gelieve --no-rename expliciet te vermelden. In versie 1.20.x wordt --rename "
+"de standaard"
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2604,6 +2911,15 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+"omleiden met 'rename' van bestand '%s' uit een Essentieel pakket is "
+"gevaarlijk; gebruik --no-rename"
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Er is geen omleiding '%s'; er wordt er geen verwijderd.\n"
 
@@ -2647,19 +2963,6 @@ msgstr "pakket mag geen regeleinden bevatten"
 msgid "divert-to may not contain newlines"
 msgstr "omleiden-naar mag geen regeleinden bevatten"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "kon omleidingenbestand niet openen"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "kon de status van het omleidingenbestand niet opvragen"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "tegenstrijdige omleidingen waarbij '%.250s' of '%.250s' betrokken zijn"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2956,119 +3259,183 @@ msgstr ""
 "Pakket %s wordt vastgehouden; er wordt niets mee gedaan.\n"
 " Gebruik --force-hold om deze richtlijn te negeren.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "probleem wordt genegeerd omdat --force aanstaat:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Alle forceeropties instellen"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "controlebestand '%s' voor pakket '%s' heeft geen afsluitend regeleinde"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr "MAC-gebaseerde beveiliging gebruiken, indien beschikbaar"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "controlebestand '%s' voor pakket '%s' heeft een ontbrekende waarde"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Een pakket vervangen door een eerdere versie"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Elk pakket configureren dat dit pakket kan helpen"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Bij-pakketten verwerken, ook als ze vastgehouden worden"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
 msgstr ""
-"controlebestand '%s' voor pakket '%s' heeft een ontbrekend "
-"waardescheidingsteken"
+"Trachten om zaken te (de)installeren, zelfs al bent u geen systeembeheerder"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "controlebestand '%s' voor pakket '%s' bevat een lege bestandsnaam"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH loopt belangrijke programma's mis; problemen zijn waarschijnlijk"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "kan controlebestand '%s' voor pakket '%s' niet openen"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Een pakket installeren, zelfs als de authenticiteitstoets faalde"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "kan status niet opvragen van controlebestand '%s' voor pakket '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Zelfs pakketten met foute versienummers verwerken"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "controlebestand '%s' voor pakket '%s' is geen gewoon bestand"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr "Een bestaande stat override overschrijven als deze toegevoegd wordt"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "kan controlebestand '%s' voor pakket '%s' niet lezen"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr "Een ontbrekende stat override negeren als deze verwijderd wordt"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "kan controlebestand '%s' voor pakket '%s' niet sluiten"
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Een bestand uit een pakket overschrijven met dat uit een ander pakket"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "kan bestand met de lijst bestanden van pakket '%.250s' niet openen"
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Een omgeleid bestand overschrijven met een niet-omgeleide versie"
 
-#: src/filesdb.c
-#, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
 msgstr ""
-"bestand met de lijst bestanden van pakket'%.250s' ontbreekt; aangenomen\n"
-"wordt dat het pakket momenteel geen geïnstalleerde bestanden heeft"
+"Een map van een pakket overschrijven met een bestand uit een ander pakket"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Geen veilige I/O-bewerkingen uitvoeren bij het uitpakken"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr "Niet chrooten naar de omgeving van een pakketonderhouder-script"
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
 msgstr ""
-"kan de status niet opvragen van bestand met de lijst bestanden van pakket "
-"'%.250s'"
+"Steeds de nieuwe configuratiebestanden gebruiken; er geen vragen over stellen"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
 msgstr ""
-"bestand met de lijst bestanden van pakket '%.250s' is geen gewoon bestand"
+"Steeds de oude configuratiebestanden gebruiken; er geen vragen over stellen"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "bestand met de lijst bestanden van pakket '%.250s' wordt gelezen"
+#: src/force.c
+msgid ""
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
+msgstr ""
+"De standaardoptie gebruiken voor nieuwe configuratiebestanden als zo een\n"
+"standaard bestaat; er geen vragen over stellen. Als geen standaard gevonden\n"
+"wordt, zal er u een vraag over gesteld worden, tenzij ook de optie\n"
+"confold of de optie confnew ingesteld is"
+
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Steeds ontbrekende configuratiebestanden installeren"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
+"Voorstellen om configuratiebestanden te vervangen door versies die niet "
+"recenter zijn"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Ook pakketten verwerken met foute of ontbrekende architectuur"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Toch installeren, zelfs al maakt dit een ander pakket defect"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "De installatie van conflicterende pakketten toelaten"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Alle vereistenproblemen omzetten naar waarschuwingen"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Alle versiegebonden vereistenproblemen omzetten naar waarschuwingen"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Pakketten verwijderen die een installatie vereisen"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Een essentieel pakket verwijderen"
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"bestand met de lijst bestanden van pakket '%.250s' heeft geen afsluitend "
-"regeleinde"
+"%s forceeropties - gedrag sturen als problemen gevonden werden:\n"
+"  waarschuwen maar verder gaan:\n"
+"              --force-<ding>,<ding>,...\n"
+"  stoppen met foutmelding:\n"
+"             --refuse-<ding>,<ding>,... | --no-force-<ding>,...\n"
+" Dingen forceren:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"bestand met de lijst bestanden van pakket '%.250s' bevat een lege "
-"bestandsnaam"
+"\n"
+"OPGELET - opties aangeduid met [!] kunnen uw installatie ernstig "
+"beschadigen.\n"
+"Forceeropties aangeduid met [*] staan standaard aan.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
-"fout bij sluiten van bestand met de lijst bestanden van pakket '%.250s'"
+"\n"
+"Momenteel mogelijke opties:\n"
+" %s\n"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Database wordt ingelezen ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "onbekende force/refuse optie '%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d bestand of map momenteel geïnstalleerd.)\n"
-msgstr[1] "%d bestanden en mappen momenteel geïnstalleerd.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "verouderde force/refuse optie '%s'"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "probleem wordt genegeerd omdat --force aanstaat:"
 
 #: src/help.c
 msgid "not installed"
@@ -3133,42 +3500,6 @@ msgstr ""
 "NOOT: PATH van root zou gewoonlijk /usr/local/sbin, /usr/sbin en /sbin "
 "moeten bevatten"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "kan het bestaan van '%.250s' niet verifiëren"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "kan infomap niet lezen"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "fout bij openen van %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "beschadigd opmaakbestand '%s' van de infodatabase"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"opmaak van infodatabase (%d) bevat fouten of is te nieuw; probeer het met "
-"een nieuwere versie van dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "infobestand %s/%s aan geen enkel pakket gekoppeld"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "fout bij schrijven naar '%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3178,27 +3509,27 @@ msgstr "Programma voor Debian pakketbeheer '%s' versie %s.\n"
 #, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3223,36 +3554,39 @@ msgstr ""
 "  --triggers-only   <pakket> ... | -a|--pending\n"
 "  -r|--remove       <pakket> ... | -a|--pending\n"
 "  -P|--purge        <pakket> ... | -a|--pending\n"
-"  -V|--verify  <pakket>  ...       Controleer integriteit van pakket(ten).\n"
-"  --get-selections [<patroon> ...] Toon lijst van selecties op stdout.\n"
-"  --set-selections                 Stel pakketselecties in vanuit stdin.\n"
-"  --clear-selections               Deselecteer elk niet-essentieel pakket.\n"
-"  --update-avail [<Packages-best>] Vervang info over beschikbare pakketten.\n"
-"  --merge-avail [<Packages-best>]  Voeg samen met info uit bestand.\n"
-"  --clear-avail                    Verwijder huidige info over "
-"beschikbaarheid.\n"
-"  --forget-old-unavail             Vergeet niet-geïnstalleerde\n"
-"                                     niet-beschikbare pakketten.\n"
-"  -s|--status <pakket> ...         Toon de statusinfo van pakket.\n"
-"  -p|--print-avail <pakket> ...    Toon info over beschikbare versie.\n"
-"  -L|--listfiles <pakket> ...      Toon bestanden die 'van' pakket zijn.\n"
-"  -l|--list [<patroon> ...]        Geef lijst van pakketten bondig weer.\n"
-"  -S|--search <patroon> ...        Vind pakket(ten) die bestand(en) "
+"  -V|--verify  <pakket>  ...       De integriteit van pakket(ten) "
+"verifiëren.\n"
+"  --get-selections [<patroon> ...] De lijst van selecties op stdout tonen.\n"
+"  --set-selections                 Pakketselecties instellen vanuit stdin.\n"
+"  --clear-selections               Elk niet-essentieel pakket deselecteren.\n"
+"  --update-avail [<Packages-best>] Info over beschikbare pakketten "
+"vervangen.\n"
+"  --merge-avail [<Packages-best>]  Met info uit bestand samenvoegen.\n"
+"  --clear-avail                    Huidige info over beschikbaarheid "
+"vervangen.\n"
+"  --forget-old-unavail             Niet-geïnstalleerde niet-beschikbare\n"
+"                                     pakketten vergeten.\n"
+"  -s|--status <pakket> ...         De statusinfo van pakket tonen.\n"
+"  -p|--print-avail <pakket> ...    Info over beschikbare versie tonen.\n"
+"  -L|--listfiles <pakket> ...      Bestanden die 'van' pakket zijn tonen.\n"
+"  -l|--list [<patroon> ...]        Lijst van pakketten bondig weergeven.\n"
+"  -S|--search <patroon> ...        Pakket(ten) zoeken die bestand(en) "
 "bevatten.\n"
-"  -C|--audit [<pakket> ...]        Zoek naar defect(e) pakket(ten).\n"
-"  --yet-to-unpack                  Som voor installatie geselecteerde\n"
-"                                     pakketten op.\n"
-"  --predep-package                 Som uit te pakken voorvereisten op.\n"
-"  --add-architecture <arch>        Voeg <arch> toe aan lijst van "
-"architecturen.\n"
-"  --remove-architecture <arch>     Verwijder <arch> uit architecturenlijst.\n"
-"  --print-architecture             Toon dpkg-architectuur.\n"
-"  --print-foreign-architectures    Toon toegelaten vreemde architecturen.\n"
-"  --assert-<functionaliteit>       Bevestig de vermelde functionaliteit.\n"
-"  --validate-<ding> <tekenreeks>   Valideer een <tekenreeks> van <ding>.\n"
-"  --compare-versions <a> <op> <b>  Vergelijk versienummers - zie onder.\n"
-"  --force-help                     Toon hulp over forceren.\n"
-"  -Dh|--debug=help                 Toon hulp over debuggen.\n"
+"  -C|--audit [<pakket> ...]        Controleren op defect(e) pakket(ten).\n"
+"  --yet-to-unpack                  Voor installatie geselecteerde\n"
+"                                     pakketten weergeven.\n"
+"  --predep-package                 Uit te pakken voorvereisten weergeven.\n"
+"  --add-architecture <arch>        <arch> aan architecturenlijst toevoegen.\n"
+"  --remove-architecture <arch>     <arch> uit architecturenlijst "
+"verwijderen.\n"
+"  --print-architecture             dpkg-architectuur weergeven.\n"
+"  --print-foreign-architectures    Toegelaten vreemde architecturen tonen.\n"
+"  --assert-<functionaliteit>       Ondersteuning voor de vermelde\n"
+"                                     functionaliteit beweren.\n"
+"  --validate-<ding> <tekenreeks>   Een <tekenreeks> van <ding> valideren.\n"
+"  --compare-versions <a> <op> <b>  Versienummers vergelijken - zie onder.\n"
+"  --force-help                     Hulp over forceren tonen.\n"
+"  -Dh|--debug=help                 Hulp over debuggen tonen.\n"
 "\n"
 
 #: src/main.c src/querycmd.c src/trigcmd.c dpkg-deb/main.c dpkg-split/main.c
@@ -3262,8 +3596,8 @@ msgid ""
 "      --version                    Show the version.\n"
 "\n"
 msgstr ""
-"  -?, --help                       Toon deze hulptekst.\n"
-"      --version                    Toon het versienummer.\n"
+"  -?, --help                       Deze hulptekst tonen.\n"
+"      --version                    Het versienummer tonen.\n"
 "\n"
 
 #: src/main.c
@@ -3342,43 +3676,43 @@ msgid ""
 "\n"
 msgstr ""
 "Opties:\n"
-"  --admindir=<map>         Gebruik <map> in plaats van %s.\n"
-"  --root=<map>             Installeer op een andere hoofdmap.\n"
-"  --instdir=<map>          Verander hoofdmap maar niet beheersmap.\n"
-"  --path-exclude=<patroon> Gebruik geen pad dat met shell-patroon "
-"overeenkomt.\n"
-"  --path-include=<patroon> Voeg patroon terug toe na een eerdere "
+"  --admindir=<map>         <map> gebruiken in plaats van %s.\n"
+"  --root=<map>             Op een andere hoofdmap installeren.\n"
+"  --instdir=<map>          De hoofdmap maar niet de beheersmap veranderen.\n"
+"  --path-exclude=<patroon> Geen paden installeren die met shell-patroon\n"
+"                             overeenkomen.\n"
+"  --path-include=<patroon> Patroon terug toevoegen na een eerdere "
 "uitsluiting.\n"
-"  -O|--selected-only       Sla pakketten over die niet geselecteerd\n"
-"                             werden voor installatie/opwaardering.\n"
-"  -E|--skip-same-version   Sla pakketten over met dezelfde versie\n"
-"                             als de geïnstalleerde.\n"
-"  -G|--refuse-downgrade    Sla pakketten over met oudere versie\n"
-"                             dan de geïnstalleerde.\n"
-"  -B|--auto-deconfigure    Installeer zelfs als het een ander pakket "
+"  -O|--selected-only       Pakketten die niet geselecteerd werden voor\n"
+"                             installatie/opwaardering, overslaan.\n"
+"  -E|--skip-same-version   Pakketten met dezelfde versie\n"
+"                             als de geïnstalleerde, overslaan.\n"
+"  -G|--refuse-downgrade    Pakketten met oudere versie\n"
+"                             dan de geïnstalleerde, overslaan.\n"
+"  -B|--auto-deconfigure    Installeren, zelfs als dit een ander pakket "
 "vernielt.\n"
-"  --[no-]triggers          Forceer of sla volgende triggerverwerking over.\n"
+"  --[no-]triggers          Volgende triggerverwerking overslaan of "
+"forceren.\n"
 "  --verify-format=<indeling>\n"
-"                           Indeling van verify-uitvoer (ondersteund: "
-"'rpm').\n"
-"  --no-debsig              Verifieer geen digitale handtekeningen op "
-"pakketten.\n"
+"                           Uitvoerindeling verifiëren (ondersteund: 'rpm').\n"
+"  --no-debsig              Geen digitale handtekeningen op pakketten\n"
+"                             trachten te verifiëren.\n"
 "  --no-act|--dry-run|--simulate\n"
-"                           Meld wat dpkg zou doen, zonder het te doen.\n"
-"  -D|--debug=<octaal>      Activeer debug - zie -Dhelp of --debug=help.\n"
-"  --status-fd <n>          Zend info over statuswijzigingen\n"
+"                           Enkel zeggen wat dpkg zou doen - het niet doen.\n"
+"  -D|--debug=<octaal>      Debuggen activeren (zie -Dhelp of --debug=help).\n"
+"  --status-fd <n>          Info over statuswijzigingen zenden\n"
 "                             naar bestandsindicator <n>.\n"
 "  --status-logger=<commando>\n"
-"                           Zend info over statuswijzigingen\n"
+"                           Info over statuswijzigingen zenden\n"
 "                             naar stdin van <commando>.\n"
-"  --log=<bestandsnaam>     Log statusveranderingen en\n"
-"                             acties naar <bestandsnaam>.\n"
+"  --log=<bestandsnaam>     Statusveranderingen en\n"
+"                             acties loggen naar <bestandsnaam>.\n"
 "  --ignore-depends=<pakket>,...\n"
-"                           Negeer vereisten bij <pakket>.\n"
-"  --force-...              Negeer problemen (zie --force-help).\n"
+"                           Vereisten bij <pakket> negeren.\n"
+"  --force-...              Problemen negeren (zie --force-help).\n"
 "  --no-force-...|--refuse-...\n"
-"                           Stop bij problemen.\n"
-"  --abort-after <n>        Breek af na <n> fouten.\n"
+"                           Stoppen bij problemen.\n"
+"  --abort-after <n>        Afbreken na <n> fouten.\n"
 "\n"
 
 #: src/main.c
@@ -3426,116 +3760,6 @@ msgstr ""
 "'more'!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Stel alle forceeropties in"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Vervang een pakket door een eerdere versie"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Configureer elk pakket dat dit kan helpen"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Verwerk bij-pakketten, ook als ze vastgehouden worden"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Tracht zaken te (de)installeren, zelfs al ben je geen systeembeheerder"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "PATH loopt belangrijke programma's mis; problemen zijn waarschijnlijk"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Installeer een pakket, zelfs als de authenticiteitstoets faalde"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Behandel zelfs pakketten met foute versienummers"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Overschrijf een bestand uit een pakket met dat uit een ander"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Overschrijf een omgeleid bestand met een niet-omgeleide versie"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Overschrijf een map van een pakket met een bestand uit een ander"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Voer geen veilige I/O-bewerkingen uit bij het uitpakken"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr "Chroot niet naar de omgeving van een pakketonderhouder-script"
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-"Gebruik steeds de nieuwe configuratiebestanden; stel er geen vragen over"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Gebruik steeds de oude configuratiebestanden; stel er geen vragen over"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Gebruik de standaardoptie voor nieuwe configuratiebestanden als zo een\n"
-"standaard bestaat; stel er geen vragen over. Als geen standaard gevonden\n"
-"wordt, zal er u een vraag over gesteld worden, tenzij ook de optie\n"
-"confold of de optie confnew ingesteld is"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Installeer steeds ontbrekende configuratiebestanden"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-"Stel voor om configuratiebestanden niet door nieuwere versies te vervangen"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Behandel ook pakketten met foute of ontbrekende architectuur"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Installeer toch, zelfs al maakt dit een ander pakket defect"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Laat de installatie van conflicterende pakketten toe"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Zet alle vereistenproblemen om in waarschuwingen"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Zet alle versiegebonden vereistenproblemen om in waarschuwingen"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Verwijder pakketten die een installatie vragen"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Verwijder een essentieel pakket"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Over het algemeen nuttige voortgangsinformatie"
 
@@ -3669,42 +3893,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s forceeropties - gedrag sturen als problemen gevonden werden:\n"
-"  waarschuw maar ga verder:  --force-<ding>,<ding>,...\n"
-"  stop met foutmelding:      --refuse-<ding>,<ding>,... | --no-force-"
-"<ding>,...\n"
-" Dingen forceren:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"OPGELET - opties aangeduid met [!] kunnen uw installatie ernstig "
-"beschadigen.\n"
-"Forceeropties aangeduid met [*] staan standaard aan.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "onbekende force/refuse optie '%.*s'"
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "verouderde force/refuse optie '%s'"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "kon '%i' niet openen voor een stroom"
 
@@ -3885,6 +4073,10 @@ msgid "Description"
 msgstr "Omschrijving"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr "pakketlijst wordt getoond met pagineringsprogramma"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "omleiding door %s van: %s\n"
@@ -3919,6 +4111,11 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "pakket '%s' is niet geïnstalleerd en er is geen info beschikbaar"
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Gebruik dpkg --info (= dpkg-deb --info) om archiefbestanden te bekijken.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "pakket '%s' is niet beschikbaar"
@@ -3945,11 +4142,10 @@ msgstr "omgeleid door %s naar: %s\n"
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
-"Gebruik dpkg --info (= dpkg-deb --info) om archiefbestanden te bekijken,\n"
-"en dpkg --contents (= dpkg-deb --contents) om de inhoud weer te geven.\n"
+"Gebruik dpkg --contents (= dpkg-deb --contents) om de inhoud van "
+"archiefbestanden weer te geven.\n"
 
 #: src/querycmd.c dpkg-deb/info.c
 #, c-format
@@ -3991,34 +4187,34 @@ msgstr ""
 #, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
 "Commando's:\n"
-"  -s|--status <pakketnaam> ... Toon details van pakketstatus.\n"
+"  -s|--status <pakketnaam> ... Details over pakketstatus tonen.\n"
 "  -p|--print-avail <pakketnaam> ...\n"
-"                               Toon details van beschikbare versie.\n"
+"                               Details over beschikbare versie tonen.\n"
 "  -L|--listfiles <pakketnaam> ...\n"
-"                               Som bestanden 'van' het pakket op.\n"
-"  -l|--list [<patroon> ...]    Som de pakketten beknopt op.\n"
-"  -W|--show [<patroon> ...]    Toon de informatie over de pakketten.\n"
-"  -S|--search <patroon> ...    Zoek pakket(ten) die bestand(en) bevatten.\n"
-"     --control-list <pakket>   Toon de lijst van controlebestanden v/h "
-"pakket.\n"
+"                               Bestanden 'van' pakket(ten) opsommen.\n"
+"  -l|--list [<patroon> ...]    De pakketten beknopt opsommen.\n"
+"  -W|--show [<patroon> ...]    De informatie over pakket(ten) tonen.\n"
+"  -S|--search <patroon> ...    Pakket(ten) zoeken die bestand(en) bevatten.\n"
+"     --control-list <pakket>   Lijst van controlebestanden v/h pakket "
+"tonen.\n"
 "     --control-show <pakket> <bestand>\n"
-"                               Toon de inhoud van het controlebestand.\n"
+"                               De inhoud van het controlebestand tonen.\n"
 "  -c|--control-path <pakket> [<bestand>]\n"
-"                               Toon het pad van het controlebestand.\n"
+"                               Het pad van het controlebestand tonen.\n"
 "\n"
 
 #: src/querycmd.c
@@ -4031,10 +4227,10 @@ msgid ""
 "\n"
 msgstr ""
 "Opties:\n"
-"  --admindir=<map>     Gebruik <map> in plaats van %s.\n"
-"  --load-avail         Gebruik bestand available bij --show en --list.\n"
+"  --admindir=<map>     <map> gebruiken in plaats van %s.\n"
+"  --load-avail         Bestand 'available' gebruiken bij --show en --list.\n"
 "  -f|--showformat=<indeling>\n"
-"                       Gebruik alternatieve indeling voor --show\n"
+"                       Alternatieve indeling gebruiken voor --show\n"
 "\n"
 
 #: src/querycmd.c dpkg-deb/main.c
@@ -4188,8 +4384,16 @@ msgstr "kan '%.250s' niet uitvoerbaar maken"
 #: src/script.c
 msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
-"de beheersmap moet onder de installatiemap liggen opdat dpkg goed zou kunnen "
-"functioneren"
+"de beheersmap (admindir) moet onder de hoofdmap (instdir) liggen opdat dpkg "
+"goed zou kunnen functioneren"
+
+#: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+"onvoldoende privileges om de hoofdmap te veranderen met --force-not-root, "
+"het gebruik van --force-script-chrootless in overweging nemen?"
 
 #: src/script.c
 #, c-format
@@ -4214,10 +4418,9 @@ msgstr ""
 "niet instellen"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "installed %s script"
+#, c-format
 msgid "installed %s package %s script"
-msgstr "%s script geïnstalleerd"
+msgstr "van pakket %s werd script %s geïnstalleerd"
 
 #: src/script.c
 #, c-format
@@ -4225,16 +4428,14 @@ msgid "unable to stat %s '%.250s'"
 msgstr "kan de status van %s '%.250s' niet opvragen"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "new %s script"
+#, c-format
 msgid "new %s package %s script"
-msgstr "nieuw %s script"
+msgstr "van het nieuwe pakket %s het script %s"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "old %s script"
+#, c-format
 msgid "old %s package %s script"
-msgstr "verouderd %s script"
+msgstr "van het verouderd pakket %s het script %s"
 
 #: src/script.c
 #, c-format
@@ -4340,9 +4541,9 @@ msgid ""
 msgstr ""
 "Commando's:\n"
 "  --add <eigenaar> <groep> <modus> <pad>\n"
-"                           voeg nieuwe <pad>-regel toe in de database.\n"
-"  --remove <pad>           verwijder <pad> uit de database.\n"
-"  --list [<glob-patroon>]  toon huidige overstijgingen in de database.\n"
+"                           nieuwe <pad>-regel toevoegen in de database.\n"
+"  --remove <pad>           <pad> uit de database verwijderen.\n"
+"  --list [<glob-patroon>]  huidige 'overrides' in de database tonen.\n"
 "\n"
 
 #: src/statcmd.c
@@ -4350,20 +4551,31 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 "\n"
 msgstr ""
 "Opties:\n"
-"  --admindir <map>   stel de map met het 'statoverride'-bestand in.\n"
+"  --admindir <map>   de map met het statusmodificatie-bestand instellen.\n"
+"  --instdir <map>    de hoofdmap (root) instellen,\n"
+"                       maar niet de beheersmap (admindir).\n"
+"  --root <map>       de map van het hoofdbestandssysteem instellen.\n"
 "  --update           <pad>-rechten onmiddellijk bijwerken.\n"
-"  --force            actie afdwingen zelfs als gezondheidscheck mislukt.\n"
+"  --force            verouderde alias voor --force-all.\n"
+"  --force-...        override-problemen (zie --force-help).\n"
+"  --no-force-...     stoppen als er problemen zijn.\n"
+"  --refuse-...       idem.\n"
 "  --quiet            stille verwerking, minimale uitvoer.\n"
-"  --help             toon deze hulptekst.\n"
-"  --version          toon de versie.\n"
+"  --help             deze hulptekst tonen.\n"
+"  --version          de versie tonen.\n"
 "\n"
 
 #: src/statcmd.c
@@ -4415,79 +4627,10 @@ msgstr "geen overstijging aanwezig"
 msgid "--update is useless for --remove"
 msgstr "--update is waardeloos voor --remove"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "ongeldige uid %s in overstijging van bestandsstatus (statoverride)"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "ongeldige gid %s in overstijging van bestandsstatus (statoverride)"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "ongeldige modus %s in overstijging van bestandsstatus (statoverride)"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "kan statoverride-bestand (bestand met overstijgingsinfo) niet openen"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr ""
-"kan de status van het statoverride-bestand (bestand met overstijgingsinfo) "
-"niet opvragen"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr ""
-"statoverride-bestand (bestand met overstijgingsinfo) '%.250s' wordt gelezen"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr ""
-"het afsluitende regeleinde ontbreekt in het statoverride-bestand (bestand "
-"met overstijgingsinfo)"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr ""
-"statoverride-bestand (bestand met overstijgingsinfo) bevat een lege regel"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr ""
-"syntaxisfout in het statoverride-bestand (bestand met overstijgingsinfo)"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr ""
-"onbekende gebruiker '%s' in het statoverride-bestand (bestand met "
-"overstijgingsinfo)"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr ""
-"onverwacht regeleinde in het statoverride-bestand (bestand met "
-"overstijgingsinfo)"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr ""
-"onbekende groep '%s' in het statoverride-bestand (bestand met "
-"overstijgingsinfo)"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr ""
-"er zijn meerdere statoverrides (overstijgingen van de status) voor bestand "
-"'%.250s'"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "verouderde optie --%s; gelieve in plaats ervan --%s te gebruiken"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4518,7 +4661,7 @@ msgid ""
 "\n"
 msgstr ""
 "Commando's:\n"
-"  --check-supported       Ga na of het actieve dpkg triggers ondersteunt.\n"
+"  --check-supported       Nagaan of het actieve dpkg triggers ondersteunt.\n"
 "\n"
 
 #: src/trigcmd.c
@@ -4536,9 +4679,9 @@ msgid ""
 "\n"
 msgstr ""
 "Opties:\n"
-"  --admindir=<map>           Gebruik <map> in plaats van %s.\n"
-"  --by-package=<pakket>      Overstijg triggerafwachter (normaal\n"
-"                             ingesteld door dpkg).\n"
+"  --admindir=<map>           <map> gebruiken in plaats van %s.\n"
+"  --by-package=<pakket>      Triggerafwachter overstijgen (normaal\n"
+"                               ingesteld door dpkg).\n"
 "  --await                    Pakket moet de afhandeling afwachten.\n"
 "  --no-await                 Geen pakket moet de afhandeling afwachten.\n"
 "  --no-act                   Enkel testen - niets echt wijzigen.\n"
@@ -4704,6 +4847,10 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Bezig met de-configureren van %s (%s) ...\n"
 
+#: src/unpack.c
+msgid "conffile file contains an empty line"
+msgstr "conffile-configuratiebestand bevat een lege regel"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4845,13 +4992,8 @@ msgid "package filesystem archive extraction"
 msgstr "uitpakken van archief met het bestandssysteem van het pakket"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "fout bij lezen van de tar-uitvoer van dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
-msgstr ""
-"beschadigd tar-bestand met het bestandssysteem - beschadigd pakketarchief"
+msgid "corrupted filesystem tarfile in package archive"
+msgstr "beschadigd tar-bestand met het bestandssysteem in pakketarchief"
 
 #: src/unpack.c
 #, c-format
@@ -4864,16 +5006,20 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s verwacht hoogstens één Packages-bestand als argument"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, c-format
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
-"kan niet bij de statusomgeving van dpkg voor een grote bijwerking van "
-"beschikbare pakketten"
+"kan de databasemap '%s' van dpkg niet benaderen voor een grote bijwerking "
+"van beschikbare pakketten"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, c-format
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"grote bijwerking van beschikbare pakketten vereist schrijftoegang tot de "
-"statusomgeving van dpkg"
+"schrijftoegang tot databasemap '%s' van dpkg is vereist voor een grote "
+"bijwerking van beschikbare pakketten"
 
 #: src/update.c
 #, c-format
@@ -5110,11 +5256,10 @@ msgstr ""
 "bestand '%.250s' is beschadigd - foutief magisch nummer van archiefkoptekst"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "file '%.250s' is not a debian binary archive (try dpkg-split?)"
+#, c-format
 msgid "file '%.250s' is not a Debian binary archive (try dpkg-split?)"
 msgstr ""
-"bestand '%.250s' is geen binair archief van debian (probeer dpkg-split?)"
+"bestand '%.250s' is geen binair archief van Debian (dpkg-split proberen?)"
 
 #: dpkg-deb/extract.c
 msgid "archive information header member"
@@ -5160,15 +5305,12 @@ msgid "archive '%.250s' contains two control members, giving up"
 msgstr "archief '%.250s' bevat twee controle-elementen; er wordt opgegeven"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " new debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd bytes.\n"
+#, c-format
 msgid ""
 " new Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
 msgstr ""
-" nieuw debian pakket, versie %d.%d.\n"
+" nieuw Debian-pakket, versie %d.%d.\n"
 " grootte %jd bytes: controlearchief=%jd bytes.\n"
 
 #: dpkg-deb/extract.c
@@ -5188,15 +5330,12 @@ msgid "cannot skip archive control member from '%s': %s"
 msgstr "kan het archiefcontrole-element van '%s' niet overslaan: %s"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " old debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd, main archive=%jd.\n"
+#, c-format
 msgid ""
 " old Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgstr ""
-" verouderd debian pakket, versie %d.%d.\n"
+" verouderd Debian-pakket, versie %d.%d.\n"
 " grootte %jd bytes: controlearchief=%jd, hoofdarchief=%jd.\n"
 
 #: dpkg-deb/extract.c
@@ -5208,10 +5347,9 @@ msgstr ""
 " werd door het te downloaden in ASCII-modus"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "'%.255s' is not a debian format archive"
+#, c-format
 msgid "'%.255s' is not a Debian format archive"
-msgstr "'%.255s' is geen archief in debian-formaat"
+msgstr "'%.255s' is geen archief volgens Debian-formaat"
 
 #: dpkg-deb/extract.c
 #, c-format
@@ -5229,16 +5367,17 @@ msgid "decompressing archive member"
 msgstr "element van het archief wordt gedecomprimeerd"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "chdir naar de map is mislukt"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "aanmaken map is mislukt"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "chdir naar de map na het aanmaken ervan is mislukt"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr "onverwachte reeds bestaande padnaam %s"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "chdir naar de map is mislukt"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5365,17 +5504,17 @@ msgid ""
 "\n"
 msgstr ""
 "Commando's:\n"
-"  -b|--build <map> [<deb>]         Bouw een archief.\n"
-"  -c|--contents <deb>              Toon de inhoud.\n"
-"  -I|--info <deb> [<cbestand>...]  Toon info op stdout.\n"
-"  -W|--show <deb>                  Toon informatie over pakket(ten)\n"
-"  -f|--field <deb> [<cveld>...]    Toon veld(en) op stdout.\n"
-"  -e|--control <deb> [<map>]       Pak control-info uit.\n"
-"  -x|--extract <deb> <map>         Pak bestanden uit.\n"
-"  -X|--vextract <deb> <map>        Pak bestanden uit en lijst ze op.\n"
-"  -R|--raw-extract <deb> <map>     Pak control-info en bestanden uit.\n"
-"  --ctrl-tarfile <deb>             Maak control-tar-archief.\n"
-"  --fsys-tarfile <deb>             Maak tar-archief van bestandssysteem.\n"
+"  -b|--build <map> [<deb>]         Een archief bouwen.\n"
+"  -c|--contents <deb>              De inhoud tonen.\n"
+"  -I|--info <deb> [<cbestand>...]  Info tonen op stdout.\n"
+"  -W|--show <deb>                  Informatie over pakket(ten) tonen\n"
+"  -f|--field <deb> [<cveld>...]    Veld(en) op stdout tonen.\n"
+"  -e|--control <deb> [<map>]       Control-info uitpakken.\n"
+"  -x|--extract <deb> <map>         Bestanden uitpakken.\n"
+"  -X|--vextract <deb> <map>        Bestanden uitpakken en deze opsommen.\n"
+"  -R|--raw-extract <deb> <map>     Control-info en bestanden uitpakken.\n"
+"  --ctrl-tarfile <deb>             Control-tar-archief maken.\n"
+"  --fsys-tarfile <deb>             Tar-archief van bestandssysteem maken.\n"
 "\n"
 
 #: dpkg-deb/main.c
@@ -5392,31 +5531,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  -v, --verbose                    Enable verbose output.\n"
-#| "  -D, --debug                      Enable debugging output.\n"
-#| "      --showformat=<format>        Use alternative format for --show.\n"
-#| "      --deb-format=<format>        Select archive format.\n"
-#| "                                     Allowed values: 0.939000, 2.0 "
-#| "(default).\n"
-#| "      --nocheck                    Suppress control file check (build "
-#| "bad\n"
-#| "                                     packages).\n"
-#| "      --uniform-compression        Use the compression params on all "
-#| "members.\n"
-#| "  -z#                              Set the compression level when "
-#| "building.\n"
-#| "  -Z<type>                         Set the compression type used when "
-#| "building.\n"
-#| "                                     Allowed types: gzip, xz, none.\n"
-#| "  -S<strategy>                     Set the compression strategy when "
-#| "building.\n"
-#| "                                     Allowed values: none; extreme (xz);\n"
-#| "                                     filtered, huffman, rle, fixed "
-#| "(gzip).\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  -v, --verbose                    Enable verbose output.\n"
@@ -5441,23 +5556,24 @@ msgid ""
 "\n"
 msgstr ""
 "Opties:\n"
-"  -v, --verbose                Activeer uitvoerige uitvoer.\n"
-"  -D, --debug                  Activeer debugging-uitvoer.\n"
-"      --showformat=<formaat>   Gebruik alternatieve indeling voor --show.\n"
-"      --deb-format=<formaat>   Selecteer archiefformaat.\n"
-"                                 Toegelaten waarden: 0.939000, 2.0 "
+"  -v, --verbose                  Uitvoerige uitvoer activeren.\n"
+"  -D, --debug                    Debug-uitvoer activeren.\n"
+"      --showformat=<formaat>     Andere indeling gebruiken met --show.\n"
+"      --deb-format=<formaat>     Archiefformaat selecteren.\n"
+"                                  Geldige waarden: 0.939000, 2.0 "
 "(standaard).\n"
-"      --nocheck                Onderdruk check van 'control'-bestand\n"
-"                                 (bouwt ongeldige pakketten)\n"
-"      --uniform-compression    Gebruik de compressieparameters\n"
-"                                 voor alle elementen.\n"
-"  -z#                          Stel compressieniveau in bij het bouwen.\n"
-"  -Z<type>                     Stel het compressietype in bij het bouwen.\n"
-"                                 Toegelaten types: gzip, xz, none.\n"
-"  -S<strategie>                Stel de compressiestrategie in bij het "
-"bouwen.\n"
-"                                 Toegelaten waarden: none; extreme (xz);\n"
-"                                 filtered, huffman, rle, fixed (gzip).\n"
+"      --nocheck                  Toets van 'control'-bestand onderdrukken\n"
+"                                  (bouwt ongeldige pakketten).\n"
+"      --root-owner-group         Stelt eigenaar en groep dwingend in op "
+"root.\n"
+"      --[no-]uniform-compression De compressieparameters gebruiken\n"
+"                                  voor alle elementen.\n"
+"  -z#                            Bouwcompressieniveau instellen.\n"
+"  -Z<type>                       Bouwcompressietype instellen.\n"
+"                                  Geldige types: gzip, xz, none.\n"
+"  -S<strategie>                  Bouwcompressiestrategie instellen.\n"
+"                                  Geldige waarden: none; extreme (xz);\n"
+"                                  filtered, huffman, rle, fixed (gzip).\n"
 "\n"
 
 #: dpkg-deb/main.c
@@ -5796,12 +5912,12 @@ msgid ""
 "\n"
 msgstr ""
 "Commando's:\n"
-"  -s|--split <bestand> [<prefix>]   Splits een archief.\n"
-"  -j|--join <deel> <deel> ...       Combineer delen.\n"
-"  -I|--info <deel> ...              Toon info over deel.\n"
-"  -a|--auto -o <compleet> <deel>    Auto-combineer delen.\n"
-"  -l|--listq                        Toon geïsoleerde delen.\n"
-"  -d|--discard [<bestand> ...]      Verwijder geïsoleerde delen.\n"
+"  -s|--split <bestand> [<prefix>]   Een archief splitsen.\n"
+"  -j|--join <deel> <deel> ...       Delen combineren.\n"
+"  -I|--info <deel> ...              Info tonen over deel.\n"
+"  -a|--auto -o <compleet> <deel>    Delen auto-combineren.\n"
+"  -l|--listq                        Geïsoleerde delen tonen.\n"
+"  -d|--discard [<bestand> ...]      Geïsoleerde delen verwijderen.\n"
 "\n"
 
 #: dpkg-split/main.c
@@ -5817,12 +5933,12 @@ msgid ""
 "\n"
 msgstr ""
 "Opties:\n"
-"    --depotdir <map>             Gebruik <map> in plaats van %s/%s.\n"
+"    --depotdir <map>             <map> gebruiken in plaats van %s/%s.\n"
 "    -S|--partsize <grootte>      In Kb; (voor -s is de standaard 450).\n"
 "    -o|--output <bestand>        Bestandsnaam, voor -j (standaard is\n"
 "                                   <pakket>_<versie>_<architectuur>.deb).\n"
 "    -Q|--npquiet                 Stille verwerking als -a geen deel is.\n"
-"    --msdos                      Genereer type 8.3 bestandsnamen.\n"
+"    --msdos                      Type 8.3 bestandsnamen genereren.\n"
 "\n"
 
 #: dpkg-split/main.c
@@ -6029,21 +6145,23 @@ msgstr ""
 "Commando's:\n"
 "  --install <link> <naam> <pad> <prioriteit>\n"
 "    [--slave <link> <naam> <pad>] ...\n"
-"                        voeg een groep van alternatieven toe aan het "
+"                        een groep van alternatieven toevoegen aan het "
 "systeem.\n"
-"  --remove <naam> <pad> verwijder <pad> uit de alternatievengroep <naam>.\n"
-"  --remove-all <naam>   verwijder groep <naam> uit het "
-"alternatievensysteem.\n"
-"  --auto <naam>         zet de hoofdlink <naam> om naar automatische modus.\n"
-"  --display <naam>      toon informatie over de groep <naam>.\n"
+"  --remove <naam> <pad> <pad> uit de alternatievengroep <naam> verwijderen.\n"
+"  --remove-all <naam>   groep <naam> uit het alternatievensysteem "
+"verwijderen.\n"
+"  --auto <naam>         de hoofdlink <naam> omzetten naar automatische "
+"modus.\n"
+"  --display <naam>      informatie tonen over de groep <naam>.\n"
 "  --query <naam>        machineleesbare versie van --display <naam>.\n"
-"  --list <naam>         toon alle doelen in de groep <naam>.\n"
-"  --get-selections      toon hoofdnamen van alternatieven en hun status.\n"
-"  --set-selections      lees status van alternatieven van standaard-input.\n"
-"  --config <naam>       toon alle alternatieven voor de groep <naam>\n"
-"                          en vraag de gebruiker welke gebruikt moet worden.\n"
-"  --set <naam> <pad>    stel <pad> in als alternatief voor <naam>.\n"
-"  --all                 voer --config uit voor alle alternatieven.\n"
+"  --list <naam>         alle doelen in de groep <naam> tonen.\n"
+"  --get-selections      hoofdnamen van alternatieven en hun status tonen.\n"
+"  --set-selections      status van alternatieven van standaard-input lezen.\n"
+"  --config <naam>       alle alternatieven voor de groep <naam> tonen\n"
+"                          en de gebruiker vragen welke gebruikt moet "
+"worden.\n"
+"  --set <naam> <pad>    <pad> instellen als alternatief voor <naam>.\n"
+"  --all                 --config uitvoeren voor alle alternatieven.\n"
 "\n"
 
 #: utils/update-alternatives.c
@@ -6081,23 +6199,26 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
 "Opties:\n"
-"  --altdir <map>       wijzig de map met alternatieven.\n"
-"  --admindir <map>     wijzig de administratieve map.\n"
-"  --log <bestand>      wijzig het logbestand.\n"
-"  --force              laat bestanden vervangen door alternatieven.\n"
-"  --skip-auto          sla in automatische modus prompt over bij correct\n"
+"  --altdir <map>       de map met alternatieven veranderen.\n"
+"  --admindir <map>     de beheersmap veranderen.\n"
+"  --log <bestand>      het logbestand veranderen.\n"
+"  --force              toelaten dat bestanden vervangen worden\n"
+"                         door alternatieven-koppelingen.\n"
+"  --skip-auto          in automatische modus prompt overslaan bij correct\n"
 "                         geconfigureerde alternatieven (enkel voor --"
 "config)\n"
-"  --verbose            luidruchtige verwerking, meer uitvoer.\n"
 "  --quiet              stille verwerking, minimale uitvoer.\n"
-"  --help               toon deze hulptekst.\n"
-"  --version            toon de versie.\n"
+"  --verbose            luidruchtige verwerking, meer uitvoer.\n"
+"  --debug              debug-uitvoer, veel meer uitvoer.\n"
+"  --help               deze hulptekst tonen.\n"
+"  --version            de versie tonen.\n"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6594,17 +6715,94 @@ msgstr ""
 #: utils/update-alternatives.polkit.in
 msgid "Run update-alternatives to modify system alternative selections"
 msgstr ""
+"Voer update-alternatives uit om de alternatievenselecties op het systeem te "
+"wijzigen"
 
 #: utils/update-alternatives.polkit.in
 msgid "Authentication is required to run update-alternatives"
-msgstr ""
+msgstr "Authenticatie is nodig voor het uitvoeren van update-alternatives"
+
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "kan het vergrendelingsbestand %s niet openen om te testen"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr ""
+#~ "onbekende gebruiker '%s' in het statoverride-bestand (bestand met "
+#~ "overstijgingsinfo)"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
+#~ msgid "unknown group '%s' in statoverride file"
 #~ msgstr ""
-#~ "verouderde optie '--%s'; gelieve in plaats ervan '--%s' te gebruiken"
+#~ "onbekende groep '%s' in het statoverride-bestand (bestand met "
+#~ "overstijgingsinfo)"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "er ontbreekt een waarde in het controlebestand '%s'"
+#~ msgid "%s is missing"
+#~ msgstr "%s ontbreekt"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "'%.50s' is niet toegestaan voor %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "rommel na %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "ongeldige pakketnaam (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no in booleaans veld"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "veld '%s', verwijzing naar '%.255s': fout in versie"
+
+#~ msgid "empty value for %s"
+#~ msgstr "lege waarde voor %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "de status van het pakket zegt dat op triggers gewacht wordt, maar er "
+#~ "worden geen triggers verwacht"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "de status van het pakket zegt dat triggers in de wacht staan, maar dat is "
+#~ "niet zo"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "grote bijwerking van beschikbare pakketten vereist schrijftoegang tot de "
+#~ "statusomgeving van dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "fout bij lezen van de tar-uitvoer van dpkg-deb"
+
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "kan controlebestand '%s' voor pakket '%s' niet openen"
+
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "kan status niet opvragen van controlebestand '%s' voor pakket '%s'"
+
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "controlebestand '%s' voor pakket '%s' is geen gewoon bestand"
+
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "kan controlebestand '%s' voor pakket '%s' niet sluiten"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "kan bestand met de lijst bestanden van pakket '%.250s' niet openen"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "kan de status niet opvragen van bestand met de lijst bestanden van pakket "
+#~ "'%.250s'"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "bestand met de lijst bestanden van pakket '%.250s' is geen gewoon bestand"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "bestand met de lijst bestanden van pakket '%.250s' wordt gelezen"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "chdir naar de map na het aanmaken ervan is mislukt"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "er ontbreekt een waardescheidingsteken in controlebestand '%s'"
@@ -6673,9 +6871,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF op stdin bij conffile prompt"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "onverwacht bestandseinde in pakketnaam op regel %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "onverwacht bestandseinde na pakketnaam op regel %d"
 
@@ -6960,10 +7155,6 @@ msgstr ""
 #~ msgstr "slaaf %s: %s"
 
 #, fuzzy
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "kan de status van de oude naam '%s' niet opvragen: %s"
-
-#, fuzzy
 #~ msgid "scan of %s failed: %s"
 #~ msgstr "%s: kopiëren van %s naar %s is mislukt, poging wordt opgegeven: %s"
 
@@ -6988,10 +7179,6 @@ msgstr ""
 #~ msgstr "kan %s niet sluiten: %s"
 
 #, fuzzy
-#~ msgid "cannot write %s: %s"
-#~ msgstr "kan %s niet verwijderen: %s"
-
-#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "kan %s niet hernoemen naar %s: %s"
 
diff --git a/po/nn.po b/po/nn.po
index f60e4c3aa..f11a342b8 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:51+0200\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -145,7 +145,8 @@ msgstr "feil ved oppretting av eining «%.255s»"
 msgid "error creating new backup file '%s'"
 msgstr "feil ved oppretting av røyr «%.255s»"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "klarte ikkje fjerna «%.250s»"
@@ -367,22 +368,36 @@ msgstr "klarte ikkje søkja til starten av %.250s etter etterfyllinga"
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "klarte ikkje opna mellombels fil for vsnprintf"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "klarte ikkje lesa fildeskriptorflagg for %.250s"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "klarte ikkje åpna/oppretta låsefila til statusdatabasen"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
 msgstr "klarte ikkje åpna/oppretta låsefila til statusdatabasen"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "du har ikkje løyve til å låsa dpkg-statusdatabasen"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "klarte ikkje låsa dpkg-statusdatabasen"
 
 #: lib/dpkg/dbmodify.c
@@ -390,11 +405,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "den ønskte handlinga krev superbrukartilgang"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "får ikkje tilgang til dpkg-statusområdet"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operasjonen krev lese- og skrivetilgang til dpkg-statusområdet"
 
 #: lib/dpkg/dbmodify.c
@@ -432,6 +451,195 @@ msgstr "klarte ikkje lukka oppdatert status for «%.250s»"
 msgid "unable to install updated status of '%.250s'"
 msgstr "klarte ikkje installera oppdatert status for «%.250s»"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "klarte ikkje sjekka om «%.250s» finst"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "klarte ikkje lesa infokatalogen"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "feil ved opning av %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "klarte ikkje opna kjeldefila «%.250s»"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "oppsettsfila «%.250s» finst ikkje i pakken"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "feil ved oppretting av hard lenkje «%.255s»"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "feil ved skriving av «%s»"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "klarte ikkje lesa oppsettsfilkatalogen «%.250s» (frå «%.250s»)"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "klarte ikkje opna omdirigeringsfil"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "klarte ikkje utføra «fstat» på omdirigeringsfila"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr ""
+"omdirigeringar i konflikt med kvarandre, involverer «%.250s» eller «%.250s»"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg: Alvorleg åtvaring: Fillistefila for pakken «%.250s» manglar. Går ut "
+"frå at pakken ikkje har nokon filer installert.\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Les database ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d filer og katalogar er installerte.)\n"
+msgstr[1] "%d filer og katalogar er installerte.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "«statoverride»-fil «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride gid %s"
+msgstr "«statoverride»-fil «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride mode %s"
+msgstr "«statoverride»-fil «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "klarte ikkje opna «statoverride»-fila"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "klarte ikkje utføra «fstat» på «statoverride»-fila"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "«statoverride»-fil «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "«statoverride»-fila inneheld ei tom linje"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "«statoverride»-fila inneheld ei tom linje"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "klarte ikkje opna «statoverride»-fila"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "uventa slutt på linje i pakkenamnet på linje %d"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "«statoverride»-fil «%.250s»"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -559,62 +767,71 @@ msgid "internal error"
 msgstr "%s: Intern gzip-feil: Las: «%s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s manglar"
+#, fuzzy
+msgid "is missing a value"
+msgstr "fann ikkje «%.255s» (i «%.255s»)"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "«%.*s» kan ikkje brukast for %s"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "rot etter %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ugyldig pakkenamn (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Pakken «%s» er ikkje installert.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tomt fildetaljfelt «%s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "fildetaljfeltet «%s» kan ikkje brukast i statusfila"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "for mange verdiar i fildetaljfeltet «%s» (samanlikna med andre)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "for få verdiar i fildetaljfeltet «%s» (samanlikna med andre)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "ja/nei i boolsk felt"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "forelda «Revision»- eller «Package-Revision»-felt brukt"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "«%s»-felt, referanse til «%.255s»: feil i versjon: %.255s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "error in Version string `%.250s': %.250s"
+msgid "word in '%s' field: %s"
+msgstr "feil i versjonsstreng «%.250s»: %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
@@ -623,31 +840,31 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "verdi i «status»-felt kan ikkje brukast i denne samanhengen"
 
 #: lib/dpkg/fields.c
-#, fuzzy
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+msgid "first (want) word in '%s' field: %s"
 msgstr "tredje ord (status) i «status»-felt"
 
 #: lib/dpkg/fields.c
-#, fuzzy
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+msgid "second (error) word in '%s' field: %s"
 msgstr "tredje ord (status) i «status»-felt"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "tredje ord (status) i «status»-felt"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "feil i versjonsstreng «%.250s»: %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "forelda «Revision»- eller «Package-Revision»-felt brukt"
 
 #: lib/dpkg/fields.c
@@ -659,11 +876,13 @@ msgstr "verdien for «conffiles» har ei linje med ugyldig format «%.*s»"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "verdien for «conffiles» har ei linje som startar utan mellomrom «%c»"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "rot- eller null-katalog er nemnt som oppsettsfil"
 
 #: lib/dpkg/fields.c
@@ -750,9 +969,8 @@ msgstr "«%s»-felt, referanse til «%.255s»: versjon ikkje avslutta"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "«%s»-felt, referanse til «%.255s»: feil i versjon: %.255s"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "«%s»-felt, referanse til «%.255s»: versjon inneheld «(»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -760,8 +978,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "«%s»-felt, syntaksfeil etter referanse til pakken «%.255s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternativ («|») kan ikkje brukast i %s-feltet"
 
 #: lib/dpkg/fields.c
@@ -803,6 +1022,26 @@ msgstr ""
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+msgid "cannot stat %s"
+msgstr "fann ikkje «%.255s» (i «%.255s»)"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "åtvaring, oppsettsfila «%s» er inga vanleg fil\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot read %s"
+msgstr "klarte ikkje køyra %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot open %s"
+msgstr "klarte ikkje opna avlusingsfil «%s»: %s\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 msgid "unable to unlock %s"
 msgstr "klarte ikkje køyra %s"
 
@@ -823,8 +1062,19 @@ msgid "unable to lock %s"
 msgstr "klarte ikkje køyra %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+msgid "cannot open file %s"
+msgstr "klarte ikkje opna avlusingsfil «%s»: %s\n"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "klarte ikkje tømma i vsnprintf"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "klarte ikkje lesa infokatalogen"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -848,13 +1098,13 @@ msgstr "klarte ikkje oppretta katalog"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "klarte ikkje utføra «dup» for std%s"
+msgid "failed to dup for fd %d"
+msgstr "klarte ikkje utføra «dup» for fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "klarte ikkje utføra «dup» for fd %d"
+msgid "failed to dup for std%s"
+msgstr "klarte ikkje utføra «dup» for std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -993,29 +1243,31 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "det brukardefinerte feltet «%.*s» finst meir enn éin gong"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "manglar %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "tom verdi for %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "verdien for feltet «%s» finst meir enn éin gong"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has '%s' field but is missing architecture"
+msgstr " (pakke: "
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr " (pakke: "
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Oppsett versjon for pakke med status som ikkje passar"
 
 #: lib/dpkg/parse.c
@@ -1024,7 +1276,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1033,11 +1286,14 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "  %.250s vil verta fjerna.\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Ein pakke som ikkje er installert har oppsettsfiler. Dei vert ignorerte."
 
@@ -1056,8 +1312,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1258,11 +1514,6 @@ msgstr "klarte ikkje oppretta «%.255s»"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1278,6 +1529,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "manglar %s"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(inga skildring tilgjengeleg)"
@@ -1362,6 +1623,67 @@ msgstr "underprosessen %s mislukkast med ventestatuskode %d"
 msgid "wait for %s subprocess failed"
 msgstr "venting på %s mislukkast"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "ugyldig teikn «%c» i feltbreidda\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "ugyldig teikn «%c» i feltbreidda\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "«statoverride»-fil «%.250s»"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header gid field"
+msgstr "«statoverride»-fil «%.250s»"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "ugyldig teikn «%c» i feltbreidda\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "ukjend komprimeringstype «%s»!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 msgid "cannot stat pathname '%s'"
@@ -1380,12 +1702,12 @@ msgstr "klarte ikkje lesa infokatalogen"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "klarte ikkje opna kjeldefila «%.250s»"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "klarte ikkje køyra %s"
 
 #: lib/dpkg/trigdeferred.c
@@ -1596,11 +1918,6 @@ msgstr "feil ved oppretting av røyr «%.255s»"
 msgid "error creating device '%.255s'"
 msgstr "feil ved oppretting av eining «%.255s»"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "feil ved oppretting av hard lenkje «%.255s»"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1924,10 +2241,10 @@ msgstr "får ikkje tilgang til arkivet"
 msgid "archive '%s' is not a regular file"
 msgstr "åtvaring, oppsettsfila «%s» er inga vanleg fil\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2144,6 +2461,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Skriv «exit» når du er ferdig.\n"
 
@@ -2521,7 +2842,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2538,6 +2862,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 msgid "cannot stat file '%s'"
@@ -2660,6 +2990,13 @@ msgstr ""
 "installert.\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid " is to be removed.\n"
 msgid "No diversion '%s', none removed.\n"
@@ -2702,20 +3039,6 @@ msgstr "Pakken «%s» inneheld ingen filer (!)\n"
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "klarte ikkje opna omdirigeringsfil"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "klarte ikkje utføra «fstat» på omdirigeringsfila"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr ""
-"omdirigeringar i konflikt med kvarandre, involverer «%.250s» eller «%.250s»"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3015,118 +3338,167 @@ msgstr ""
 "Pakken %s er halden tilbake, og vert ikkje rørt. Bruk --force-hold for å "
 "tvinga gjennom behandling.\n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
-"dpkg - Åtvaring, overstyrer problemet fordi --force er slått på:\n"
-" "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "klarte ikkje lesa oppsettsfilkatalogen «%.250s» (frå «%.250s»)"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg: Alvorleg åtvaring: Fillistefila for pakken «%.250s» manglar. Går ut "
-"frå at pakken ikkje har nokon filer installert.\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "filliste for pakken «%.250s»"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "kravproblem - fjernar ikkje"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "kravproblem - fjernar ikkje"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Les database ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "ukjend tvingings-/avvisingsval «%.*s»"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d filer og katalogar er installerte.)\n"
-msgstr[1] "%d filer og katalogar er installerte.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "Åtvaring: Forelda val «%s»\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"dpkg - Åtvaring, overstyrer problemet fordi --force er slått på:\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3190,42 +3562,6 @@ msgstr ""
 "%d forventa program vart ikkje funne i søkjestigen (PATH).\n"
 "NB: For root bør PATH innehalda /usr/local/sbin, /usr/sbin og /sbin."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "klarte ikkje sjekka om «%.250s» finst"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "klarte ikkje lesa infokatalogen"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "feil ved opning av %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "klarte ikkje opna kjeldefila «%.250s»"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "oppsettsfila «%.250s» finst ikkje i pakken"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "feil ved skriving av «%s»"
-
 #: src/main.c
 #, fuzzy, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3235,27 +3571,27 @@ msgstr "» pakkehandteringsprogram, versjon "
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3468,114 +3804,6 @@ msgstr ""
 "informasjonen."
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "kravproblem - fjernar ikkje"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "kravproblem - fjernar ikkje"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3706,33 +3934,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "ukjend tvingings-/avvisingsval «%.*s»"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "Åtvaring: Forelda val «%s»\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "klarte ikkje opna «%i» for straum"
 
@@ -3917,6 +4118,10 @@ msgid "Description"
 msgstr "Skildring"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, fuzzy, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "omdirigert av %s"
@@ -3954,6 +4159,16 @@ msgstr ""
 "Pakken «%s» er ikkje installert og det finst ingen informasjon om han.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Bruk dpkg --info (= dpkg-deb --info) for å undersøkja arkivfiler,\n"
+"og dpkg --contents (= dpkg-deb --contents) for å visa innhaldet i dei.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -3980,9 +4195,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "omdirigert av %s"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Bruk dpkg --info (= dpkg-deb --info) for å undersøkja arkivfiler,\n"
 "og dpkg --contents (= dpkg-deb --contents) for å visa innhaldet i dei.\n"
@@ -4029,16 +4247,16 @@ msgstr "» pakkehandteringsprogram, versjon "
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4238,6 +4456,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "klarte ikkje skifta filrot til «%.250s»"
@@ -4388,8 +4612,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4444,68 +4673,10 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "«statoverride»-fil «%.250s»"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride gid %s"
-msgstr "«statoverride»-fil «%.250s»"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride mode %s"
-msgstr "«statoverride»-fil «%.250s»"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "klarte ikkje opna «statoverride»-fila"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "klarte ikkje utføra «fstat» på «statoverride»-fila"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "«statoverride»-fil «%.250s»"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "«statoverride»-fila inneheld ei tom linje"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "«statoverride»-fila inneheld ei tom linje"
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "klarte ikkje opna «statoverride»-fila"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "klarte ikkje opna «statoverride»-fila"
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "uventa slutt på linje i pakkenamnet på linje %d"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "klarte ikkje opna «statoverride»-fila"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "«statoverride»-fil «%.250s»"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Åtvaring: Forelda val «%s»\n"
 
 #: src/trigcmd.c
 #, fuzzy
@@ -4719,6 +4890,12 @@ msgstr "Fjernar oppsettet av %s, slik at %s kan fjernast ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Fjernar %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "«statoverride»-fila inneheld ei tom linje"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4862,11 +5039,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "feil ved lesing av tar-utdata frå dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "øydelagd filsystem-tarfil - øydelagt pakkearkiv"
 
 #: src/unpack.c
@@ -4882,13 +5057,20 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s treng akkurat éi «Packages»-fil som parameter"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "klarte ikkje få tilgang til dpkg-statusområdet for rå tilgjengeoppdatering"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr "rå tilgjengeoppdatering krev skrivetilgang til dpkg-statusområdet"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr ""
+"klarte ikkje få tilgang til dpkg-statusområdet for rå tilgjengeoppdatering"
 
 #: src/update.c
 #, c-format
@@ -5266,16 +5448,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "klarte ikkje skifta til katalog"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "klarte ikkje oppretta katalog"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "klarte ikkje skifta til katalogen etter å ha oppretta han"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "uventa slutt på fil i pakkenamnet på linje %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "klarte ikkje skifta til katalog"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6076,8 +6260,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6555,12 +6740,85 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Åtvaring: Forelda val «%s»\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "klarte ikkje opna mellombels fil for vsnprintf"
 
 #, fuzzy
-#~ msgid "control file '%s' missing value"
-#~ msgstr "fann ikkje «%.255s» (i «%.255s»)"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "klarte ikkje opna «statoverride»-fila"
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "klarte ikkje opna «statoverride»-fila"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s manglar"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "«%.*s» kan ikkje brukast for %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "rot etter %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "ugyldig pakkenamn (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "ja/nei i boolsk felt"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "«%s»-felt, referanse til «%.255s»: feil i versjon: %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr "tom verdi for %s"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr "rå tilgjengeoppdatering krev skrivetilgang til dpkg-statusområdet"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "feil ved lesing av tar-utdata frå dpkg-deb"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "filliste for pakken «%.250s»"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "klarte ikkje skifta til katalogen etter å ha oppretta han"
 
 #, fuzzy
 #~ msgid "control file '%s' missing value separator"
@@ -6637,9 +6895,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "slutt på fil ved standard-inn ved oppsettsfilprompt"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "uventa slutt på fil i pakkenamnet på linje %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "uventa slutt på fil etter pakkenamnet på linje %d"
 
@@ -6882,10 +7137,6 @@ msgstr ""
 #~ msgstr "--build tek høgst to parametrar"
 
 #, fuzzy
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "fann ikkje «%.255s» (i «%.255s»)"
-
-#, fuzzy
 #~| msgid "failed to exec %s"
 #~ msgid "failed to execute %s: %s"
 #~ msgstr "klarte ikkje køyra %s"
@@ -6911,10 +7162,6 @@ msgstr ""
 #~ msgstr "klarte ikkje køyra %s"
 
 #, fuzzy
-#~ msgid "cannot write %s: %s"
-#~ msgstr "klarte ikkje køyra %s"
-
-#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "finn ikkje %s «%.250s»"
 
diff --git a/po/pa.po b/po/pa.po
index ac61ada69..4bd5d3d01 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1,13 +1,12 @@
 # translation of pa.po to Punjabi
-# Copyright (C) YEAR Software in the Public Interest, Inc.
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the dpkg package.
 #
 # A S Alam <apbrar@gmail.com>, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:51+0200\n"
 "Last-Translator: A S Alam <apbrar@gmail.com>\n"
 "Language-Team: Punjabi <punjabi-users@lists.sf.net>\n"
@@ -140,7 +139,8 @@ msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 msgid "error creating new backup file '%s'"
 msgstr "conffiles ਫਾਇਲ ਅਪਵਾਦ ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "`%.250s' ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
@@ -352,31 +352,46 @@ msgstr ""
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
-msgstr ""
+#, fuzzy, c-format
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "(Reading database ... "
+msgid "dpkg database lock"
+msgstr "(ਡਾਟਾਬੇਸ ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ ... "
+
+#: lib/dpkg/dbmodify.c
 msgid "requested operation requires superuser privilege"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
-msgstr ""
+#, fuzzy, c-format
+msgid "unable to access the dpkg database directory %s"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, c-format
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
@@ -414,6 +429,185 @@ msgstr ""
 msgid "unable to install updated status of '%.250s'"
 msgstr ""
 
+#: lib/dpkg/db-ctrl-access.c
+#, fuzzy, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "ਜਾਣਕਾਰੀ ਡਾਇਰੈਕਟਰੀ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "`%s' ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "loading control file '%s' for package '%s'"
+msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "loading files list file for package '%s'"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(ਡਾਟਾਬੇਸ ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
+msgstr[1] "%d ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride gid %s"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride mode %s"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -537,62 +731,66 @@ msgid "internal error"
 msgstr "ਅੰਦਰੂਨੀ ਗਲਤੀ: %s ਨਿਕਾਰਾ: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s ਗੁੰਮ ਹੈ"
+#, fuzzy
+#| msgid "unable to read %s: %s"
+msgid "is missing a value"
+msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "  %.250s is not installed.\n"
-msgid "'%.50s' is not allowed for %s"
-msgstr "  %.250s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।\n"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "%s ਬਾਅਦ ਕੂੜਾ"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ਗਲਤ ਪੈਕੇਜ ਨਾਂ (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "ਪੈਕੇਜ `%s' ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।\n"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
-msgstr ""
+#, fuzzy, c-format
+msgid "archive details '%s' field not allowed in status file"
+msgstr " %s (ਇੱਕ ਸਧਾਰਨ ਫਾਇਲ ਨਹੀਂ)\n"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
+#, c-format
+msgid "boolean (yes/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "ਗਲਤ ਪੈਕੇਜ ਨਾਂ (%.250s)"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "error closing %.250s"
+msgid "word in '%s' field: %s"
+msgstr "%.250s ਬੰਦ ਕਰਨ 'ਚ ਗਲਤੀ"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -600,26 +798,30 @@ msgid "value for '%s' field not allowed in this context"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, c-format
+msgid "first (want) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "error closing %.250s"
+msgid "second (error) word in '%s' field: %s"
+msgstr "%.250s ਬੰਦ ਕਰਨ 'ਚ ਗਲਤੀ"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, c-format
+msgid "third (status) word in '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error closing %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "%.250s ਬੰਦ ਕਰਨ 'ਚ ਗਲਤੀ"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -629,11 +831,12 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, c-format
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -705,7 +908,7 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
+msgid "'%s' field, reference to '%.255s': version '%s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -715,7 +918,7 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -755,6 +958,29 @@ msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾ
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "unable to read %s: %s"
+msgid "cannot stat %s"
+msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr " %s (ਇੱਕ ਸਧਾਰਨ ਫਾਇਲ ਨਹੀਂ)\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to read %s: %s"
+msgid "cannot open %s"
+msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to open %s: %s"
 msgid "unable to unlock %s"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
@@ -776,8 +1002,20 @@ msgid "unable to lock %s"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "unable to read %s: %s"
+msgid "cannot open file %s"
+msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "ਫਾਇਲ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -800,12 +1038,12 @@ msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
+msgid "failed to dup for fd %d"
 msgstr ""
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
+msgid "failed to dup for std%s"
 msgstr ""
 
 #: lib/dpkg/mlib.c
@@ -945,27 +1183,30 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr ""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "%s ਗੁੰਮ ਹੈ"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s ਲਈ ਖਾਲੀ ਮੁੱਲ"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "`%s' ਖੇਤਰ ਦਾ ਦੂਹਰਾ ਮੁੱਲ"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has '%s' field but is missing architecture"
+msgstr " (ਪੈਕੇਜ: "
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr " (ਪੈਕੇਜ: "
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, c-format
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -974,7 +1215,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -983,11 +1225,13 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "  ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਵੇਗਾ।\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, c-format
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1005,8 +1249,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1190,11 +1434,6 @@ msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 msgid "invalid character '%c' in field width"
@@ -1210,6 +1449,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "ਨਵੀਂ-ਲਾਇਨ %s ਬਾਅਦ ਮੌਜੂਦ ਨਹੀਂ"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀਂ)"
@@ -1292,6 +1541,64 @@ msgstr ""
 msgid "wait for %s subprocess failed"
 msgstr "ਸ਼ੈੱਲ ਫੇਲ੍ਹ ਹੋ ਲੈ ਦਿਓ"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header size field"
+msgstr "ਵਰਜਨ ਨੰਬਰ"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header mtime field"
+msgstr "ਵਰਜਨ ਨੰਬਰ"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header gid field"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header checksum field"
+msgstr "ਵਰਜਨ ਨੰਬਰ"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown argument '%s'"
+msgid "unknown tar header type '%c'"
+msgstr "ਲਾਜ਼ਮੀ ਮੁੱਲ `%s'"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
@@ -1310,12 +1617,12 @@ msgstr "ਜਾਣਕਾਰੀ ਡਾਇਰੈਕਟਰੀ ਪੜ੍ਹੀ ਨਹ
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
 #: lib/dpkg/trigdeferred.c
@@ -1524,11 +1831,6 @@ msgstr ""
 msgid "error creating device '%.255s'"
 msgstr ""
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr ""
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1821,10 +2123,10 @@ msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
 msgid "archive '%s' is not a regular file"
 msgstr " %s (ਇੱਕ ਸਧਾਰਨ ਫਾਇਲ ਨਹੀਂ)\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2006,6 +2308,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr ""
 
@@ -2342,7 +2648,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2384,6 +2693,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "unable to read %s: %s"
@@ -2514,6 +2829,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr ""
 
@@ -2552,19 +2874,6 @@ msgstr ""
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr ""
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr ""
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr ""
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2822,111 +3131,166 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to write %s: %s"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+msgid "Turn all dependency problems into warnings"
+msgstr ""
+"dpkg: ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਨੇ %s ਨੂੰ ਹਟਾਉਣ ਤੋਂ ਰੋਕਿਆ:\n"
+"%s"
+
+#: src/force.c
+#, fuzzy
+msgid "Turn dependency version problems into warnings"
+msgstr ""
+"dpkg: ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਨੇ %s ਨੂੰ ਹਟਾਉਣ ਤੋਂ ਰੋਕਿਆ:\n"
+"%s"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
 msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(ਡਾਟਾਬੇਸ ਪੜ੍ਹਿਆ ਜਾ ਰਿਹਾ ਹੈ ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
-msgstr[1] "%d ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr ""
 
 #: src/help.c
 msgid "not installed"
@@ -2985,41 +3349,6 @@ msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin"
 msgstr ""
 
-#: src/infodb-access.c
-#, fuzzy, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "%s ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ: %s"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "ਜਾਣਕਾਰੀ ਡਾਇਰੈਕਟਰੀ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr ""
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "`%s' ਲਿਖਣ ਦੌਰਾਨ ਗਲਤੀ"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3029,27 +3358,27 @@ msgstr "ਡੇਬੀਅਨ `%s' ਪੈਕੇਜ ਮੈਨਜੇਮਿੰਟ ਪ�
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3241,116 +3570,6 @@ msgid ""
 msgstr ""
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-msgid "Turn all dependency problems into warnings"
-msgstr ""
-"dpkg: ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਨੇ %s ਨੂੰ ਹਟਾਉਣ ਤੋਂ ਰੋਕਿਆ:\n"
-"%s"
-
-#: src/main.c
-#, fuzzy
-msgid "Turn dependency version problems into warnings"
-msgstr ""
-"dpkg: ਨਿਰਭਰਤਾ ਸਮੱਸਿਆ ਨੇ %s ਨੂੰ ਹਟਾਉਣ ਤੋਂ ਰੋਕਿਆ:\n"
-"%s"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3474,33 +3693,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr ""
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr ""
 
@@ -3672,6 +3864,10 @@ msgid "Description"
 msgstr "ਵੇਰਵਾ"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr ""
@@ -3707,6 +3903,10 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "ਪੈਕੇਜ `%s' ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ ਅਤੇ ਕੋਈ ਜਾਣਕਾਰੀ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।\n"
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -3734,8 +3934,7 @@ msgstr ""
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 
 #: src/querycmd.c dpkg-deb/info.c
@@ -3779,16 +3978,16 @@ msgstr "ਡੇਬੀਅਨ `%s' ਪੈਕੇਜ ਮੈਨਜੇਮਿੰਟ ਪ�
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -3962,6 +4161,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr ""
@@ -4103,8 +4308,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4175,64 +4385,10 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride gid %s"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride mode %s"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr ""
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr ""
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr ""
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr ""
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr ""
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4469,6 +4625,11 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "%s ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ...\n"
 
+#: src/unpack.c
+#, fuzzy
+msgid "conffile file contains an empty line"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4604,11 +4765,7 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr ""
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 
 #: src/unpack.c
@@ -4622,11 +4779,15 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s needs <name>"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, c-format
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, c-format
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
 
 #: src/update.c
@@ -4976,16 +5137,17 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "ਡਾਇਰੈਕਟਰੀ ਬਦਲਣ ਲਈ ਫੇਲ੍ਹ"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਲਈ ਫੇਲ੍ਹ"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਬਾਅਦ ਇਸ 'ਚ ਜਾਣ ਲਈ ਫੇਲ੍ਹ"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr ""
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "ਡਾਇਰੈਕਟਰੀ ਬਦਲਣ ਲਈ ਫੇਲ੍ਹ"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -5816,8 +5978,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6318,13 +6481,54 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s ਗੁੰਮ ਹੈ"
 
 #, fuzzy
-#~| msgid "unable to read %s: %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
+#~| msgid "  %.250s is not installed.\n"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "  %.250s ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ।\n"
+
+#~ msgid "junk after %s"
+#~ msgstr "%s ਬਾਅਦ ਕੂੜਾ"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "ਗਲਤ ਪੈਕੇਜ ਨਾਂ (%.250s)"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s ਲਈ ਖਾਲੀ ਮੁੱਲ"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#, fuzzy
+#~| msgid "unable to write %s: %s"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਬਾਅਦ ਇਸ 'ਚ ਜਾਣ ਲਈ ਫੇਲ੍ਹ"
 
 #, fuzzy
 #~| msgid "unable to read %s: %s"
@@ -6514,11 +6718,6 @@ msgstr ""
 #~ msgstr " ਸਲੇਵ %s: %s"
 
 #, fuzzy
-#~| msgid "unable to read %s: %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
-
-#, fuzzy
 #~ msgid "while writing %s: %s"
 #~ msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
@@ -6526,11 +6725,6 @@ msgstr ""
 #~ msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "%s ਲਿਖਣ ਲਈ ਅਸਫ਼ਲ: %s"
-
-#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
diff --git a/po/pl.po b/po/pl.po
index ae3d95e06..20a4bc2d0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -10,13 +10,13 @@
 # Robert Luberda <robert@debian.org>, 2006-2008.
 # Wiktor Wandachowicz <siryes@gmail.com>, 2008-2009.
 # Michał Kułach <michal.kulach@gmail.com>, 2012.
-# Łukasz Dulny <bartekchom@poczta.onet.pl>, 2014.
+# Łukasz Dulny <bartekchom@poczta.onet.pl>, 2014, 2018.
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.16.1\n"
+"Project-Id-Version: dpkg 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2015-04-07 10:00+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
+"PO-Revision-Date: 2018-09-26 22:42+0200\n"
 "Last-Translator: Łukasz Dulny <BartekChom@poczta.onet.pl>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
 "Language: pl\n"
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
 
 #: lib/dpkg/ar.c
 msgid "failed to fstat archive"
@@ -146,7 +146,8 @@ msgstr "błąd usuwania starego pliku zapasowego \"%s\""
 msgid "error creating new backup file '%s'"
 msgstr "nie można utworzyć nowego pliku zapasowego \"%s\""
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "nie można usunąć \"%.250s\""
@@ -350,20 +351,39 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "nie można przewinąć na początek pliku %.250s po jego wypełnieniu"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "%s: nie można otworzyć pliku blokady $s do sprawdzenia"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "nie można odczytać flag deskryptora pliku dla \"%.250s\""
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create frontend lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "nie można otworzyć/utworzyć pliku blokującego fasadę"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
 msgstr "nie można otworzyć/utworzyć pliku blokującego bazę danych stanu dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "brak praw do zablokowania bazy danych stanu dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg frontend"
+msgid "dpkg frontend lock"
+msgstr "fasada dpkg"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "baza danych stanu dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -371,11 +391,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "żądana operacja wymaga uprawnień administratora"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "brak dostępu do sekcji stanu dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operacja wymaga uprawnień zapisu/odczytu sekcji stanu dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -413,11 +437,192 @@ msgstr "nie można zamknąć uaktualnionego pliku \"%.250s\""
 msgid "unable to install updated status of '%.250s'"
 msgstr "nie można zainstalować uaktualnionego pliku \"%.250s\""
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "nie można stwierdzić istnienia \"%.250s\""
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "nie można odczytać katalogu informacyjnego"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "nie można otworzyć %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "uszkodzony plik formatu bazy danych informacji \"%s\""
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"format bazy danych informacji (%d) jest nieprawidłowy lub zbyt nowy - proszę "
+"spróbować użyć nowszego dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "plik informacyjny %s/%s nie jest powiązany z żadnym pakietem"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "nie można utworzyć dowiązania \"%.255s\""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "błąd podczas zapisu \"%s\""
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"plik kontrolny \"%s\" dla pakietu \"%s\" nie zawiera kończącej pustej linii"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "w pliku kontrolnym \"%s\" dla pakietu \"%s\" brakuje wartości"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"w pliku kontrolnym \"%s\" dla pakietu \"%s\" brakuje separatora wartości"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "plik kontrolny \"%s\" dla pakietu \"%s\" zawiera pustą nazwę pliku"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "loading control file '%s' for package '%s'"
+msgstr "ładowanie pliku kontrolnego \"%s\" dla pakietu \"%s\""
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "nie można otworzyć listy ominiętych plików"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "nie można ustalić stanu listy ominiętych plików"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "konflikt dla ominięcia \"%.250s\" lub \"%.250s\""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "loading files list file for package '%s'"
+msgstr "ładowanie listy plików pakietu \"%.250s\""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"brak listy plików pakietu \"%.250s\" - przyjęcie, że pakiet nie ma "
+"zainstalowanych plików"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "lista plików pakietu \"%.250s\" nie zawiera kończącej pustej linii"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "lista plików pakietu \"%.250s\" zawiera pustą nazwę pliku"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Odczytywanie bazy danych ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d plik lub katalog obecnie zainstalowany.)\n"
+msgstr[1] "%d pliki i katalogi obecnie zainstalowane.)\n"
+msgstr[2] "%d plików i katalogów obecnie zainstalowanych.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "nieprawidłowe statoverride uid %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "nieprawidłowe statoverride gid %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "nieprawidłowe statoverride mode %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "nie można otworzyć listy pliku statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "nie można ustalić stanu pliku statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "odczytywanie pliku statoverride \"%.250s\""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "plik statoverride nie zawiera kończącej pustej linii"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "plik statoverride zawiera pustą linię"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "błąd składni w pliku statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "niespodziewany koniec linii w pliku statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "wielokrotne określenia statoverrides dla pliku \"%.250s\""
+
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty major component"
 msgid "format version with too big major component"
-msgstr "wersja formatu z pustą główną częścią składową"
+msgstr "wersja formatu ze zbyt dużą główną częścią składową"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty major component"
@@ -428,10 +633,8 @@ msgid "format version has no dot"
 msgstr "wersja formatu nie ma kropki"
 
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty minor component"
 msgid "format version with too big minor component"
-msgstr "wersja formatu z pustą poboczną częścią składową"
+msgstr "wersja formatu ze zbyt dużą poboczną częścią składową"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty minor component"
@@ -494,26 +697,20 @@ msgid ""
 "%s%s%s: %s%s:%s\n"
 " %s\n"
 msgstr ""
+"%s%s%s: %s%s:%s\n"
+" %s\n"
 
 #: lib/dpkg/ehandle.c
 msgid "out of memory for new error context"
 msgstr "brak pamięci na nowy błąd kontekstu"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid ""
-#| "%s: error while cleaning up:\n"
-#| " %s\n"
 msgid "error while cleaning up"
-msgstr ""
-"%s: błąd podczas czyszczenia środowiska:\n"
-" %s\n"
+msgstr "błąd podczas czyszczenia środowiska"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid "%s: too many nested errors during error recovery!!\n"
 msgid "too many nested errors during error recovery"
-msgstr "%s: za dużo osadzonych błędów podczas obsługi błędu!!\n"
+msgstr "za dużo osadzonych błędów podczas obsługi błędu"
 
 #: lib/dpkg/ehandle.c
 msgid "out of memory for new cleanup entry"
@@ -525,86 +722,85 @@ msgstr ""
 "brak pamięci na nową pozycję z argumentami dla obsługi czyszczenia środowiska"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid ""
-#| "%s: unrecoverable fatal error, aborting:\n"
-#| " %s\n"
 msgid "unrecoverable fatal error, aborting"
-msgstr ""
-"%s: nienaprawialny błąd krytyczny, przerywanie:\n"
-" %s\n"
+msgstr "nienaprawialny błąd krytyczny, przerywanie"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid ""
-#| "%s: outside error context, aborting:\n"
-#| " %s\n"
 msgid "outside error context, aborting"
-msgstr ""
-"%s: zewnętrzny błąd kontekstu, przerywanie:\n"
-" %s\n"
+msgstr "zewnętrzny błąd kontekstu, przerywanie"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid "internal error (bug)"
 msgid "internal error"
-msgstr "błąd wewnętrzny (bug)"
+msgstr "błąd wewnętrzny"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "brak %s"
+#, fuzzy
+#| msgid "missing package"
+msgid "is missing a value"
+msgstr "brakująca nazwa pakietu"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "\"%.50s\" jest niedozwolony dla %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Pomijanie nieprawidłowego wiersza: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "śmieci po %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "niepoprawna nazwa pakietu (%.250s)"
+#, fuzzy, c-format
+#| msgid "package name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "nazwa pakietu \"%s\" jest nieprawidłowa: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
-msgstr "puste pole opisu pliku \"%s\""
+#, fuzzy, c-format
+#| msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
+msgstr "puste pole opisu archiwum \"%s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
-msgstr "pole opisu pliku \"%s\" jest niedozwolone w pliku statusu"
+#, fuzzy, c-format
+#| msgid "archive details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
+msgstr "pole opisu archiwum \"%s\" jest niedozwolone w pliku statusu"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
-msgstr "za dużo danych w polu opisu pliku \"%s\" (w porównaniu z innymi)"
+#, fuzzy, c-format
+#| msgid "too many values in archive details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
+msgstr "za dużo danych w polu opisu archiwum \"%s\" (w porównaniu z innymi)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
-msgstr "za mało danych w polu opisu pliku \"%s\" (w porównaniu z innymi)"
+#, fuzzy, c-format
+#| msgid "too few values in archive details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
+msgstr "za mało danych w polu opisu archiwum \"%s\" (w porównaniu z innymi)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no w polu boolean"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "użyto niewykorzystywanego już pola \"%s\" lub \"%s\""
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "obca/dozwolona/taka sama/brak w polu o czterech stanach"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "\"%s\" nie jest poprawną nazwą architektury: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "słowo w polu \"Priority\""
 
 #: lib/dpkg/fields.c
@@ -613,25 +809,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "niedozwolona wartość w tym kontekście dla pola \"%s\""
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "pierwsze (want) słowo w polu \"Status\""
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "drugie (error) słowo w polu \"Status\""
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "trzecie (status) słowo w polu \"Status\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "błąd w polu \"%s\" \"%.250s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "użyto niewykorzystywanego już pola \"%s\" lub \"%s\""
 
 #: lib/dpkg/fields.c
@@ -640,13 +844,16 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "wartość dla \"%s\" ma niepoprawną linię \"%.*s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "wartość dla \"%s\" ma linię rozpoczętą od znaku niebędącego spacją \"%c\""
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "katalog główny lub pusty jest użyty jako \"conffile\""
 
 #: lib/dpkg/fields.c
@@ -733,9 +940,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "pole \"%s\", w odniesieniu do \"%.255s\": numer wersji niezakończony"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "pole \"%s\", w odniesieniu do \"%.255s\": błąd w numerze wersji"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "pole \"%s\", w odniesieniu do \"%.255s\": numer wersji zawiera \"%c\""
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -743,8 +951,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "pole \"%s\", błąd składni po odniesieniu do pakietu \"%.255s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "wybór (\"|\") niedozwolony dla pola %s"
 
 #: lib/dpkg/fields.c
@@ -784,6 +993,26 @@ msgstr "nie można ustawić uprawnień pliku docelowego \"%.250s\""
 
 #: lib/dpkg/file.c
 #, c-format
+msgid "cannot stat %s"
+msgstr "nie można ustalić stanu %s"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "%s is not a regular file"
+msgstr "%s nie jest zwykłym plikiem"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot read %s"
+msgstr "nie można odczytać %s"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot open %s"
+msgstr "nie można otworzyć %s"
+
+#: lib/dpkg/file.c
+#, c-format
 msgid "unable to unlock %s"
 msgstr "nie można odblokować %s"
 
@@ -803,8 +1032,20 @@ msgid "unable to lock %s"
 msgstr "nie można zablokować %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "pokazywanie pliku za pomocą programu stronicującego"
+#, fuzzy, c-format
+#| msgid "cannot open %s"
+msgid "cannot open file %s"
+msgstr "nie można otworzyć %s"
+
+#: lib/dpkg/file.c
+msgid "pager to show file"
+msgstr "program stronicujący do pokazania pliku"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "nie można ominąć pliku \"%s\" do siebie samego"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -826,13 +1067,13 @@ msgstr "nie można zaalokować pamięci"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "nie można wykonać funkcji \"dup\" dla std%s"
+msgid "failed to dup for fd %d"
+msgstr "nie można wykonać funkcji \"dup\" dla fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "nie można wykonać funkcji \"dup\" dla fd %d"
+msgid "failed to dup for std%s"
+msgstr "nie można wykonać funkcji \"dup\" dla std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -945,10 +1186,9 @@ msgid "invalid integer for -%c: '%.250s'"
 msgstr "błędna liczba całkowita dla -%c: \"%.250s\""
 
 #: lib/dpkg/options.c
-#, fuzzy, c-format
-#| msgid "obsolete option '--%s'\n"
+#, c-format
 msgid "obsolete option '--%s'"
-msgstr "niewykorzystywana już opcja \"--%s\"\n"
+msgstr "niewykorzystywana już opcja \"--%s\""
 
 #: lib/dpkg/options.c
 #, c-format
@@ -971,27 +1211,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "powielona wartość pola definiowanego przez użytkownika \"%.*s\""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "brakujący %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "brak wartości dla %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "powielona wartość pola \"%s\""
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "pakiet posiada pole \"%s\", ale nie ma informacji o architekturze"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "pakiet posiada pole \"%s\", ale architektura jest ustawiona na \"all\""
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Config-Version dla pakietu z nieprawidłowym statusem"
 
 #: lib/dpkg/parse.c
@@ -1000,8 +1246,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "pakiet ma status %s, ale są oczekujące wyzwalacze"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "pakiet ma status triggers-awaited, ale brak oczekujących wyzwalaczy"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "pakiet ma status %s, ale są oczekujące wyzwalacze"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1009,11 +1257,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "pakiet ma status %s, ale są zaplanowane wyzwalacze"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "pakiet ma status triggers-pending, ale brak zaplanowanych wyzwalaczy"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "pakiet ma status %s, ale są zaplanowane wyzwalacze"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Niezainstalowany pakiet ma pliki konfiguracyjne, informacje o nich zostają "
 "usunięte"
@@ -1031,15 +1283,18 @@ msgid ""
 "mixed non-coinstallable and coinstallable package instances present; most "
 "probably due to an upgrade from an unofficial dpkg"
 msgstr ""
-"wymieszane kopie pakietu, które mogą, z tymi które nie mogą być "
+"wymieszane kopie pakietu, które mogą, z tymi, które nie mogą być "
 "zainstalowane razem - powodem jest prawdopodobnie aktualizacja przy użyciu "
 "nieoficjalnego dpkg"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Wieloarchitekturowość: %s) nie jest współinstalowalny z %s, który ma "
 "wiele zainstalowanych kopii"
@@ -1083,10 +1338,9 @@ msgid "field name '%.*s' cannot start with hyphen"
 msgstr "nazwa pola \"%.*s\" nie może rozpoczynać się myślnikiem"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "EOF after field name `%.*s'"
+#, c-format
 msgid "end of file after field name '%.*s'"
-msgstr "EOF po nazwie pola \"%.*s\""
+msgstr "koniec pliku po nazwie pola \"%.*s\""
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1094,10 +1348,9 @@ msgid "newline in field name '%.*s'"
 msgstr "koniec linii w nazwie pola \"%.*s\""
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "MSDOS EOF (^Z) in field name `%.*s'"
+#, c-format
 msgid "MSDOS end of file (^Z) in field name '%.*s'"
-msgstr "MSDOS EOF (^Z) w nazwie pola \"%.*s\""
+msgstr "dosowy koniec pliku (^Z) w nazwie pola \"%.*s\""
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1105,16 +1358,14 @@ msgid "field name '%.*s' must be followed by colon"
 msgstr "po nazwie pola \"%.*s\" musi wystąpić dwukropek"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "EOF before value of field `%.*s' (missing final newline)"
+#, c-format
 msgid "end of file before value of field '%.*s' (missing final newline)"
-msgstr "EOF przed wartością pola \"%.*s\" (brak końca linii)"
+msgstr "koniec pliku przed wartością pola \"%.*s\" (brak końca linii)"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
+#, c-format
 msgid "MSDOS end of file (^Z) in value of field '%.*s' (missing newline?)"
-msgstr "MSDOS EOF w wartości pola \"%.*s\" (brak końca linii?)"
+msgstr "dosowy koniec pliku (^Z) w wartości pola \"%.*s\" (brak końca linii?)"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1122,10 +1373,9 @@ msgid "blank line in value of field '%.*s'"
 msgstr "pusta linia w wartości pola \"%.*s\""
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "EOF during value of field `%.*s' (missing final newline)"
+#, c-format
 msgid "end of file during value of field '%.*s' (missing final newline)"
-msgstr "EOF w wartości pola \"%.*s\" (brak końca linii)"
+msgstr "koniec pliku w wartości pola \"%.*s\" (brak końca linii)"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1178,10 +1428,8 @@ msgid "version string has embedded spaces"
 msgstr "ciąg znaków dla numeru wersji zawiera spacje"
 
 #: lib/dpkg/parsehelp.c
-#, fuzzy
-#| msgid "epoch in version is negative"
 msgid "epoch in version is empty"
-msgstr "epoka w numerze wersji jest ujemna"
+msgstr "epoka w numerze wersji jest pusta"
 
 #: lib/dpkg/parsehelp.c
 msgid "epoch in version is not number"
@@ -1200,16 +1448,12 @@ msgid "nothing after colon in version number"
 msgstr "brak znaków po dwukropku w numerze wersji"
 
 #: lib/dpkg/parsehelp.c
-#, fuzzy
-#| msgid "version string is empty"
 msgid "revision number is empty"
-msgstr "ciąg znaków dla numeru wersji jest pusty"
+msgstr "numer rewizji jest pusty"
 
 #: lib/dpkg/parsehelp.c
-#, fuzzy
-#| msgid "version string is empty"
 msgid "version number is empty"
-msgstr "ciąg znaków dla numeru wersji jest pusty"
+msgstr "numer wersji jest pusty"
 
 #: lib/dpkg/parsehelp.c
 msgid "version number does not start with digit"
@@ -1232,12 +1476,6 @@ msgstr "nie można bezpiecznie usunąć \"%.255s\""
 msgid "rm command for cleanup"
 msgstr "polecenie rm do wyczyszczenia"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-"niejednoznaczna nazwa pakietu \"%s\" z więcej niż jedną zainstalowaną kopią"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1251,13 +1489,23 @@ msgstr "szerokość pola jest poza zakresem"
 msgid "missing closing brace"
 msgstr "brakująca kwadratowy nawias zamykający"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+"niejednoznaczna nazwa pakietu \"%s\" z więcej niż jedną zainstalowaną kopią"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(brak dostępnego opisu)"
 
 #: lib/dpkg/pkg-show.c
-#, fuzzy, c-format
-#| msgid "version '%s' has bad syntax: %s"
+#, c-format
 msgid "version '%s' has bad syntax: %s"
 msgstr "wersja \"%s\" ma złą składnię: %s"
 
@@ -1307,20 +1555,17 @@ msgid "fork failed"
 msgstr "nie można wykonać funkcji \"fork\""
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s returned error exit status %d"
+#, c-format
 msgid "%s subprocess returned error exit status %d"
 msgstr "podproces %s zwrócił kod błędu %d"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was interrupted"
+#, c-format
 msgid "%s subprocess was interrupted"
 msgstr "podproces %s został przerwany"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was killed by signal (%s)%s"
+#, c-format
 msgid "%s subprocess was killed by signal (%s)%s"
 msgstr "podproces %s został zabity sygnałem (%s)%s"
 
@@ -1329,43 +1574,105 @@ msgid ", core dumped"
 msgstr ", zrzut pamięci"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s failed with wait status code %d"
+#, c-format
 msgid "%s subprocess failed with wait status code %d"
 msgstr "podproces %s zgłosił błąd poprzez kod %d funkcji \"wait\""
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "wait for subprocess %s failed"
+#, c-format
 msgid "wait for %s subprocess failed"
 msgstr "oczekiwanie na podproces %s nie powiodło się"
 
-#: lib/dpkg/treewalk.c
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "nieprawidłowy znak \"%c\" w szerokości pola"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "nieprawidłowy znak \"%c\" w szerokości pola"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "nieprawidłowe statoverride uid %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "nieprawidłowe statoverride gid %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "nieprawidłowy znak \"%c\" w szerokości pola"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
 #, fuzzy, c-format
-#| msgid "cannot stat file '%s'"
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "nieobsługiwane opcje w nagłówku pliku"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "nieznany typ kompresji \"%s\"!"
+
+#: lib/dpkg/treewalk.c
+#, c-format
 msgid "cannot stat pathname '%s'"
-msgstr "nie można ustalić stanu pliku \"%s\""
+msgstr "nie można ustalić stanu ścieżki \"%s\""
 
 #: lib/dpkg/treewalk.c
-#, fuzzy, c-format
-#| msgid "cannot scan directory '%.255s'"
+#, c-format
 msgid "cannot open directory '%s'"
-msgstr "nie można przeszukać katalogu \"%.255s\""
+msgstr "nie można otworzyć katalogu \"%s\""
 
 #: lib/dpkg/treewalk.c
-#, fuzzy, c-format
-#| msgid "control directory is not a directory"
+#, c-format
 msgid "treewalk root %s is not a directory"
-msgstr "katalog kontrolny nie jest katalogiem"
+msgstr "korzeń przeszukiwania drzewa %s nie jest katalogiem"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr ""
 "nie można otworzyć/utworzyć pliku blokującego dla wyzwalaczy \"%.250s\""
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "obszar wyzwalaczy"
 
 #: lib/dpkg/trigdeferred.c
@@ -1385,12 +1692,12 @@ msgstr ""
 "nie można otworzyć/utworzyć nowego pliku wyzwalaczy odłożonych \"%.250s\""
 
 #: lib/dpkg/trigdeferred.c
-#, fuzzy, c-format
-#| msgid "syntax error in triggers deferred file '%.250s' at character '%s'%s"
+#, c-format
 msgid ""
 "syntax error in triggers deferred file '%.250s' at line %d character %zd '%s'"
 msgstr ""
-"błąd składni w pliku wyzwalaczy odłożonych \"%.250s\" na pozycji \"%s\"%s"
+"błąd składni w pliku wyzwalaczy odłożonych \"%.250s\" w linii %d na pozycji "
+"%zd '%s'"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
@@ -1536,10 +1843,9 @@ msgid "too-long line or missing newline in '%.250s'"
 msgstr "zbyt długa linia lub brakujący znak nowej linii w \"%.250s\""
 
 #: lib/dpkg/utils.c
-#, fuzzy, c-format
-#| msgid "unexpected end of file in %.250s"
+#, c-format
 msgid "unexpected end of file reading '%.250s'"
-msgstr "niespodziewany koniec pliku dla %.250s"
+msgstr "niespodziewany koniec czytania pliku \"%.250s\""
 
 #: lib/dpkg/varbuf.c
 msgid "error formatting string into varbuf variable"
@@ -1595,11 +1901,6 @@ msgstr "nie można utworzyć potoku \"%.255s\""
 msgid "error creating device '%.255s'"
 msgstr "nie można utworzyć urządzenia \"%.255s\""
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "nie można utworzyć dowiązania \"%.255s\""
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1659,10 +1960,9 @@ msgstr ""
 "symbolicznego \"%.250s\" dla dowiązania \"%.250s\""
 
 #: src/archives.c
-#, fuzzy, c-format
-#| msgid "cannot open archive part file '%.250s'"
+#, c-format
 msgid "newline not allowed in archive object name '%.255s'"
-msgstr "nie można otworzyć pliku części \"%.250s\""
+msgstr "nowa linia nie dozwolona w nazwie obiektu archiwalnego \"%.255s\""
 
 #: src/archives.c
 #, c-format
@@ -1706,7 +2006,7 @@ msgstr "archiwum zawiera obiekt \"%.255s\" nieznanego typu 0x%x"
 #: src/archives.c
 #, c-format
 msgid "Replacing files in old package %s (%s) ...\n"
-msgstr "Zastąpienie plików z poprzedniego pakietu %s (%s) ...\n"
+msgstr "Zastąpienie plików z starego pakietu %s (%s) ...\n"
 
 #: src/archives.c
 #, c-format
@@ -1862,7 +2162,7 @@ msgstr "rozważanie usunięcia %s w zamian za %s ..."
 #: src/archives.c
 #, c-format
 msgid "%s is not properly installed; ignoring any dependencies on it"
-msgstr "%s nie jest poprawnie zainstalowany; ignorowanie zależności od niego"
+msgstr "%s nie jest poprawnie zainstalowany - ignorowanie zależności od niego"
 
 #: src/archives.c
 #, c-format
@@ -1910,21 +2210,19 @@ msgid "--%s needs at least one package archive file argument"
 msgstr "--%s wymaga co najmniej jednego argumentu będącego plikiem archiwum"
 
 #: src/archives.c src/unpack.c
-#, fuzzy, c-format
-#| msgid "cannot access archive"
+#, c-format
 msgid "cannot access archive '%s'"
-msgstr "brak dostępu do archiwum"
+msgstr "brak dostępu do archiwum \"%s\""
 
 #: src/archives.c
-#, fuzzy, c-format
-#| msgid "conffile '%s' is not a plain file"
+#, c-format
 msgid "archive '%s' is not a regular file"
-msgstr "plik konfiguracyjny \"%s\" nie jest zwykłym plikiem"
+msgstr "archiwum \"%s\" nie jest zwykłym plikiem"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<standardowe wyjście>"
 
@@ -2047,7 +2345,7 @@ msgstr " ==> Wykorzystany zostanie aktualny plik według żądania.\n"
 #: src/configure.c
 #, c-format
 msgid " ==> Keeping old config file as default.\n"
-msgstr " ==> Domyślnie zostanie zachowany poprzedni plik konfiguracyjny.\n"
+msgstr " ==> Domyślnie zostanie zachowany stary plik konfiguracyjny.\n"
 
 #: src/configure.c
 #, c-format
@@ -2100,14 +2398,16 @@ msgid "read error on stdin at conffile prompt"
 msgstr "błąd odczytu ze standardowego wejścia wykryty po znaku zachęty"
 
 #: src/configure.c
-#, fuzzy
-#| msgid "read error on stdin at conffile prompt"
 msgid "end of file on stdin at conffile prompt"
-msgstr "błąd odczytu ze standardowego wejścia wykryty po znaku zachęty"
+msgstr "koniec pliku standardowego wejścia wykryty po znaku zachęty"
 
 #: src/configure.c
 msgid "conffile difference visualizer"
-msgstr "Wizualizacja różnic w plikach konfiguracyjnych"
+msgstr "wizualizacja różnic w plikach konfiguracyjnych"
+
+#: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr "Przydatne zmienne środowiskowe:\n"
 
 #: src/configure.c
 msgid "Type 'exit' when you're done.\n"
@@ -2115,7 +2415,7 @@ msgstr "Należy wpisać \"exit\" po zakończeniu pracy.\n"
 
 #: src/configure.c
 msgid "conffile shell"
-msgstr "Plik konfiguracyjny powłoki"
+msgstr "plik konfiguracyjny powłoki"
 
 #: src/configure.c
 #, c-format
@@ -2141,7 +2441,7 @@ msgstr ""
 #: src/configure.c
 #, c-format
 msgid "%s: failed to remove old backup '%.250s': %s"
-msgstr "%s: nie można usunąć poprzedniej kopii \"%.250s\": %s"
+msgstr "%s: nie można usunąć starej kopii \"%.250s\": %s"
 
 #: src/configure.c
 #, c-format
@@ -2156,7 +2456,7 @@ msgstr "%s: nie można usunąć \"%.250s\": %s"
 #: src/configure.c
 #, c-format
 msgid "%s: failed to remove old distributed version '%.250s': %s"
-msgstr "%s: nie można usunąć poprzedniej wersji \"%.250s\": %s"
+msgstr "%s: nie można usunąć starej wersji \"%.250s\": %s"
 
 #: src/configure.c
 #, c-format
@@ -2462,13 +2762,29 @@ msgstr ""
 "Polecenia:\n"
 "  [--add] <plik>               dodaje ominięcie.\n"
 "  --remove <plik>              usuwa ominięcie.\n"
-"  --list [<wzorzec globalny>]  pokazuje ominięcia pliku.\n"
+"  --list [<wzorzec-globalny>]  pokazuje ominięcia pliku.\n"
 "  --listpackage <plik>         pokazuje pakiet, który omija plik.\n"
 "  --truename <plik>            zwraca ominięty plik.\n"
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --no-rename              do not move the file aside (or back) "
+#| "(default).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2477,7 +2793,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2486,10 +2805,11 @@ msgid ""
 msgstr ""
 "Opcje:\n"
 "  --package <pakiet>       nazwa pakietu, którego kopia <pliku> nie\n"
-"                            będzie ominięta.\n"
+"                             będzie ominięta.\n"
 "  --local                  wszystkie wersje pakietu są omijane.\n"
 "  --divert <divert-to>     nazwa używane przez wersje innych pakietów.\n"
 "  --rename                 natychmiast zmienia nazwę pliku.\n"
+"  --no-rename              nie zmienia nazwy pliku (domyślnie).\n"
 "  --admindir <katalog>     ustawia katalog zawierający plik diversions.\n"
 "  --test                   nic nie robi, tylko pokazuje, co byłoby "
 "zrobione.\n"
@@ -2511,6 +2831,12 @@ msgstr ""
 "podano.\n"
 "Skrypty przed/poinstalacyjne muszą zawsze podawać --package i --divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr "proszę jawnie podać --no-rename, --rename stanie się domyślne w 1.20.x"
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2632,6 +2958,15 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+"omijanie pliku \"%s\" z pakietu Essential za pomocą rename jest "
+"niebezpieczne, użyj --no-rename"
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Brak ominięcia \"%s\", nic nie usunięto.\n"
 
@@ -2675,19 +3010,6 @@ msgstr "pakiet nie może zawierać znaków nowej linii"
 msgid "divert-to may not contain newlines"
 msgstr "divert-to nie może zawierać znaków nowej linii"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "nie można otworzyć listy ominiętych plików"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "nie można ustalić stanu listy ominiętych plików"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "konflikt dla ominięcia \"%.250s\" lub \"%.250s\""
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2876,55 +3198,47 @@ msgstr ""
 msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr ""
 "nie można rozwiązać problemu ze wstępnymi wymaganiami dla %.250s (potrzebne "
-"\"dla %.250s)"
+"dla %.250s)"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one package name argument"
+#, c-format
 msgid "--%s takes one <pkgname> argument"
-msgstr "--%s wymaga podania jednej nazwy pakietu jako argument"
+msgstr "--%s wymaga podania jednego argumentu <nazwa-pakietu>"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "package '%s' is not installed"
+#, c-format
 msgid "package name '%s' is invalid: %s"
-msgstr "pakiet \"%s\" nie jest zainstalowany"
+msgstr "nazwa pakietu \"%s\" jest nieprawidłowa: %s"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one package name argument"
+#, c-format
 msgid "--%s takes one <trigname> argument"
-msgstr "--%s wymaga podania jednej nazwy pakietu jako argument"
+msgstr "--%s wymaga podania jednego argumentu <nazwa-wyzwalacza>"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "trigger name contains invalid character"
+#, c-format
 msgid "trigger name '%s' is invalid: %s"
-msgstr "nazwa wyzwalacza zawiera niepoprawny znak"
+msgstr "nazwa wyzwalacza \"%s\" jest nieprawidłowa: %s"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one package name argument"
+#, c-format
 msgid "--%s takes one <archname> argument"
-msgstr "--%s wymaga podania jednej nazwy pakietu jako argument"
+msgstr "--%s wymaga podania jednego argumentu <nazwa-architektury>"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "architecture '%s' is illegal: %s"
+#, c-format
 msgid "architecture name '%s' is invalid: %s"
-msgstr "architektura \"%s\" jest nieprawidłowa: %s"
+msgstr "nazwa architektury \"%s\" jest nieprawidłowa: %s"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one argument"
+#, c-format
 msgid "--%s takes one <version> argument"
-msgstr "--%s wymaga jednego argumentu"
+msgstr "--%s wymaga jednego argumentu <wersja>"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "version '%s' has bad syntax: %s"
+#, c-format
 msgid "version '%s' has bad syntax"
-msgstr "wersja \"%s\" ma złą składnię: %s"
+msgstr "wersja \"%s\" ma złą składnię"
 
 #: src/enquiry.c
 msgid ""
@@ -2940,7 +3254,7 @@ msgstr "błędna relacja dla --compare-versions"
 #: src/enquiry.c
 #, c-format
 msgid "--%s used with obsolete relation operator '%s'"
-msgstr ""
+msgstr "--%s uzyty z przestarzałym operatorem relacji \"%s\""
 
 #: src/errors.c
 #, c-format
@@ -2993,120 +3307,175 @@ msgstr ""
 "Pakiet %s jest wstrzymany i nie będzie przetwarzany. --force-hold wymusza "
 "jego przetworzenie.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "problem zignorowany po użyciu opcji --force:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Ustawianie wszystkich opcji wymuszenia"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"plik kontrolny \"%s\" dla pakietu \"%s\" nie zawiera kończącej pustej linii"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Zastępowanie pakietu niższą wersją"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Konfigurowanie pakietów, które mogą pomóc danemu"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Przetwarzanie ubocznych pakietów, nawet jeśli są zatrzymane"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Próba instalowania/usuwania nawet nie będąc rootem"
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH nie obejmuje ważnych programów, może stwarzać problemy"
+
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
 msgstr ""
-"plik kontrolny \"%s\" dla pakietu \"%s\" nie zawiera kończącej pustej linii"
+"Instalowanie pakietów nawet jeśli nie uda się sprawdzanie autentyczności"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Przetwarzanie pakietów, nawet ze złymi wersjami"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"plik kontrolny \"%s\" dla pakietu \"%s\" nie zawiera kończącej pustej linii"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "plik kontrolny \"%s\" dla pakietu \"%s\" zawiera pustą nazwę pliku"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "nie można otworzyć pliku kontrolnego \"%s\" dla pakietu \"%s\""
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Nadpisywanie plików jednego pakietu innym"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "nie można ustalić stanu pliku kontrolnego \"%s\" dla pakietu \"%s\""
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Nadpisywanie ominiętego pliku wersją bez ominięć"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "plik \"%s\" dla pakietu \"%s\" nie jest zwykłym plikiem"
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Nadpisywanie katalogu danego pakietu innym plikiem"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "nie można wypakować pliku kontrolnego \"%s\" dla pakietu \"%s\""
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Nieprzeprowadzanie bezpiecznych operacji we/wy podczas rozpakowywania"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "nie można zamknąć pliku kontrolnego \"%s\" dla pakietu \"%s\""
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+"Nie używaj chroot do przejścia do środowiska skryptu od opiekuna pakietu"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "nie można otworzyć listy plików pakietu \"%.250s\""
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Używanie nowych plików konfiguracyjnych zawsze, bez pytania"
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Używanie starych plików konfiguracyjnych zawsze, bez pytania"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"brak listy plików pakietu \"%.250s\", przyjęcie że pakiet nie ma "
-"zainstalowanych plików"
+"Używanie domyślnej opcji dla nowych plików konfiguracyjnych, bez pytania,\n"
+"jeśli jest dostępna. Jeśli nie można znaleźć opcji\n"
+"domyślnej, pytanie użytkownika, chyba że podana\n"
+"zostania opcja confold albo confnew"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "nie można ustalić stanu listy plików pakietu \"%.250s\""
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Instalowanie brakujących plików konfiguracyjnych za każdym razem"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "lista plików pakietu \"%.250s\" nie jest zwykłym plikiem"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
+"Oferowanie zastąpienia plików konfiguracyjnych kiedy nie ma nowych wersji"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "odczytywanie listy plików pakietu \"%.250s\""
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Przetwarzania pakietów nawet ze złą lub brakującą architekturą"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Instalowanie nawet jeśli może to zepsuć inny pakiet"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Pozwalanie na instalację konfliktujących ze sobą pakietów"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Zmienianie wszystkich problemów z zależnościami w ostrzeżenia"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Zmienianie wszystkich problemów z wersją w ostrzeżenia"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Usuwanie pakietów, które wymagają instalacji"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Usuwanie istotnych pakietów"
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "lista plików pakietu \"%.250s\" nie zawiera kończącej pustej linii"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"%s wymuszanie opcji - kontrola zachowania w przypadku wykrycia błędów:\n"
+"  ostrzeż, ale kontynuuj: --force-<opcja>,<opcja>,...\n"
+"  zatrz. w razie błędu:   --refuse-<opcja>,<opcja>,... | --no-force-"
+"<opcja>,...\n"
+" Opcje do wymuszenia:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "lista plików pakietu \"%.250s\" zawiera pustą nazwę pliku"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"OSTRZEŻENIE - użycie opcji oznaczonych [!] może poważnie uszkodzić system.\n"
+"Opcje wymuszania oznaczone [*] są domyślnie włączone.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "nie można zamknąć listy plików pakietu \"%.250s\""
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Odczytywanie bazy danych ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "nieznana opcja force/refuse \"%.*s\""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d plik lub katalog obecnie zainstalowany.)\n"
-msgstr[1] "%d pliki i katalogi obecnie zainstalowane.)\n"
-msgstr[2] "%d plików i katalogów obecnie zainstalowanych.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "niewykorzystywana już opcja force/refuse \"%s\""
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "problem zignorowany po użyciu opcji --force:"
 
 #: src/help.c
 msgid "not installed"
@@ -3175,42 +3544,6 @@ msgstr ""
 "Uwaga: Zmienna PATH dla konta administratora zawiera zwykle katalogi /usr/"
 "local/sbin, /usr/sbin oraz /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "nie można stwierdzić istnienia \"%.250s\""
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "nie można odczytać katalogu informacyjnego"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "nie można otworzyć %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "uszkodzony plik formatu bazy danych informacji \"%s\""
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"format bazy danych informacji (%d) jest nieprawidłowy lub zbyt nowy - proszę "
-"spróbować użyć nowszego dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "plik informacyjny %s/%s nie jest powiązany z żadnym pakietem"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "błąd podczas zapisu \"%s\""
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3244,39 +3577,45 @@ msgstr "Wersja %2$s programu do zarządzania pakietami Debiana %1$s.\n"
 #| "  -l|--list [<pattern> ...]        List packages concisely.\n"
 #| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
 #| "  -C|--audit [<package> ...]       Check for broken package(s).\n"
+#| "  --yet-to-unpack                  Print packages selected for "
+#| "installation.\n"
+#| "  --predep-package                 Print pre-dependencies to unpack.\n"
 #| "  --add-architecture <arch>        Add <arch> to the list of "
 #| "architectures.\n"
 #| "  --remove-architecture <arch>     Remove <arch> from the list of "
 #| "architectures.\n"
 #| "  --print-architecture             Print dpkg architecture.\n"
 #| "  --print-foreign-architectures    Print allowed foreign architectures.\n"
+#| "  --assert-<feature>               Assert support for the specified "
+#| "feature.\n"
+#| "  --validate-<thing> <string>      Validate a <thing>'s <string>.\n"
 #| "  --compare-versions <a> <op> <b>  Compare version numbers - see below.\n"
 #| "  --force-help                     Show help on forcing.\n"
 #| "  -Dh|--debug=help                 Show help on debugging.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3317,10 +3656,15 @@ msgstr ""
 "  -l|--list [<wzorzec> ...]         Zwięzła lista pakietów.\n"
 "  -S|--search <wzorzec> ...         Szukanie pakietu zawierającego plik.\n"
 "  -C|--audit [<nazwa-pakietu> ...]  Sprawdzanie uszkodzonych pakietów.\n"
+"  --yet-to-unpack                   Wypisz pakiety wybrane do instalacji.\n"
+"  --predep-package                  Wybierz wstępne wymagania do "
+"rozpakowania.\n"
 "  --add-architecture <arch>         Dodanie <arch> do listy architektur.\n"
 "  --remove-architecture <arch>      Usunięcie <arch> z listy architektur.\n"
 "  --print-architecture              Podanie architektury dpkg.\n"
 "  --print-foreign-architectures     Podaje dozwolone architektury obce\n"
+"  --assert-<funkcja>                Załóż wsparcie dla podanej funkcji.\n"
+"  --validate-<przedmiot> <łańcuch>  Walidacja <łańcucha> <przedmiotu>.\n"
 "  --compare-versions <a> <rel> <b>  Porównanie numerów wersji - patrz "
 "niżej.\n"
 "  --force-help                      Pomoc na temat wymuszania.\n"
@@ -3339,23 +3683,15 @@ msgstr ""
 "\n"
 
 #: src/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
-#| "  --assert-working-epoch | --assert-long-filenames | --assert-multi-"
-#| "conrep |\n"
-#| "  --assert-multi-arch | --assert-versioned-provides.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Assertable features: support-predepends, working-epoch, long-filenames,\n"
 "  multi-conrep, multi-arch, versioned-provides.\n"
 "\n"
 msgstr ""
-"Do użytku wewnętrznego: dpkg --assert-support-predepends | --predep-package "
-"|\n"
-"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep. "
-"|\n"
-"  --assert-multi-arch | --assert-versioned-provides.\n"
+"Funkcje z możliwym do założenia wsparciem: support-predepends, working-"
+"epoch, long-filenames,\n"
+"  multi-conrep, multi-arch, versioned-provides.\n"
 "\n"
 
 #: src/main.c
@@ -3364,14 +3700,11 @@ msgid ""
 "Validatable things: pkgname, archname, trigname, version.\n"
 "\n"
 msgstr ""
+"Walidowalne: pkgname, archname, trigname, version.\n"
+"\n"
 
 #: src/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Use dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--field|\n"
-#| " -x|--extract|-X|--vextract|--fsys-tarfile  on archives (type %s --"
-#| "help).\n"
-#| "\n"
+#, c-format
 msgid ""
 "Use dpkg with -b, --build, -c, --contents, -e, --control, -I, --info,\n"
 "  -f, --field, -x, --extract, -X, --vextract, --ctrl-tarfile, --fsys-"
@@ -3379,9 +3712,10 @@ msgid ""
 "on archives (type %s --help).\n"
 "\n"
 msgstr ""
-"Proszę użyć dpkg -b|--build|-c|--contents|-e|--control|-I|--info|-f|--"
-"field|\n"
-" -x|--extract|-X|--vextract|--fsys-tarfile na archiwach (patrz %s --help).\n"
+"Proszę użyć dpkg z -b, --build, -c, --contents, -e, --control, -I, --info,\n"
+"  -f, --field, -x, --extract, -X, --vextract, --ctrl-tarfile, --fsys-"
+"tarfile\n"
+"na archiwach (patrz %s --help).\n"
 "\n"
 
 #: src/main.c
@@ -3510,116 +3844,6 @@ msgstr ""
 "\"more\"!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Ustawianie wszystkich opcji wymuszenia"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Zastępowanie pakietu niższą wersją"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Konfigurowanie pakietów, które mogą pomóc danemu"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Przetwarzanie ubocznych pakietów, nawet jeśli są zatrzymane"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Próba instalowania/usuwania nawet nie będąc rootem"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "PATH nie obejmuje ważnych programów, może stwarzać problemy"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-"Instalowanie pakietów nawet jeśli nie uda się sprawdzanie autentyczności"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Przetwarzanie pakietów, nawet ze złymi wersjami"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Nadpisywanie plików jednego pakietu innym"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Nadpisywanie ominiętego pliku wersją bez ominięć"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Nadpisywanie katalogu danego pakietu innym plikiem"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Nieprzeprowadzanie bezpiecznych operacji we/wy podczas rozpakowywania"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Używanie nowych plików konfiguracyjnych zawsze, bez pytania"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Używanie starych plików konfiguracyjnych zawsze, bez pytania"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Używanie domyślnej opcji dla nowych plików konfiguracyjnych, bez pytania,\n"
-"jeśli jest dostępna. Jeśli nie można znaleźć opcji\n"
-"domyślnej, pytanie użytkownika, chyba że podana\n"
-"zostania opcja confold albo confnew"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Instalowanie brakujących plików konfiguracyjnych za każdym razem"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-"Oferowanie zastąpienia plików konfiguracyjnych kiedy nie ma nowych wersji"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Przetwarzania pakietów nawet ze złą lub brakującą architekturą"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Instalowanie nawet jeśli może to zepsuć inny pakiet"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Pozwalanie na instalację konfliktujących ze sobą pakietów"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Zmienianie wszystkich problemów z zależnościami w ostrzeżenia"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Zmienianie wszystkich problemów z wersją w ostrzeżenia"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Usuwanie pakietów, które wymagają instalacji"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Usuwanie istotnych pakietów"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Z reguły pomocne informacje o postępie"
 
@@ -3747,43 +3971,7 @@ msgstr "usuwanie architektury \"%s\" używanej aktualnie przez bazę danych"
 #, c-format
 msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr ""
-"nie można usunąć architektury \"%s\": obecnie jest używana przez bazę danych"
-
-#: src/main.c
-#, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s wymuszanie opcji - kontrola zachowania w przypadku wykrycia błędów:\n"
-"  ostrzeż, ale kontynuuj: --force-<opcja>,<opcja>,...\n"
-"  zatrz. w razie błędu:   --refuse-<opcja>,<opcja>,... | --no-force-"
-"<opcja>,...\n"
-" Opcje do wymuszenia:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"OSTRZEŻENIE - użycie opcji oznaczonych [!] może poważnie uszkodzić system.\n"
-"Opcje wymuszania oznaczone [*] są domyślnie włączone.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "nieznana opcja force/refuse \"%.*s\""
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "niewykorzystywana już opcja force/refuse \"%s\"\n"
+"nie można usunąć architektury \"%s\" używanej aktualnie przez bazę danych"
 
 #: src/main.c
 #, c-format
@@ -3791,10 +3979,9 @@ msgid "couldn't open '%i' for stream"
 msgstr "nie udało się otworzyć \"%i\" jako strumienia"
 
 #: src/main.c
-#, fuzzy, c-format
-#| msgid "unexpected eof before end of line %d"
+#, c-format
 msgid "unexpected end of file before end of line %d"
-msgstr "niespodziewany EOF przed końcem linii %d"
+msgstr "niespodziewany koniec pliku przed końcem linii %d"
 
 #: src/main.c src/querycmd.c src/statcmd.c dpkg-deb/main.c dpkg-split/main.c
 msgid "need an action option"
@@ -3802,7 +3989,7 @@ msgstr "należy określić działanie"
 
 #: src/main.c
 msgid "cannot set primary group ID to root"
-msgstr ""
+msgstr "nie można ustawić root jako głównego identyfikatora grupy"
 
 #: src/main.c src/script.c
 msgid "unable to setenv for subprocesses"
@@ -3970,6 +4157,10 @@ msgid "Description"
 msgstr "Opis"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr "pokazywanie listy pakietów za pomocą programu stronicującego"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "ominięcie przez %s z: %s\n"
@@ -4005,9 +4196,14 @@ msgstr ""
 "pakiet \"%s\" nie jest zainstalowany i informacje o nim nie są dostępne"
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Użyj dpkg --info (= dpkg-deb --info), aby zobaczyć informacje o pakiecie.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
-msgstr "pakiet \"%s\" nie jest dostępny"
+msgstr "pakiet \"%s\" jest niedostępny"
 
 #: src/querycmd.c
 #, c-format
@@ -4031,11 +4227,10 @@ msgstr "ominięty przez %s do: %s\n"
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
-"Użyj dpkg --info (= dpkg-deb --info), aby zobaczyć informacje o pakiecie,\n"
-"oraz dpkg --contents (= dpkg-deb --contents), aby sprawdzić jego zawartość.\n"
+"Użyj dpkg --contents (= dpkg-deb --contents), aby sprawdzić zawartość "
+"pakietu.\n"
 
 #: src/querycmd.c dpkg-deb/info.c
 #, c-format
@@ -4078,31 +4273,32 @@ msgstr ""
 #, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
 "Polecenia:\n"
-"  -s|--status <pakiet> ...       Pokazuje szczegóły o stanie pakietu.\n"
-"  -p|--print-avail <pakiet> ...  Pokazuje szczegóły o dostępnej wersji.\n"
-"  -L|--listfiles <pakiet> ...    Lista plików danego pakietu.\n"
-"  -l|--list [<wzorzec> ...]      Zwięzła lista pakietów.\n"
-"  -W|--show [<wzorzec> ...]      Pokazuje informacje o pakiecie.\n"
-"  -S|--search <wzorzec> ...      Znajduje pakiet(y) zawierające plik(i).\n"
-"     --control-list <package>    Wypisuje listę plików kontrolnych pakietu.\n"
-"     --control-show <pakiet> <plik>\n"
-"                                 Pokazuje plik kontrolny pakietu.\n"
-"  -c|--control-path <pakiet> [<plik>]\n"
-"                                 Pokazuje ścieżkę do pliku kontrolnego "
+"  -s, --status [<pakiet>...]      Pokazuje szczegóły o stanie pakietu.\n"
+"  -p, --print-avail [<pakiet>...] Pokazuje szczegóły o dostępnej wersji.\n"
+"  -L, --listfiles [<pakiet>...]   Lista plików danego pakietu.\n"
+"  -l, --list [<wzorzec>...]       Zwięzła lista pakietów.\n"
+"  -W, --show [<wzorzec>...]       Pokazuje informacje o pakiecie.\n"
+"  -S, --search <wzorzec>...       Znajduje pakiet(y) zawierające plik(i).\n"
+"      --control-list <pakiet>     Wypisuje listę plików kontrolnych "
+"pakietu.\n"
+"      --control-show <pakiet> <plik>\n"
+"                                  Pokazuje plik kontrolny pakietu.\n"
+"  -c, --control-path <pakiet> [<plik>]\n"
+"                                  Pokazuje ścieżkę do pliku kontrolnego "
 "pakietu.\n"
 "\n"
 
@@ -4161,7 +4357,7 @@ msgid ""
 " files of which are on the system; use --purge to remove them too"
 msgstr ""
 "ignorowanie żądania usunięcia %.250s, ponieważ w systemie\n"
-" są tylko jego pliki konfiguracyjne; --purge usunie także te pliki"
+" są tylko jego pliki konfiguracyjne - --purge usunie także te pliki"
 
 #: src/remove.c
 msgid "this is an essential package; it should not be removed"
@@ -4241,31 +4437,28 @@ msgstr "Czyszczenie z plików konfiguracyjnych pakietu %s (%s) ...\n"
 #, c-format
 msgid "cannot remove old config file '%.250s' (= '%.250s')"
 msgstr ""
-"nie można usunąć poprzedniego pliku konfiguracyjnego \"%.250s\" (= \"%.250s"
-"\")"
+"nie można usunąć starego pliku konfiguracyjnego \"%.250s\" (= \"%.250s\")"
 
 #: src/remove.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+#, c-format
 msgid "cannot read config file directory '%.250s' (from '%.250s')"
 msgstr ""
-"nie można odczytać katalogu starego pliku konfiguracyjnego \"%.250s\" (= "
-"\"%.250s\")"
+"nie można odczytać katalogu pliku konfiguracyjnego \"%.250s\" (z \"%.250s\")"
 
 #: src/remove.c
 #, c-format
 msgid "cannot remove old backup config file '%.250s' (of '%.250s')"
 msgstr ""
-"nie można usunąć kopii poprzedniego pliku konfiguracyjnego \"%.250s\" (= "
-"\"%.250s\")"
+"nie można usunąć kopii starego pliku konfiguracyjnego \"%.250s\" (od \"%.250s"
+"\")"
 
 #: src/remove.c
 msgid "cannot remove old files list"
-msgstr "nie można usunąć poprzedniej listy plików"
+msgstr "nie można usunąć starej listy plików"
 
 #: src/remove.c
 msgid "can't remove old postrm script"
-msgstr "nie można usunąć poprzedniego skryptu postrm"
+msgstr "nie można usunąć starego skryptu postrm"
 
 #: src/script.c
 #, c-format
@@ -4278,6 +4471,12 @@ msgstr ""
 "admindir musi znajdować się wewnątrz instdir, aby dpkg pracował prawidłowo"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "nie można zmienić katalogu głównego na \"%.250s\""
@@ -4298,10 +4497,9 @@ msgstr ""
 "pakietu"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "installed %s script"
+#, c-format
 msgid "installed %s package %s script"
-msgstr "zainstalowany skrypt %s"
+msgstr "zainstalowany pakiet %s skrypt %s"
 
 #: src/script.c
 #, c-format
@@ -4309,16 +4507,14 @@ msgid "unable to stat %s '%.250s'"
 msgstr "nie można ustalić stanu %s \"%.250s\""
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "new %s script"
+#, c-format
 msgid "new %s package %s script"
-msgstr "nowy skrypt %s"
+msgstr "nowy pakiet %s skrypt %s"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "old %s script"
+#, c-format
 msgid "old %s package %s script"
-msgstr "poprzedni skrypt %s"
+msgstr "stary pakiet %s skrypt %s"
 
 #: src/script.c
 #, c-format
@@ -4338,10 +4534,9 @@ msgid "... it looks like that went OK"
 msgstr "... najprawdopodobniej wywołanie skryptu powiodło się"
 
 #: src/select.c
-#, fuzzy, c-format
-#| msgid "unexpected end of line in package name at line %d"
+#, c-format
 msgid "unexpected end of file in package name at line %d"
-msgstr "niespodziewany koniec linii w nazwie pakietu w linii %d"
+msgstr "niespodziewany koniec pliku w nazwie pakietu w linii %d"
 
 #: src/select.c
 #, c-format
@@ -4349,10 +4544,9 @@ msgid "unexpected end of line in package name at line %d"
 msgstr "niespodziewany koniec linii w nazwie pakietu w linii %d"
 
 #: src/select.c
-#, fuzzy, c-format
-#| msgid "unexpected end of line after package name at line %d"
+#, c-format
 msgid "unexpected end of file after package name at line %d"
-msgstr "niespodziewany koniec linii po nazwie pakietu w linii %d"
+msgstr "niespodziewany koniec pliku po nazwie pakietu w linii %d"
 
 #: src/select.c
 #, c-format
@@ -4370,10 +4564,11 @@ msgid "illegal package name at line %d: %.250s"
 msgstr "nieprawidłowa nazwa pakietu w linii %d: %.250s"
 
 #: src/select.c
-#, fuzzy, c-format
-#| msgid "package not in database at line %d: %.250s"
+#, c-format
 msgid "package not in status nor available database at line %d: %.250s"
-msgstr "pakietu nie znajduje się w bazie danych, w wierszu %d: %.250s"
+msgstr ""
+"pakietu nie znajduje się w statusie ani dostępnej bazie danych, w wierszu "
+"%d: %.250s"
 
 #: src/select.c
 #, c-format
@@ -4385,17 +4580,14 @@ msgid "read error on standard input"
 msgstr "nie można odczytać standardowego wejścia"
 
 #: src/select.c
-#, fuzzy
-#| msgid ""
-#| "found unknown packages; this might mean the available database\n"
-#| "is outdated, and needs to be updated through a frontend method"
 msgid ""
 "found unknown packages; this might mean the available database\n"
 "is outdated, and needs to be updated through a frontend method;\n"
 "please see the FAQ <https://wiki.debian.org/Teams/Dpkg/FAQ>"
 msgstr ""
-"znaleziona nieznany pakiet - może to znaczyć, że dostępna baza danych\n"
-"jest przestarzała i musi być zaktualizowana przy pomocy metody fasadowej"
+"znaleziony nieznany pakiet - może to znaczyć, że dostępna baza danych\n"
+"jest przestarzała i musi być zaktualizowana przy pomocy metody fasadowej -\n"
+"proszę zobaczyć FAQ <https://wiki.debian.org/Teams/Dpkg/FAQ>"
 
 #: src/selinux.c
 msgid "cannot open security status notification channel"
@@ -4428,19 +4620,32 @@ msgid ""
 msgstr ""
 "Polecenia:\n"
 "  --add <właściciel> <grupa> <tryb> <ścieżka>\n"
-"                                dodaje nowy wpis do bazy danych.\n"
-"  --remove <ścieżka>               usuwa plik z bazy danych.\n"
-"  --list [<wzorzec globalny>]   wyświetla aktualne nadpisania z bazy "
-"danych.\n"
+"                               dodaje nowy wpis do bazy danych.\n"
+"  --remove <ścieżka>           usuwa plik z bazy danych.\n"
+"  --list [<wzorzec-globalny>]  wyświetla aktualne nadpisania z bazy danych.\n"
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4460,16 +4665,14 @@ msgid "stripping trailing /"
 msgstr "usuwanie końcowych znaków /"
 
 #: src/statcmd.c
-#, fuzzy, c-format
-#| msgid "control file '%s' does not exist"
+#, c-format
 msgid "user '%s' does not exist"
-msgstr "plik kontrolny \"%s\" nie istnieje"
+msgstr "użytkownik \"%s\" nie istnieje"
 
 #: src/statcmd.c
-#, fuzzy, c-format
-#| msgid "control file '%s' does not exist"
+#, c-format
 msgid "group '%s' does not exist"
-msgstr "plik kontrolny \"%s\" nie istnieje"
+msgstr "grupa\"%s\" nie istnieje"
 
 #: src/statcmd.c
 #, c-format
@@ -4491,7 +4694,7 @@ msgstr ""
 #: src/statcmd.c
 #, c-format
 msgid "an override for '%s' already exists; aborting"
-msgstr "nadpisanie dla \"%s\" już istnieje, przerywanie"
+msgstr "nadpisanie dla \"%s\" już istnieje - przerywanie"
 
 #: src/statcmd.c
 #, c-format
@@ -4506,67 +4709,12 @@ msgstr "brak nadpisania"
 msgid "--update is useless for --remove"
 msgstr "--update jest bezużyteczne w połączeniu z --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "niepoprawny status"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "odczytywanie pliku statoverride \"%.250s\""
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "odczytywanie pliku statoverride \"%.250s\""
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "nie można otworzyć listy pliku statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "nie można ustalić stanu pliku statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "odczytywanie pliku statoverride \"%.250s\""
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "plik statoverride nie zawiera kończącej pustej linii"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "plik statoverride zawiera pustą linię"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "błąd składni w pliku statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "nieznany użytkownik \"%s\" w pliku statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "niespodziewany koniec linii w pliku statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "nieznana grupa \"%s\" w pliku statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "wielokrotne określenia statoverrides dla pliku \"%.250s\""
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr ""
+"niewykorzystywana już opcja \"--%s\", zamiast niej proszę używać \"--%s\""
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4786,6 +4934,10 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Dekonfigurowanie pakietu %s (%s) ...\n"
 
+#: src/unpack.c
+msgid "conffile file contains an empty line"
+msgstr "plik conffile zawiera pustą linię"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4807,7 +4959,7 @@ msgstr "nie można zamknąć %.250s"
 #, c-format
 msgid "old version of package has overly-long info file name starting '%.250s'"
 msgstr ""
-"poprzednia wersja pakietu ma plik informacyjny o zbyt długiej nazwie "
+"stara wersja pakietu ma plik informacyjny o zbyt długiej nazwie "
 "rozpoczynającej się od \"%.250s\""
 
 #: src/unpack.c
@@ -4857,20 +5009,19 @@ msgstr ""
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
-"nie można ustalić stanu poprzedniego pliku \"%.250s\", plik nie będzie "
-"usuwany: %s"
+"nie można ustalić stanu starego pliku \"%.250s\", plik nie będzie usuwany: %s"
 
 #: src/unpack.c
 #, c-format
 msgid "unable to delete old directory '%.250s': %s"
-msgstr "nie można usunąć poprzedniego katalogu \"%.250s\": %s"
+msgstr "nie można usunąć starego katalogu \"%.250s\": %s"
 
 #: src/unpack.c
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
-"poprzedni plik konfiguracyjny \"%.250s\" był pustym katalogiem (i właśnie "
-"został usunięty)"
+"stary plik konfiguracyjny \"%.250s\" był pustym katalogiem (i właśnie został "
+"usunięty)"
 
 #: src/unpack.c
 #, c-format
@@ -4930,11 +5081,9 @@ msgid "package filesystem archive extraction"
 msgstr "wyodrębnianie archiwum systemu plików pakietu"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "nie można odczytać potoku z \"dpkg-deb\" zawierającego archiwum tar"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "uszkodzone archiwum tar - uszkodzone archiwum pakietu"
 
 #: src/unpack.c
@@ -4948,12 +5097,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s wymaga podania najwyżej jednej nazwy pliku pakietu"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "brak dostępu do katalogu administracyjnego dpkg"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr "brak praw zapisu do katalogu administracyjnego dpkg"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "brak dostępu do katalogu administracyjnego dpkg"
 
 #: src/update.c
 #, c-format
@@ -4978,8 +5133,8 @@ msgstr[2] "Informacje o %d pakietach zostały zaktualizowane.\n"
 msgid ""
 "obsolete '--%s' option; unavailable packages are automatically cleaned up"
 msgstr ""
-"niewykorzystywana już opcja \"--%s\", niedostępne pakiety będą automatycznie "
-"czyszczone"
+"niewykorzystywana już opcja \"--%s\" - niedostępne pakiety będą "
+"automatycznie czyszczone"
 
 #: dpkg-deb/build.c
 #, c-format
@@ -4991,10 +5146,9 @@ msgid "control member"
 msgstr "człon kontrolny"
 
 #: dpkg-deb/build.c
-#, fuzzy, c-format
-#| msgid "newline in field name '%.*s'"
+#, c-format
 msgid "newline not allowed in pathname '%s'"
-msgstr "koniec linii w nazwie pola \"%.*s\""
+msgstr "koniec linii nie dozwolony w nazwie ścieżki \"%s\""
 
 #: dpkg-deb/build.c
 msgid "data member"
@@ -5078,10 +5232,8 @@ msgstr ""
 "nazwa pakietu zawiera znaki nie będące małymi literami, cyframi lub \"-+.\""
 
 #: dpkg-deb/build.c
-#, fuzzy
-#| msgid "package architecture"
 msgid "package architecture is missing or empty"
-msgstr "architektura pakietu"
+msgstr "brak lub pusta architektura pakietu"
 
 #: dpkg-deb/build.c
 #, c-format
@@ -5102,20 +5254,17 @@ msgid "unable to check for existence of archive '%.250s'"
 msgstr "nie można sprawdzić istnienia archiwum \"%.250s\""
 
 #: dpkg-deb/build.c
-#, fuzzy
-#| msgid "compressing data member"
 msgid "compressing tar member"
-msgstr "człon danych kompresji"
+msgstr "człon kompresji tar"
 
 #: dpkg-deb/build.c
 msgid "<compress> from tar -cf"
 msgstr "<kompresja> z tar -cf"
 
 #: dpkg-deb/build.c dpkg-split/split.c
-#, fuzzy, c-format
-#| msgid "unable to create '%.255s'"
+#, c-format
 msgid "unable to parse timestamp '%.255s'"
-msgstr "nie można utworzyć \"%.255s\""
+msgstr "nie można odczytać czasu modyfikacji \"%.255s\""
 
 #: dpkg-deb/build.c utils/update-alternatives.c
 #, c-format
@@ -5131,16 +5280,14 @@ msgid "not checking contents of control area"
 msgstr "pominięcie sprawdzenia zawartości obszaru kontrolnego"
 
 #: dpkg-deb/build.c
-#, fuzzy, c-format
-#| msgid "dpkg-deb: building an unknown package in '%s'.\n"
+#, c-format
 msgid "building an unknown package in '%s'."
-msgstr "dpkg-deb: budowanie nieznanego pakietu w \"%s\".\n"
+msgstr "budowanie nieznanego pakietu w \"%s\"."
 
 #: dpkg-deb/build.c
-#, fuzzy, c-format
-#| msgid "dpkg-deb: building package '%s' in '%s'.\n"
+#, c-format
 msgid "building package '%s' in '%s'."
-msgstr "dpkg-deb: budowanie pakietu \"%s\" w \"%s\".\n"
+msgstr "budowanie pakietu \"%s\" w \"%s\"."
 
 #: dpkg-deb/build.c
 #, c-format
@@ -5201,8 +5348,7 @@ msgstr ""
 "plik \"%.250s\" jest uszkodzony - zła liczba magiczna nagłówka archiwum"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "file '%.250s' is not a debian binary archive (try dpkg-split?)"
+#, c-format
 msgid "file '%.250s' is not a Debian binary archive (try dpkg-split?)"
 msgstr ""
 "plik \"%.250s\" nie jest archiwum binarnym Debiana (spróbuj dpkg-split?)"
@@ -5223,7 +5369,7 @@ msgstr "archiwum ma nieprawidłową wersję formatu: %s"
 #: dpkg-deb/extract.c
 #, c-format
 msgid "archive is format version %d.%d; get a newer dpkg-deb"
-msgstr "archiwum jest w wersji formatu %d.%d; potrzebny jest nowy dpkg-deb"
+msgstr "archiwum jest w wersji formatu %d.%d - potrzebny jest nowy dpkg-deb"
 
 #: dpkg-deb/extract.c
 #, c-format
@@ -5249,10 +5395,7 @@ msgid "archive '%.250s' contains two control members, giving up"
 msgstr "archiwum \"%.250s\" zawiera dwa archiwa kontrolne, przerywanie"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " new debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd bytes.\n"
+#, c-format
 msgid ""
 " new Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
@@ -5275,15 +5418,12 @@ msgid "cannot skip archive control member from '%s': %s"
 msgstr "nie można pominąć członu kontrolnego archiwum z \"%s\": %s"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " old debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd, main archive=%jd.\n"
+#, c-format
 msgid ""
 " old Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgstr ""
-" poprzedni pakiet Debiana, wersja %d.%d.\n"
+" stary pakiet Debiana, wersja %d.%d.\n"
 " rozmiar %jd bajtów: archiwum kontrolne=%jd, archiwum z danymi=%jd.\n"
 
 #: dpkg-deb/extract.c
@@ -5295,8 +5435,7 @@ msgstr ""
 " transferu FTP dokonanego w trybie ASCII"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "'%.255s' is not a debian format archive"
+#, c-format
 msgid "'%.255s' is not a Debian format archive"
 msgstr "\"%.255s\" nie jest plikiem archiwum Debiana"
 
@@ -5315,16 +5454,17 @@ msgid "decompressing archive member"
 msgstr "dekompresowanie członu archiwum"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "nie można zmienić katalogu bieżącego"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "nie można utworzyć katalogu"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "nie można zmienić katalogu po jego utworzeniu"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr "niespodziewana już istniejąca ścieżka %s"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "nie można zmienić katalogu bieżącego"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5366,7 +5506,7 @@ msgstr ""
 #: dpkg-deb/extract.c
 #, c-format
 msgid "--%s does not support (yet) reading the .deb from standard input"
-msgstr ""
+msgstr "--%s nie obsługuje (jeszcze) czytania .deb ze standardowego wejścia"
 
 #: dpkg-deb/info.c
 #, c-format
@@ -5424,10 +5564,8 @@ msgid "     not a plain file          %.255s\n"
 msgstr "     nie jest plikiem          %.255s\n"
 
 #: dpkg-deb/info.c
-#, fuzzy
-#| msgid "(no 'control' file in control archive!)\n"
 msgid "no 'control' file in control archive!"
-msgstr "(brak pliku \"control\" w archiwum kontrolnym!)\n"
+msgstr "brak pliku \"control\" w archiwum kontrolnym!"
 
 #: dpkg-deb/main.c
 #, c-format
@@ -5481,35 +5619,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  -v, --verbose                    Enable verbose output.\n"
-#| "  -D, --debug                      Enable debugging output.\n"
-#| "      --showformat=<format>        Use alternative format for --show.\n"
-#| "      --deb-format=<format>        Select archive format.\n"
-#| "                                     Allowed values: 0.939000, 2.0 "
-#| "(default).\n"
-#| "      --old                        Legacy alias for '--deb-"
-#| "format=0.939000'.\n"
-#| "      --new                        Legacy alias for '--deb-format=2.0'.\n"
-#| "      --nocheck                    Suppress control file check (build "
-#| "bad\n"
-#| "                                     packages).\n"
-#| "      --uniform-compression        Use the compression params on all "
-#| "members.\n"
-#| "  -z#                              Set the compression level when "
-#| "building.\n"
-#| "  -Z<type>                         Set the compression type used when "
-#| "building.\n"
-#| "                                     Allowed types: gzip, xz, bzip2, "
-#| "none.\n"
-#| "  -S<strategy>                     Set the compression strategy when "
-#| "building.\n"
-#| "                                     Allowed values: none; extreme (xz);\n"
-#| "                                     filtered, huffman, rle, fixed "
-#| "(gzip).\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  -v, --verbose                    Enable verbose output.\n"
@@ -5540,17 +5650,17 @@ msgstr ""
 "      --deb-format=<format>  Wybór formatu archiwum.\n"
 "                               Dozwolone wartości: 0.939000, 2.0 "
 "(domyślna).\n"
-"      --old                  Zgodnościowy alias dla \"--deb-"
-"format=0.939000\".\n"
-"      --new                  Zgodnościowy alias dla \"--deb-format=2.0\".\n"
 "  --nocheck                  Pominięcie sprawdzania pliku kontrolnego "
 "(tworzenie\n"
 "                               niepoprawnych pakietów).\n"
-"  -z#                        Określenie stopnia kompresji dla budowanego "
+"      --root-owner-group           Wymusza użytkownika i grupę root.\n"
+"      --[no-]uniform-compression   Użyj parametrów kompresji dla wszystkich "
+"członów.\n"
+"  -z#                        Ustawienie stopnia kompresji dla budowanego "
 "pakietu.\n"
 "  -Z<typ>                    Ustawienie rodzaju kompresji podczas "
 "budowania.\n"
-"                               Dozwolone wartości: gzip, xz, bzip2, none.\n"
+"                               Dozwolone wartości: gzip, xz, none.\n"
 "  -S<strategia>              Ustawienie strategii kompresji w czasie "
 "budowania.\n"
 "                               Dozwolone wartości: none; extreme (xz);\n"
@@ -5606,16 +5716,15 @@ msgid "unknown compression type '%s'!"
 msgstr "nieznany typ kompresji \"%s\"!"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid "deprecated compression type '%s'; use xz instead"
+#, c-format
 msgid "obsolete compression type '%s'; use xz instead"
-msgstr "przestarzały typ kompresji \"%s\" - w zamian proszę użyć xz"
+msgstr "niewykorzystywany już typ kompresji \"%s\" - w zamian proszę użyć xz"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid "deprecated compression type '%s'; use xz or gzip instead"
+#, c-format
 msgid "obsolete compression type '%s'; use xz or gzip instead"
-msgstr "przestarzały typ kompresji \"%s\" - w zamian proszę użyć xz lub gzip"
+msgstr ""
+"niewykorzystywany już typ kompresji \"%s\" - w zamian proszę użyć xz lub gzip"
 
 #: dpkg-deb/main.c
 #, c-format
@@ -6063,7 +6172,7 @@ msgstr "wyodrębnianie pola wartości pakietu"
 
 #: dpkg-split/split.c
 msgid "<dpkg-deb --info pipe>"
-msgstr ""
+msgstr "<dpkg-deb --info potok>"
 
 #: dpkg-split/split.c
 #, c-format
@@ -6147,6 +6256,7 @@ msgstr ""
 "                             użytkownika, która ma być używana.\n"
 "  --set <nazwa> <ścieżka>    ustawia <ścieżkę> jako alternatywę dla "
 "<nazwy>.\n"
+"  --all                      wywołuje --config dla wszystkich alternatyw.\n"
 "\n"
 
 #: utils/update-alternatives.c
@@ -6175,7 +6285,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6185,8 +6309,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6349,16 +6474,13 @@ msgid "unable to flush file '%s'"
 msgstr "nie można opróżnić pliku \"%s\""
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "Current 'best' version is '%s'."
+#, c-format
 msgid "  link best version is %s"
-msgstr "Obecnie \"najlepszą\" wersją jest \"%s\"."
+msgstr "najlepszą wersją dowiązania jest \"%s\"."
 
 #: utils/update-alternatives.c
-#, fuzzy
-#| msgid "No versions available."
 msgid "  link best version not available"
-msgstr "Żadna wersja nie jest dostępna."
+msgstr "  najlepsza wersja dowiązania niedostępna"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6370,16 +6492,14 @@ msgid "  link currently absent"
 msgstr "  obecnie brak dowiązania"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "  %.250s is %s.\n"
+#, c-format
 msgid "  link %s is %s"
-msgstr "  %.250s jest %s.\n"
+msgstr "  dowiązanie %s jest %s"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "  slave %s: %s"
+#, c-format
 msgid "  slave %s is %s"
-msgstr " podrzędne %s: %s"
+msgstr " podrzędne %s jest %s"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6396,8 +6516,8 @@ msgstr " podrzędne %s: %s"
 msgid "There is %d choice for the alternative %s (providing %s)."
 msgid_plural "There are %d choices for the alternative %s (providing %s)."
 msgstr[0] "Jest %d dostępna alternatywa dla %s (dostarczającego %s)."
-msgstr[1] "Są %d dostępne alternatywy dla %s (dostarczające %s)."
-msgstr[2] "Jest %d dostępnych alternatyw dla %s (dostarczających %s)."
+msgstr[1] "Są %d dostępne alternatywy dla %s (dostarczającego %s)."
+msgstr[2] "Jest %d dostępnych alternatyw dla %s (dostarczającego %s)."
 
 #: utils/update-alternatives.c
 msgid "Selection"
@@ -6416,12 +6536,10 @@ msgid "Status"
 msgstr "Status"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Press enter to keep the current choice[*], or type selection number: "
+#, c-format
 msgid "Press <enter> to keep the current choice[*], or type selection number: "
 msgstr ""
-"Proszę wcisnąć Enter, aby pozostawić bieżący wybór[*]; albo wpisać wybrany "
+"Proszę wcisnąć <enter>, aby pozostawić bieżący wybór[*]; albo wpisać wybrany "
 "numer: "
 
 #: utils/update-alternatives.c
@@ -6466,7 +6584,7 @@ msgstr "nieusuwanie %s, ponieważ nie jest dowiązaniem"
 #: utils/update-alternatives.c
 #, c-format
 msgid "alternative %s for %s not registered; not removing"
-msgstr "alternatywa %s dla %s nie jest zarejestrowana, nie będzie usunięta"
+msgstr "alternatywa %s dla %s nie jest zarejestrowana - nie będzie usunięta"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6476,13 +6594,13 @@ msgstr "usuwanie alternatywy wybranej ręcznie - przełączanie %s do trybu auto
 #: utils/update-alternatives.c
 #, c-format
 msgid "alternative %s for %s not registered; not setting"
-msgstr "alternatywa %s dla %s nie jest zarejestrowana, nie będzie ustawiona"
+msgstr "alternatywa %s dla %s nie jest zarejestrowana - nie będzie ustawiona"
 
 #: utils/update-alternatives.c
 #, c-format
 msgid "%s/%s is dangling; it will be updated with best choice"
 msgstr ""
-"%s/%s nie jest poprawnym dowiązaniem, zostanie zaktualizowane najlepszym "
+"%s/%s nie jest poprawnym dowiązaniem - zostanie zaktualizowane najlepszym "
 "wyborem"
 
 #: utils/update-alternatives.c
@@ -6543,7 +6661,7 @@ msgstr ""
 #: utils/update-alternatives.c
 #, c-format
 msgid "Alternative %s unchanged because choice %s is not available."
-msgstr "Niezmieniona alternatywa %s ponieważ wybór %s jest niedostępny."
+msgstr "Niezmieniona alternatywa %s, ponieważ wybór %s jest niedostępny."
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6684,7 +6802,7 @@ msgstr "<standardowe wejście>"
 #, c-format
 msgid "automatic updates of %s/%s are disabled; leaving it alone"
 msgstr ""
-"automatyczne aktualizacje %s/%s są wyłączone, pozostawianie go bez zmian"
+"automatyczne aktualizacje %s/%s są wyłączone - pozostawianie go bez zmian"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6694,15 +6812,81 @@ msgstr ""
 
 #: utils/update-alternatives.polkit.in
 msgid "Run update-alternatives to modify system alternative selections"
-msgstr ""
+msgstr "Uruchom update-alternatives, aby zmienić wybór alternatyw w systemie"
 
 #: utils/update-alternatives.polkit.in
 msgid "Authentication is required to run update-alternatives"
-msgstr ""
+msgstr "Uruchomienie update-alternatives wymaga uwierzytelnienia"
+
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "%s: nie można otworzyć pliku blokady $s do sprawdzenia"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "nieznany użytkownik \"%s\" w pliku statoverride"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "nieznana grupa \"%s\" w pliku statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "brak %s"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "\"%.50s\" jest niedozwolony dla %s"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
+#~ msgid "junk after %s"
+#~ msgstr "śmieci po %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "niepoprawna nazwa pakietu (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no w polu boolean"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "pole \"%s\", w odniesieniu do \"%.255s\": błąd w numerze wersji"
+
+#~ msgid "empty value for %s"
+#~ msgstr "brak wartości dla %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "pakiet ma status triggers-awaited, ale brak oczekujących wyzwalaczy"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
 #~ msgstr ""
-#~ "niewykorzystywana już opcja \"--%s\", zamiast niej proszę używać \"--%s\""
+#~ "pakiet ma status triggers-pending, ale brak zaplanowanych wyzwalaczy"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr "brak praw zapisu do katalogu administracyjnego dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "nie można odczytać potoku z \"dpkg-deb\" zawierającego archiwum tar"
+
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "nie można otworzyć pliku kontrolnego \"%s\" dla pakietu \"%s\""
+
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "nie można ustalić stanu pliku kontrolnego \"%s\" dla pakietu \"%s\""
+
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "plik kontrolny \"%s\" dla pakietu \"%s\" nie jest zwykłym plikiem"
+
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "nie można zamknąć pliku kontrolnego \"%s\" dla pakietu \"%s\""
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "nie można otworzyć listy plików pakietu \"%.250s\""
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "nie można ustalić stanu listy plików pakietu \"%.250s\""
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "lista plików pakietu \"%.250s\" nie jest zwykłym plikiem"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "odczytywanie listy plików pakietu \"%.250s\""
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "nie można zmienić katalogu po jego utworzeniu"
 
 #~ msgid "control file '%s' missing value"
 #~ msgstr "brak wartości w pliku kontrolnym \"%s\""
@@ -6770,9 +6954,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF na standardowym wejściu wprowadzony ze znaku zachęty"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "niespodziewany EOF w nazwie pakietu w linii %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "niespodziewany EOF po nazwie pakietu w linii %d"
 
@@ -6821,10 +7002,10 @@ msgstr ""
 #~ "wartość w polu \"triggers-awaited\" jest niedozwolona w tym kontekście"
 
 #~ msgid "failed to fstat previous diversions file"
-#~ msgstr "nie można ustalić stanu poprzedniej listy ominiętych plików"
+#~ msgstr "nie można ustalić stanu starej listy ominiętych plików"
 
 #~ msgid "failed to fstat previous statoverride file"
-#~ msgstr "nie można ustalić stanu poprzedniego pliku statoverride"
+#~ msgstr "nie można ustalić stanu starego pliku statoverride"
 
 #~ msgid "package %s has too many Conflicts/Replaces pairs"
 #~ msgstr "pakiet %s ma zbyt wiele par Conflits/Replaces"
@@ -7039,10 +7220,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "jest dowiązaniem podrzędnym %s"
 
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "nie można ustalić stanu starego pliku \"%s\" : %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "nieudane readlink(%s): %s"
 
@@ -7069,10 +7246,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "nie można zamknąć %s: %s"
 
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "nie można zapisać %s: %s"
-
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "nie można zmienić nazwy pliku \"%s\" na \"%s\""
 
@@ -7271,7 +7444,7 @@ msgstr ""
 #~ "zależnościach\n"
 #~ "  depends [!]           Zignorowanie wszelkich problemów z zależnościami\n"
 #~ "  confnew [!]           Użycie nowego pliku konfiguracyjnego bez pytania\n"
-#~ "  confold [!]           Użycie poprzedniego pliku konfiguracyjnego bez "
+#~ "  confold [!]           Użycie starego pliku konfiguracyjnego bez "
 #~ "pytania\n"
 #~ "  confdef [!]           Użycie domyślnej opcji dla plików konfig. bez\n"
 #~ "                        pytania, chyba że nie uda się jej znaleźć, a nie\n"
@@ -7433,9 +7606,6 @@ msgstr ""
 #~ msgid "cannot open diversions: %s"
 #~ msgstr "nie można otworzyć listy ominiętych plików: %s"
 
-#~ msgid "missing package"
-#~ msgstr "brakująca nazwa pakietu"
-
 #~ msgid "rename: rename `%s' to `%s': %s"
 #~ msgstr "rename: zmiana nazwy \"%s\" na \"%s\": %s"
 
diff --git a/po/pt.po b/po/pt.po
index c8074aa73..d01e4cfa8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1,13 +1,13 @@
 # Portuguese translation for dpkg.
 # Copyright (C) 2004 Free Software Foundation, Inc.
 #
-# Miguel Figueiredo <elmig@debianpt.org>, 2004-2017.
+# Miguel Figueiredo <elmig@debianpt.org>, 2004-2019.
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2017-07-01 14:55+0100\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
+"PO-Revision-Date: 2019-08-25 10:45+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
 "Language: pt\n"
@@ -24,12 +24,12 @@ msgstr "falhou o fstat ao arquivo"
 #: lib/dpkg/ar.c
 #, c-format
 msgid "failed to read archive '%.255s'"
-msgstr "falhou ler o arquivo `%.255s'"
+msgstr "falhou ler o arquivo '%.255s'"
 
 #: lib/dpkg/ar.c lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to create '%.255s'"
-msgstr "não foi possível criar `%.255s'"
+msgstr "não foi possível criar '%.255s'"
 
 #: lib/dpkg/ar.c lib/dpkg/dir.c src/divertcmd.c dpkg-split/join.c
 #: dpkg-split/queue.c utils/update-alternatives.c
@@ -85,7 +85,7 @@ msgstr "tem de começar por alfanumérico"
 #, c-format
 msgid "character '%c' not allowed (only letters, digits and characters '%s')"
 msgstr ""
-"o caractere `%c' não é permitido (apenas letras, dígitos e caracteres `%s')"
+"o caractere '%c' não é permitido (apenas letras, dígitos e caracteres '%s')"
 
 #: lib/dpkg/arch.c
 msgctxt "architecture"
@@ -124,7 +124,7 @@ msgstr "não foi possível fazer sync ao ficheiro '%.250s'"
 #: lib/dpkg/atomic-file.c
 #, c-format
 msgid "unable to close new file '%.250s'"
-msgstr "não foi possível fechar o novo ficheiro `%.250s'"
+msgstr "não foi possível fechar o novo ficheiro '%.250s'"
 
 #: lib/dpkg/atomic-file.c
 #, c-format
@@ -136,10 +136,11 @@ msgstr "erro ao remover o antigo ficheiro de backup '%s'"
 msgid "error creating new backup file '%s'"
 msgstr "erro ao criar o novo ficheiro de backup '%s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
-msgstr "não pode remover `%.250s'"
+msgstr "não pode remover '%.250s'"
 
 #: lib/dpkg/atomic-file.c
 #, c-format
@@ -318,7 +319,7 @@ msgstr ""
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "cannot scan updates directory '%.255s'"
-msgstr "não pode pesquisar directório de actualizações `%.255s'"
+msgstr "não pode pesquisar directório de actualizações '%.255s'"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
@@ -342,33 +343,54 @@ msgstr "não foi possível executar seek para o inicio de %.250s após enchiment
 
 #: lib/dpkg/dbmodify.c
 #, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "não foi bloquear ficheiro %s para teste"
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "não foi possível verificar o lock ao ficheiro do direct+orio %s da base "
+"de dados do dpkg"
+
+#: lib/dpkg/dbmodify.c
+#, c-format
+#| msgid "unable to open/create frontend lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "não foi possível abrir/criar o lock do frontend para o directório %s"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
-msgstr "não foi possível abrir/criar lockfile de status da base de dados"
+#, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "não foi possível abrir/criar o ficheiro de lock da base de dados do dpkg para o directório %s"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
-msgstr "não tem permissão para bloquear a base de dados do status dpkg"
+#, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
+msgstr "não tem permissão para lock ao directório %s da base de dados do dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
-msgstr "base de dados de estado do dpkg"
+#| msgid "dpkg frontend"
+msgid "dpkg frontend lock"
+msgstr "lock ao frontend do dpkg"
+
+#: lib/dpkg/dbmodify.c
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
+msgstr "lock à base de dados do dpkg"
 
 #: lib/dpkg/dbmodify.c
 msgid "requested operation requires superuser privilege"
 msgstr "a operação pedida necessita de privilégios de super-utilizador"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
-msgstr "não foi possível aceder à área de status do dpkg"
+#, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
+msgstr "não foi possível aceder ao directório %s da base de dados do dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
-msgstr ""
-"a operação necessita de acesso de leitura/escrita na área do estado do dpkg"
+#, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
+msgstr "é necessário acesso leitura/escrita ao directório %s da base de dados do dpkg"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
@@ -378,38 +400,230 @@ msgstr "falhou a remoção do meu próprio ficheiro de actualização %.255s"
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to write updated status of '%.250s'"
-msgstr "não foi possível escrever o status actualizado de `%.250s'"
+msgstr "não foi possível escrever o status actualizado de '%.250s'"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to flush updated status of '%.250s'"
-msgstr "não foi possível esvaziar o status actualizado de `%.250s'"
+msgstr "não foi possível esvaziar o status actualizado de '%.250s'"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to truncate for updated status of '%.250s'"
-msgstr "não foi possível truncar para o status actualizado de `%.250s'"
+msgstr "não foi possível truncar para o status actualizado de '%.250s'"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to fsync updated status of '%.250s'"
-msgstr "não foi possível fazer fsync ao status actualizado de `%.250s'"
+msgstr "não foi possível fazer fsync ao status actualizado de '%.250s'"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to close updated status of '%.250s'"
-msgstr "não foi possível fechar o status actualizado de `%.250s'"
+msgstr "não foi possível fechar o status actualizado de '%.250s'"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to install updated status of '%.250s'"
-msgstr "não foi possível instalar o status actualizado de `%.250s'"
+msgstr "não foi possível instalar o status actualizado de '%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "não foi possível verificar a existência de '%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "não pode ler directório info"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "erro ao tentar abrir %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "ficheiro de formato da base de dados de info corrompido '%s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"o formato de base de dados de informação (%d) está errado ou é demasiado "
+"novo; tente obter um dpkg mais recent"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "Ficheiro info %s/%s não associado a qualquer pacote"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "erro ao criar hard link '%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "erro ao escrever '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "falta uma nova linha final no ficheiro control '%s' para o pacote '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "falta um valor ao ficheiro control '%s' para o pacote '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"falta um separador de valor no ficheiro control '%s' para o pacote '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"o ficheiro control '%s' para o pacote '%s' contém um nome de ficheiro vazio"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "loading control file '%s' for package '%s'"
+msgstr "a carregar o ficheiro control '%s' para o pacote '%s'"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "falhou abrir ficheiro diversions"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "falhou fstat ao ficheiro diversions"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "desvios em conflito envolvendo '%.250s' ou '%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "loading files list file for package '%s'"
+msgstr "a carregar o ficheiro de lista de ficheiros para o pacote '%s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"falta ficheiro de lista de ficheiros '%.250s'; assumindo que o pacote não "
+"tem actualmente ficheiros instalados"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"falta uma nova linha final no ficheiro de lista de ficheiros para o pacote "
+"'%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"o ficheiro de lista de ficheiros para o pacote '%.250s' contém um ficheiro "
+"vazio"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(A ler a base de dados ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d ficheiro(s) e directório(s) actualmente instalados.)\n"
+msgstr[1] "%d ficheiros e directórios actualmente instalados.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "uid statoverride inválido %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "gid statoverride inválido %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "modo statoverride inválido %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "falhou abrir ficheiro statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "falhou o fstat ao ficheiros statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "a ler ficheiro statoverride '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "falta uma linha vazia no final do ficheiro statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "ficheiro statoverride contém uma linha vazia"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "erro de sintaxe no ficheiro statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+"utilizador de sistema '%s' desconhecido no ficheiro statoverride; o\n"
+"utilizador de sistema foi removido antes do override, o que provavelmente\n"
+"será um bug do empacotamento, para recuperar pode remover o override "
+"manualmente com %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "fim de linha inesperado no ficheiro statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+"grupo de sistema '%s' desconhecido no ficheiro statoverride; o grupo de\n"
+"sistema foi removido antes do override, o que provavelmente será um bug do\n"
+"empacotamento, para recuperar pode remover o override manualmente com %s"
+
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "vários statoverrides presentes para o ficheiro '%.250s'"
 
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty major component"
 msgid "format version with too big major component"
-msgstr "formato de versão com componente maior vazio"
+msgstr "formato de versão com componente maior demasiado grande"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty major component"
@@ -420,10 +634,8 @@ msgid "format version has no dot"
 msgstr "formato de versão não tem ponto"
 
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty minor component"
 msgid "format version with too big minor component"
-msgstr "formato de versão com componente menor vazio"
+msgstr "formato de versão com componente demasiado grande"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty minor component"
@@ -462,7 +674,7 @@ msgstr "não foi possível fazer sync ao ficheiro '%s'"
 #: lib/dpkg/dump.c
 #, c-format
 msgid "failed to write details of '%.50s' to '%.250s'"
-msgstr "falhou escrever os detalhes de `%.50s' a `%.250s'"
+msgstr "falhou escrever os detalhes de '%.50s' a '%.250s'"
 
 #: lib/dpkg/dump.c
 #, c-format
@@ -521,64 +733,73 @@ msgid "internal error"
 msgstr "erro interno"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "falta %s"
+#| msgid "missing package"
+msgid "is missing a value"
+msgstr "falta um valor"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "`%.50s' não é permitido para %s"
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "tem um valor inválido '%.50s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "lixo após %s"
+msgid "has trailing junk"
+msgstr "tem lixo no final"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "invalid package name (%.250s)"
-msgstr "nome de pacote inválido (%.250s)"
+#| msgid "package name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "nome de pacote inválido no campo '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
-msgstr "campo de detalhes de ficheiro vazio `%s'"
+#| msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
+msgstr "campo '%s' de detalhes de arquivo vazio"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "file details field '%s' not allowed in status file"
-msgstr "campo `%s' de detalhes de ficheiro não é permitido no ficheiro status"
+#| msgid "archive details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
+msgstr "campo '%s' de detalhes de arquivo não é permitido no ficheiro status"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too many values in file details field '%s' (compared to others)"
-msgstr ""
-"demasiados valores no campo de detalhes `%s' do ficheiro (comparado com "
-"outros)"
+#| msgid "too many values in archive details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
+msgstr "demasiados valores no campo '%s' de detalhes de arquivo (comparado com outros)"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "too few values in file details field '%s' (compared to others)"
-msgstr ""
-"valores a menos no campo `%s' de detalhes de ficheiro (comparado com outros)"
+#| msgid "too few values in archive details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
+msgstr "valores a menos no campo '%s' de detalhes de arquivo (comparado com outros)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "sim/não no campo booleano"
+#, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "booleano (sim/não) campo '%s': %s"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
-msgstr "foreign/allowed/same/no em campo de quatro estados"
+#, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
+msgstr "campo '%s' de quatro estados (estrangeiro/permitido/igual/não): %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr "'%s' não é um nome válido de arquitectura: %s"
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "'%s' não é um nome válido de arquitectura no campo '%s': %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
-msgstr "palavra no campo 'Priority'"
+#, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
+msgstr "palavra no campo '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -586,26 +807,34 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "valor para o campo '%s' não é permitido neste contexto"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
-msgstr "primeira (want) palavra no campo 'Status'"
+#, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
+msgstr "primeiro (quer) palavra no campo '%s': %s"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
-msgstr "segunda (error) palavra no campo 'Status'"
+#, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
+msgstr "segundo (erro) palavra no campo '%s': %s"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
-msgstr "terceira (status) palavra no campo 'Status'"
+#, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
+msgstr "terceiro (status) palavra no campo '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "error in '%s' field string '%.250s'"
-msgstr "erro na string do campo '%s' '%.250s'"
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
+msgstr "campo '%s' com valor '%.250s'"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "obsolete '%s' or '%s' field used"
-msgstr "utilizados campos obsoletos '%s' ou '%s'"
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
+msgstr "utilizado o campo '%s' obsoleto"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -614,24 +843,27 @@ msgstr "o valor para '%s' tem uma linha mal formatada '%.*s'"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
-msgstr "o valor para '%s' tem uma linha que começa por um não-espaço '%c'"
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
+msgstr "o valor para o campo '%s' tem uma linha que começa por um não-espaço '%c'"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
-msgstr "raiz ou directório nulo está listado como conffile"
+#, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
+msgstr "raiz ou directório vazio está listado como conffilei no campo '%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid ""
 "'%s' field, missing package name, or garbage where package name expected"
 msgstr ""
-"campo `%s', falta nome de pacote, ou lixo onde era esperado nome de pacote"
+"campo '%s', falta nome de pacote, ou lixo onde era esperado nome de pacote"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, invalid package name '%.255s': %s"
-msgstr "campo `%s', nome de pacote inválido `%.255s': %s"
+msgstr "campo '%s', nome de pacote inválido '%.255s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -655,7 +887,7 @@ msgid ""
 "'%s' field, reference to '%.255s':\n"
 " bad version relationship %c%c"
 msgstr ""
-"campo `%s', referência a `%.255s':\n"
+"campo '%s', referência a '%.255s':\n"
 " má relação de versão %c%c"
 
 #: lib/dpkg/fields.c
@@ -664,8 +896,8 @@ msgid ""
 "'%s' field, reference to '%.255s':\n"
 " '%c' is obsolete, use '%c=' or '%c%c' instead"
 msgstr ""
-"campo `%s', referência a `%255s':\n"
-" `%c' está obsoleto, em vez disso utilize `%c=' ou `%c%c'"
+"campo '%s', referência a '%.255s':\n"
+" '%c' está obsoleto, em vez disso utilize '%c=' ou '%c%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -673,14 +905,14 @@ msgid ""
 "'%s' field, reference to '%.255s':\n"
 " implicit exact match on version number, suggest using '=' instead"
 msgstr ""
-"campo `%s', referência a `%.255s':\n"
-" combinação exacta implícita no número de versão, sugere utilizar `=' em vez "
+"campo '%s', referência a '%.255s':\n"
+" combinação exacta implícita no número de versão, sugere utilizar '=' em vez "
 "disso"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "only exact versions may be used for '%s' field"
-msgstr "apenas  podem ser utilizadas versões exactas para o campo '%s'"
+msgstr "apenas podem ser utilizadas versões exactas para o campo '%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -688,53 +920,55 @@ msgid ""
 "'%s' field, reference to '%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
-"campo `%s', referência a `%.255s':\n"
+"campo '%s', referência a '%.255s':\n"
 " valor de versão começa por não-alfanumérico, sugere adicionar um espaço"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, reference to '%.255s': version contains '%c'"
-msgstr "campo `%s', referência a `%.255s': versão contém `%c'"
+msgstr "campo '%s', referência a '%.255s': versão contém '%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, reference to '%.255s': version unterminated"
-msgstr "campo `%s', referência a `%.255s': versão não terminada"
+msgstr "campo '%s', referência a '%.255s': versão não terminada"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "campo '%s', referência a '%.255s': erro na versão"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "campo '%s', referência a '%.255s': versão '%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, syntax error after reference to package '%.255s'"
-msgstr "campo `%s', erro de sintaxe após referência ao pacote `%.255s'"
+msgstr "campo '%s', erro de sintaxe após referência ao pacote '%.255s'"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "alternatives ('|') not allowed in %s field"
-msgstr "alternativas (`|') não são permitidas no campo %s"
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
+msgstr "alternativas ('|') não são permitidas no campo '%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "illegal pending trigger name '%.255s': %s"
-msgstr "nome de 'trigger' pendente ilegal `%.255s': %s"
+msgstr "nome de 'trigger' pendente ilegal '%.255s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "duplicate pending trigger '%.255s'"
-msgstr "'trigger' duplicado `%.255s' pendente"
+msgstr "'trigger' duplicado '%.255s' pendente"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "illegal package name in awaited trigger '%.255s': %s"
-msgstr "nome de pacote ilegal no 'trigger' esperado `%.255s': %s"
+msgstr "nome de pacote ilegal no 'trigger' esperado '%.255s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "duplicate awaited trigger package '%.255s'"
-msgstr "'trigger' esperado duplicado do pacote `%.255s'"
+msgstr "'trigger' esperado duplicado do pacote '%.255s'"
 
 #: lib/dpkg/file.c
 #, c-format
@@ -753,6 +987,26 @@ msgstr "não foi possível definir o modo do ficheiro de destino '%.250s'"
 
 #: lib/dpkg/file.c
 #, c-format
+msgid "cannot stat %s"
+msgstr "Não pode fazer stat %s"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "%s is not a regular file"
+msgstr "%s não é um ficheiro normal"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot read %s"
+msgstr "não pode escrever %s"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot open %s"
+msgstr "não pode abrir %s"
+
+#: lib/dpkg/file.c
+#, c-format
 msgid "unable to unlock %s"
 msgstr "não foi possível desbloquear %s"
 
@@ -772,8 +1026,18 @@ msgid "unable to lock %s"
 msgstr "não foi possível bloquear %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "a mostrar ficheiro no pager"
+#, c-format
+msgid "cannot open file %s"
+msgstr "não pode abrir o ficheiro '%s'"
+
+#: lib/dpkg/file.c
+msgid "pager to show file"
+msgstr "pager para mostrar ficheiro"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot write file %s into the pager"
+msgstr "não pode escreiver o ficheiro %s para o pager"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -795,13 +1059,13 @@ msgstr "a alocação de memória falhou"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "falhou dup para std%s"
+msgid "failed to dup for fd %d"
+msgstr "falhou dup para fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "falhou dup para fd %d"
+msgid "failed to dup for std%s"
+msgstr "falhou dup para std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -860,12 +1124,12 @@ msgstr "'%s' não toma valores"
 #: lib/dpkg/options.c
 #, c-format
 msgid "read error in configuration file '%.255s'"
-msgstr "erro de leitura no ficheiro de configuração `%.255s'"
+msgstr "erro de leitura no ficheiro de configuração '%.255s'"
 
 #: lib/dpkg/options.c
 #, c-format
 msgid "error closing configuration file '%.255s'"
-msgstr "erro ao fechar o ficheiro de configuração `%.255s'"
+msgstr "erro ao fechar o ficheiro de configuração '%.255s'"
 
 #: lib/dpkg/options.c
 #, c-format
@@ -905,7 +1169,7 @@ msgstr "a opção -%c não toma valores"
 #: lib/dpkg/options.c dpkg-split/main.c
 #, c-format
 msgid "invalid integer for --%s: '%.250s'"
-msgstr "número inteiro inválido para --%s: `%.250s'"
+msgstr "número inteiro inválido para --%s: '%.250s'"
 
 #: lib/dpkg/options.c
 #, c-format
@@ -925,41 +1189,47 @@ msgstr "acções em conflito -%c (--%s) e -%c (--%s)"
 #: lib/dpkg/parse.c
 #, c-format
 msgid "duplicate value for '%s' field"
-msgstr "valor duplicado para o campo `%s'"
+msgstr "valor duplicado para o campo '%s'"
 
 #: lib/dpkg/parse.c
 #, c-format
 msgid "user-defined field name '%.*s' too short"
-msgstr "nome do campo definido pelo utilizador `%.*s' é muito pequeno"
+msgstr "nome do campo definido pelo utilizador '%.*s' é muito pequeno"
 
 #: lib/dpkg/parse.c
 #, c-format
 msgid "duplicate value for user-defined field '%.*s'"
-msgstr "valor duplicado para campo definido pelo utilizador `%.*s'"
+msgstr "valor duplicado para campo definido pelo utilizador '%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "missing %s"
-msgstr "falta %s"
+#| msgid "missing %s"
+msgid "missing '%s' field"
+msgstr "falta o campo '%s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-msgid "empty value for %s"
-msgstr "valor vazio para %s"
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "valor vazio para o campo '%s'"
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is missing architecture"
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "o pacote tem o campo '%s' mas falta-lhe a arquitectura"
 
 #: lib/dpkg/parse.c
 #, c-format
-msgid "package has field '%s' but is architecture all"
-msgstr "o pacote tem o campo '%s' mas é de arquitectura all"
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
+msgstr "o pacote tem o campo '%s' mas é de arquitectura '%s'"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
-msgstr "Config-Version para o pacote com Status inapropriado"
+#, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
+msgstr "campo '%s' presente para o pacote com campo inapropriado '%s'"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -967,9 +1237,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "o pacote tem estado %s mas são esperados 'triggers'"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"o pacote tem estado 'triggers-awaited' mas não são esperados 'triggers'"
+#, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "o pacote tem o estado %s mas não esperaram 'triggers'"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -977,15 +1248,16 @@ msgid "package has status %s but triggers are pending"
 msgstr "o pacote tem estado %s mas estão 'triggers' pendentes"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"o pacote tem estado 'triggers-pending' mas não tem 'triggers' pendentes"
+#, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "o pacote tem estado %s mas não há 'triggers' pendentes"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
-msgstr ""
-"Pacote que tem estado não-instalado tem ficheiros de configuração, a esquecê-"
-"los"
+#, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
+msgstr "o pacotes tem estado %s e tem ficheiros de configuração, a esquecê-los"
 
 #: lib/dpkg/parse.c
 msgid ""
@@ -1006,23 +1278,26 @@ msgstr ""
 
 #: lib/dpkg/parse.c
 #, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
-"%s %s (Multi-Arch: %s) não é co-instalável com %s que tem várias instâncias "
-"instaladas"
+"o pacote %s (%s) com campo '%s: %s' não é co-instalável com %s, que tem "
+"várias instâncias instaladas"
 
 #: lib/dpkg/parse.c
 #, c-format
 msgid "failed to open package info file '%.255s' for reading"
 msgstr ""
-"falhou ao abrir ficheiro de informações do pacote `%.255s' para leitura"
+"falhou ao abrir ficheiro de informações do pacote '%.255s' para leitura"
 
 #: lib/dpkg/parse.c
 #, c-format
 msgid "can't stat package info file '%.255s'"
-msgstr "não pode fazer stat ao ficheiro de informação do pacote `%.255s'"
+msgstr "não pode fazer stat ao ficheiro de informação do pacote '%.255s'"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1032,7 +1307,7 @@ msgstr "a ler o ficheiro de informação do pacote '%s' : %s'"
 #: lib/dpkg/parse.c
 #, c-format
 msgid "can't mmap package info file '%.255s'"
-msgstr "não pode fazer mmap ao ficheiro de informação do pacote `%.255s'"
+msgstr "não pode fazer mmap ao ficheiro de informação do pacote '%.255s'"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1056,7 +1331,7 @@ msgstr "fim de ficheiro após campo do nome '%.*s'"
 #: lib/dpkg/parse.c
 #, c-format
 msgid "newline in field name '%.*s'"
-msgstr "newline no campo do nome `%.*s'"
+msgstr "newline no campo do nome '%.*s'"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1066,7 +1341,7 @@ msgstr "fim de ficheiro MSDOS (^Z) no campo do nome '%.*s'"
 #: lib/dpkg/parse.c
 #, c-format
 msgid "field name '%.*s' must be followed by colon"
-msgstr "campo do nome `%.*s' tem de ser seguido de dois pontos"
+msgstr "campo do nome '%.*s' tem de ser seguido de dois pontos"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1091,7 +1366,7 @@ msgstr "fim de ficheiro durante o valor do campo '%.*s' (falta newline final)"
 #: lib/dpkg/parse.c
 #, c-format
 msgid "failed to close after read: '%.255s'"
-msgstr "falhou fechar após ler: `%.255s'"
+msgstr "falhou fechar após ler: '%.255s'"
 
 #: lib/dpkg/parse.c
 msgid "several package info entries found, only one allowed"
@@ -1101,7 +1376,7 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid "no package information in '%.255s'"
-msgstr "sem informação de pacotes em `%.255s'"
+msgstr "sem informação de pacotes em '%.255s'"
 
 #: lib/dpkg/parsehelp.c
 #, c-format
@@ -1187,11 +1462,6 @@ msgstr "não foi remover, em segurança, '%.255s'"
 msgid "rm command for cleanup"
 msgstr "comando rm para limpar"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "nome de pacote '%s' ambíguo com mais de uma instância instalada"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1205,6 +1475,16 @@ msgstr "comprimento do campo está fora de alcance"
 msgid "missing closing brace"
 msgstr "falta colchete de fecho"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr "não pode obter a hora da última modificação do sistema de ficheiros do pacote %s"
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "nome de pacote '%s' ambíguo com mais de uma instância instalada"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(sem descrição disponível)"
@@ -1259,20 +1539,17 @@ msgid "fork failed"
 msgstr "falhou fork"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s returned error exit status %d"
+#, c-format
 msgid "%s subprocess returned error exit status %d"
-msgstr "subprocesso %s retornou erro do status de saída %d"
+msgstr "o subprocesso %s retornou erro do status de saída %d"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was interrupted"
+#, c-format
 msgid "%s subprocess was interrupted"
 msgstr "o sub-processo %s foi interrompido"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was killed by signal (%s)%s"
+#, c-format
 msgid "%s subprocess was killed by signal (%s)%s"
 msgstr "o subprocesso %s foi morto pelo sinal (%s)%s"
 
@@ -1281,16 +1558,73 @@ msgid ", core dumped"
 msgstr ", core dumped"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s failed with wait status code %d"
+#, c-format
 msgid "%s subprocess failed with wait status code %d"
-msgstr "subprocesso %s falhou com o código de status de wait %d"
+msgstr "o subprocesso %s falhou com o código de status wait %d"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "wait for subprocess %s failed"
+#, c-format
 msgid "wait for %s subprocess failed"
-msgstr "wait para o sub-processo %s falhou"
+msgstr "falhou a espera para o subprocesso %s"
+
+#: lib/dpkg/tarfn.c
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "campo de tamanho de cabeçalho tar inválido"
+
+#: lib/dpkg/tarfn.c
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "campo mtime do cabeçalho tar inválido"
+
+#: lib/dpkg/tarfn.c
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "campo uid de cabeçalho tar inválido"
+
+#: lib/dpkg/tarfn.c
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "campo gid de cabeçalho tar inválido"
+
+#: lib/dpkg/tarfn.c
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "campo checksum de cabeçalho tar inválido"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr "checksum de cabeçalho tar inválido"
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr "cabeçalho tar parcialmente lido"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr "cabeçalho tar inválido com nome de campo vazio"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr "cabeçalho GNU tar não suportado, tipo '%c'"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "tipo de cabeçalho Solaris tar tipo '%c'"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr "cabeçalho PAX tar tipo '%c' não suportado"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "cabeçalho tar desconhecido de tipo '%c'"
 
 #: lib/dpkg/treewalk.c
 #, c-format
@@ -1300,7 +1634,7 @@ msgstr "não pode fazer stat ao caminho '%s'"
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot open directory '%s'"
-msgstr "não pode abrir o directório `%s'"
+msgstr "não pode abrir o directório '%s'"
 
 #: lib/dpkg/treewalk.c
 #, c-format
@@ -1309,63 +1643,65 @@ msgstr "a raiz da navegação %s não é um directório"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
-msgstr "não foi possível abrir/criar o ficheiro de acesso exclusivo `%.250s'"
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
+msgstr "não foi possível abrir/criar o ficheiro de lock para triggers '%.250s'"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
-msgstr "área de triggers"
+#| msgid "triggers area"
+msgid "triggers database lock"
+msgstr "lock da base de dados de triggers"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to open triggers deferred file '%.250s'"
-msgstr "não foi possível abrir o ficheiro de 'triggers' adiados `%.250s'"
+msgstr "não foi possível abrir o ficheiro de 'triggers' adiados '%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to stat triggers deferred file '%.250s'"
-msgstr "não foi possível fazer stat ao ficheiro de 'triggers' adiados `%.250s'"
+msgstr "não foi possível fazer stat ao ficheiro de 'triggers' adiados '%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to open/create new triggers deferred file '%.250s'"
 msgstr ""
-"não foi possível abrir/criar novo ficheiro de 'triggers' adiados `%.250s'"
+"não foi possível abrir/criar novo ficheiro de 'triggers' adiados '%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid ""
 "syntax error in triggers deferred file '%.250s' at line %d character %zd '%s'"
 msgstr ""
-"erro de sintaxe no ficheiro de 'triggers' adiados `%.250s' na linha %d, no "
+"erro de sintaxe no ficheiro de 'triggers' adiados '%.250s' na linha %d, no "
 "caractere %zd '%s'"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "invalid package name '%.250s' in triggers deferred file '%.250s'"
 msgstr ""
-"nome de pacote inválido `%.250s' no ficheiro `%.250s' de 'triggers' adiados"
+"nome de pacote inválido '%.250s' no ficheiro '%.250s' de 'triggers' adiados"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "error reading triggers deferred file '%.250s'"
-msgstr "erro ao ler o ficheiro de 'triggers' adiados `%.250s'"
+msgstr "erro ao ler o ficheiro de 'triggers' adiados '%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to write new triggers deferred file '%.250s'"
 msgstr ""
-"não foi possível escrever o novo ficheiro de 'triggers' adiados `%.250s'"
+"não foi possível escrever o novo ficheiro de 'triggers' adiados '%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to close new triggers deferred file '%.250s'"
-msgstr "não foi possível fechar o novo ficheiro `%.250s' de 'triggers' adiados"
+msgstr "não foi possível fechar o novo ficheiro '%.250s' de 'triggers' adiados"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to install new triggers deferred file '%.250s'"
-msgstr "não foi possível instalar novo ficheiro de 'triggers' adiados `%.250s'"
+msgstr "não foi possível instalar novo ficheiro de 'triggers' adiados '%.250s'"
 
 #: lib/dpkg/triglib.c
 #, c-format
@@ -1373,19 +1709,19 @@ msgid ""
 "invalid or unknown syntax in trigger name '%.250s' (in trigger interests for "
 "package '%.250s')"
 msgstr ""
-"sintaxe inválida ou desconhecida no nome `%.250s' do 'trigger' (nos "
-"interesses do 'trigger' para o pacote `%.250s')"
+"sintaxe inválida ou desconhecida no nome '%.250s' do 'trigger' (nos "
+"interesses do 'trigger' para o pacote '%.250s')"
 
 #: lib/dpkg/triglib.c
 #, c-format
 msgid "failed to open trigger interest list file '%.250s'"
 msgstr ""
-"falhou a abertura do ficheiro `%.250s' de lista de interesses do 'trigger'"
+"falhou a abertura do ficheiro '%.250s' de lista de interesses do 'trigger'"
 
 #: lib/dpkg/triglib.c
 #, c-format
 msgid "failed to rewind trigger interest file '%.250s'"
-msgstr "falhou o rewind ao ficheiro `%.250s' de interesses do 'trigger'"
+msgstr "falhou o rewind ao ficheiro '%.250s' de interesses do 'trigger'"
 
 #: lib/dpkg/triglib.c
 #, c-format
@@ -1393,26 +1729,26 @@ msgid ""
 "trigger interest file '%.250s' syntax error; illegal package name '%.250s': "
 "%.250s"
 msgstr ""
-"erro de sintaxe do ficheiro de interesse, `%.250s', do 'trigger'; nome `"
-"%.250s': ilegal de pacote: %.250s"
+"erro de sintaxe do ficheiro de interesse, '%.250s', do 'trigger'; nome "
+"'%.250s': ilegal de pacote: %.250s"
 
 #: lib/dpkg/triglib.c
 #, c-format
 msgid ""
 "duplicate file trigger interest for filename '%.250s' and package '%.250s'"
 msgstr ""
-"ficheiro duplicado de interesse de 'trigger' para o ficheiro `%.250s' e "
-"pacote `%.250s'"
+"ficheiro duplicado de interesse de 'trigger' para o ficheiro '%.250s' e "
+"pacote '%.250s'"
 
 #: lib/dpkg/triglib.c
 #, c-format
 msgid "unable to read file triggers file '%.250s'"
-msgstr "não foi possível ler o ficheiro `%.250s' de 'triggers' de ficheiro"
+msgstr "não foi possível ler o ficheiro '%.250s' de 'triggers' de ficheiro"
 
 #: lib/dpkg/triglib.c
 #, c-format
 msgid "syntax error in file triggers file '%.250s'"
-msgstr "erro de sintaxe no ficheiro `%.250s' de 'triggers' de ficheiro"
+msgstr "erro de sintaxe no ficheiro '%.250s' de 'triggers' de ficheiro"
 
 #: lib/dpkg/triglib.c
 #, c-format
@@ -1420,8 +1756,8 @@ msgid ""
 "file triggers record mentions illegal package name '%.250s' (for interest in "
 "file '%.250s'): %.250s"
 msgstr ""
-"registo de ficheiro de 'trigger' menciona o nome de pacote ilegal `"
-"%.250s' (para o interesse no ficheiro `%.250s'): %.250s"
+"registo de ficheiro de 'trigger' menciona o nome de pacote ilegal "
+"'%.250s' (para o interesse no ficheiro '%.250s'): %.250s"
 
 #: lib/dpkg/triglib.c
 #, c-format
@@ -1429,13 +1765,13 @@ msgid ""
 "triggers ci file '%.250s' contains illegal trigger syntax in trigger name "
 "'%.250s': %.250s"
 msgstr ""
-"o ficheiro `%.250s' de triggers ci contém sintaxe ilegal de trigger no "
-"trigger com o nome `%.250s': %.250s"
+"o ficheiro '%.250s' de triggers ci contém sintaxe ilegal de trigger no "
+"trigger com o nome '%.250s': %.250s"
 
 #: lib/dpkg/triglib.c
 #, c-format
 msgid "unable to open triggers ci file '%.250s'"
-msgstr "não foi possível abrir o ficheiro de triggers ci `%.250s'"
+msgstr "não foi possível abrir o ficheiro de triggers ci '%.250s'"
 
 #: lib/dpkg/triglib.c
 msgid "triggers ci file contains unknown directive syntax"
@@ -1444,19 +1780,19 @@ msgstr "o ficheiro de triggers ci contém sintaxe com directiva desconhecida"
 #: lib/dpkg/triglib.c
 #, c-format
 msgid "triggers ci file contains unknown directive '%.250s'"
-msgstr "o ficheiro de triggers ci contém a directiva `%.250s' desconhecida"
+msgstr "o ficheiro de triggers ci contém a directiva '%.250s' desconhecida"
 
 #: lib/dpkg/triglib.c
 #, c-format
 msgid "unable to create triggers state directory '%.250s'"
 msgstr ""
-"não foi possível criar o directório, `%.250s',  de estado de 'triggers'"
+"não foi possível criar o directório, '%.250s',  de estado de 'triggers'"
 
 #: lib/dpkg/triglib.c
 #, c-format
 msgid "unable to set ownership of triggers state directory '%.250s'"
 msgstr ""
-"não foi possível definir o dono do directório,`%.250s', de estado de "
+"não foi possível definir o dono do directório,'%.250s', de estado de "
 "'triggers'"
 
 #: lib/dpkg/trigname.c
@@ -1470,17 +1806,17 @@ msgstr "o nome do 'trigger' contém um carácter inválido"
 #: lib/dpkg/utils.c
 #, c-format
 msgid "read error in '%.250s'"
-msgstr "erro de leitura em `%.250s'"
+msgstr "erro de leitura em '%.250s'"
 
 #: lib/dpkg/utils.c
 #, c-format
 msgid "fgets gave an empty string from '%.250s'"
-msgstr "fgets deu uma string vazia de `%.250s'"
+msgstr "fgets deu uma string vazia de '%.250s'"
 
 #: lib/dpkg/utils.c
 #, c-format
 msgid "too-long line or missing newline in '%.250s'"
-msgstr "linha demasiado comprida ou falta 'newline' em `%.250s'"
+msgstr "linha demasiado comprida ou falta 'newline' em '%.250s'"
 
 #: lib/dpkg/utils.c
 #, c-format
@@ -1509,7 +1845,7 @@ msgstr ""
 #: src/archives.c
 #, c-format
 msgid "unable to create '%.255s' (while processing '%.255s')"
-msgstr "não conseguiu criar `%.255s' (enquanto processava `%.255s')"
+msgstr "não conseguiu criar '%.255s' (enquanto processava '%.255s')"
 
 #: src/archives.c
 #, c-format
@@ -1519,42 +1855,37 @@ msgstr "não pode copiar dados extráidos para '%.255s' para '%.255s': %s"
 #: src/archives.c src/statcmd.c
 #, c-format
 msgid "error setting ownership of '%.255s'"
-msgstr "erro ao definir dono de `%255s'"
+msgstr "erro ao definir dono de '%255s'"
 
 #: src/archives.c src/statcmd.c
 #, c-format
 msgid "error setting permissions of '%.255s'"
-msgstr "erro ao definir permissões de `%.255s'"
+msgstr "erro ao definir permissões de '%.255s'"
 
 #: src/archives.c
 #, c-format
 msgid "error closing/writing '%.255s'"
-msgstr "erro ao fechar/escrever `%.255s'"
+msgstr "erro ao fechar/escrever '%.255s'"
 
 #: src/archives.c
 #, c-format
 msgid "error creating pipe '%.255s'"
-msgstr "erro ao criar pipe `%.255s'"
+msgstr "erro ao criar pipe '%.255s'"
 
 #: src/archives.c
 #, c-format
 msgid "error creating device '%.255s'"
-msgstr "erro ao criar dispositivo `%.255s'"
-
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "erro ao criar hard link `%.255s'"
+msgstr "erro ao criar dispositivo '%.255s'"
 
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
-msgstr "erro ao criar link simbólico `%.255s'"
+msgstr "erro ao criar link simbólico '%.255s'"
 
 #: src/archives.c
 #, c-format
 msgid "error creating directory '%.255s'"
-msgstr "erro ao criar o directório `%.255s'"
+msgstr "erro ao criar o directório '%.255s'"
 
 #: src/archives.c
 #, c-format
@@ -1564,17 +1895,17 @@ msgstr "não pode processar hash MD5 para o ficheiro tar '%.255s': %s"
 #: src/archives.c
 #, c-format
 msgid "error setting timestamps of '%.255s'"
-msgstr "erro ao definir timestamps de `%.255s'"
+msgstr "erro ao definir timestamps de '%.255s'"
 
 #: src/archives.c
 #, c-format
 msgid "error setting ownership of symlink '%.255s'"
-msgstr "erro ao definir dono do link simbólico `%255s'"
+msgstr "erro ao definir dono do link simbólico '%255s'"
 
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "unable to read link '%.255s'"
-msgstr "não foi possível ler link `%.255s'"
+msgstr "não foi possível ler link '%.255s'"
 
 #: src/archives.c src/configure.c
 #, c-format
@@ -1594,8 +1925,8 @@ msgstr ""
 #, c-format
 msgid "failed to stat (dereference) existing symlink '%.250s'"
 msgstr ""
-"falhou o fazer stat (anular referência) de ligação simbólica existente `"
-"%.250s'"
+"falhou o fazer stat (anular referência) de ligação simbólica existente "
+"'%.250s'"
 
 #: src/archives.c
 #, c-format
@@ -1604,7 +1935,7 @@ msgid ""
 "symlink '%.250s'"
 msgstr ""
 "falhou o fazer stat (anular referência) proposto novo alvo para a ligação "
-"simbólica `%.250s' para a ligação simbólica `%.250s'"
+"simbólica '%.250s' para a ligação simbólica '%.250s'"
 
 #: src/archives.c
 #, c-format
@@ -1617,18 +1948,18 @@ msgid ""
 "trying to overwrite '%.250s', which is the diverted version of "
 "'%.250s' (package: %.100s)"
 msgstr ""
-"a tentar sobre-escrever `%.250s', que é a versão desviada de `"
-"%250s' (pacote: %.100s)"
+"a tentar sobreescrever '%.250s', que é a versão desviada de '%250s' (pacote: "
+"%.100s)"
 
 #: src/archives.c
 #, c-format
 msgid "trying to overwrite '%.250s', which is the diverted version of '%.250s'"
-msgstr "a tentar sobre-escrever %.250s', que é a versão desviada de `%250s'"
+msgstr "a tentar sobre-escrever '%.250s', que é a versão desviada de '%.250s'"
 
 #: src/archives.c
 #, c-format
 msgid "unable to stat '%.255s' (which I was about to install)"
-msgstr "não foi possível fazer stat a `%.255s' (que eu ia instalar)"
+msgstr "não foi possível fazer stat a '%.255s' (que eu ia instalar)"
 
 #: src/archives.c
 #, c-format
@@ -1636,20 +1967,20 @@ msgid ""
 "unable to clean up mess surrounding '%.255s' before installing another "
 "version"
 msgstr ""
-"não foi possível efectuar uma limpeza à volta de `%.255s' antes de instalar "
+"não foi possível efectuar uma limpeza à volta de '%.255s' antes de instalar "
 "outra versão"
 
 #: src/archives.c
 #, c-format
 msgid "unable to stat restored '%.255s' before installing another version"
 msgstr ""
-"não foi possível fazer stat ao recuperado `%.255s' antes de instalar outra "
+"não foi possível fazer stat ao recuperado '%.255s' antes de instalar outra "
 "versão"
 
 #: src/archives.c
 #, c-format
 msgid "archive contained object '%.255s' of unknown type 0x%x"
-msgstr "arquivo continha objecto `%.255s' de tipo desconhecido 0x%x"
+msgstr "arquivo continha objecto '%.255s' de tipo desconhecido 0x%x"
 
 #: src/archives.c
 #, c-format
@@ -1679,29 +2010,29 @@ msgstr ""
 #: src/archives.c
 #, c-format
 msgid "unable to move aside '%.255s' to install new version"
-msgstr "não foi possível mover `%.255s' para instalar a nova versão"
+msgstr "não foi possível mover '%.255s' para instalar a nova versão"
 
 #: src/archives.c
 #, c-format
 msgid "unable to make backup symlink for '%.255s'"
-msgstr "não foi possível criar backup do link simbólico para `%.255s'"
+msgstr "não foi possível criar backup do link simbólico para '%.255s'"
 
 #: src/archives.c
 #, c-format
 msgid "unable to chown backup symlink for '%.255s'"
-msgstr "não foi possível fazer chown a backup do link simbólico para `%.255s'"
+msgstr "não foi possível fazer chown a backup do link simbólico para '%.255s'"
 
 #: src/archives.c
 #, c-format
 msgid "unable to make backup link of '%.255s' before installing new version"
 msgstr ""
-"não foi possível fazer backup link de `%.255s' antes de instalar a nova "
+"não foi possível fazer backup link de '%.255s' antes de instalar a nova "
 "versão"
 
 #: src/archives.c
 #, c-format
 msgid "unable to install new version of '%.255s'"
-msgstr "não foi possível instalar nova versão de `%.255s'"
+msgstr "não foi possível instalar nova versão de '%.255s'"
 
 #: src/archives.c
 #, c-format
@@ -1864,10 +2195,10 @@ msgstr "não pode aceder ao arquivo '%s'"
 msgid "archive '%s' is not a regular file"
 msgstr "o arquivo '%s' não é um ficheiro normal"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<saída standard>"
 
@@ -1907,13 +2238,13 @@ msgid ""
 "unable to remove newly-installed version of '%.250s' to allow reinstallation "
 "of backup copy"
 msgstr ""
-"não foi possível remover versão recentemente instalada de `%.250s' para "
+"não foi possível remover versão recentemente instalada de '%.250s' para "
 "permitir re-instalação de cópia backup"
 
 #: src/cleanup.c
 #, c-format
 msgid "unable to restore backup version of '%.250s'"
-msgstr "não foi possível restaurar versão de backup de `%.250s'"
+msgstr "não foi possível restaurar versão de backup de '%.250s'"
 
 #: src/cleanup.c
 #, c-format
@@ -1923,12 +2254,12 @@ msgstr "não foi possível remover cópia de backup de '%.250s'"
 #: src/cleanup.c
 #, c-format
 msgid "unable to remove newly-installed version of '%.250s'"
-msgstr "não foi possível remover a versão acabada de instalar de `%.250s'"
+msgstr "não foi possível remover a versão acabada de instalar de '%.250s'"
 
 #: src/cleanup.c
 #, c-format
 msgid "unable to remove newly-extracted version of '%.250s'"
-msgstr "não foi possível remover versão de `%.250s' recentemente extraída"
+msgstr "não foi possível remover versão de '%.250s' recentemente extraída"
 
 #: src/configure.c
 #, c-format
@@ -2050,8 +2381,12 @@ msgid "conffile difference visualizer"
 msgstr "visualizador de diferenças de conffile"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr "Variáveis de ambiente úteis:\n"
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
-msgstr "Escreva `exit' quando tiver terminado.\n"
+msgstr "Escreva 'exit' quando tiver terminado.\n"
 
 #: src/configure.c
 msgid "conffile shell"
@@ -2066,7 +2401,7 @@ msgstr "não foi possível fazer stat do novo conffile distribuído '%.250s'"
 #, c-format
 msgid "unable to stat current installed conffile '%.250s'"
 msgstr ""
-"não é possível fazer stat ao ficheiro de configuração `%.250s' actualmente "
+"não é possível fazer stat ao ficheiro de configuração '%.250s' actualmente "
 "instalado"
 
 #: src/configure.c
@@ -2077,7 +2412,7 @@ msgid ""
 "Installing new config file as you requested.\n"
 msgstr ""
 "\n"
-"Ficheiro de configuração `%s', não existe no sistema.\n"
+"Ficheiro de configuração '%s', não existe no sistema.\n"
 "A instalar novo ficheiro de configuração conforme você pediu.\n"
 
 #: src/configure.c
@@ -2118,12 +2453,12 @@ msgstr "A instalar nova versão do ficheiro de configuração %s ...\n"
 #: src/configure.c utils/update-alternatives.c
 #, c-format
 msgid "unable to install '%.250s' as '%.250s'"
-msgstr "Não foi possível instalar `%.250s' como `%.250s'"
+msgstr "Não foi possível instalar '%.250s' como '%.250s'"
 
 #: src/configure.c
 #, c-format
 msgid "no package named '%s' is installed, cannot configure"
-msgstr "não está instalado nenhum pacote chamado `%s', não pode configurar"
+msgstr "não está instalado nenhum pacote chamado '%s', não pode configurar"
 
 #: src/configure.c
 #, c-format
@@ -2137,7 +2472,7 @@ msgid ""
 " cannot configure (current status '%.250s')"
 msgstr ""
 "o pacote %.250s não está pronto para configuração\n"
-" não pode configurar (status actual `%.250s')"
+" não pode configurar (status actual '%.250s')"
 
 #: src/configure.c
 #, c-format
@@ -2415,7 +2750,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2427,12 +2765,18 @@ msgstr ""
 "                             será desviada.\n"
 "  --local                  todas as versões do pacotes estão desviadas.\n"
 "  --divert <desviar para>  o nome usado pelas outras versões do pacote.\n"
-"  --rename                 move o ficheiro para outro lado (ou para trás).\n"
-"  --admindir <directório>  definir o directório com os ficheiros desviados.\n"
+"  --rename                 mover o ficheiro para outro lado (ou de volta).\n"
+"  --no-rename              não mover o ficheiro para outro lado (ou de "
+"volta) (predefinido).\n"
+"  --admindir <directório>  definir o directório com o ficheiro diversions.\n"
+"  --instdir <directório>   definir o directório raiz, mas não o directório "
+"admin.\n"
+"  --root <directório>      definir o directório do sistema de ficheiros "
+"raiz.\n"
 "  --test                   não fazer nada, apenas exemplificar.\n"
 "  --quiet                  operação em modo silencioso, saída mínima.\n"
 "  --help                   mostrar esta mensagem de ajuda.\n"
-"  --version                indicar a versão.\n"
+"  --version                mostrar a versão.\n"
 "\n"
 
 #: src/divertcmd.c
@@ -2449,6 +2793,14 @@ msgstr ""
 "Os scripts preinst/postrm dos pacotes devem sempre especificar --package e --"
 "divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+"por favor especifique explicitamente --no-rename, a predefinição irá mudar "
+"para --rename na 1.20.x"
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2465,8 +2817,8 @@ msgid ""
 "rename involves overwriting '%s' with\n"
 "  different file '%s', not allowed"
 msgstr ""
-"renomear envolve sobre-escrever `%s' com\n"
-"  um ficheiro diferente `%s', não permitido"
+"renomear envolve sobre-escrever '%s' com\n"
+"  um ficheiro diferente '%s', não permitido"
 
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
@@ -2539,12 +2891,12 @@ msgstr "--%s necessita de um único argumento"
 
 #: src/divertcmd.c
 msgid "cannot divert directories"
-msgstr "não é possível desviar directórios"
+msgstr "não pode desviar directórios"
 
 #: src/divertcmd.c
 #, c-format
 msgid "cannot divert file '%s' to itself"
-msgstr "não é possível desviar o ficheiro '%s' para o próprio"
+msgstr "não pode desviar o ficheiro '%s' para si próprio"
 
 #: src/divertcmd.c
 #, c-format
@@ -2554,7 +2906,7 @@ msgstr "A deixar '%s'\n"
 #: src/divertcmd.c
 #, c-format
 msgid "'%s' clashes with '%s'"
-msgstr "`%s' choca com `%s'"
+msgstr "'%s' choca com '%s'"
 
 #: src/divertcmd.c
 #, c-format
@@ -2570,6 +2922,15 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+"desviar o ficheiro '%s' de um pacote Essential com renomear é perigoso, "
+"utilize --no-rename"
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Nenhum desvio '%s', nenhum removido.\n"
 
@@ -2581,8 +2942,8 @@ msgid ""
 "  found '%s'"
 msgstr ""
 "erro ao tentar desviar\n"
-"  quando a remover `%s'\n"
-"  foi encontrado `%s'"
+"  quando a remover '%s'\n"
+"  foi encontrado '%s'"
 
 #: src/divertcmd.c
 #, c-format
@@ -2592,8 +2953,8 @@ msgid ""
 "  found '%s'"
 msgstr ""
 "erro no pacote\n"
-"  quando a remover `%s'\n"
-"  foi encontrado `%s'"
+"  quando a remover '%s'\n"
+"  foi encontrado '%s'"
 
 #: src/divertcmd.c
 #, c-format
@@ -2613,19 +2974,6 @@ msgstr "o pacote não pode conter novas linhas"
 msgid "divert-to may not contain newlines"
 msgstr "o desvio não pode conter novas linhas"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "falhou abrir ficheiro diversions"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "falhou fstat ao ficheiro diversions"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "desvios em conflito envolvendo `%.250s' ou `%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2919,119 +3267,178 @@ msgstr ""
 "Pacote %s está em espera, não lhe tocando. Utilize --force-hold para "
 "forçar.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "a ultrapassar problema porque --force está activo: "
+#: src/force.c
+msgid "Set all force options"
+msgstr "Definir todas as opções de forçar"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "falta uma nova linha final no ficheiro control '%s' para o pacote '%s'"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr "Utilize segurança baseada em MAC, se disponível"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "falta um valor ao ficheiro control '%s' para o pacote '%s'"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Substituir um pacote por uma versão inferior"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr ""
-"falta um separador de valor no ficheiro control '%s' para o pacote '%s'"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configurar qualquer pacote que poderá ajudar este"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr ""
-"o ficheiro control '%s' para o pacote `%s' contém um nome de ficheiro vazio"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Processar pacotes incidentes mesmo quando em manter"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "não foi possível abrir o ficheiro control '%s' para o pacote '%s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Tentar (des)instalar coisas mesmo não sendo root"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "não foi possível stat ao ficheiro control '%s' para o pacote '%s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "Faltam programas importantes em PATH, seguramente problemas"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "o ficheiro control '%s' para o pacote '%s' não é um ficheiro normal"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Instalar um pacote mesmo que falhe a verificação de autenticidade"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "não pode ler o ficheiro control '%s' para o pacote '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Processar até pacotes com versões erradas"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "não pode fechar o ficheiro control '%s' para o pacote '%s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr "Sobreescrever um stat override existente ao acrescentá-lo"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr ""
-"não foi possível abrir o ficheiro de lista de ficheiros para o pacote `"
-"%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr "Ignorar um stat override em falta ao removê-lo"
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Sobrescrever um ficheiro de um pacote por outro"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Sobrescrever um ficheiro desviado com uma versão não desviada"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "sobrescrever o directório de um pacote por outro ficheiro"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Não executar operações I/O seguras ao descompactar"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr "Não fazer chroot para o ambiente de script do maintainer"
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Utilizar sempre os novos ficheiros de configuração, não perguntar"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Utilizar sempre os ficheiros de configuração antigos, não perguntar"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"falta ficheiro de lista de ficheiros '%.250s'; assumindo que o pacote não "
-"tem actualmente ficheiros instalados"
+"Utilizar a opção por omissão para novos ficheiros de\n"
+"configuração, se estiver disponível não questionar.\n"
+"Se não puder ser encontrado nenhum por omissão irá\n"
+"ser questionado a menos que também sejam indicadas\n"
+"as opções confold ou confnew"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr ""
-"não foi possível fazer stat ao ficheiro de lista de ficheiros para o pacote "
-"'%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Instalar sempre ficheiros de configuração em falta"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "lista de ficheiros para o pacote '%.250s' não é um ficheiro normal"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Oferecer para substituir ficheiros de configuração sem novas versões"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "a ler lista de ficheiros para o pacote '%.250s'"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Processar até pacotes com arquitectura errada ou sem nenhuma"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Instalar mesmo que vá estragar outro pacote"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Permitir a instalação de pacotes em conflito"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Tornar todos os problemas com dependências em avisos"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Tornar problemas com versões de dependências em avisos"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Remover pacotes que necessitam de instalação"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Remover um pacote essencial"
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"falta uma nova linha final no ficheiro de lista de ficheiros para o pacote "
-"'%.250s'"
+"Opções para forçar %s - controlar comportamento quando são encontrados "
+"problemas:\n"
+"  avisar e continuar:  --force-<coisa>,<coisa>,...\n"
+"  parar com erro.      --refuse-<coisa>,<coisa>,... | --no-force-"
+"<coisa>,...\n"
+" Opções para forçar:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"o ficheiro de lista de ficheiros para o pacote `%.250s' contém um ficheiro "
-"vazio"
+"\n"
+"AVISO - a utilização de opções marcadas com [!] pode danificar seriamente a\n"
+"sua instalação. As opções para forçar marcadas com [*] estão habilitadas por\n"
+"predefinição.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "erro ao fechar o ficheiro de lista de ficheiros para o pacote `%.250s'"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+"\n"
+"Opções atualmente ativas:\n"
+" %s\n"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(A ler a base de dados ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "opção desconhecida de forçar/recusar '%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d ficheiro(s) e directório(s) actualmente instalados.)\n"
-msgstr[1] "%d ficheiros e directórios actualmente instalados.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "opção forçar/recusar obsoleta '%s'"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "a ultrapassar problema porque --force está activo: "
 
 #: src/help.c
 msgid "not installed"
@@ -3096,72 +3503,78 @@ msgstr ""
 "Nota: a PATH do root normalmente deve conter /usr/local/sbin, /usr/sbin e /"
 "sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "não foi possível verificar a existência de `%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "não pode ler directório info"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "erro ao tentar abrir %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "ficheiro de formato da base de dados de info corrompido '%s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"o formato de base de dados de informação (%d) está errado ou é demasiado "
-"novo; tente obter um dpkg mais recent"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "Ficheiro info %s/%s não associado a qualquer pacote"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "erro ao escrever '%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
-msgstr "Debian `%s' programa de gestão de pacotes versão %s.\n"
+msgstr "Debian '%s' programa de gestão de pacotes versão %s.\n"
 
 #: src/main.c
 #, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -i|--install       <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  --unpack           <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  -A|--record-avail  <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  --configure        <package> ... | -a|--pending\n"
+#| "  --triggers-only    <package> ... | -a|--pending\n"
+#| "  -r|--remove        <package> ... | -a|--pending\n"
+#| "  -P|--purge         <package> ... | -a|--pending\n"
+#| "  -V|--verify <package> ...        Verify the integrity of package(s).\n"
+#| "  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+#| "  --set-selections                 Set package selections from stdin.\n"
+#| "  --clear-selections               Deselect every non-essential package.\n"
+#| "  --update-avail [<Packages-file>] Replace available packages info.\n"
+#| "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
+#| "  --clear-avail                    Erase existing available info.\n"
+#| "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "  -C|--audit [<package> ...]       Check for broken package(s).\n"
+#| "  --yet-to-unpack                  Print packages selected for "
+#| "installation.\n"
+#| "  --predep-package                 Print pre-dependencies to unpack.\n"
+#| "  --add-architecture <arch>        Add <arch> to the list of "
+#| "architectures.\n"
+#| "  --remove-architecture <arch>     Remove <arch> from the list of "
+#| "architectures.\n"
+#| "  --print-architecture             Print dpkg architecture.\n"
+#| "  --print-foreign-architectures    Print allowed foreign architectures.\n"
+#| "  --assert-<feature>               Assert support for the specified "
+#| "feature.\n"
+#| "  --validate-<thing> <string>      Validate a <thing>'s <string>.\n"
+#| "  --compare-versions <a> <op> <b>  Compare version numbers - see below.\n"
+#| "  --force-help                     Show help on forcing.\n"
+#| "  -Dh|--debug=help                 Show help on debugging.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3179,15 +3592,15 @@ msgid ""
 "\n"
 msgstr ""
 "Comandos:\n"
-"  -i|--install       <ficheiro .deb> ... | -R|--recursive <diretório> ...\n"
-"  --unpack           <ficheiro .deb> ... | -R|--recursive <diretório> ...\n"
-"  -A|--record-avail  <ficheiro .deb> ... | -R|--recursive <diretório> ...\n"
-"  --configure        <pacote> ... | -a|--pending\n"
-"  --triggers-only    <pacote> ... | -a|--pending\n"
-"  -r|--remove        <pacote> ... | -a|--pending\n"
-"  -P|--purge         <pacote> ... | -a|--pending\n"
+"  -i|--install       <ficheiro .deb>... | -R|--recursive <diretório> ...\n"
+"  --unpack           <ficheiro .deb>... | -R|--recursive <diretório> ...\n"
+"  -A|--record-avail  <ficheiro .deb>... | -R|--recursive <diretório> ...\n"
+"  --configure        <pacote>...  | -a|--pending\n"
+"  --triggers-only    <pacote>...  | -a|--pending\n"
+"  -r|--remove        <pacote>...  | -a|--pending\n"
+"  -P|--purge         <pacote>...  | -a|--pending\n"
 "  -V|--verify <pacote> ...        Verificar a integridade do(s) pacote(s).\n"
-"  --get-selections [<padrão> ...] Enviar a lista de selecções para stdout.\n"
+"  --get-selections [<padrão>...]  Enviar a lista de selecções para stdout.\n"
 "  --set selections                Definir a lista de selecções a partir de "
 "stdin.\n"
 "  --clear-selections              Desseleccionar todos os pacotes não "
@@ -3199,12 +3612,12 @@ msgstr ""
 "disponíveis.\n"
 "  --forget-old-unavail            Esquecer pacotes desinstalados "
 "indisponíveis.\n"
-"  -s|--status <pacote> ...        Mostrar detalhes de estado do pacote.\n"
-"  -p|--print-avail <pacote> ...   Mostrar detalhes da versão disponível.\n"
-"  -L|--listfiles <pacote> ...     Listar ficheiros que pertencem ao(s) "
+"  -s|--status [<pacote>...]       Mostrar detalhes de estado do pacote.\n"
+"  -p|--print-avail [<pacote>...]  Mostrar detalhes da versão disponível.\n"
+"  -L|--listfiles <pacote>...      Listar ficheiros que pertencem ao(s) "
 "pacote(s).\n"
 "  -l|--list [<padrão> ...]        Listar pacotes resumidamente.\n"
-"  -S|--search <padrão> ...        Encontrar pacote(s) com o(s) ficheiro(s).\n"
+"  -S|--search <padrão>...         Encontrar pacote(s) com o(s) ficheiro(s).\n"
 "  -C|--audit [<pacote> ...]       Procurar pacotes com problemas.\n"
 "  --yet-to-unpack                 Escrever pacotes selecionados para "
 "instalação.\n"
@@ -3390,115 +3803,6 @@ msgstr ""
 "'less' ou 'more' !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Definir todas as opções de forçar"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Substituir um pacote por uma versão inferior"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Configurar qualquer pacote que poderá ajudar este"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Processar pacotes incidentes mesmo quando em manter"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Tentar (des)instalar coisas mesmo não sendo root"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "Faltam programas importantes em PATH, seguramente problemas"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Instalar um pacote mesmo que falhe a verificação de autenticidade"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Processar até pacotes com versões erradas"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Sobrescrever um ficheiro de um pacote por outro"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Sobrescrever um ficheiro desviado com uma versão não desviada"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "sobrescrever o directório de um pacote por outro ficheiro"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Não executar operações I/O seguras ao descompactar"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr "Não fazer chroot para o ambiente de script do maintainer"
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Utilizar sempre os novos ficheiros de configuração, não perguntar"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Utilizar sempre os ficheiros de configuração antigos, não perguntar"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Utilizar a opção por omissão para novos ficheiros de\n"
-"configuração, se estiver disponível não questionar.\n"
-"Se não puder ser encontrado nenhum por omissão irá\n"
-"ser questionado a menos que também sejam indicadas\n"
-"as opções confold ou confnew"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Instalar sempre ficheiros de configuração em falta"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Oferecer para substituir ficheiros de configuração sem novas versões"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Processar até pacotes com arquitectura errada ou sem nenhuma"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Instalar mesmo que vá estragar outro pacote"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Permitir a instalação de pacotes em conflito"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Tornar todos os problemas com dependências em avisos"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Tornar problemas com versões de dependências em avisos"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Remover pacotes que necessitam de instalação"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Remover um pacote essencial"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Informação de progresso geralmente útil"
 
@@ -3631,46 +3935,8 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"Opções para forçar %s - controlar comportamento quando são encontrados "
-"problemas:\n"
-"  avisar e continuar:  --force-<coisa>,<coisa>,...\n"
-"  parar com erro.      --refuse-<coisa>,<coisa>,... | --no-force-"
-"<coisa>,...\n"
-" Opções para forçar:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"AVISO - a utilização de opções marcadas com [!] pode danificar seriamente a\n"
-"sua instalação. As opções para forçar marcadas com [*] estão habilitadas "
-"por\n"
-"pré-definição.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "opção desconhecida de forçar/recusar `%.*s'"
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "opção forçar/recusar obsoleta '%s'"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
-msgstr "não pode abrir `%i' para stream"
+msgstr "não pode abrir '%i' para stream"
 
 #: src/main.c
 #, c-format
@@ -3728,7 +3994,7 @@ msgid ""
 " (current status '%.250s' with no pending triggers)"
 msgstr ""
 "o pacote %.250s não está pronto para processamento de trigger\n"
-" (estado actual `%.250s' sem triggers pendentes)"
+" (estado actual '%.250s' sem triggers pendentes)"
 
 #: src/packages.c
 #, c-format
@@ -3849,6 +4115,10 @@ msgid "Description"
 msgstr "Descrição"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr "mostrar a lista de pacotes no pager"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "desviado por %s para: %s\n"
@@ -3884,6 +4154,11 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "o pacote '%s' não está instalado e não está disponível informação"
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Utilize dpkg --info (= dpkg-deb --info) para examinar ficheiros de arquivo.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "o pacote '%s' não está disponível"
@@ -3891,7 +4166,7 @@ msgstr "o pacote '%s' não está disponível"
 #: src/querycmd.c
 #, c-format
 msgid "Package '%s' does not contain any files (!)\n"
-msgstr "O pacote `%s' não contém qualquer ficheiro (!)\n"
+msgstr "O pacote '%s' não contém qualquer ficheiro (!)\n"
 
 #: src/querycmd.c
 #, c-format
@@ -3910,11 +4185,10 @@ msgstr "desviado por %s para: %s\n"
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
-"Utilize dpkg --info (= dpkg-deb --info) para examinar ficheiros de arquivo,\n"
-"e dpkg --contents (= dpkg-deb --contents) para listar o seu conteúdo.\n"
+"Utilize dpkg --contents (= dpkg-deb --contents) para listar o conteúdo de "
+"ficheiros de arquivo.\n"
 
 #: src/querycmd.c dpkg-deb/info.c
 #, c-format
@@ -3956,35 +4230,34 @@ msgstr ""
 #, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
 "Comandos:\n"
-"  -s|--status <pacote> ...         Mostrar detalhes do estado do pacote.\n"
-"  -p|--print-avail <pacote> ...    Mostrar detalhes da versão disponível.\n"
-"  -L|--listfiles <pacote> ...      Listar os ficheiros que pertencem ao(s) "
+"  -s|--status [<pacote>...]        Mostrar detalhes do estado do pacote.\n"
+"  -p|--print-avail [<pacote>...]   Mostrar detalhes da versão disponível.\n"
+"  -L|--listfiles <pacote>...       Listar os ficheiros que pertencem ao(s) "
 "pacotes(s).\n"
-"  -l|--list [<padrão> ...]         Listar pacotes de forma concisa.\n"
-"  -W|--show <padrão> ...           Mostrar informação sobre o(s) pacote(s).\n"
-"  -S|--search <padrão> ...         Mostrar pacote(s) dono(s) do(s) "
+"  -l|--list [<padrão>...]          Listar os pacotes de forma concisa.\n"
+"  -W|--show [<padrão>...]          Mostrar informação sobre o(s) pacote(s).\n"
+"  -S|--search <padrão>...          Encontrar pacote(s) dono(s) do(s) "
 "ficheiro(s).\n"
-"     --control-list <pacote>       Mostrar a lista de ficheiros de controlo "
-"de pacote.\n"
-"     --control-show <pacote> <ficheiro>\n"
-"                                   Mostrar o ficheiro de controlo do "
+"     --control-list <pacote>       Mostrar a lista de ficheiros control de "
 "pacote.\n"
+"     --control-show <pacote> <ficheiro>\n"
+"                                   Mostrar o ficheiro control do pacote.\n"
 "  -c|--control-path <pacote> [<ficheiro>]\n"
-"                                   Escrever caminho do ficheiro control do "
+"                                   Escrever o caminho do ficheiro control do "
 "pacote.\n"
 "\n"
 
@@ -4095,7 +4368,7 @@ msgstr "A remover %s (%s) ...\n"
 #, c-format
 msgid "unable to delete control info file '%.250s'"
 msgstr ""
-"não foi possível remover o ficheiro de informações de controle `%.250s'"
+"não foi possível remover o ficheiro de informações de controle '%.250s'"
 
 #: src/remove.c
 #, c-format
@@ -4126,7 +4399,7 @@ msgstr "A purgar os ficheiros de configuração para %s (%s) ...\n"
 #: src/remove.c
 #, c-format
 msgid "cannot remove old config file '%.250s' (= '%.250s')"
-msgstr "não pode remover ficheiro de configuração antigo `%.250s' (= `%.250s')"
+msgstr "não pode remover ficheiro de configuração antigo '%.250s' (= '%.250s')"
 
 #: src/remove.c
 #, c-format
@@ -4138,12 +4411,12 @@ msgstr ""
 #, c-format
 msgid "cannot remove old backup config file '%.250s' (of '%.250s')"
 msgstr ""
-"não pode remover o backup do ficheiro de configuração antigo `%.250s') (de `"
-"%.250s')"
+"não pode remover o backup do ficheiro de configuração antigo '%.250s') (de "
+"'%.250s')"
 
 #: src/remove.c
 msgid "cannot remove old files list"
-msgstr "não foi possível remover a antiga lista de ficheiros"
+msgstr "não pode remover a antiga lista de ficheiros"
 
 #: src/remove.c
 msgid "can't remove old postrm script"
@@ -4152,7 +4425,7 @@ msgstr "não pode remover o script postrm antigo"
 #: src/script.c
 #, c-format
 msgid "unable to set execute permissions on '%.250s'"
-msgstr "não foi possível definir permissões de execução em `%.250s'"
+msgstr "não foi possível definir permissões de execução em '%.250s'"
 
 #: src/script.c
 msgid "admindir must be inside instdir for dpkg to work properly"
@@ -4160,14 +4433,22 @@ msgstr ""
 "admindir tem de ser dentro de instdir para o dpkg funcionar correctamente"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+"sem privilégios suficientes para alterar o directório raiz com --force-not-"
+"root, considere utilizar --force-script-chrootless?"
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
-msgstr "falhou o chroot para `%.250s'"
+msgstr "falhou o chroot para '%.250s'"
 
 #: src/script.c dpkg-deb/build.c
 #, c-format
 msgid "failed to chdir to '%.255s'"
-msgstr "o chdir para `%.255s' falhou"
+msgstr "o chdir para '%.255s' falhou"
 
 #: src/script.c
 msgid "unable to setenv for maintainer script"
@@ -4175,31 +4456,27 @@ msgstr "não foi possível fazer setenv para o script do maintainer"
 
 #: src/script.c
 msgid "cannot set security execution context for maintainer script"
-msgstr ""
-"não foi possível definir o contexto de execução para o script do maintainer"
+msgstr "não pode definir o contexto de execução para o script do maintainer"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "installed %s script"
+#, c-format
 msgid "installed %s package %s script"
-msgstr "script %s instalado"
+msgstr "instalado, do pacote %s, o script %s"
 
 #: src/script.c
 #, c-format
 msgid "unable to stat %s '%.250s'"
-msgstr "não foi possível o stat a %s `%.250s'"
+msgstr "não foi capaz de stat %s '%.250s'"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "new %s script"
+#, c-format
 msgid "new %s package %s script"
-msgstr "novo script %s"
+msgstr "do pacote %s, novo script %s"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "old %s script"
+#, c-format
 msgid "old %s package %s script"
-msgstr "script %s antigo"
+msgstr "do pacote antigo %s, script %s"
 
 #: src/script.c
 #, c-format
@@ -4276,11 +4553,11 @@ msgstr ""
 
 #: src/selinux.c
 msgid "cannot open security status notification channel"
-msgstr "não conseguiu abrir o canal de notificação de estado de segurança"
+msgstr "não pode abrir o canal de notificação de estado de segurança"
 
 #: src/selinux.c
 msgid "cannot get security labeling handle"
-msgstr "não foi possível obter a identificação de segurança"
+msgstr "não pode obter a identificação de segurança"
 
 #: src/selinux.c
 #, c-format
@@ -4312,11 +4589,28 @@ msgstr ""
 
 #: src/statcmd.c
 #, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --instdir <directory>    set the root directory, but not the admin "
+#| "dir.\n"
+#| "  --root <directory>       set the directory of the root filesystem.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4325,11 +4619,17 @@ msgstr ""
 "Opções:\n"
 "  --admindir <directório>  definir o directório com o ficheiro "
 "statoverride.\n"
+"  --instdir <directório>   definir o direcorio raiz, mas não o directório "
+"admin.\n"
+"  --root <directório>      definir o directório do sistema de ficheiros "
+"raiz.\n"
 "  --update                 actualizar imediatamente as permissões do "
 "<caminho>.\n"
-"  --force                  força uma acção mesmo que o teste de sanidade "
-"falhe.\n"
-"  --quiet                  a operação silenciosa, saída mínima.\n"
+"  --force                  alias descontinuado para --force-all.\n"
+"  --force-...              ultrapassar problemas (veja --force-help).\n"
+"  --no-force-...           parar quando forem encontrados problemas.\n"
+"  --refuse-...             idem.\n"
+"  --quiet                  operação silenciosa, saída mínima.\n"
 "  --help                   mostrar esta mensagem de ajuda.\n"
 "  --version                mostrar a versão.\n"
 "\n"
@@ -4383,64 +4683,11 @@ msgstr "não está presente nenhum 'override'"
 msgid "--update is useless for --remove"
 msgstr "--update é inútil para --remove"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "uid statoverride inválido %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "gid statoverride inválido %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "modo statoverride inválido %s"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "falhou abrir ficheiro statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "falhou o fstat ao ficheiros statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "a ler ficheiro statoverride '%.250s'"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "falta uma linha vazia no final do ficheiro statoverride"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "ficheiro statoverride contém uma linha vazia"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "erro de sintaxe no ficheiro statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "utilizador desconhecido '%s' no ficheiro statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "fim de linha inesperado no ficheiro statoverride"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "grupo '%s' desconhecido no statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "vários statoverrides presentes para o ficheiro '%.250s'"
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "opção --%s obsoleta; por favor utilize antes --%s"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4525,7 +4772,7 @@ msgstr "nome '%.250s' ilegal de pacote esperado: %.250s"
 #: src/trigcmd.c
 #, c-format
 msgid "invalid trigger name '%.250s': %.250s"
-msgstr "nome `%.250s' de 'trigger' inválido: %.250s"
+msgstr "nome '%.250s' de 'trigger' inválido: %.250s"
 
 #: src/trigproc.c
 msgid ""
@@ -4584,7 +4831,7 @@ msgstr ".../%s"
 #: src/unpack.c
 #, c-format
 msgid "error ensuring '%.250s' doesn't exist"
-msgstr "erro ao assegurar que `%.250s' não existe"
+msgstr "erro ao assegurar que '%.250s' não existe"
 
 #: src/unpack.c
 msgid "split package reassembly"
@@ -4657,6 +4904,10 @@ msgstr "A desconfigurar %s (%s), para permitir a remoção de %s (%s) ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "A desconfigurar %s (%s) ...\n"
 
+#: src/unpack.c
+msgid "conffile file contains an empty line"
+msgstr "ficheiro conffile contém uma linha vazia"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4678,17 +4929,17 @@ msgstr "erro a fechar %.250s"
 msgid "old version of package has overly-long info file name starting '%.250s'"
 msgstr ""
 "a antiga versão do pacote tem um nome de ficheiro demasiado comprido "
-"começando por `%.250s'"
+"começando por '%.250s'"
 
 #: src/unpack.c
 #, c-format
 msgid "unable to remove obsolete info file '%.250s'"
-msgstr "não foi possível remover o ficheiro de info obsoleto `%.250s'"
+msgstr "não foi possível remover o ficheiro de info obsoleto '%.250s'"
 
 #: src/unpack.c
 #, c-format
 msgid "unable to install (supposed) new info file '%.250s'"
-msgstr "não foi possível instalar (o suposto) novo ficheiro info `%.250s'"
+msgstr "não foi possível instalar (o suposto) novo ficheiro info '%.250s'"
 
 #: src/unpack.c
 msgid "unable to open temp control directory"
@@ -4699,18 +4950,18 @@ msgstr "não foi possível abrir o directório temporário de controle"
 msgid "package contains overly-long control info file name (starting '%.50s')"
 msgstr ""
 "o pacote contém um ficheiro de info de control com o nome de ficheiro "
-"demasiado comprido (começando por `%.50s')"
+"demasiado comprido (começando por '%.50s')"
 
 #: src/unpack.c
 #, c-format
 msgid "package control info contained directory '%.250s'"
-msgstr "a informação de controle do pacote contém o directório `%.250s'"
+msgstr "a informação de controle do pacote contém o directório '%.250s'"
 
 #: src/unpack.c
 #, c-format
 msgid "package control info rmdir of '%.250s' didn't say not a dir"
 msgstr ""
-"rmdir de info de controle do pacote `%.250s' não disse que não era um dir"
+"rmdir de info de controle do pacote '%.250s' não disse que não era um dir"
 
 #: src/unpack.c
 #, c-format
@@ -4720,7 +4971,7 @@ msgstr "o pacote %s continha lista como ficheiro info"
 #: src/unpack.c
 #, c-format
 msgid "unable to install new info file '%.250s' as '%.250s'"
-msgstr "não foi possível instalar o novo ficheiro info `%.250s' como `%.250s'"
+msgstr "não foi possível instalar o novo ficheiro info '%.250s' como '%.250s'"
 
 #: src/unpack.c
 #, c-format
@@ -4744,7 +4995,7 @@ msgstr ""
 #: src/unpack.c
 #, c-format
 msgid "unable to stat other new file '%.250s'"
-msgstr "Não foi possível fazer stat a outro novo ficheiro `%.250s'"
+msgstr "Não foi possível fazer stat a outro novo ficheiro '%.250s'"
 
 #: src/unpack.c
 #, c-format
@@ -4799,14 +5050,9 @@ msgid "package filesystem archive extraction"
 msgstr "extracção do arquivo do pacote do sistema de ficheiros"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "erro ao ler a saída do tar de dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
-msgstr ""
-"sistema de ficheiros do ficheiro tar corrompido - arquivo de pacote "
-"corrompido"
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
+msgstr "sistema de ficheiros do ficheiro tar corrompido no arquivo de pacote"
 
 #: src/unpack.c
 #, c-format
@@ -4819,16 +5065,19 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s necessita no máximo um argumento ficheiro-Packages"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
-msgstr ""
-"não foi possível aceder à area de status do dpkg para uma completa "
-"actualização"
+#, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
+msgstr "não foi possível aceder ao directório '%s' da base de dados do dpkg para actualização em massa"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"actualização completa de disponibilidade necessita de acesso de escrita à "
-"área de estado do dpkg"
+"é necessário acesso de escrita ao directório '%s' da base de dados dos dpkg para atualização em massa"
 
 #: src/update.c
 #, c-format
@@ -4891,7 +5140,7 @@ msgstr ""
 #, c-format
 msgid "maintainer script '%.50s' is not a plain file or symlink"
 msgstr ""
-"script `%.50s' do maintainer não é ficheiro de texto simples ou link "
+"script '%.50s' do maintainer não é ficheiro de texto simples ou link "
 "simbólico"
 
 #: dpkg-deb/build.c
@@ -4900,13 +5149,13 @@ msgid ""
 "maintainer script '%.50s' has bad permissions %03lo (must be >=0555 and "
 "<=0775)"
 msgstr ""
-"script `%.50s' do maintainer tem permissões erradas %03lo (devem ser >=0555 "
+"script '%.50s' do maintainer tem permissões erradas %03lo (devem ser >=0555 "
 "e <=0775)"
 
 #: dpkg-deb/build.c
 #, c-format
 msgid "maintainer script '%.50s' is not stattable"
-msgstr "não é possível fazer stat ao script `%.50s' do maintainer"
+msgstr "não é possível fazer stat ao script '%.50s' do maintainer"
 
 #: dpkg-deb/build.c
 msgid "error opening conffiles file"
@@ -4925,12 +5174,12 @@ msgstr ""
 #: dpkg-deb/build.c
 #, c-format
 msgid "conffile '%.250s' does not appear in package"
-msgstr "o conffile `%.250s' não aparece no pacote"
+msgstr "o conffile '%.250s' não aparece no pacote"
 
 #: dpkg-deb/build.c
 #, c-format
 msgid "conffile '%.250s' is not stattable"
-msgstr "não é possível fazer stat ao conffile `%.250s'"
+msgstr "não é possível fazer stat ao conffile '%.250s'"
 
 #: dpkg-deb/build.c
 #, c-format
@@ -4950,7 +5199,7 @@ msgstr "erro ao ler o ficheiro conffiles"
 msgid "package name has characters that aren't lowercase alphanums or '-+.'"
 msgstr ""
 "o nome do pacote tem caracteres que não são caracteres alfanuméricos "
-"minúsculos nem `-+.'"
+"minúsculos nem '-+.'"
 
 #: dpkg-deb/build.c
 msgid "package architecture is missing or empty"
@@ -4971,7 +5220,7 @@ msgstr[1] "a ignorar %d avisos acerca do(s) ficheiro(s) de controle"
 #: dpkg-deb/build.c
 #, c-format
 msgid "unable to check for existence of archive '%.250s'"
-msgstr "não foi possível verificar a existência do repositório `%.250s'"
+msgstr "não foi possível verificar a existência do repositório '%.250s'"
 
 #: dpkg-deb/build.c
 msgid "compressing tar member"
@@ -4994,7 +5243,7 @@ msgstr "--%s necessita de um argumento <directório>"
 #: dpkg-deb/build.c
 msgid "target is directory - cannot skip control file check"
 msgstr ""
-"o alvo é um directório - não é possível saltar a verificação do ficheiro de "
+"o alvo é um directório - não pode saltar a verificação do ficheiro de "
 "controle"
 
 #: dpkg-deb/build.c
@@ -5009,7 +5258,7 @@ msgstr "a compilar um pacote desconhecido em '%s'."
 #: dpkg-deb/build.c
 #, c-format
 msgid "building package '%s' in '%s'."
-msgstr "a compilar o pacote `%s' em `%s'."
+msgstr "a compilar o pacote '%s' em '%s'."
 
 #: dpkg-deb/build.c
 #, c-format
@@ -5034,7 +5283,7 @@ msgstr "falhou ao fazer fstat ao ficheiro temporário (%s)"
 #: dpkg-deb/build.c
 #, c-format
 msgid "error writing '%s'"
-msgstr "erro ao escrever `%s'"
+msgstr "erro ao escrever '%s'"
 
 #: dpkg-deb/build.c
 #, c-format
@@ -5069,11 +5318,10 @@ msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "o ficheiro '%.250s' está corrompido - mau cabeçalho de arquivo"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "file '%.250s' is not a debian binary archive (try dpkg-split?)"
+#, c-format
 msgid "file '%.250s' is not a Debian binary archive (try dpkg-split?)"
 msgstr ""
-"o ficheiro `%.250s' não é um arquivo binário debian (tente dpkg-split?)"
+"o ficheiro '%.250s' não é um arquivo Debian binário (tente dpkg-split?)"
 
 #: dpkg-deb/extract.c
 msgid "archive information header member"
@@ -5117,15 +5365,12 @@ msgid "archive '%.250s' contains two control members, giving up"
 msgstr "o arquivo '%.250s' contém dois membros de controle, a desistir"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " new debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd bytes.\n"
+#, c-format
 msgid ""
 " new Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
 msgstr ""
-" novo pacote debian, versão %d.%d.\n"
+" novo pacote Debian, versão %d.%d.\n"
 " %jd bytes de tamanho: arquivo de controle=%jd bytes.\n"
 
 #: dpkg-deb/extract.c
@@ -5143,15 +5388,12 @@ msgid "cannot skip archive control member from '%s': %s"
 msgstr "não pode saltar membro do controlo do arquivo '%s': %s"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " old debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd, main archive=%jd.\n"
+#, c-format
 msgid ""
 " old Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgstr ""
-" pacote debian antigo, versão %d.%d.\n"
+" pacote Debian antigo, versão %d.%d.\n"
 " tamanho %jd bytes: arquivo de controle=%jd, arquivo principal=%jd.\n"
 
 #: dpkg-deb/extract.c
@@ -5163,10 +5405,9 @@ msgstr ""
 " por ter sido feito o download em modo ASCII"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "'%.255s' is not a debian format archive"
+#, c-format
 msgid "'%.255s' is not a Debian format archive"
-msgstr "`%.255s' não é um arquivo de formato debian"
+msgstr "'%.255s' não é um arquivo de formato Debian"
 
 #: dpkg-deb/extract.c
 #, c-format
@@ -5183,16 +5424,17 @@ msgid "decompressing archive member"
 msgstr "a descomprimir membro do arquivo"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "falhou o chdir para o directório"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "falhou criar directório"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "falhou o chdir para o directório após o ter criado"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr "nome de caminho %s pré-existente inesperado"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "falhou o chdir para o directório"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5249,7 +5491,7 @@ msgstr "'%.255s' não contém nenhum componente de controle '%.255s'"
 #: dpkg-deb/info.c
 #, c-format
 msgid "open component '%.255s' (in %.255s) failed in an unexpected way"
-msgstr "abrir o componente `%.255s' (em %.255s) falhou de um modo inesperado"
+msgstr "abrir o componente '%.255s' (em %.255s) falhou de um modo inesperado"
 
 #: dpkg-deb/info.c
 #, c-format
@@ -5261,22 +5503,22 @@ msgstr[1] "%d componentes de controle pedidos em falta"
 #: dpkg-deb/info.c utils/update-alternatives.c
 #, c-format
 msgid "cannot scan directory '%.255s'"
-msgstr "não pode pesquisar o directório `%.255s'"
+msgstr "não pode pesquisar o directório '%.255s'"
 
 #: dpkg-deb/info.c
 #, c-format
 msgid "cannot stat '%.255s' (in '%.255s')"
-msgstr "Não pode fazer stat `%.255s' (em %.255s')"
+msgstr "Não pode fazer stat '%.255s' (em %.255s')"
 
 #: dpkg-deb/info.c
 #, c-format
 msgid "cannot open '%.255s' (in '%.255s')"
-msgstr "não pode abrir `%.255s' (em %.255s')"
+msgstr "não pode abrir '%.255s' (em %.255s')"
 
 #: dpkg-deb/info.c
 #, c-format
 msgid "failed to read '%.255s' (in '%.255s')"
-msgstr "falhou ler `%.255s' (em `%.255s')"
+msgstr "falhou ler '%.255s' (em '%.255s')"
 
 #: dpkg-deb/info.c
 #, c-format
@@ -5295,7 +5537,7 @@ msgstr "nenhum ficheiro 'control' no arquivo de controle!"
 #: dpkg-deb/main.c
 #, c-format
 msgid "Debian '%s' package archive backend version %s.\n"
-msgstr "Debian `%s'' backend do arquivo de pacote versão %s.\n"
+msgstr "Debian '%s'' backend do arquivo de pacote versão %s.\n"
 
 #: dpkg-deb/main.c
 #, c-format
@@ -5341,35 +5583,11 @@ msgid ""
 msgstr ""
 "<deb> é o nome do ficheiro de um arquivo de formato Debian.\n"
 "<cfile> é o nome de um componente de um ficheiro administrativo.\n"
-"<cfield> é o nome de um campo no ficheiro principal `control'.\n"
+"<cfield> é o nome de um campo no ficheiro principal 'control'.\n"
 "\n"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  -v, --verbose                    Enable verbose output.\n"
-#| "  -D, --debug                      Enable debugging output.\n"
-#| "      --showformat=<format>        Use alternative format for --show.\n"
-#| "      --deb-format=<format>        Select archive format.\n"
-#| "                                     Allowed values: 0.939000, 2.0 "
-#| "(default).\n"
-#| "      --nocheck                    Suppress control file check (build "
-#| "bad\n"
-#| "                                     packages).\n"
-#| "      --uniform-compression        Use the compression params on all "
-#| "members.\n"
-#| "  -z#                              Set the compression level when "
-#| "building.\n"
-#| "  -Z<type>                         Set the compression type used when "
-#| "building.\n"
-#| "                                     Allowed types: gzip, xz, none.\n"
-#| "  -S<strategy>                     Set the compression strategy when "
-#| "building.\n"
-#| "                                     Allowed values: none; extreme (xz);\n"
-#| "                                     filtered, huffman, rle, fixed "
-#| "(gzip).\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  -v, --verbose                    Enable verbose output.\n"
@@ -5402,15 +5620,16 @@ msgstr ""
 "(default).\n"
 "      --nocheck                    Suprimir verificação do arquivo controlo "
 "(construir pacotes mal-formados).\n"
-"      --uniform-compression        Usar os parâmetros de compressão em todos "
+"      --root-owner-group           Forçar que o dono e grupo seja root.\n"
+"      --[no-]uniform-compression   Usar os parâmetros de compressão em todos "
 "os membros.\n"
 "  -z#                              Definir o nível de compressão para a "
 "compilação.\n"
-"  -Z<tipo>                         Definir o tipo de compressão utilizado ao "
-"compilar.\n"
+"  -Z<tipo>                         Definir o tipo de compressão utilizado "
+"para a compilação.\n"
 "                                     Tipos permitidos: gzip, xz, none.\n"
-"  -S<estratégia>                   Definir a estratégia de compressão ao "
-"compilar.\n"
+"  -S<estratégia>                   Definir a estratégia de compressão para a "
+"compilação.\n"
 "                                     Tipos permitidos: none, extreme (xz);\n"
 "                                     filtered, huffman, rle, fixed (gzip).\n"
 "\n"
@@ -5426,7 +5645,7 @@ msgstr ""
 "\n"
 "Use 'dpkg' para instalar e remover pacotes do seu sistema, ou 'apt' ou\n"
 "'aptitude' para uma gestão de pacotes amigável. Os pacotes descompactados\n"
-"com `dpkg-deb --extract' serão incorrectamente instalados !\n"
+"com 'dpkg-deb --extract' serão incorrectamente instalados !\n"
 
 #: dpkg-deb/main.c
 msgid ""
@@ -5459,7 +5678,7 @@ msgstr "estratégua de compressão desconhecida '%s'!"
 #: dpkg-deb/main.c
 #, c-format
 msgid "unknown compression type '%s'!"
-msgstr "compressão desconhecida tipo `%s'!"
+msgstr "compressão desconhecida tipo '%s'!"
 
 #: dpkg-deb/main.c
 #, c-format
@@ -5484,7 +5703,7 @@ msgstr "tipo de compressão '%s' não suportada com compressão uniforme"
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - bad digit (code %d) in %s"
-msgstr "o ficheiro `%.250s' está corrompido - dígito errado (código %d) em %s"
+msgstr "o ficheiro '%.250s' está corrompido - dígito errado (código %d) em %s"
 
 #: dpkg-split/info.c
 #, c-format
@@ -5494,12 +5713,12 @@ msgstr "o ficheiro '%s' está corrompido; número inteiro fora da gama em %s"
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - %.250s missing"
-msgstr "o ficheiro `%.250s' está corrompido - %.250s em falta"
+msgstr "o ficheiro '%.250s' está corrompido - %.250s em falta"
 
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - missing newline after %.250s"
-msgstr "o ficheiro `%.250s' está corrompido - falta newline após %.250s"
+msgstr "o ficheiro '%.250s' está corrompido - falta newline após %.250s"
 
 #: dpkg-split/info.c
 #, c-format
@@ -5517,13 +5736,13 @@ msgstr ""
 #, c-format
 msgid "file '%.250s' is corrupt - bad padding character (code %d)"
 msgstr ""
-"o ficheiro `%250s' está corrompido - caractere de enchimento errado (código "
+"o ficheiro '%250s' está corrompido - caractere de enchimento errado (código "
 "(%d)"
 
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - nulls in info section"
-msgstr "o ficheiro `%.250s' está corrompido - nulos na secção info"
+msgstr "o ficheiro '%.250s' está corrompido - nulos na secção info"
 
 #: dpkg-split/info.c
 msgid "format version number"
@@ -5556,7 +5775,7 @@ msgstr "valor de controlo MD5 do ficheiro de pacote"
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - bad MD5 checksum '%.250s'"
-msgstr "o ficheiro `%.250s' está corrompido - checksum MD5 errado `%.250s'"
+msgstr "o ficheiro '%.250s' está corrompido - checksum MD5 errado '%.250s'"
 
 #: dpkg-split/info.c
 msgid "archive total size"
@@ -5605,43 +5824,43 @@ msgstr "arquitectura de pacote"
 #, c-format
 msgid "file '%.250s' is corrupt - bad magic at end of second header"
 msgstr ""
-"o ficheiro `%.250s está corrompido - magic errado no fim do segundo cabeçalho"
+"o ficheiro '%.250s está corrompido - magic errado no fim do segundo cabeçalho"
 
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - second member is not data member"
 msgstr ""
-"o ficheiro `%.250s' está corrompido - o segundo membro não é um membro de "
+"o ficheiro '%.250s' está corrompido - o segundo membro não é um membro de "
 "dados"
 
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - wrong number of parts for quoted sizes"
 msgstr ""
-"o ficheiro `%.250s' está corrompido - número errado de partes para os "
+"o ficheiro '%.250s' está corrompido - número errado de partes para os "
 "tamanhos citados"
 
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - size is wrong for quoted part number"
 msgstr ""
-"o ficheiro `%250s' está corrompido - o tamanho está errado para o número da "
+"o ficheiro '%250s' está corrompido - o tamanho está errado para o número da "
 "parte citado"
 
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is corrupt - too short"
-msgstr "o ficheiro `%.250s' está corrompido - demasiado pequeno"
+msgstr "o ficheiro '%.250s' está corrompido - demasiado pequeno"
 
 #: dpkg-split/info.c
 #, c-format
 msgid "cannot open archive part file '%.250s'"
-msgstr "não pode abrir ficheiro de parte de arquivo `%.250s'"
+msgstr "não pode abrir ficheiro de parte de arquivo '%.250s'"
 
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%.250s' is not an archive part"
-msgstr "o ficheiro `%250s' não é uma parte de arquivo"
+msgstr "o ficheiro '%250s' não é uma parte de arquivo"
 
 #: dpkg-split/info.c
 #, c-format
@@ -5687,7 +5906,7 @@ msgstr "--%s necessita de um ou mais argumentos de partes de ficheiro"
 #: dpkg-split/info.c
 #, c-format
 msgid "file '%s' is not an archive part\n"
-msgstr "o ficheiro `%s' não é uma parte de arquivo\n"
+msgstr "o ficheiro '%s' não é uma parte de arquivo\n"
 
 #: dpkg-split/join.c
 #, c-format
@@ -5699,12 +5918,12 @@ msgstr[1] "A formar o pacote %s com %d partes: "
 #: dpkg-split/join.c
 #, c-format
 msgid "unable to open output file '%.250s'"
-msgstr "não foi possível abrir o ficheiro de saída `%.250s'"
+msgstr "não foi possível abrir o ficheiro de saída '%.250s'"
 
 #: dpkg-split/join.c
 #, c-format
 msgid "unable to (re)open input part file '%.250s'"
-msgstr "não foi possível (re)abrir ficheiro de entrada de parte `%.250s'"
+msgstr "não foi possível (re)abrir ficheiro de entrada de parte '%.250s'"
 
 #: dpkg-split/join.c
 #, c-format
@@ -5724,12 +5943,12 @@ msgstr "feito\n"
 #: dpkg-split/join.c
 #, c-format
 msgid "files '%.250s' and '%.250s' are not parts of the same file"
-msgstr "os ficheiros `%.250s' e `%.250s' não são partes do mesmo ficheiro"
+msgstr "os ficheiros '%.250s' e '%.250s' não são partes do mesmo ficheiro"
 
 #: dpkg-split/join.c
 #, c-format
 msgid "there are several versions of part %d - at least '%.250s' and '%.250s'"
-msgstr "existem diversas versões da parte %d - pelo menos `%.250s' e `%.250s'"
+msgstr "existem diversas versões da parte %d - pelo menos '%.250s' e '%.250s'"
 
 #: dpkg-split/join.c
 #, c-format
@@ -5739,7 +5958,7 @@ msgstr "falta a parte %d"
 #: dpkg-split/main.c
 #, c-format
 msgid "Debian '%s' package split/join tool; version %s.\n"
-msgstr "Debian `%s' ferramenta para dividir/juntar pacotes; versão %s.\n"
+msgstr "Debian '%s' ferramenta para dividir/juntar pacotes; versão %s.\n"
 
 #: dpkg-split/main.c
 #, c-format
@@ -5812,7 +6031,7 @@ msgstr ""
 #: dpkg-split/queue.c
 #, c-format
 msgid "unable to read depot directory '%.250s'"
-msgstr "não foi possível ler o directório depot `%.250s'"
+msgstr "não foi possível ler o directório depot '%.250s'"
 
 #: dpkg-split/queue.c
 msgid "--auto requires the use of the --output option"
@@ -5825,22 +6044,22 @@ msgstr "--auto necessita exactamente de um ficheiro de parte como argumento"
 #: dpkg-split/queue.c
 #, c-format
 msgid "unable to read part file '%.250s'"
-msgstr "não foi possível ler o ficheiro de parte `%.250s'"
+msgstr "não foi possível ler o ficheiro de parte '%.250s'"
 
 #: dpkg-split/queue.c
 #, c-format
 msgid "File '%.250s' is not part of a multipart archive.\n"
-msgstr "O ficheiro `%.250s' não faz parte de um arquivo de várias partes.\n"
+msgstr "O ficheiro '%.250s' não faz parte de um arquivo de várias partes.\n"
 
 #: dpkg-split/queue.c
 #, c-format
 msgid "unable to reopen part file '%.250s'"
-msgstr "não foi possível re-abrir ficheiro dividido `%.250s'"
+msgstr "não foi possível re-abrir ficheiro dividido '%.250s'"
 
 #: dpkg-split/queue.c
 #, c-format
 msgid "unable to open new depot file '%.250s'"
-msgstr "não foi possível abrir novo ficheiro depot `%.250s'"
+msgstr "não foi possível abrir novo ficheiro depot '%.250s'"
 
 #: dpkg-split/queue.c
 #, c-format
@@ -5850,7 +6069,7 @@ msgstr "não pode extrair parte de pacote dividido '%s': %s"
 #: dpkg-split/queue.c
 #, c-format
 msgid "unable to rename new depot file '%.250s' to '%.250s'"
-msgstr "não foi possível renomear o novo ficheiro depot `%.250s' para `%.250s'"
+msgstr "não foi possível renomear o novo ficheiro depot '%.250s' para '%.250s'"
 
 #: dpkg-split/queue.c
 #, c-format
@@ -5864,7 +6083,7 @@ msgstr " e "
 #: dpkg-split/queue.c
 #, c-format
 msgid "unable to delete used-up depot file '%.250s'"
-msgstr "não foi possível apagar ficheiro depot utilizado em cima `%.250s'"
+msgstr "não foi possível apagar ficheiro depot utilizado em cima '%.250s'"
 
 #: dpkg-split/queue.c
 msgid "Junk files left around in the depot directory:\n"
@@ -5873,7 +6092,7 @@ msgstr "Ficheiros de lixo deixados no directório depot:\n"
 #: dpkg-split/queue.c
 #, c-format
 msgid "unable to stat '%.250s'"
-msgstr "não foi possível fazer stat `%.250s'"
+msgstr "não foi possível fazer stat '%.250s'"
 
 #: dpkg-split/queue.c
 #, c-format
@@ -5897,7 +6116,7 @@ msgstr " Pacote %s: parte(s) "
 #: dpkg-split/queue.c
 #, c-format
 msgid "part file '%.250s' is not a plain file"
-msgstr "ficheiro de parte `%.250s' não é um ficheiro comum"
+msgstr "ficheiro de parte '%.250s' não é um ficheiro comum"
 
 #: dpkg-split/queue.c
 #, c-format
@@ -5907,7 +6126,7 @@ msgstr "(total %jd bytes)\n"
 #: dpkg-split/queue.c
 #, c-format
 msgid "unable to discard '%.250s'"
-msgstr "não foi possível descartar `%.250s'"
+msgstr "não foi possível descartar '%.250s'"
 
 #: dpkg-split/queue.c
 #, c-format
@@ -5925,7 +6144,7 @@ msgstr "<dpkg-deb --info pipe>"
 #: dpkg-split/split.c
 #, c-format
 msgid "unable to open source file '%.250s'"
-msgstr "não foi possível abrir o ficheiro fonte `%.250s'"
+msgstr "não foi possível abrir o ficheiro fonte '%.250s'"
 
 #: dpkg-split/split.c
 msgid "unable to fstat source file"
@@ -5934,7 +6153,7 @@ msgstr "não foi possível fazer fstat ao ficheiro fonte"
 #: dpkg-split/split.c
 #, c-format
 msgid "source file '%.250s' not a plain file"
-msgstr "o ficheiro fonte `%.250s' não é um ficheiro simples"
+msgstr "o ficheiro fonte '%.250s' não é um ficheiro simples"
 
 #: dpkg-split/split.c
 #, c-format
@@ -6032,6 +6251,20 @@ msgstr ""
 
 #: utils/update-alternatives.c
 #, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6041,8 +6274,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6053,10 +6287,11 @@ msgstr ""
 "  --force                  permitir substituir ficheiros por links "
 "alternativos.\n"
 "  --skip-auto              saltar a questão para alternativas correctamente\n"
-"                             configuradas em modo automático (relevante\n"
-"                             apenas para --config)\n"
-"  --verbose                operação detalhada, mais texto na saída.\n"
+"                           configuradas em modo automático (relevante\n"
+"                           apenas para --config)\n"
 "  --quiet                  operação silenciosa, saída mínima\n"
+"  --verbose                operação detalhada, mais texto na saída.\n"
+"  --debug                  saída de debug, muito mais saída.\n"
 "  --help                   mostrar esta mensagem de ajuda.\n"
 "  --version                mostrar a versão.\n"
 
@@ -6458,7 +6693,7 @@ msgstr "ligação de alternativa %s já é gerida por %s (escrabo de %s)"
 #: utils/update-alternatives.c
 #, c-format
 msgid "unknown argument '%s'"
-msgstr "argumento desconhecido `%s'"
+msgstr "argumento desconhecido '%s'"
 
 #: utils/update-alternatives.c
 msgid "--install needs <link> <name> <path> <priority>"
@@ -6540,13 +6775,89 @@ msgstr "para voltar às actualizações automáticas utilize '%s --auto %s'"
 #: utils/update-alternatives.polkit.in
 msgid "Run update-alternatives to modify system alternative selections"
 msgstr ""
+"Corra update-alternatives para modificar o sistema de seleções de "
+"alternativas"
 
 #: utils/update-alternatives.polkit.in
 msgid "Authentication is required to run update-alternatives"
-msgstr ""
+msgstr "É necessária autenticação para correr update-alternatives"
+
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "não foi bloquear ficheiro %s para teste"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "utilizador desconhecido '%s' no ficheiro statoverride"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "grupo '%s' desconhecido no statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "falta %s"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "'%.50s' não é permitido para %s"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "opção obsoleta '--%s'; por favor utilize antes '--%s'"
+#~ msgid "junk after %s"
+#~ msgstr "lixo após %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "nome de pacote inválido (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "sim/não no campo booleano"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "campo '%s', referência a '%.255s': erro na versão"
+
+#~ msgid "empty value for %s"
+#~ msgstr "valor vazio para %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "o pacote tem estado 'triggers-awaited' mas não são esperados 'triggers'"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "o pacote tem estado 'triggers-pending' mas não tem 'triggers' pendentes"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "actualização completa de disponibilidade necessita de acesso de escrita à "
+#~ "área de estado do dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "erro ao ler a saída do tar de dpkg-deb"
+
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "não foi possível abrir o ficheiro control '%s' para o pacote '%s'"
+
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "não foi possível stat ao ficheiro control '%s' para o pacote '%s'"
+
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "o ficheiro control '%s' para o pacote '%s' não é um ficheiro normal"
+
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "não pode fechar o ficheiro control '%s' para o pacote '%s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr ""
+#~ "não foi possível abrir o ficheiro de lista de ficheiros para o pacote `"
+#~ "%.250s'"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "não foi possível fazer stat ao ficheiro de lista de ficheiros para o "
+#~ "pacote '%.250s'"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "lista de ficheiros para o pacote '%.250s' não é um ficheiro normal"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "a ler lista de ficheiros para o pacote '%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "falhou o chdir para o directório após o ter criado"
 
 #~ msgid "control file '%s' missing value"
 #~ msgstr "falta valor no ficheiro de controlo '%s'"
@@ -6614,9 +6925,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF em stdin na prompt do ficheiro de configuração"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "eof inesperado no nome do pacote na linha %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "eof inesperado após nome de pacote na linha %d"
 
@@ -6899,9 +7207,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "é um escravo de %s"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "Não pode fazer stat %s: %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "readlink(%s) falhou: %s"
 
@@ -6926,9 +7231,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "não foi possível fechar %s: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "não foi possível escrever %s: %s"
-
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "não foi possível renomear %s para %s: %s"
@@ -7268,9 +7570,6 @@ msgstr ""
 #~ msgid "cannot open diversions: %s"
 #~ msgstr "falhou ao abrir desvios: %s"
 
-#~ msgid "missing package"
-#~ msgstr "falta pacote"
-
 #~ msgid "rename: rename `%s' to `%s': %s"
 #~ msgstr "renomear: renomear `%s' para `%s': %s"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 42122dc93..4e6fa566d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:52+0200\n"
 "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n"
 "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian."
@@ -152,7 +152,8 @@ msgstr "remover antigo \"diversions-old\": %s"
 msgid "error creating new backup file '%s'"
 msgstr "erro criando pipe '%.255s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "não foi possível remover '%.250s'"
@@ -378,24 +379,39 @@ msgstr "impossível executar \"seek\" no começo de %.250s após enchimento"
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "impossível abrir tmpfile para vsnprintf"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "impossível ler as \"flags\" do descritor de arquivos para %.250s"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr ""
 "impossível abrir/criar arquivo de bloqueio do banco de dados de estados"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr ""
+"impossível abrir/criar arquivo de bloqueio do banco de dados de estados"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr ""
 "você não tem permissão para bloquear o banco de dados de estados do dpkg"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "impossível bloquear banco de dados de estados do dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -403,11 +419,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "a operação solicitada requer privilégios de superusuário"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "impossível acessar área de estado do dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operação requer acesso de leitura/escrita à área de estado do dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -445,6 +465,203 @@ msgstr "impossível fechar estado atualizado de '%.250s'"
 msgid "unable to install updated status of '%.250s'"
 msgstr "impossível instalar estado atualizado de '%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "impossível verificar a existência de '%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "não foi possível ler diretório info"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "erro tentando abrir %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "impossível abrir arquivo fonte '%.250s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "arquivo de configuração (\"conffile\") '%.250s' não aparece no pacote"
+
+# NOTA: "hard link" = "link fixo" segundo a tradução do próprio `ln' - Carlos
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "erro criando ligação fixa (\"hard link\") '%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "erro escrevendo '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr ""
+"não foi possível ler diretório de arquivo do configuração '%.250s' (de "
+"'%.250s')"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "falhou ao abrir arquivo de desvios"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "falhou ao executar \"fstat\" no arquivo de desvios"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "desvios conflitantes envolvendo '%.250s' ou '%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "erro fechando arquivo com lista de arquivos do pacote '%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg: aviso sério: arquivo com lista de arquivos do pacote '%.250s' está "
+"faltando, assumindo que o pacote não tem arquivos instalados atualmente.\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Lendo banco de dados ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d arquivos e diretórios atualmente instalados).\n"
+msgstr[1] "%d arquivos e diretórios atualmente instalados).\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "modo de atualização inválido"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride gid %s"
+msgstr "arquivo statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride mode %s"
+msgstr "arquivo statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "falhou ao abrir arquivo \"statoverride\""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "falhou ao executar \"fstat\" no arquivo \"statoverride\""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "arquivo \"statoverride\" '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "arquivo \"statoverride\" contém linha em branco"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "arquivo \"statoverride\" contém linha em branco"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "falhou ao abrir arquivo \"statoverride\""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "fim de linha inesperado no nome do pacote na linha %d"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "arquivo \"statoverride\" '%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -587,65 +804,73 @@ msgid "internal error"
 msgstr "erro interno - modo ruim '%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s está faltando"
+#, fuzzy
+#| msgid "cannot stat old name `%s': %s"
+msgid "is missing a value"
+msgstr "não foi possível executar \"stat\" em nome antigo '%s': %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.*s' não tem permissão para %s"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "lixo depois de %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "nome de pacote inválido (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Pacote '%s' não está instalado.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "campo de detalhes de arquivo '%s' vazio"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "campo de detalhes de arquivo '%s' não permitido em arquivo de estado"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "muitos valores no campo de detalhes de arquivo '%s' (comparado a outros)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "poucos valores no campo de detalhes de arquivo '%s' (comparado a outros)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "sim/não em campo booleano"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "campo 'Revision' ou 'Package-Revision' obsoleto foi usado"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "campo '%s', referência a '%.255s': erro em versão: %.255s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "palavra no campo 'prioridade'"
 
 #: lib/dpkg/fields.c
@@ -655,33 +880,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "valor para campo 'status' não permitido neste contexto"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "primeira (\"want\") palavra no campo 'status'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "segunda (\"error\") palavra no campo 'status'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "terceira (\"status\") palavra no campo 'status'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "erro na string \"Version\" '%.250s': %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "campo 'Revision' ou 'Package-Revision' obsoleto foi usado"
 
 #: lib/dpkg/fields.c
@@ -693,11 +918,13 @@ msgstr "valor para 'conffiles' tem linha mal formatada '%.*s'"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "valor para 'conffiles' possui linha começando com '%c' sem espaçamento"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr ""
 "diretório raiz ou nulo é listado como um arquivo de configuração (\"conffile"
 "\")"
@@ -788,9 +1015,9 @@ msgstr "campo '%s', referência a '%.255s': versão não terminada"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "campo '%s', referência a '%.255s': erro em versão: %.255s"
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "campo '%s', referência a '%.255s': versão contém '%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -798,8 +1025,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "campo '%s', erro de sintaxe após referência a pacote '%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternativas ('|') não permitidas no campo %s"
 
 #: lib/dpkg/fields.c
@@ -843,6 +1071,29 @@ msgstr ""
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat old name `%s': %s"
+msgid "cannot stat %s"
+msgstr "não foi possível executar \"stat\" em nome antigo '%s': %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr ""
+"aviso, arquivo de configuração (\"conffile\") '%s' não é um arquivo simples\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "unable to write %s: %s"
+msgid "cannot read %s"
+msgstr "impossível escrever %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot open %s"
+msgstr "não foi possível abrir log `%s' : %s\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to unlock %s: %s"
 msgid "unable to unlock %s"
 msgstr "impossível desbloquear %s: %s"
@@ -865,8 +1116,19 @@ msgid "unable to lock %s"
 msgstr "impossível desbloquear %s: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+msgid "cannot open file %s"
+msgstr "não foi possível abrir log `%s' : %s\n"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "impossível efetuar \"flush\" em vsnprintf "
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "Não foi possível desviar diretórios"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -889,13 +1151,13 @@ msgstr "falhou ao alocar memória"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "dup para std%s falhou"
+msgid "failed to dup for fd %d"
+msgstr "dup para fd %d falhou"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "dup para fd %d falhou"
+msgid "failed to dup for std%s"
+msgstr "dup para std%s falhou"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1033,30 +1295,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "valor duplo para campo definido pelo usuário '%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "%s faltando"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "valor vazio para %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "valor duplicado para o campo '%s'"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has '%s' field but is missing architecture"
+msgstr "pacote possui estado %s mas há gatilhos em espera"
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
 #| msgid "package has status %s but triggers are awaited"
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "pacote possui estado %s mas há gatilhos em espera"
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "'Configured-Version' para pacote com 'Status' inapropriado"
 
 #: lib/dpkg/parse.c
@@ -1065,9 +1330,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "pacote possui estado %s mas há gatilhos em espera"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"pacote possui estado \"triggers-awaited\" mas não há gatilhos em espera"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "pacote possui estado %s mas há gatilhos em espera"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1075,12 +1341,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "pacote possui estado %s mas há gatilhos pendentes"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"pacote possui estado \"triggers-pending\" mas não há gatilhos pendentes"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "pacote possui estado %s mas há gatilhos pendentes"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Pacote que no estado não-instalado possui arquivos de configuração "
 "(\"conffiles\"), esquecendo-os"
@@ -1100,8 +1369,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1308,11 +1577,6 @@ msgstr "impossível criar '%.255s'"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1329,6 +1593,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "\"altname\" faltando"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(nenhuma descrição disponível)"
@@ -1415,6 +1689,67 @@ msgstr "sub-processo %s falhou com código de estado de espera %d"
 msgid "wait for %s subprocess failed"
 msgstr "espera por %s falhou"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "caractere '%c' inválido no campo tamanho\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "caractere '%c' inválido no campo tamanho\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "modo de atualização inválido"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header gid field"
+msgstr "arquivo statoverride `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "caractere '%c' inválido no campo tamanho\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "tipo de compressão desconhecido '%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -1433,14 +1768,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "não foi possível ler diretório info"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "impossível abrir/criar arquivo de bloqueio de gatilhos '%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
 #| msgid "triggered"
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "disparado por gatilho"
 
 #: lib/dpkg/trigdeferred.c
@@ -1667,12 +2003,6 @@ msgstr "erro criando pipe '%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "erro criando dispositivo '%.255s'"
 
-# NOTA: "hard link" = "link fixo" segundo a tradução do próprio `ln' - Carlos
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "erro criando ligação fixa (\"hard link\") '%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -2012,10 +2342,10 @@ msgid "archive '%s' is not a regular file"
 msgstr ""
 "aviso, arquivo de configuração (\"conffile\") '%s' não é um arquivo simples\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2238,6 +2568,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Digite 'exit' quando terminar.\n"
 
@@ -2624,7 +2958,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2666,6 +3003,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 #| msgid "cannot stat old name `%s': %s"
@@ -2801,6 +3144,13 @@ msgstr ""
 "dpkg - aviso: ignorando pedido para remover %.250s que não está instalado.\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid "No diversion `%s', none removed"
 msgid "No diversion '%s', none removed.\n"
@@ -2848,19 +3198,6 @@ msgstr "pacote não pode conter novas linhas"
 msgid "divert-to may not contain newlines"
 msgstr "desviar-para não pode conter novas linhas"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "falhou ao abrir arquivo de desvios"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "falhou ao executar \"fstat\" no arquivo de desvios"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "desvios conflitantes envolvendo '%.250s' ou '%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3165,128 +3502,167 @@ msgstr ""
 "Pacote %s está sendo retido, não vou tocá-lo. Use --force-hold para "
 "sobrepor.\n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
-"dpkg - aviso, ignorando problema porque --force foi habilitado:\n"
-" "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
 msgstr ""
-"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Configure any package which may help this one"
 msgstr ""
-"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
 msgstr ""
-"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "impossível abrir arquivo com lista de arquivos do pacote '%.250s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "impossível abrir arquivo com lista de arquivos do pacote '%.250s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
 msgstr ""
-"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
 msgstr ""
-"não foi possível ler diretório de arquivo do configuração '%.250s' (de "
-"'%.250s')"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "erro fechando arquivo com lista de arquivos do pacote '%.250s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "impossível abrir arquivo com lista de arquivos do pacote '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg: aviso sério: arquivo com lista de arquivos do pacote '%.250s' está "
-"faltando, assumindo que o pacote não tem arquivos instalados atualmente.\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "impossível abrir arquivo com lista de arquivos do pacote '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
-"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "lista de arquivos do pacote '%.250s'"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "problemas de dependência - não removendo"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "problemas de dependência - não removendo"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
 msgstr ""
-"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo vazio"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "erro fechando arquivo com lista de arquivos do pacote '%.250s'"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Lendo banco de dados ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "opção de forçar/recusar '%.*s' desconhecida"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d arquivos e diretórios atualmente instalados).\n"
-msgstr[1] "%d arquivos e diretórios atualmente instalados).\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "Aviso: opção forçar/recusar obsoleta '%s'\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"dpkg - aviso, ignorando problema porque --force foi habilitado:\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3350,42 +3726,6 @@ msgstr ""
 "Nota: o PATH do root usualmente deveria conter /usr/local/sbin, /usr/sbin e /"
 "sbin."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "impossível verificar a existência de '%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "não foi possível ler diretório info"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "erro tentando abrir %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "impossível abrir arquivo fonte '%.250s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "arquivo de configuração (\"conffile\") '%.250s' não aparece no pacote"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "erro escrevendo '%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3425,27 +3765,27 @@ msgstr "Programa de gerenciamento de pacotes Debian '%s' versão %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3703,114 +4043,6 @@ msgstr ""
 "ou 'more' !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "problemas de dependência - não removendo"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "problemas de dependência - não removendo"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3943,33 +4175,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "opção de forçar/recusar '%.*s' desconhecida"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "Aviso: opção forçar/recusar obsoleta '%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "não foi possível abrir '%i' para \"stream\""
 
@@ -4157,6 +4362,10 @@ msgid "Description"
 msgstr "Descrição"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "desviado por %s a partir de: %s\n"
@@ -4194,6 +4403,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "Pacote '%s' não está instalado e não há informações disponíveis.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Use dpkg --info (= dpkg-deb --info) para examinar arquivos de pacote,\n"
+"e dpkg --contents (= dpkg-deb --contents) para listar seu conteúdo.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4220,9 +4439,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "desviado por %s para: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Use dpkg --info (= dpkg-deb --info) para examinar arquivos de pacote,\n"
 "e dpkg --contents (= dpkg-deb --contents) para listar seu conteúdo.\n"
@@ -4270,16 +4492,16 @@ msgstr "Programa de gerenciamento de pacotes Debian '%s' versão %s.\n"
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4483,6 +4705,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "falhou ao executar \"chroot\" para '%.250s'"
@@ -4635,8 +4863,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4716,68 +4949,10 @@ msgstr "Nenhum \"override\" presente."
 msgid "--update is useless for --remove"
 msgstr "aviso: --update é inútil para --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "modo de atualização inválido"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride gid %s"
-msgstr "arquivo statoverride `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride mode %s"
-msgstr "arquivo statoverride `%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "falhou ao abrir arquivo \"statoverride\""
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "falhou ao executar \"fstat\" no arquivo \"statoverride\""
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "arquivo \"statoverride\" '%.250s'"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "arquivo \"statoverride\" contém linha em branco"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "arquivo \"statoverride\" contém linha em branco"
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "falhou ao abrir arquivo \"statoverride\""
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "falhou ao abrir arquivo \"statoverride\""
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "fim de linha inesperado no nome do pacote na linha %d"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "falhou ao abrir arquivo \"statoverride\""
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "arquivo \"statoverride\" '%.250s'"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Aviso: opção obsoleta '--%s'\n"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5040,6 +5215,12 @@ msgstr "Desconfigurando %s, para permitir a remoção de %s ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Desconfigurando %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "arquivo \"statoverride\" contém linha em branco"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -5190,11 +5371,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "erro lendo a saída do tar do dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 "arquivo tar do sistema de arquivos corrompido - arquivo de pacote corrompido"
 
@@ -5211,16 +5390,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s precisa de exatamente um arquivo Packages como argumento"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "impossível acessar a área de estados do dpkg para uma completa atualização "
 "de disponibilidade"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"atualização completa de disponibilidade requer acesso de escrita à área de "
-"estados do dpkg"
+"impossível acessar a área de estados do dpkg para uma completa atualização "
+"de disponibilidade"
 
 #: src/update.c
 #, c-format
@@ -5615,16 +5800,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "falhou ao mudar para o diretório"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "falhou ao criar diretório"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "falhou ao mudar para o diretório após criá-lo"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "fim de arquivo inesperado no nome do pacote na linha %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "falhou ao mudar para o diretório"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6542,8 +6729,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -7065,13 +7253,99 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Aviso: opção obsoleta '--%s'\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "impossível abrir tmpfile para vsnprintf"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "não foi possível executar \"stat\" em nome antigo '%s': %s"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "falhou ao abrir arquivo \"statoverride\""
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "falhou ao abrir arquivo \"statoverride\""
+
+#~ msgid "%s is missing"
+#~ msgstr "%s está faltando"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "'%.*s' não tem permissão para %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "lixo depois de %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "nome de pacote inválido (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "sim/não em campo booleano"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "campo '%s', referência a '%.255s': erro em versão: %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr "valor vazio para %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "pacote possui estado \"triggers-awaited\" mas não há gatilhos em espera"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "pacote possui estado \"triggers-pending\" mas não há gatilhos pendentes"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "atualização completa de disponibilidade requer acesso de escrita à área "
+#~ "de estados do dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "erro lendo a saída do tar do dpkg-deb"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "impossível abrir arquivo com lista de arquivos do pacote '%.250s'"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "impossível abrir arquivo com lista de arquivos do pacote '%.250s'"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr ""
+#~ "arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo "
+#~ "vazio"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "erro fechando arquivo com lista de arquivos do pacote '%.250s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "impossível abrir arquivo com lista de arquivos do pacote '%.250s'"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "impossível abrir arquivo com lista de arquivos do pacote '%.250s'"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "arquivo com lista de arquivos do pacote '%.250s' contém nome de arquivo "
+#~ "vazio"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "lista de arquivos do pacote '%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "falhou ao mudar para o diretório após criá-lo"
 
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
@@ -7147,9 +7421,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF em stdin no prompt do arquivo de configuração (\"conffile\")"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "fim de arquivo inesperado no nome do pacote na linha %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "fim de arquivo inesperado após nome do pacote na linha %d"
 
@@ -7445,11 +7716,6 @@ msgstr ""
 #~ msgstr " escravo %s: %s"
 
 #, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "não foi possível executar \"stat\" em nome antigo '%s': %s"
-
-#, fuzzy
 #~| msgid "%s: copying %s to %s failed, giving up: %s"
 #~ msgid "scan of %s failed: %s"
 #~ msgstr "%s: cópia de %s para %s falhou, desistindo: %s"
@@ -7476,11 +7742,6 @@ msgstr ""
 #~ msgstr "impossível fechar %s: %s"
 
 #, fuzzy
-#~| msgid "unable to write %s: %s"
-#~ msgid "cannot write %s: %s"
-#~ msgstr "impossível escrever %s: %s"
-
-#, fuzzy
 #~| msgid "unable to rename %s to %s: %s"
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "impossível renomear %s para %s: %s"
diff --git a/po/ro.po b/po/ro.po
index ca2b4b919..58d959a98 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -12,7 +12,7 @@
 # - unable to stat/sync/... = stat/sync/ imposibil pentru...
 # - unable to do foobar = nu se poate face/drege
 #
-# Copyright (C) 2005 THE PACKAGE'S COPYRIGHT HOLDER
+# Copyright © 2005-2008 Dpkg Developers
 #
 # Rușeț Zeno <rzeno@cwazy.co.uk>, 2005.
 # Eddy Petrișor <eddy.petrisor@gmail.com>, 2005, 2006, 2007, 2008.
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:52+0200\n"
 "Last-Translator: ioan-eugen STAN <stan.ieugen@gmail.com>\n"
 "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n"
@@ -169,7 +169,8 @@ msgstr "eroare la ștergerea redirectărilor anterioare"
 msgid "error creating new backup file '%s'"
 msgstr "eroare la crearea pipei „%.255s”"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "nu se poate șterge „%.250s”"
@@ -393,26 +394,38 @@ msgstr "flush imposibil pentru %.250s după completarea cu spații"
 msgid "unable to seek to start of %.250s after padding"
 msgstr "nu se poate căuta începutul lui %.250s după completarea cu spații"
 
-# numele funcților și argumentelor acestora rămân cele originale
-# pentru a nu induce în eroare utilizatorul
-# `' devine „” - oricum ` și ' nu sunt pereche
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "nu se poate deschide fișierul de blocare %s pentru testare"
+#, fuzzy, c-format
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "nu se pot citi fanioanele descriptorului de fișier pentru %.250s"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "nu se poate deschide/crea fișierul de blocare a bazei de date"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
 msgstr "nu se poate deschide/crea fișierul de blocare a bazei de date"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "nu aveți drepturi de blocare a bazei de date dpkg status"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "nu se poate bloca baza de date dpkg status"
 
 #: lib/dpkg/dbmodify.c
@@ -420,11 +433,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "operația solicitată necesită drepturi de superutilizator"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "nu se poate accesa zona dpkg status"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operația necesită acces de tip scriere/citire în zona dpkg status"
 
 #: lib/dpkg/dbmodify.c
@@ -462,6 +479,216 @@ msgstr "nu se poate închide starea actualizată a lui „%.250s”"
 msgid "unable to install updated status of '%.250s'"
 msgstr "nu se poate instala starea actualizată a lui „%.250s”"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "nu se poate verifica existența lui „%.250s”"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "nu se poate citi directorul info"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "eroare la încercarea de a deschide %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+#| msgid "unable to write file '%s'"
+msgid "corrupt info database format file '%s'"
+msgstr "nu se poate scrie fișierul „%s”"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "fișierul conffile „%.250s” nu apare în pachet"
+
+# hard link este un alt nume pentru un target și spre
+# deosebire de symbolic link, target obligatoriu trebuie
+# să existe
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "eroare la crearea legăturii hard „%.255s”"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "eroare la scrierea „%s”"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
+"newline de la final"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
+"newline de la final"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
+"newline de la final"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"fișierul cu lista fișierelor pachetului „%.250s” conține nume de fișier vid"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr ""
+"nu se poate citi directorul fișierului de configurare „%.250s” (din „%.250s”)"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "eșec la deschiderea fișierului de redirectări"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "eșec la fstat a fișierului de redirectări"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "redirectări conflictuale care implică „%.250s” sau „%.250s”"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr ""
+"eroare la închiderea fișierului listei cu fișierele pentru pachetul „%.250s”"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid ""
+#| "files list file for package `%.250s' missing, assuming package has no "
+#| "files currently installed."
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"fișierul cu lista fișierelor pachetului „%.250s” lipsește, se presupune că "
+"pachetul nu are nici un fișier instalat."
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
+"newline de la final"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"fișierul cu lista fișierelor pachetului „%.250s” conține nume de fișier vid"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Se citește baza de date ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d fișier sau director actualmente instalat.)\n"
+msgstr[1] "%d fișiere și directoare actualmente instalate.)\n"
+msgstr[2] "%d de fișiere și directoare actualmente instalate.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "stare nevalidă"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "fișier statoverride „%.250s”"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "fișier statoverride „%.250s”"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "eșec la deschiderea fișierului statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "eșec la fstat pentru fișierul statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "fișier statoverride „%.250s”"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "din fișierul statoverride lipsește caracterul newline de la final"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "fișierul statoverride conține linie goală"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "eroare de sintaxă în fișierul statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "sfârșit de linie neașteptat în fișierul statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "există multiple înlocuiri de stare pentru fișierul „%.250s”"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version number"
@@ -609,67 +836,74 @@ msgid "internal error"
 msgstr "%s: eroare internă gzip la citire"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s lipsește"
+#, fuzzy
+#| msgid "cannot stat file '%s'"
+msgid "is missing a value"
+msgstr "stat imposibil pentru fișierul „%s”"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "„%.*s” nepermis pentru %s"
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Omite linie nevalidă: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "gunoi după %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "nume nevalid de pachet (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Pachetul „%s” nu este instalat.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "câmp „%s” cu detalii fișier gol"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "câmp cu detalii fișier „%s” nepermis în fișierul de stare"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "prea multe valori în câmpul detaliilor fișier „%s” (comparativ cu altele)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "prea puține valori în câmpul detaliilor fișier „%s” (comparativ cu altele)"
 
-# yes/no nu poate fi tradus deoarece e vorba de interpretarea valorilor existente în
-# fișerele de configurare(vezi codul sursă indicata)
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no în câmp logic"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "s-a folosit câmp învechit „Revision” sau „Package-Revision”"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': error in version"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "câmpul „%s”, referință la „%.255s”: eroare în versiune"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "cuvânt în câmpul „priority”"
 
 #: lib/dpkg/fields.c
@@ -679,33 +913,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "valoare nepermisă pentru câmpul „status” în acest context"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "primul (dorit) cuvânt în câmpul „status”"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "al doilea cuvânt (eroare) în câmpul „status”"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "al treilea cuvânt (stare) în câmpul „status”"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string '%.250s'"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "eroare în șirul Version „%.250s”"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "s-a folosit câmp învechit „Revision” sau „Package-Revision”"
 
 #: lib/dpkg/fields.c
@@ -717,12 +951,14 @@ msgstr "valoarea pentru „conffiles” are linie malformată „%.*s”"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "valoarea pentru „conffiles” conține o linie care nu începe cu spații „%c”"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "director nul sau rădăcină este trecut ca un fișier conffile"
 
 #: lib/dpkg/fields.c
@@ -811,9 +1047,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "câmpul „%s”, referință la „%.255s”: versiune neterminată"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "câmpul „%s”, referință la „%.255s”: eroare în versiune"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "câmpul „%s”, referință la „%.255s”: versiunea conține „%c”"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -821,8 +1058,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "câmpul „%s”, eroare sintactică după referința la pachetul „%.255s”"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternativele („|”) nu sunt permise în câmpul %s"
 
 #: lib/dpkg/fields.c
@@ -862,6 +1100,30 @@ msgstr "nu se poate seta modul fișierului țintă „%.250s”"
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "stat imposibil pentru „%s”: „%s”"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "fișierul conffile „%s” nu este fișier propriu-zis"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "nu se poate scrie %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot open %s"
+msgstr "nu se poate adăuga la %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 #| msgid "unable to close %s: %s"
 msgid "unable to unlock %s"
 msgstr "nu se poate închide %s: %s"
@@ -884,10 +1146,22 @@ msgid "unable to lock %s"
 msgstr "nu se poate închide %s: %s"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to %s: %s"
+msgid "cannot open file %s"
+msgstr "nu se poate adăuga la %s: %s"
+
+#: lib/dpkg/file.c
 #, fuzzy
-#| msgid "long filenames"
-msgid "showing file on pager"
-msgstr "denumiri lungi de fișiere"
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "eșec la flush pentru fișierul „%s”"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "nu se poate redirecta fișierul „%s” către el însuși"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -910,13 +1184,13 @@ msgstr "eșec la alocarea memoriei"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "eșec la dup pentru std%s"
+msgid "failed to dup for fd %d"
+msgstr "eșec la dup pentru fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "eșec la dup pentru fd %d"
+msgid "failed to dup for std%s"
+msgstr "eșec la dup pentru std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1057,30 +1331,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "valoare duplicată pentru câmpul definit de utilizator „%.*s”"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "lipsește %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "valoare vidă pentru %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "valoare duplicată pentru câmpul „%s”"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has '%s' field but is missing architecture"
+msgstr "pachetul are starea %s, dar declanșatorii sunt așteptați"
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
 #| msgid "package has status %s but triggers are awaited"
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "pachetul are starea %s, dar declanșatorii sunt așteptați"
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Configured-Version pentru pachet cu Status inadecvat"
 
 #: lib/dpkg/parse.c
@@ -1089,9 +1366,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "pachetul are starea %s, dar declanșatorii sunt așteptați"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"pachetul are starea triggers-awaited, dar nu se așteaptă nici un declanșator"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "pachetul are starea %s, dar declanșatorii sunt așteptați"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1099,13 +1377,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "pachetul are starea %s, dar declanșatorii sunt în așteptare"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"pachetul are starea triggers-pending, dar nu există nici un declanșator în "
-"așteptare"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "pachetul are starea %s, dar declanșatorii sunt în așteptare"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Pachet care în starea not-installed are fișiere conffile, se uită de ele"
 
@@ -1124,8 +1404,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1344,11 +1624,6 @@ msgstr "nu se poate șterge în siguranță „%.255s”"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1363,6 +1638,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr ""
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(nici o descriere disponibilă)"
@@ -1453,6 +1738,70 @@ msgstr "subprocesul %s a eșuat cu codul stării de așteptare %d"
 msgid "wait for %s subprocess failed"
 msgstr "așteptarea după sub-procesul %s a eșuat"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "caracter nevalid „%c” în lățimea câmpului\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "caracter nevalid „%c” în lățimea câmpului\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "stare nevalidă"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "statoverride file `%.250s'"
+msgid "invalid tar header gid field"
+msgstr "fișier statoverride „%.250s”"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "caracter nevalid „%c” în lățimea câmpului\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "generated corrupt ar header for '%s'"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "s-a generat un antet ar corupt pentru „%s”"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "tip de compresie necunoscut „%s”!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1472,15 +1821,16 @@ msgid "treewalk root %s is not a directory"
 msgstr "directorul de control nu este un director"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr ""
 "nu se poate deschide/crea fișierul de blocare pentru declanșatori „%.250s”"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
 #| msgid "triggered"
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "declanșat"
 
 #: lib/dpkg/trigdeferred.c
@@ -1709,14 +2059,6 @@ msgstr "eroare la crearea pipei „%.255s”"
 msgid "error creating device '%.255s'"
 msgstr "eroare la crearea dispozitivului „%.255s”"
 
-# hard link este un alt nume pentru un target și spre
-# deosebire de symbolic link, target obligatoriu trebuie
-# să existe
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "eroare la crearea legăturii hard „%.255s”"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -2066,10 +2408,10 @@ msgstr "nu se poate accesa arhiva"
 msgid "archive '%s' is not a regular file"
 msgstr "fișierul conffile „%s” nu este fișier propriu-zis"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<standard output>"
 
@@ -2292,6 +2634,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Tastați „exit” când ați terminat.\n"
 
@@ -2664,7 +3010,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2673,7 +3033,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2709,6 +3072,12 @@ msgstr ""
 "Scripturile preinst/postrm din pachete ar trebui să specifice\n"
 "întotdeauna --package și --divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2834,6 +3203,13 @@ msgstr "se ignoră cererea de ștergere a lui %.250s care nu este instalat."
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Nu există redirectare „%s”, nu s-a șters nimic.\n"
 
@@ -2878,19 +3254,6 @@ msgstr "pachetul nu poate conține caractere newline"
 msgid "divert-to may not contain newlines"
 msgstr "redirectare-către nu poate conține caractere newline"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "eșec la deschiderea fișierului de redirectări"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "eșec la fstat a fișierului de redirectări"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "redirectări conflictuale care implică „%.250s” sau „%.250s”"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3203,145 +3566,165 @@ msgstr ""
 "Pachetul %s este reținut, nu se atinge. Folosiți --force-hold pentru al "
 "forța.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "problemă la forțare datorită activării lui --force: "
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
-"newline de la final"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
 msgstr ""
-"din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
-"newline de la final"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Configure any package which may help this one"
 msgstr ""
-"din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
-"newline de la final"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
 msgstr ""
-"fișierul cu lista fișierelor pachetului „%.250s” conține nume de fișier vid"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
 msgstr ""
-"nu se poate deschide fișierul cu lista fișierelor pentru pachetul „%.250s”"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to stat files list file for package '%.250s'"
-msgid "cannot stat control file '%s' for package '%s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
 msgstr ""
-"stat imposibil pentru fișierul cu lista fișierelor pentru pachetul „%.250s”"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is not a regular file"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
 msgstr ""
-"din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
-"newline de la final"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
 msgstr ""
-"nu se poate citi directorul fișierului de configurare „%.250s” (din „%.250s”)"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"eroare la închiderea fișierului listei cu fișierele pentru pachetul „%.250s”"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
-"nu se poate deschide fișierul cu lista fișierelor pentru pachetul „%.250s”"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid ""
-#| "files list file for package `%.250s' missing, assuming package has no "
-#| "files currently installed."
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"fișierul cu lista fișierelor pachetului „%.250s” lipsește, se presupune că "
-"pachetul nu are nici un fișier instalat."
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
 msgstr ""
-"stat imposibil pentru fișierul cu lista fișierelor pentru pachetul „%.250s”"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "files list for package '%.250s' is not a regular file"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
-"din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
-"newline de la final"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "lista fișierelor pentru pachetul „%.250s”"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "probleme de dependență - nu se elimină"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "probleme de dependență - nu se elimină"
+
+#: src/force.c
+msgid "Remove packages which require installation"
 msgstr ""
-"din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
-"newline de la final"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"fișierul cu lista fișierelor pachetului „%.250s” conține nume de fișier vid"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"eroare la închiderea fișierului listei cu fișierele pentru pachetul „%.250s”"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Se citește baza de date ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d fișier sau director actualmente instalat.)\n"
-msgstr[1] "%d fișiere și directoare actualmente instalate.)\n"
-msgstr[2] "%d de fișiere și directoare actualmente instalate.)\n"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "opțiune de forțare/refuzare necunoscută „%.*s”"
+
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "opțiune învechită de forțare/refuzare „%s”\n"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "problemă la forțare datorită activării lui --force: "
 
 #: src/help.c
 msgid "not installed"
@@ -3417,43 +3800,6 @@ msgstr ""
 "NB: PATH pentru utilizatorul root ar trebui să conțină /usr/local/sbin, /usr/"
 "sbin și /sbin."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "nu se poate verifica existența lui „%.250s”"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "nu se poate citi directorul info"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "eroare la încercarea de a deschide %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-#| msgid "unable to write file '%s'"
-msgid "corrupt info database format file '%s'"
-msgstr "nu se poate scrie fișierul „%s”"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "fișierul conffile „%.250s” nu apare în pachet"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "eroare la scrierea „%s”"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3493,27 +3839,27 @@ msgstr "Debian „%s”, programul de administrare a pachetelor versiunea %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3798,114 +4144,6 @@ msgstr ""
 "sau „more” !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "probleme de dependență - nu se elimină"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "probleme de dependență - nu se elimină"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -4041,34 +4279,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "opțiune de forțare/refuzare necunoscută „%.*s”"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "opțiune învechită de forțare/refuzare „%s”\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "nu s-a putut deschide „%i” pentru fluxul de date"
 
@@ -4258,6 +4468,12 @@ msgid "Description"
 msgstr "Descriere"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "long filenames"
+msgid "showing package list on pager"
+msgstr "denumiri lungi de fișiere"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "redirectare de către %s de la: %s\n"
@@ -4295,6 +4511,16 @@ msgstr ""
 "Pachetul „%s” nu este instalat și nu este disponibilă nici o informație.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Folosiți dpkg --info (= dpkg-deb --info) ca să examinați fișierele arhivei,\n"
+"și dpkg --contents (= dpkg-deb --contents) ca să-i afișați conținutul.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4321,9 +4547,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "redirectat de %s către: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Folosiți dpkg --info (= dpkg-deb --info) ca să examinați fișierele arhivei,\n"
 "și dpkg --contents (= dpkg-deb --contents) ca să-i afișați conținutul.\n"
@@ -4384,16 +4613,16 @@ msgstr ""
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4607,6 +4836,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "eșec la chroot în „%.250s”"
@@ -4783,8 +5018,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4860,70 +5100,11 @@ msgstr "Nu este prezentă nici o înlocuire."
 msgid "--update is useless for --remove"
 msgstr "--update este inutil pentru --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "stare nevalidă"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "fișier statoverride „%.250s”"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "fișier statoverride „%.250s”"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "eșec la deschiderea fișierului statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "eșec la fstat pentru fișierul statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "fișier statoverride „%.250s”"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "din fișierul statoverride lipsește caracterul newline de la final"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "fișierul statoverride conține linie goală"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "eroare de sintaxă în fișierul statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "syntax error: unknown user '%s' in statoverride file"
-msgid "unknown user '%s' in statoverride file"
-msgstr "eroare de sintaxă: utilizator „%s” necunoscut în fișierul statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "sfârșit de linie neașteptat în fișierul statoverride"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "syntax error: unknown group '%s' in statoverride file"
-msgid "unknown group '%s' in statoverride file"
-msgstr "eroare de sintaxă: grup „%s” necunoscut în fișierul statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "există multiple înlocuiri de stare pentru fișierul „%.250s”"
+#| msgid "obsolete option '--%s', please use '--%s' instead."
+msgid "deprecated --%s option; use --%s instead"
+msgstr "opțiune învechită „--%s”, folosiți „--%s” în schimb."
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5183,6 +5364,12 @@ msgstr "Se deconfigurează %s, pentru a fi permite ștergerea lui %s ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Se deconfigurează %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "fișierul statoverride conține linie goală"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 #| msgid "conffile name '%.50s...' is too long, or missing final newline"
@@ -5331,11 +5518,9 @@ msgid "package filesystem archive extraction"
 msgstr "extragerea câmpului de către dpkg-deb"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "eroare la citirea rezultatului tar al lui dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 "sistemul de fișiere al fișierului tar este corupt - arhiva pachetului este "
 "coruptă"
@@ -5353,16 +5538,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s necesită exact un fișier Packages ca argument"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "nu se poate accesa zona de stare a lui dpkg pentru actualizarea bulk "
 "available"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"actualizarea bulk available necesită acces de scriere la zona de stare a lui "
-"dpkg"
+"nu se poate accesa zona de stare a lui dpkg pentru actualizarea bulk "
+"available"
 
 #: src/update.c
 #, c-format
@@ -5756,16 +5947,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "eșec la schimbarea directorului"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "eșec la crearea directorului"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "eșec la schimbarea directorului după crearea lui"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "eof neașteptat în numele pachetului la linia %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "eșec la schimbarea directorului"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6737,8 +6930,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -7289,15 +7483,116 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+# numele funcților și argumentelor acestora rămân cele originale
+# pentru a nu induce în eroare utilizatorul
+# `' devine „” - oricum ` și ' nu sunt pereche
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "nu se poate deschide fișierul de blocare %s pentru testare"
+
 #, fuzzy
-#~| msgid "obsolete option '--%s', please use '--%s' instead."
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "opțiune învechită „--%s”, folosiți „--%s” în schimb."
+#~| msgid "syntax error: unknown user '%s' in statoverride file"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr ""
+#~ "eroare de sintaxă: utilizator „%s” necunoscut în fișierul statoverride"
 
 #, fuzzy
-#~| msgid "cannot stat file '%s'"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "stat imposibil pentru fișierul „%s”"
+#~| msgid "syntax error: unknown group '%s' in statoverride file"
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "eroare de sintaxă: grup „%s” necunoscut în fișierul statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s lipsește"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "„%.*s” nepermis pentru %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "gunoi după %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "nume nevalid de pachet (%.250s)"
+
+# yes/no nu poate fi tradus deoarece e vorba de interpretarea valorilor existente în
+# fișerele de configurare(vezi codul sursă indicata)
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no în câmp logic"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "câmpul „%s”, referință la „%.255s”: eroare în versiune"
+
+#~ msgid "empty value for %s"
+#~ msgstr "valoare vidă pentru %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "pachetul are starea triggers-awaited, dar nu se așteaptă nici un "
+#~ "declanșator"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "pachetul are starea triggers-pending, dar nu există nici un declanșator "
+#~ "în așteptare"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "actualizarea bulk available necesită acces de scriere la zona de stare a "
+#~ "lui dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "eroare la citirea rezultatului tar al lui dpkg-deb"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "nu se poate deschide fișierul cu lista fișierelor pentru pachetul „%.250s”"
+
+#, fuzzy
+#~| msgid "unable to stat files list file for package '%.250s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "stat imposibil pentru fișierul cu lista fișierelor pentru pachetul "
+#~ "„%.250s”"
+
+#, fuzzy
+#~| msgid "files list file for package '%.250s' is missing final newline"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr ""
+#~ "din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
+#~ "newline de la final"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "eroare la închiderea fișierului listei cu fișierele pentru pachetul "
+#~ "„%.250s”"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr ""
+#~ "nu se poate deschide fișierul cu lista fișierelor pentru pachetul „%.250s”"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "stat imposibil pentru fișierul cu lista fișierelor pentru pachetul "
+#~ "„%.250s”"
+
+#, fuzzy
+#~| msgid "files list file for package '%.250s' is missing final newline"
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "din fișierul cu lista fișierelor pachetului „%.250s” lipsește caracterul "
+#~ "newline de la final"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "lista fișierelor pentru pachetul „%.250s”"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "eșec la schimbarea directorului după crearea lui"
 
 #, fuzzy
 #~| msgid "cannot stat file '%s'"
@@ -7370,9 +7665,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF de la stdin la promptul despre fișierul conffile"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "eof neașteptat în numele pachetului la linia %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "eof neașteptat după numele pachetului la linia %d"
 
@@ -7636,9 +7928,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "este un sclav pentru %s"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "stat imposibil pentru „%s”: „%s”"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "readlink(%s) a eșuat: %s"
 
@@ -7663,9 +7952,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "nu se poate închide %s: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "nu se poate scrie %s: %s"
-
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
diff --git a/po/ru.po b/po/ru.po
index 74ce2d754..309b30963 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:52+0200\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -139,7 +139,8 @@ msgstr "ошибка при удалении старого резервного
 msgid "error creating new backup file '%s'"
 msgstr "ошибка при создании нового резервного файла «%s»"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "не удалось удалить «%.250s»"
@@ -343,20 +344,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "не удалось перейти к началу %.250s после выравнивания"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "не удалось открыть файл блокировки %s для тестирования"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "не удалось получить файловый дескриптор каталога «%s»"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "не удалось открыть/создать файл блокировки базы данных состояний"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "не удалось открыть/создать файл блокировки базы данных состояний"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "у вас нет прав на блокирование базы данных состояний dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "база данных состояния dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -364,11 +382,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "запрошенная операция требует привилегий суперпользователя"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "не удалось получить доступ к области состояния dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "операция требует прав на чтение области состояния dpkg и запись в неё"
 
 #: lib/dpkg/dbmodify.c
@@ -406,6 +428,195 @@ msgstr "не удалось закрыть обновлённый файл со�
 msgid "unable to install updated status of '%.250s'"
 msgstr "не удалось установить обновлённый файл состояния пакета «%.250s»"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "не удалось проверить существование файла «%.250s»"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "ошибка чтения информационного каталога"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "ошибка при попытке открыть файл %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "повреждение информационного файла формата базы данных «%s»"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"формат информационной базы данных (%d) поддельный или слишком новый; "
+"попробуйте обновить версию dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "информационный файл %s/%s не связан ни с одним пакетом"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "ошибка создания жёсткой ссылки «%.255s»"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "ошибка во время записи «%s»"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "в конце управляющего файла «%s» пакетом «%s» нет символа новой строки"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "в конце управляющего файла «%s» пакетом «%s» нет символа новой строки"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "в конце управляющего файла «%s» пакетом «%s» нет символа новой строки"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "в управляющем файле «%s» пакета «%s» содержится пустое имя файла"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read '%s' control file for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "не удалось прочитать управляющий файл «%s» пакета «%s»"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "не удалось открыть файл diversions"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "не удалось выполнить fstat на файл diversions"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "конфликт файлов diversions из пакетов «%.250s» и «%.250s»"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "ошибка при закрытии списка файлов пакета «%.250s»"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"список файлов пакета «%.250s» отсутствует; предполагаем, что на данный "
+"момент у пакета нет установленных файлов"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"в списке файлов пакета «%.250s» отсутствует завершающий символ новой строки"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "список файлов пакета «%.250s» содержит пустое имя файла"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Чтение базы данных … "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "на данный момент установлен %d файл и каталог.)\n"
+msgstr[1] "на данный момент установлено %d файла и каталога.)\n"
+msgstr[2] "на данный момент установлено %d файлов и каталогов.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "неправильное состояние"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "выполняется чтение файла statoverride «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "выполняется чтение файла statoverride «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "не удалось открыть файл statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "не удалось выполнить fstat на файл statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "выполняется чтение файла statoverride «%.250s»"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "в файле statoverride отсутствует завершающий символ новой строки"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "файл statoverride содержит пустую строку"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "синтаксическая ошибка в файле statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "неожиданный конец строки в файле statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "для файла «%.250s» есть несколько statoverrides"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -544,63 +755,76 @@ msgid "internal error"
 msgstr "внутренняя ошибка"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "отсутствует %s"
+#, fuzzy
+#| msgid "missing package"
+msgid "is missing a value"
+msgstr "отсутствует пакет"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "«%.50s» не разрешено в %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Пропускается некорректная строка: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "мусор после %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "недопустимое имя пакета (%.250s)"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "пакет «%s» не установлен"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "пустое значение в поле информации о файле «%s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr ""
 "в файле состояний пакетов не может встречаться информационное поле «%s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "в информационном поле «%s» слишком много значений (по сравнению с остальными)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "в информационном поле «%s» слишком мало значений (по сравнению с остальными)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "значение «да» или «нет» в логическом поле"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "используется устаревшее поле «%s» или «%s»"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "foreign/allowed/same/no в поле quadstate"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "«%s» не является допустимым именем архитектуры: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "слово в поле «Priority»"
 
 #: lib/dpkg/fields.c
@@ -609,25 +833,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "значение в поле «%s» в этом контексте недопустимо"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "первое (желаемое) слово в поле «Status»"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "второе (ошибочное) слово в поле «Status»"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "третье (состояние) слово в поле «Status»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "ошибка в поле «%s», строке «%.250s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "используется устаревшее поле «%s» или «%s»"
 
 #: lib/dpkg/fields.c
@@ -636,13 +868,16 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "значение поля «%s» содержит недопустимую строку «%.*s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "значение поля «%s» содержит строку, начинающуюся с непробельного символа «%c»"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "в качестве conffile указан корневой или пустой каталог"
 
 #: lib/dpkg/fields.c
@@ -726,9 +961,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "Поле «%s», ссылка на «%.255s»: название версии не завершено"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "Поле «%s», ссылка на «%.255s»: ошибка в поле версии"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "Поле «%s», ссылка на «%.255s»: версия содержит «%c»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -736,8 +972,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "Поле «%s»: синтаксическая ошибка после ссылки на пакет «%.255s»"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "В поле %s альтернативы («|») недопустимы"
 
 #: lib/dpkg/fields.c
@@ -776,6 +1013,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "не удалось установить права доступа файла назначения «%.250s»"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "не удалось выполнить stat для «%s»: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "conffile-файл «%s» не является обычным файлом"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "не удалось записать в %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "не удалось добавить в «%s»"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "не удалось разблокировать %s"
@@ -796,8 +1057,22 @@ msgid "unable to lock %s"
 msgstr "не удалось заблокировать %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "показывает файл в пейджере"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "не удалось добавить в «%s»"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "не удалось сбросить на диск файл «%s»"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "невозможно отклонить файл «%s» в самого себя"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -819,13 +1094,13 @@ msgstr "не удалось выделить память"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "не удалось создать копию дескриптора потока std%s"
+msgid "failed to dup for fd %d"
+msgstr "не удалось создать копию дескриптора файла %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "не удалось создать копию дескриптора файла %d"
+msgid "failed to dup for std%s"
+msgstr "не удалось создать копию дескриптора потока std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -964,27 +1239,33 @@ msgstr ""
 "значение пользовательского поля «%.*s» должно встречаться только один раз"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "отсутствует %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "пустое значение там, где ожидается %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "значение поля «%s» должно встречаться только один раз"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "пакет содержит поле «%s», но такая архитектура отсутствует"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "пакет содержит поле «%s», но оно для всех архитектур"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Config-Version для пакета с недопустимым значением Status"
 
 #: lib/dpkg/parse.c
@@ -993,8 +1274,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "пакет в состоянии %s, но есть триггеры ожидания"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "пакет в состоянии triggers-awaited, но нет триггеров ожидания"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "пакет в состоянии %s, но есть триггеры ожидания"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1002,11 +1285,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "пакет в состоянии %s, но есть триггеры рассмотрения"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "пакет в состоянии triggers-awaited, но нет триггеров рассмотрения"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "пакет в состоянии %s, но есть триггеры рассмотрения"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Пакет в состоянии not-installed имел файлы настройки, можно не принимать во "
 "внимание"
@@ -1030,10 +1317,13 @@ msgstr ""
 "неофициальной версии dpkg"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Multi-Arch: %s) не может быть установлен одновременно с %s, для "
 "которого имеется несколько установленных экземпляров"
@@ -1229,12 +1519,6 @@ msgstr "не удалось безопасно удалить «%.255s»"
 msgid "rm command for cleanup"
 msgstr "команда rm для очистки"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-"неоднозначное имя пакета «%s» с более чем одним установленным экземпляром"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1248,6 +1532,17 @@ msgstr "ширина поля вне допустимого диапазона"
 msgid "missing closing brace"
 msgstr "нет закрывающей скобки"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+"неоднозначное имя пакета «%s» с более чем одним установленным экземпляром"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(описание недоступно)"
@@ -1338,6 +1633,70 @@ msgstr "работа подпроцесса %s завершилась неуда
 msgid "wait for %s subprocess failed"
 msgstr "ожидание завершения подпроцесса %s завершилось неудачно"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "недопустимый символ «%c» в поле ширины"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "недопустимый символ «%c» в поле ширины"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "неправильное состояние"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid tar header gid field"
+msgstr "выполняется чтение файла statoverride «%.250s»"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "недопустимый символ «%c» в поле ширины"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "неподдерживаемые параметры в заголовке файла"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "неизвестный тип сжатия «%s»!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1357,12 +1716,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "каталог control не является каталогом"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "не удалось открыть/создать файл блокировки триггеров «%.250s»"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "область триггеров"
 
 #: lib/dpkg/trigdeferred.c
@@ -1584,11 +1946,6 @@ msgstr "ошибка создания канала «%.255s»"
 msgid "error creating device '%.255s'"
 msgstr "ошибка создания устройства «%.255s»"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "ошибка создания жёсткой ссылки «%.255s»"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1909,10 +2266,10 @@ msgstr "нет доступа к архиву"
 msgid "archive '%s' is not a regular file"
 msgstr "conffile-файл «%s» не является обычным файлом"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<стандартный вывод>"
 
@@ -2095,6 +2452,10 @@ msgid "conffile difference visualizer"
 msgstr "Визуализатор различий conffile"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Когда закончите, наберите «exit».\n"
 
@@ -2456,7 +2817,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2465,7 +2840,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2500,6 +2878,12 @@ msgstr ""
 " совпадать с --divert. В сценариях пакетов preinst/postrm всегда нужно\n"
 "указывать --package и --divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2621,6 +3005,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Нет отклонения «%s», ничего не удалено.\n"
 
@@ -2664,19 +3055,6 @@ msgstr "пакет не может содержать символов ново�
 msgid "divert-to may not contain newlines"
 msgstr "divert-to не может содержать символов новой строки"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "не удалось открыть файл diversions"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "не удалось выполнить fstat на файл diversions"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "конфликт файлов diversions из пакетов «%.250s» и «%.250s»"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2983,118 +3361,176 @@ msgstr ""
 "Пакет %s зафиксирован и не будет обработан. Если вас это не устраивает, "
 "используйте --force-hold.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "проблема игнорируется, поскольку задан параметр --force:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Установить все параметры игнорирования"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "в конце управляющего файла «%s» пакетом «%s» нет символа новой строки"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "в конце управляющего файла «%s» пакетом «%s» нет символа новой строки"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Заменить пакет на пакеты с меньшей версией"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "в конце управляющего файла «%s» пакетом «%s» нет символа новой строки"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Настроить любой пакет, который может помочь этому"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "в управляющем файле «%s» пакета «%s» содержится пустое имя файла"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Обработать несущественные пакеты, даже когда они зафиксированы"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "не удалось открыть управляющий файл «%s» пакета «%s»"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr ""
+"Попытаться выполнить установку/удаление даже не имея прав суперпользователя"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "не удалось выполнить stat для управляющего файла «%s» пакета «%s»"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "В PATH отсутствуют важные программы, возможны проблемы"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "файл «%s» пакета «%s» не является обычным файлом"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Установить пакет, даже если он не пройдёт аутентификацию"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "не удалось прочитать управляющий файл «%s» пакета «%s»"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Обрабатывать пакеты даже с ошибочными версиями"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "не удалось закрыть управляющий файл «%s» пакета «%s»"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "не удалось открыть список файлов пакета «%.250s»"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Перезаписывать файл из одного пакета файлом другого пакета"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Перезаписывать отклонённый файл его неотклонённой версией"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Перезаписывать каталог из одного пакета файлом другого пакета"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Не выполнять безопасные операции ввода-вывода при распаковке"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Всегда использовать новые файлы настроек ничего не предлагая"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Всегда использовать старые файлы настроек ничего не предлагая"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"список файлов пакета «%.250s» отсутствует; предполагаем, что на данный "
-"момент у пакета нет установленных файлов"
+"Использовать для новых файлов настройки вариант\n"
+"по умолчанию, если он есть, ничего не спрашивая.\n"
+"Если он не найден, то выдаётся запрос, если только\n"
+"не заданы параметры confold и"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "не удалось открыть список файлов пакета «%.250s»"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Всегда устанавливать отсутствующие файлы настройки"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "список файлов пакета «%.250s» не является обычным файлом"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Предлагать замену файлов настройки на старые версии"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Обрабатывать даже пакеты с неправильной или вовсе без архитектуры"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Устанавливать, даже если это сломает другой пакет"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Разрешить установку конфликтующих пакетов"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Преобразовать все проблемы с зависимостями в предупреждения"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr ""
+"Преобразовать все проблемы с зависимостями из-за версий в предупреждения"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Удалить пакеты, требующие установки"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Удалить пакет первой необходимости"
+
+#: src/force.c
 #, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "чтение списка файлов пакета «%.250s»"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"Параметры игнорирования %s позволяют управлять поведением при\n"
+"обнаружении ошибок:\n"
+"  предупредить и продолжить работу: --force-<ошибка>,<ошибка>,…\n"
+"  прекратить работу и выдать ошибку: --refuse-<ошибка>,<ошибка>,…\n"
+"   | --no-force-<ошибка>,…\n"
+" Возможные ошибки:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"в списке файлов пакета «%.250s» отсутствует завершающий символ новой строки"
+"\n"
+"ПРЕДУПРЕЖДЕНИЕ: Использование параметров, отмеченных [!], может серьёзно\n"
+"повредить систему. Параметры, отмеченные [*], задействованы по умолчанию.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "список файлов пакета «%.250s» содержит пустое имя файла"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "ошибка при закрытии списка файлов пакета «%.250s»"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "недопустимый параметр игнорирования/обработки проблем «%.*s»"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Чтение базы данных … "
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "устаревший параметр игнорирования/обработки «%s»\n"
 
-#: src/filesdb.c
-#, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "на данный момент установлен %d файл и каталог.)\n"
-msgstr[1] "на данный момент установлено %d файла и каталога.)\n"
-msgstr[2] "на данный момент установлено %d файлов и каталогов.)\n"
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "проблема игнорируется, поскольку задан параметр --force:"
 
 #: src/help.c
 msgid "not installed"
@@ -3164,42 +3600,6 @@ msgstr ""
 "Замечание: В PATH суперпользователя обычно должны присутствовать /usr/local/"
 "sbin, /usr/sbin и /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "не удалось проверить существование файла «%.250s»"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "ошибка чтения информационного каталога"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "ошибка при попытке открыть файл %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "повреждение информационного файла формата базы данных «%s»"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"формат информационной базы данных (%d) поддельный или слишком новый; "
-"попробуйте обновить версию dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "информационный файл %s/%s не связан ни с одним пакетом"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "ошибка во время записи «%s»"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3245,27 +3645,27 @@ msgstr "Система управления пакетами Debian «%s», ве
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3515,116 +3915,6 @@ msgstr ""
 "Объедините их в конвейер с программами «less» или «more»!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Установить все параметры игнорирования"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Заменить пакет на пакеты с меньшей версией"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Настроить любой пакет, который может помочь этому"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Обработать несущественные пакеты, даже когда они зафиксированы"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-"Попытаться выполнить установку/удаление даже не имея прав суперпользователя"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "В PATH отсутствуют важные программы, возможны проблемы"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Установить пакет, даже если он не пройдёт аутентификацию"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Обрабатывать пакеты даже с ошибочными версиями"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Перезаписывать файл из одного пакета файлом другого пакета"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Перезаписывать отклонённый файл его неотклонённой версией"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Перезаписывать каталог из одного пакета файлом другого пакета"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Не выполнять безопасные операции ввода-вывода при распаковке"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Всегда использовать новые файлы настроек ничего не предлагая"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Всегда использовать старые файлы настроек ничего не предлагая"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Использовать для новых файлов настройки вариант\n"
-"по умолчанию, если он есть, ничего не спрашивая.\n"
-"Если он не найден, то выдаётся запрос, если только\n"
-"не заданы параметры confold и"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Всегда устанавливать отсутствующие файлы настройки"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Предлагать замену файлов настройки на старые версии"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Обрабатывать даже пакеты с неправильной или вовсе без архитектуры"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Устанавливать, даже если это сломает другой пакет"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Разрешить установку конфликтующих пакетов"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Преобразовать все проблемы с зависимостями в предупреждения"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr ""
-"Преобразовать все проблемы с зависимостями из-за версий в предупреждения"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Удалить пакеты, требующие установки"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Удалить пакет первой необходимости"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Общая полезная информация о происходящих событиях"
 
@@ -3756,43 +4046,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"Параметры игнорирования %s позволяют управлять поведением при\n"
-"обнаружении ошибок:\n"
-"  предупредить и продолжить работу: --force-<ошибка>,<ошибка>,…\n"
-"  прекратить работу и выдать ошибку: --refuse-<ошибка>,<ошибка>,…\n"
-"   | --no-force-<ошибка>,…\n"
-" Возможные ошибки:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"ПРЕДУПРЕЖДЕНИЕ: Использование параметров, отмеченных [!], может серьёзно\n"
-"повредить систему. Параметры, отмеченные [*], задействованы по умолчанию.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "недопустимый параметр игнорирования/обработки проблем «%.*s»"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "устаревший параметр игнорирования/обработки «%s»\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "не удалось открыть поток дескриптора «%i»"
 
@@ -3977,6 +4230,12 @@ msgid "Description"
 msgstr "Описание"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "показывает файл в пейджере"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "отклонено %s из %s\n"
@@ -4013,6 +4272,18 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "пакет «%s» не установлен, информация о нём недоступна"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Для проверки файлов архивов используйте команду dpkg --info (dpkg-deb --"
+"info),\n"
+"для вывода списка файлов в них — команду dpkg--contents (dpkg-deb --"
+"contents).\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "пакет «%s» недоступен"
@@ -4038,9 +4309,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "отклонено пакетом %s в %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Для проверки файлов архивов используйте команду dpkg --info (dpkg-deb --"
 "info),\n"
@@ -4083,19 +4357,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "Система управления пакетами Debian %s, версия инструмента опроса %s.\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4285,6 +4573,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr "чтобы dpkg работал правильно, admindir должен быть внутри instdir"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "не удалось выполнить chroot в «%.250s»"
@@ -4441,12 +4735,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4513,67 +4821,11 @@ msgstr "нет замещений"
 msgid "--update is useless for --remove"
 msgstr "--update бесполезен вместе с --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "неправильное состояние"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "выполняется чтение файла statoverride «%.250s»"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "выполняется чтение файла statoverride «%.250s»"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "не удалось открыть файл statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "не удалось выполнить fstat на файл statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "выполняется чтение файла statoverride «%.250s»"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "в файле statoverride отсутствует завершающий символ новой строки"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "файл statoverride содержит пустую строку"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "синтаксическая ошибка в файле statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "неизвестный пользователь «%s» в файле statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "неожиданный конец строки в файле statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "неизвестная группа «%s» в файле statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "для файла «%.250s» есть несколько statoverrides"
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "устаревший параметр «--%s»; вместо него используйте «--%s»."
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4791,6 +5043,12 @@ msgstr "Деконфигурируется %s (%s), чтобы можно был
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Деконфигурируется %s (%s) …\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "файл statoverride содержит пустую строку"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4933,11 +5191,9 @@ msgid "package filesystem archive extraction"
 msgstr "извлечение архива файловой системы пакета"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "ошибка чтения архива tar, возвращённого dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "повреждённый архив файловой системы: повреждён файл пакета"
 
 #: src/unpack.c
@@ -4951,16 +5207,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s может быть только один аргумент (файл Packages)"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "не удалось втянуть информацию о доступных обновлениях, нет доступа к области "
 "состояний dpkg"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"втягивание информации о доступных обновлениях требует доступа к области "
-"состояний dpkg на запись"
+"не удалось втянуть информацию о доступных обновлениях, нет доступа к области "
+"состояний dpkg"
 
 #: src/update.c
 #, c-format
@@ -5326,16 +5588,18 @@ msgid "decompressing archive member"
 msgstr "разжимающий элемент архива"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "не удалось перейти в каталог"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "не удалось создать каталог"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "не удалось после создания каталога перейти в него"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "неожиданный конец файла в имени пакета в строке %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "не удалось перейти в каталог"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6189,7 +6453,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6199,8 +6477,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6712,8 +6991,84 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "устаревший параметр «--%s»; вместо него используйте «--%s»."
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "не удалось открыть файл блокировки %s для тестирования"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "неизвестный пользователь «%s» в файле statoverride"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "неизвестная группа «%s» в файле statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "отсутствует %s"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "«%.50s» не разрешено в %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "мусор после %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "недопустимое имя пакета (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "значение «да» или «нет» в логическом поле"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "Поле «%s», ссылка на «%.255s»: ошибка в поле версии"
+
+#~ msgid "empty value for %s"
+#~ msgstr "пустое значение там, где ожидается %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "пакет в состоянии triggers-awaited, но нет триггеров ожидания"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr "пакет в состоянии triggers-awaited, но нет триггеров рассмотрения"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "втягивание информации о доступных обновлениях требует доступа к области "
+#~ "состояний dpkg на запись"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "ошибка чтения архива tar, возвращённого dpkg-deb"
+
+#, fuzzy
+#~| msgid "cannot open '%s' control file for package '%s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "не удалось открыть управляющий файл «%s» пакета «%s»"
+
+#, fuzzy
+#~| msgid "cannot stat '%s' control file for package '%s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "не удалось выполнить stat для управляющего файла «%s» пакета «%s»"
+
+#, fuzzy
+#~| msgid "'%s' file for package '%s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "файл «%s» пакета «%s» не является обычным файлом"
+
+#, fuzzy
+#~| msgid "cannot close '%s' control file for package '%s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "не удалось закрыть управляющий файл «%s» пакета «%s»"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "не удалось открыть список файлов пакета «%.250s»"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "не удалось открыть список файлов пакета «%.250s»"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "список файлов пакета «%.250s» не является обычным файлом"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "чтение списка файлов пакета «%.250s»"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "не удалось после создания каталога перейти в него"
 
 #~ msgid "control file '%s' missing value"
 #~ msgstr "в управляющем файле «%s» отсутствует значение"
@@ -6783,9 +7138,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "В ответе на запрос из потока stdin прочитан символ конца файла"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "неожиданный конец файла в имени пакета в строке %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "неожиданный конец файла после имени пакета в строке %d"
 
@@ -7042,9 +7394,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "является подчинённой для %s"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "не удалось выполнить stat для «%s»: %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "readlink(%s) завершилась неудачно: %s"
 
@@ -7069,9 +7418,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "не удалось закрыть %s: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "не удалось записать в %s: %s"
-
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
@@ -7402,9 +7748,6 @@ msgstr ""
 #~ msgid "cannot open diversions: %s"
 #~ msgstr "не удалось открыть файл diversions: %s"
 
-#~ msgid "missing package"
-#~ msgstr "отсутствует пакет"
-
 #~ msgid "rename: rename `%s' to `%s': %s"
 #~ msgstr "rename: переименование `%s' в `%s': %s"
 
diff --git a/po/sk.po b/po/sk.po
index 5cd12619c..72fba3f97 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 10:01+0200\n"
 "Last-Translator: Ivan Masár <helix84@centrum.sk>\n"
 "Language-Team: Slovak <debian-l10n-slovak@lists.debian.org>\n"
@@ -140,7 +140,8 @@ msgstr "chyba pri odstraňovaní starého záložného súboru „%s“"
 msgid "error creating new backup file '%s'"
 msgstr "chyba pri vytváraní nového záložného súboru „%s“"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "nie je možné odstrániť „%.250s“"
@@ -345,20 +346,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "po naplnení nie je možné presunúť sa na začiatok %.250s"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "nie je možné otvoriť súbor zámku %s na testovanie"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "nepodarilo sa získať popisovač adresára „%s“"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "nie je možné otvoriť/vytvoriť zamykací súbor stavovej databázy"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "nie je možné otvoriť/vytvoriť zamykací súbor stavovej databázy"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "nemáte oprávnenie na uzamknutie stavovej databázy dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "stavová databáza dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -366,11 +384,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "požadovaná operácia vyžaduje oprávnenie superpoužívateľa"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "nie je možné pristúpiť ku stavovej oblasti dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operácia vyžaduje práva na čítanie/zápis do stavovej oblasti dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -408,6 +430,197 @@ msgstr "nie je možné uzavrieť aktualizovaný stav „%.250s“"
 msgid "unable to install updated status of '%.250s'"
 msgstr "nie je možné inštalovať aktualizovaný stav „%.250s“"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "nie je možné skontrolovať existenciu „%.250s“"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "nedá sa prečítať informácia o adresári"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "chyba pri pokuse otvoriť %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "Poškodený formát súbory databázy info „%s“"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"formát databázy info (%d) ne neplatný alebo príliš nový; skúste si "
+"nainštalovať novší dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "Info file %s/%s not associated to any package"
+msgid "info file %s/%s not associated to any package"
+msgstr "Súbor info %s/%s nie je priradený žiadnemu balíku"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "chyba pri vytváraní pevného odkazu „%.255s“"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "chyba pri zápise „%s“"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "v zozname súborov balíka „%.250s“ chýba na konci znak nového riadka"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "v zozname súborov balíka „%.250s“ chýba na konci znak nového riadka"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "v zozname súborov balíka „%.250s“ chýba na konci znak nového riadka"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "zoznam súborov balíka „%.250s“ obsahuje prázdny názov súboru"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot extract control file '%s' from '%s': %s"
+msgid "loading control file '%s' for package '%s'"
+msgstr "nie je možné extrahovať riadaici súbor „%s“ z „%s“: %s"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "zlyhalo otvorenie súboru s odchýlkami"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "zlyhalo vykonanie funkcie fstat v súbore s odchýlkami"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "odchýlky „%.250s“ alebo „%.250s“ sú v konflikte"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "chyba pri zatváraní zoznamu súborov balíka „%.250s“"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"súbor so zoznamom súborov balíka „%.250s“ chýba, predpokladá sa, že balík "
+"nemá momentálne nainštalované žiadne súbory"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "v zozname súborov balíka „%.250s“ chýba na konci znak nového riadka"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "zoznam súborov balíka „%.250s“ obsahuje prázdny názov súboru"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Číta sa databáza ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "momentálne je nainštalovaný %d súbor alebo adresár.\n"
+msgstr[1] "momentálne sú nainštalované %d súbory alebo adresáre.\n"
+msgstr[2] "momentálne je nainštalovaných %d súborov alebo adresárov.\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "neplatný stav"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "číta sa súbor statoverride „%.250s“"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "číta sa súbor statoverride „%.250s“"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "zlyhalo otvorenie súboru statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "zlyhalo vykonanie funkcie fstat v súbore statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "číta sa súbor statoverride „%.250s“"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "v súbore statoverride chýba na konci znak nového riadka"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "súbor statoverride obsahuje prázdny riadok"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "syntaktická chyba v súbore statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "neočakávaný koniec riadka v súbore statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "pre súbor „%.250s“ existujú viaceré súbory statoverride"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -543,65 +756,76 @@ msgid "internal error"
 msgstr "vnútorná chyba (chyba v programe)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s chýba"
+#, fuzzy
+#| msgid "control file '%s' does not exist"
+msgid "is missing a value"
+msgstr "riadiaci súbor „%s“ neexistuje"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "„%.50s“ nie je prípustné pre %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Preskočiť neplatný riadok: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "nezmyselné dáta po %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "chybné meno balíka (%.250s)"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "balík „%s“ nie je nainštalovaný"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "prázdne pole s podrobnosťami súboru „%s“"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "pole s podrobnosťami súboru „%s“ nie je prípustné v stavovom súbore"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "príliš veľa hodnôt v poli s podrobnosťami súboru „%s“ (v porovnaní s "
 "ostatnými)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "príliš málo hodnôt v poli s podrobnosťami súboru „%s“ (v porovnaní ostatnými)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "áno/nie v poli typu boolean"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "použitie zastaralého poľa „Revision“ alebo „Package-Revision“"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "cudzia/povolená/rovnaká/nie v štvorstavovom poli"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "„%s“ nie je platný názov architektúry: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "slovo v poli priority"
 
 #: lib/dpkg/fields.c
@@ -611,33 +835,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "hodnota pre stavové pole nie je prípustná v tomto kontexte"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "prvé (žiadané) slovo v stavovom poli"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "druhé (chybové) slovo v stavovom poli"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "tretie (stavové) slovo v stavovom poli"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string '%.250s'"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "chyba v reťazci Version „%.250s“"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "použitie zastaralého poľa „Revision“ alebo „Package-Revision“"
 
 #: lib/dpkg/fields.c
@@ -649,11 +873,13 @@ msgstr "hodnota pre „conffiles“ má riadok „%.*s“ v chybnom tvare"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "hodnota pre „conffiles“ nemá riadok začínajúci medzerou „%c“"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "koreňový alebo neuvedený adresár uvedený ako conffile"
 
 #: lib/dpkg/fields.c
@@ -736,9 +962,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "pole „%s“ odkazujúce na „%.255s“: verzia neukončená"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "pole „%s“ odkazujúce na „%.255s“: chyba vo verzii"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "pole „%s“ odkazujúce na „%.255s“: verzia obsahuje „%c“"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -746,8 +973,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "syntaktická chyba v poli „%s“ po odkaze na balík „%.255s“"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternatíva („|“) nie je prípustná v poli %s"
 
 #: lib/dpkg/fields.c
@@ -787,6 +1015,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "nie je možné nastaviť režim nového cieľového súboru „%.250s“"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat file '%s'"
+msgid "cannot stat %s"
+msgstr "nepodarilo sa vykonať stat() súboru „%s“"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "konfiguračný súbor „%s“ nie je čistý súbor"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot read %s"
+msgstr "nedá sa dopisovať do súboru „%s“"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "nedá sa dopisovať do súboru „%s“"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "nedá sa odomknúť %s"
@@ -807,8 +1059,22 @@ msgid "unable to lock %s"
 msgstr "nedá sa zamknúť %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "zobrazuje sa súbor v stránkovači"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "nedá sa dopisovať do súboru „%s“"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "nie je možné vyprázdniť (flush) súbor „%s“"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "nie je možné odkloniť súbor „%s“ na seba samého"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -830,13 +1096,13 @@ msgstr "nepodarilo sa alokovať pamäť"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "zlyhalo vykonanie funkcie dup pre std%s"
+msgid "failed to dup for fd %d"
+msgstr "zlyhalo vykonanie funkcie dup pre fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "zlyhalo vykonanie funkcie dup pre fd %d"
+msgid "failed to dup for std%s"
+msgstr "zlyhalo vykonanie funkcie dup pre std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -974,29 +1240,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "duplicitná hodnota používateľom definovaného poľa „%.*s“"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "chýba %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "prázdna hodnota %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "duplicitná hodnota poľa „%s“"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "balík má pole „%s“, ale chýba mu architektúra"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "balík má pole „%s“, ale má architektúru „all“"
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Configured-Version pre balík s nezodpovedajúcim Stavom"
 
 #: lib/dpkg/parse.c
@@ -1005,10 +1275,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "balík je v stave %s, ale očakávajú sa spúšťače (triggers-awaited)"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr ""
-"balík je v stave očakávajú sa spúšťače (triggers-awaited), ale neočakávajú "
-"sa žiadne spúšťače"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "balík je v stave %s, ale očakávajú sa spúšťače (triggers-awaited)"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1016,13 +1286,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "balík je v stave %s, ale očakávajú sa spúšťače (triggers-pending)"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"balík je v stave očakávajú-sa-spúšťače (triggers-pending), ale neočakávajú "
-"sa žiadne spúšťače"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "balík je v stave %s, ale očakávajú sa spúšťače (triggers-pending)"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Balíček, ktorý je v stave nenainštalovaný má konfiguračné súbory, zahadzujú "
 "sa"
@@ -1044,10 +1316,13 @@ msgstr ""
 "súčasne; pravdepodobne kvôli aktualizácii z neoficiálneho dpkg"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Multi-Arch: %s) nemôže byť nainštalovaný súčasne s %s, ktorý má "
 "viaceré nainštalované inštancie"
@@ -1237,12 +1512,6 @@ msgstr "nedá sa bezpečne odstrániť „%.255s“"
 msgid "rm command for cleanup"
 msgstr "príkaz rm na vyčistenie"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-"nejednoznačný názov balíka „%s“ s viac ako jednou nainštalovanou inštanciou"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1256,6 +1525,17 @@ msgstr "pole šírka je mimo platného rozsahu"
 msgid "missing closing brace"
 msgstr "chýba pravá zložená zátvorka"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+"nejednoznačný názov balíka „%s“ s viac ako jednou nainštalovanou inštanciou"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(popis nie je k dispozícii)"
@@ -1343,6 +1623,70 @@ msgstr "podproces %s zlyhal s čakacím stavovým kódom %d"
 msgid "wait for %s subprocess failed"
 msgstr "čakanie na podproces %s zlyhalo"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "neplatný znak „%c“ v šírke poľa"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "neplatný znak „%c“ v šírke poľa"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "neplatný stav"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid tar header gid field"
+msgstr "číta sa súbor statoverride „%.250s“"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "neplatný znak „%c“ v šírke poľa"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "nepodporované voľby v hlavičke súbora"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "neznámy typ kompresie „%s“!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1362,12 +1706,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "riadiaci adresár nie je adresár"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "nie je možné otvoriť/vytvoriť súbor zámku spúšťača „%.250s“"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "oblasť spúšťačov"
 
 #: lib/dpkg/trigdeferred.c
@@ -1588,11 +1935,6 @@ msgstr "chyba pri vytváraní rúry „%.255s“"
 msgid "error creating device '%.255s'"
 msgstr "chyba pri vytváraní zariadenia „%.255s“"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "chyba pri vytváraní pevného odkazu „%.255s“"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1910,10 +2252,10 @@ msgstr "nie je možné vstúpiť do archívu"
 msgid "archive '%s' is not a regular file"
 msgstr "konfiguračný súbor „%s“ nie je čistý súbor"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<štand. výstup>"
 
@@ -2133,6 +2475,10 @@ msgid "conffile difference visualizer"
 msgstr "vizualizátor rozdielov konfiguračných súborov conffile"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Po skončení napíšte „exit“.\n"
 
@@ -2492,7 +2838,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2501,7 +2861,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2535,6 +2898,12 @@ msgstr ""
 "Predinštalačné a poinštalačné skripty by mali vždy používať --package\n"
 "a --divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2658,6 +3027,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Odklonenie „%s“ neexistuje, takže sa neodstránilo\n"
 
@@ -2701,19 +3077,6 @@ msgstr "názov balíka nemôže obsahovať znaky nového riadka"
 msgid "divert-to may not contain newlines"
 msgstr "kam-odkloniť nemôže obsahovať znaky nového riadka"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "zlyhalo otvorenie súboru s odchýlkami"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "zlyhalo vykonanie funkcie fstat v súbore s odchýlkami"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "odchýlky „%.250s“ alebo „%.250s“ sú v konflikte"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3023,119 +3386,175 @@ msgstr ""
 "Balík %s je v stave podržaný, ponecháva sa. Použite --force-hold na "
 "prekonanie.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "prekonáva sa problém, pretože je nastavené --force: "
+#: src/force.c
+msgid "Set all force options"
+msgstr "Nastaviť všetky voľby vynútenia"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "v zozname súborov balíka „%.250s“ chýba na konci znak nového riadka"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "v zozname súborov balíka „%.250s“ chýba na konci znak nového riadka"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Nahradiť balík nižšou verziou"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "v zozname súborov balíka „%.250s“ chýba na konci znak nového riadka"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Nastaviť akýkoľvek balík, ktorý môže pomôcť tomuto"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "zoznam súborov balíka „%.250s“ obsahuje prázdny názov súboru"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Spracovať náhodné balíky aj pri podržaní"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "nie je možné otvoriť zoznam súborov balíka „%.250s“"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Pokúsiť sa (od)inštalovať veci aj ak nie ste root"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to stat files list file for package '%.250s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "nie je možné zistiť stav súboru so zoznam súborov balíka „%.250s“"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+"v ceste PATH chýbajú dôležité programy, pravdepodobne sa vyskytnú problémy"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list for package '%.250s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "zoznam súborov balíka „%.250s“ nie je obyčajný súbor"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Nainštalovať balík aj ak neprejde kontrolou autentickosti"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot extract control file '%s' from '%s': %s"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "nie je možné extrahovať riadaici súbor „%s“ z „%s“: %s"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Spracovávať aj balíky s nesprávnymi verziami"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "chyba pri zatváraní zoznamu súborov balíka „%.250s“"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "nie je možné otvoriť zoznam súborov balíka „%.250s“"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Prepísať súbor z jedného balíka iným"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Prepísať odklonený súbor neodklonenou verziou"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Prepísať adresár jedného balíka súborom iného"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Nevykonávať bezpečné V/V operácie počas rozbaľovania"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Vždy používať nové konfiguračné súbory, nepýtať sa"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Vždy používať staré konfiguračné súbory, nepýtať sa"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"súbor so zoznamom súborov balíka „%.250s“ chýba, predpokladá sa, že balík "
-"nemá momentálne nainštalované žiadne súbory"
+"Používať predvolenú voľbu pre nové konfiguračné súbory\n"
+"ak je dostupná, nepýtať sa. Ak nič nie je predvolené,\n"
+"budete vyzvaní ak ste zároveň nezadali jednu z volieb\n"
+"confold alebo confnew"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "nie je možné zistiť stav súboru so zoznam súborov balíka „%.250s“"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Vždy inštalovať chýbajúce konfiguračné súbory"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "zoznam súborov balíka „%.250s“ nie je obyčajný súbor"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Ponúknuť nahradenie konfiguračných súborov bez nových verzií"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Spracovávať aj balíky s nesprávnou alebo neuvedenou architektúrou"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Inštalovať aj ak by to pokazilo iný balík"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Povoliť inštaláciu konfliktných balíkov"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Urobí zo všetkých problémov so závislosťami upozornenia"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Urobí z problémov s verziami závislosťami upozornenia"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Odstraňovať balíky, ktoré vyžadujú inštaláciu"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Odstrániť nevyhnutný balík"
+
+#: src/force.c
 #, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "číta sa zoznam súborov balíka „%.250s“"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"Vynucovacie voľby %s - ovládanie správania v prípade problémov:\n"
+"  upozorniť, ale pokračovať:  --force-<vec>,<vec>,...\n"
+"  zastaviť s chybou:          --refuse-<vec>,<vec>,... | --no-force-"
+"<vec>,...\n"
+" Vynucovanie vecí:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "v zozname súborov balíka „%.250s“ chýba na konci znak nového riadka"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"UPOZORNENIE - použitím volien označených [!] si môžete vážne poškodiť vašu "
+"inštaláciu.\n"
+"Vynucovanie volieb odnačených [*] je štandardne zapnuté.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "zoznam súborov balíka „%.250s“ obsahuje prázdny názov súboru"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "chyba pri zatváraní zoznamu súborov balíka „%.250s“"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "neznáma vynucovacia/odmietacia voľba „%.*s“"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Číta sa databáza ... "
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "zastaralá vynucovacia/zakazovacia voľba „%s“\n"
 
-#: src/filesdb.c
-#, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "momentálne je nainštalovaný %d súbor alebo adresár.\n"
-msgstr[1] "momentálne sú nainštalované %d súbory alebo adresáre.\n"
-msgstr[2] "momentálne je nainštalovaných %d súborov alebo adresárov.\n"
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "prekonáva sa problém, pretože je nastavené --force: "
 
 #: src/help.c
 msgid "not installed"
@@ -3206,43 +3625,6 @@ msgstr ""
 "Pozn.: premenná PATH používateľa root by mala obsahovať /usr/local/sbin, /"
 "usr/sbin a /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "nie je možné skontrolovať existenciu „%.250s“"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "nedá sa prečítať informácia o adresári"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "chyba pri pokuse otvoriť %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "Poškodený formát súbory databázy info „%s“"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"formát databázy info (%d) ne neplatný alebo príliš nový; skúste si "
-"nainštalovať novší dpkg"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "Info file %s/%s not associated to any package"
-msgid "info file %s/%s not associated to any package"
-msgstr "Súbor info %s/%s nie je priradený žiadnemu balíku"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "chyba pri zápise „%s“"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3287,27 +3669,27 @@ msgstr "Debian „%s“ program na údržbu balíkov, verzia %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3586,115 +3968,6 @@ msgstr ""
 "Voľby označené [*] produkujú rozsiahly výstup - použite „less“ alebo „more“!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Nastaviť všetky voľby vynútenia"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Nahradiť balík nižšou verziou"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Nastaviť akýkoľvek balík, ktorý môže pomôcť tomuto"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Spracovať náhodné balíky aj pri podržaní"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Pokúsiť sa (od)inštalovať veci aj ak nie ste root"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-"v ceste PATH chýbajú dôležité programy, pravdepodobne sa vyskytnú problémy"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Nainštalovať balík aj ak neprejde kontrolou autentickosti"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Spracovávať aj balíky s nesprávnymi verziami"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Prepísať súbor z jedného balíka iným"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Prepísať odklonený súbor neodklonenou verziou"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Prepísať adresár jedného balíka súborom iného"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Nevykonávať bezpečné V/V operácie počas rozbaľovania"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Vždy používať nové konfiguračné súbory, nepýtať sa"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Vždy používať staré konfiguračné súbory, nepýtať sa"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Používať predvolenú voľbu pre nové konfiguračné súbory\n"
-"ak je dostupná, nepýtať sa. Ak nič nie je predvolené,\n"
-"budete vyzvaní ak ste zároveň nezadali jednu z volieb\n"
-"confold alebo confnew"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Vždy inštalovať chýbajúce konfiguračné súbory"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Ponúknuť nahradenie konfiguračných súborov bez nových verzií"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Spracovávať aj balíky s nesprávnou alebo neuvedenou architektúrou"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Inštalovať aj ak by to pokazilo iný balík"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Povoliť inštaláciu konfliktných balíkov"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Urobí zo všetkých problémov so závislosťami upozornenia"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Urobí z problémov s verziami závislosťami upozornenia"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Odstraňovať balíky, ktoré vyžadujú inštaláciu"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Odstrániť nevyhnutný balík"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Všeobecne užitočné informácie o priebehu"
 
@@ -3825,43 +4098,6 @@ msgstr "nemožno odstrániť architektúru „%s“, ktorú momentálne použív
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"Vynucovacie voľby %s - ovládanie správania v prípade problémov:\n"
-"  upozorniť, ale pokračovať:  --force-<vec>,<vec>,...\n"
-"  zastaviť s chybou:          --refuse-<vec>,<vec>,... | --no-force-"
-"<vec>,...\n"
-" Vynucovanie vecí:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"UPOZORNENIE - použitím volien označených [!] si môžete vážne poškodiť vašu "
-"inštaláciu.\n"
-"Vynucovanie volieb odnačených [*] je štandardne zapnuté.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "neznáma vynucovacia/odmietacia voľba „%.*s“"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "zastaralá vynucovacia/zakazovacia voľba „%s“\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "nie je možné otvoriť „%i“ pre tok"
 
@@ -4044,6 +4280,12 @@ msgid "Description"
 msgstr "Popis"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "zobrazuje sa súbor v stránkovači"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "odsunuté balíkom %s z: %s\n"
@@ -4079,6 +4321,16 @@ msgstr ""
 "balík „%s“ nie je nainštalovaný a nie sú o ňom dostupné žiadne informácie"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Použite dpkg --info (= dpkg-deb --info) na preskúmanie súborov archívov,\n"
+"a dpkg --contents (= dpkg-deb --contents) na vypísanie ich obsahu.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "balík „%s“ nie je dostupný"
@@ -4104,9 +4356,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "odsunuté balíkom %s do: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Použite dpkg --info (= dpkg-deb --info) na preskúmanie súborov archívov,\n"
 "a dpkg --contents (= dpkg-deb --contents) na vypísanie ich obsahu.\n"
@@ -4147,19 +4402,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "Program „%s“ na údržbu balíkov Debianu, verzia %s.\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4353,6 +4622,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr "admindir musí byť vnútri instdir, aby dpkg fungoval správne"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "zlyhalo vykonanie funkcie chroot na „%.255s“"
@@ -4523,8 +4798,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4591,69 +4871,11 @@ msgstr "nie je prítomné žiadne prekonanie"
 msgid "--update is useless for --remove"
 msgstr "--update je nepoužiteľný pri --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "neplatný stav"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "číta sa súbor statoverride „%.250s“"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "číta sa súbor statoverride „%.250s“"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "zlyhalo otvorenie súboru statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "zlyhalo vykonanie funkcie fstat v súbore statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "číta sa súbor statoverride „%.250s“"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "v súbore statoverride chýba na konci znak nového riadka"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "súbor statoverride obsahuje prázdny riadok"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "syntaktická chyba v súbore statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "syntax error: unknown user '%s' in statoverride file"
-msgid "unknown user '%s' in statoverride file"
-msgstr "syntaktická chyba: neznámy používateľ „%s“ v súbore statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "neočakávaný koniec riadka v súbore statoverride"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "syntax error: unknown group '%s' in statoverride file"
-msgid "unknown group '%s' in statoverride file"
-msgstr "syntaktická chyba: neznáma skupina „%s“ v súbore statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "pre súbor „%.250s“ existujú viaceré súbory statoverride"
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "zastaraná voľba „--%s“. Prosím, použite namiesto nej „--%s“"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4888,6 +5110,12 @@ msgstr "Dekonfiguruje sa %s, aby sa umožnilo odstránenie %s ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Dekonfiguruje sa %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "súbor statoverride obsahuje prázdny riadok"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 #| msgid "conffile name '%.50s...' is too long, or missing final newline"
@@ -5031,11 +5259,9 @@ msgid "package filesystem archive extraction"
 msgstr "extrakcia súborového systému archívu balíka"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "chyba pri čítaní dpkg-deb tar výstupu"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "poškodený systémový tar súbor - poškodený archív balíkov"
 
 #: src/unpack.c
@@ -5050,15 +5276,20 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s potrebuje presne jeden argument - súbor Packages"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "nie je možné vstúpiť do oblasti stavu dpkg pre celkovú dostupnú aktualizáciu"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"celková dostupná aktualizácia vyžaduje možnosť zápisu do stavovej oblasti "
-"dpkg"
+"nie je možné vstúpiť do oblasti stavu dpkg pre celkovú dostupnú aktualizáciu"
 
 #: src/update.c
 #, c-format
@@ -5411,16 +5642,18 @@ msgid "decompressing archive member"
 msgstr "dekomprimuje sa člen archívu"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "zlyhalo vykonanie chdir do adresára"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "zlyhalo vytvorenie adresára"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "zlyhalo vykonanie chdir do adresára po jeho vytvorení"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "neočakávaný koniec súboru v názve balíka na riadku %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "zlyhalo vykonanie chdir do adresára"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6259,7 +6492,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6269,8 +6516,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6786,13 +7034,92 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "zastaraná voľba „--%s“. Prosím, použite namiesto nej „--%s“"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "nie je možné otvoriť súbor zámku %s na testovanie"
 
 #, fuzzy
-#~| msgid "control file '%s' does not exist"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "riadiaci súbor „%s“ neexistuje"
+#~| msgid "syntax error: unknown user '%s' in statoverride file"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "syntaktická chyba: neznámy používateľ „%s“ v súbore statoverride"
+
+#, fuzzy
+#~| msgid "syntax error: unknown group '%s' in statoverride file"
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "syntaktická chyba: neznáma skupina „%s“ v súbore statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s chýba"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "„%.50s“ nie je prípustné pre %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "nezmyselné dáta po %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "chybné meno balíka (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "áno/nie v poli typu boolean"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "pole „%s“ odkazujúce na „%.255s“: chyba vo verzii"
+
+#~ msgid "empty value for %s"
+#~ msgstr "prázdna hodnota %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "balík je v stave očakávajú sa spúšťače (triggers-awaited), ale "
+#~ "neočakávajú sa žiadne spúšťače"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "balík je v stave očakávajú-sa-spúšťače (triggers-pending), ale "
+#~ "neočakávajú sa žiadne spúšťače"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "celková dostupná aktualizácia vyžaduje možnosť zápisu do stavovej oblasti "
+#~ "dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "chyba pri čítaní dpkg-deb tar výstupu"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "nie je možné otvoriť zoznam súborov balíka „%.250s“"
+
+#, fuzzy
+#~| msgid "unable to stat files list file for package '%.250s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "nie je možné zistiť stav súboru so zoznam súborov balíka „%.250s“"
+
+#, fuzzy
+#~| msgid "files list for package '%.250s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "zoznam súborov balíka „%.250s“ nie je obyčajný súbor"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "chyba pri zatváraní zoznamu súborov balíka „%.250s“"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "nie je možné otvoriť zoznam súborov balíka „%.250s“"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "nie je možné zistiť stav súboru so zoznam súborov balíka „%.250s“"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "zoznam súborov balíka „%.250s“ nie je obyčajný súbor"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "číta sa zoznam súborov balíka „%.250s“"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "zlyhalo vykonanie chdir do adresára po jeho vytvorení"
 
 #, fuzzy
 #~| msgid "control file '%s' does not exist"
@@ -6859,9 +7186,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF na štandardnom vstupe pri otázke na konfiguračné súbory"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "neočakávaný koniec súboru v názve balíka na riadku %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "neočakávaný koniec súboru za názvom balíka na riadku %d"
 
diff --git a/po/sv.po b/po/sv.po
index 923812081..6bb37d40c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:52+0200\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\n"
@@ -137,7 +137,8 @@ msgstr "fel vid borttagning av gammal säkerhetskopia \"%s\""
 msgid "error creating new backup file '%s'"
 msgstr "fel vid skapande av ny säkerhetskopia \"%s\""
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "kan inte ta bort \"%.250s\""
@@ -341,20 +342,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "kunde inte söka till början av %.250s efter utfyllnad"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "kunde inte låsa filen %s för test"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "kunde inte få tag i filhandtag för katalogen '%s'"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "kunde inte öppna/skapa låsfil för statusdatabas"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "kunde inte öppna/skapa låsfil för statusdatabas"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "du har inte rättigheter att låsa dpkgs statusdatabas"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg-statusdatabas"
 
 #: lib/dpkg/dbmodify.c
@@ -362,11 +380,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "efterfrågad operation kräver superanvändarbehörighet"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "kunde inte komma åt dpkgs statusarea"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "operationen kräver läs-/skrivåtkomst till dpkgs statusarea"
 
 #: lib/dpkg/dbmodify.c
@@ -404,6 +426,193 @@ msgstr "kunde inte stänga uppdaterad status för \"%.250s\""
 msgid "unable to install updated status of '%.250s'"
 msgstr "kunde inte installera uppdaterad status för \"%.250s\""
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "kunde inte kontrollera om \"%.250s\" existerar"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "kan inte läsa infokatalog"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "fel vid öppning av %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "trasig formatfil för informationsdatabasen: \"%s\""
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"infodatabasens format (%d) är tokigt eller för nytt; försök få tag i en "
+"nyare dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "informationsfilen %s/%s inte associerad med något paket"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "fel vid skapande av hårda länken \"%.255s\""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "fel vid skrivning av \"%s\""
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "styrfilen \"%s\" för paketet \"%s\" saknar avslutande radbrytning"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "styrfilen \"%s\" för paketet \"%s\" saknar avslutande radbrytning"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "styrfilen \"%s\" för paketet \"%s\" saknar avslutande radbrytning"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "styrfilen \"%s\" för paketet \"%s\" innehåller tomt filnamn"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read '%s' control file for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "kan inte läsa styrfilen \"%s\" för paketet \"%s\""
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "kunde inte öppna omdirigeringsfil"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "kunde inte ta status på omdirigeringsfil"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "motsägande omdirigeringar av \"%.250s\" eller \"%.250s\""
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "fel vid stängning av fillistfilen för paketet \"%.250s\""
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"fillistfilen för paketet \"%.250s\" saknas; antar att paketet inte har några "
+"filer installerade"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "fillistfilen för paketet \"%.250s\" saknar avslutande radbrytning"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "fillistfilen för paketet \"%.250s\" innehåller tomt filnamn"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Läser databasen ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d fil och katalog installerad.)\n"
+msgstr[1] "%d filer och kataloger installerade.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "felaktig status"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "läser statoverride-fil \"%.250s\""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "läser statoverride-fil \"%.250s\""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "kunde inte öppna statoverride-fil"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "kunde inte ta status på statoverride-fil"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "läser statoverride-fil \"%.250s\""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "statoverride-fil saknar avslutande radbrytning"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statoverride-fil innehåller tomrad"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "syntaxfel i statoverride-fil"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "oväntat radslut i statoverride-fil"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "flera statoverride är satta för filen \"%.250s\""
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -539,60 +748,73 @@ msgid "internal error"
 msgstr "internt fel (bugg)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s saknas"
+#, fuzzy
+#| msgid "missing package"
+msgid "is missing a value"
+msgstr "saknat paket"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "\"%.50s\" är ej tillåtet för %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Hoppar över trasig rad: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "skräp efter %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ogiltigt paketnamn (%.250s)"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "paketet \"%s\" är ej installerat"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tomt filinformationfält \"%s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "filinformationsfält \"%s\" ej tillåtet i statusfilen"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "för många värden i fildetaljsfältet \"%s\" (jämfört med andra)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "för få värden i fildetaljsfältet \"%s\" (jämfört med andra)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no i boolskt fält"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "föråldrat \"%s\"- eller \"%s\"-fält använt"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "foreign/allowed/same/no i 4-statusfält"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "\"%s\" är inte ett giltigt arkitekturnamn: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "ord i \"Priority\"-fält"
 
 #: lib/dpkg/fields.c
@@ -601,25 +823,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "värdet för fältet \"%s\" ej tillåtet i detta sammanhang"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "första ordet (vill) i \"Status\"-fältet"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "andra ordet (fel) i \"Status\"-fältet"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "tredje ordet (status) i \"Status\"-fältet"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "fel i \"%s\"-fältsträngen \"%.250s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "föråldrat \"%s\"- eller \"%s\"-fält använt"
 
 #: lib/dpkg/fields.c
@@ -628,12 +858,15 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "värde för \"%s\" har fel format på raden \"%.*s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "värde för \"%s\" innehåller rad som börjar med icke-blanksteg \"%c\""
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "rot- eller tom katalog listas som konfigurationsfil"
 
 #: lib/dpkg/fields.c
@@ -718,9 +951,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "\"%s\"-fältet: referens till \"%.255s\": versionsnumret ej avslutat"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "\"%s\"-fältet: referens till \"%.255s\": fel i version"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "\"%s\"-fältet: referens till \"%.255s\": versionen innehåller \"%c\""
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -728,8 +962,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "\"%s\"-fältet: syntaktiskt fel efter referens till paket \"%.255s\""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternativ (\"|\") tillåts inte i %s-fältet"
 
 #: lib/dpkg/fields.c
@@ -768,6 +1003,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "kunde inte ställa in läge på målfilen \"%.250s\""
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "kan inte ta status på %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "konfigurationsfilen \"%s\" är inte en vanlig fil"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "kan inte skriva %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "kunde inte lägga till i \"%s\""
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "kunde inte låsa upp %s"
@@ -788,8 +1047,22 @@ msgid "unable to lock %s"
 msgstr "kunde inte låsa %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "visar fil i bläddrare"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "kunde inte lägga till i \"%s\""
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "kunde inte tömma (flush) filen \"%s\""
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "Kan inte omdirigera filen \"%s\" till sig själv"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -811,13 +1084,13 @@ msgstr "misslyckades att allokera minne"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "kunde inte duplicera std%s"
+msgid "failed to dup for fd %d"
+msgstr "kunde inte duplicera filhandtag %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "kunde inte duplicera filhandtag %d"
+msgid "failed to dup for std%s"
+msgstr "kunde inte duplicera std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -955,27 +1228,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "dubblerat värde för användardefinierat fält \"%.*s\""
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "saknat %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "tomt värde för %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "dubblerat värde för \"%s\"-fältet"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "paketet har fältet \"%s\", men saknar arkitektur"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "paketet har fältet \"%s\", men arkitekturen är satt till \"all\""
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Config-Version för paket med opassande Status"
 
 #: lib/dpkg/parse.c
@@ -984,8 +1263,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "paketet har status %s, men utlösare väntar"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "paketet har status triggers-awaited man inga utlösare väntar"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "paketet har status %s, men utlösare väntar"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -993,11 +1274,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "paketet har status %s med utlösare är förestående"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "paketet har status triggers-pending men inga utlösare är förstående"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "paketet har status %s med utlösare är förestående"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "Paket med status non-installed har konfigurationsfiler, glömmer dem"
 
 #: lib/dpkg/parse.c
@@ -1018,10 +1303,13 @@ msgstr ""
 "inofficiell dpkg"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Multi-Arch: %s) kan inte installeras sida vid sida om %s om har flera "
 "installerade instanser"
@@ -1209,11 +1497,6 @@ msgstr "kunde inte säkert ta bort \"%.255s\""
 msgid "rm command for cleanup"
 msgstr "rm-kommando för städning"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "tvetydigt paketnamn \"%s\" med mer än en installerad instans"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1227,6 +1510,16 @@ msgstr "fältbredden är utanför tillåtet område"
 msgid "missing closing brace"
 msgstr "avslutande klammerparentes saknas"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "tvetydigt paketnamn \"%s\" med mer än en installerad instans"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(beskrivning saknas)"
@@ -1314,6 +1607,70 @@ msgstr "underprocessen %s misslyckades med statuskod %d"
 msgid "wait for %s subprocess failed"
 msgstr "väntan på underporcessen %s misslyckades"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "ogiltigt tecken \"%c\" i fältbredd"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "ogiltigt tecken \"%c\" i fältbredd"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "felaktig status"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid tar header gid field"
+msgstr "läser statoverride-fil \"%.250s\""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "ogiltigt tecken \"%c\" i fältbredd"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "filhuvudet innehåller alternativ som inte stöds"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "okänd komprimeringstyp \"%s\"."
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1333,12 +1690,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "kontrollkatalogen är inte en katalog"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "kunde inte öppna/skapa utlösarlåsfilen \"%.250s\""
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "område för utlösare"
 
 #: lib/dpkg/trigdeferred.c
@@ -1558,11 +1918,6 @@ msgstr "fel vid skapande av röret \"%.255s\""
 msgid "error creating device '%.255s'"
 msgstr "fel vid skapande av enheten \"%.255s\""
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "fel vid skapande av hårda länken \"%.255s\""
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1884,10 +2239,10 @@ msgstr "kan inte komma åt arkivet"
 msgid "archive '%s' is not a regular file"
 msgstr "konfigurationsfilen \"%s\" är inte en vanlig fil"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<standard ut>"
 
@@ -2071,6 +2426,10 @@ msgid "conffile difference visualizer"
 msgstr "visualiserare för konfigurationsfilsskillnader"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Skriv \"exit\" när du är klar.\n"
 
@@ -2425,7 +2784,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2434,7 +2807,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2468,6 +2844,12 @@ msgstr ""
 "anges. Skripten preinst/postrm i paket skall alltid ange --package och --"
 "divert.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2589,6 +2971,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Ingen omdirigering \"%s\", ingen borttagen.\n"
 
@@ -2632,19 +3021,6 @@ msgstr "paket kan inte innehålla nyradstecken"
 msgid "divert-to may not contain newlines"
 msgstr "målet kan inte innehålla nyradstecken"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "kunde inte öppna omdirigeringsfil"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "kunde inte ta status på omdirigeringsfil"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "motsägande omdirigeringar av \"%.250s\" eller \"%.250s\""
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2939,116 +3315,172 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "Paketet %s kvarhålles, rör det inte. --force-hold ignorerar.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "ignorerar problem då --force använts:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Aktivera alla tvingande flaggor"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "styrfilen \"%s\" för paketet \"%s\" saknar avslutande radbrytning"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "styrfilen \"%s\" för paketet \"%s\" saknar avslutande radbrytning"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Ersätt paket med en lägre version"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "styrfilen \"%s\" för paketet \"%s\" saknar avslutande radbrytning"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Konfigurera godtyckligt paket som kan hjälpa detta"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "styrfilen \"%s\" för paketet \"%s\" innehåller tomt filnamn"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Hantera oväsentliga paket även när de hålls"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "kan inte öppna styrfilen \"%s\" för paketet \"%s\""
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Försök (av)installera saker även som icke-root"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "kan inte ta status på styrfilen \"%s\" för paketet \"%s\""
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH saknar viktiga program, problem trolliga"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "filen \"%s\" för paketet \"%s\" är inte en vanlig fil"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Installera paket även om autentisering misslyckas"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "kan inte läsa styrfilen \"%s\" för paketet \"%s\""
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Hantera även paket med fel versioner"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "kan inte stänga styrfilen \"%s\" för paketet \"%s\""
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "kunde inte öppna fillistan för paketet \"%.250s\""
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Skriv över pakets fil med ett annats"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Skriv över omdirigerad fil med ej omdirigerad"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Skriv över ett pakets katalog med ett annats fil"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Utför ej säkra I/O-operationer vid uppackning"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Använd alltid nya konfigurationsfiler, fråga ej"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Använd alltid gamla konfigurationsfiler, fråga ej"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"fillistfilen för paketet \"%.250s\" saknas; antar att paketet inte har några "
-"filer installerade"
+"Använd förval för nya konfigurationsfiler om sådant\n"
+"finns, fråga ej. Om inget förval finns tillfrågas du\n"
+"såvida inte flaggorna confold eller confnew också angivit"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "kunde inte ta status på fillistan för paketet \"%.250s\""
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Installera alltid saknade konfigurationsfiler"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "fillistfilen för paketet \"%.250s\" är inte en vanlig fil"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Erbjud ersätta konfigurationsfiler som saknar nya versioner"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Hantera även paket med fel eller saknad arkitektur"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Installera även om ett annat paket skulle gå sönder"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Tillåt installera paket som är i konflikt"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Gör alla beroendeproblem till varningar"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Gör versionsberoendeproblem till varningar"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Ta bort paket som kräver installation"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Ta bort ett systemkritiskt paket"
+
+#: src/force.c
 #, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "läser fillista för paketet \"%.250s\""
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"%s tvingande flaggor - bestämmer vad som händer vid fel:\n"
+"  varna men fortsätt: --force-<sak>,<sak>,...\n"
+"  stanna med fel:     --refuse-<sak>,<sak>,... | --no-force-<sak>,<sak>,...\n"
+" Tvinga saker:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "fillistfilen för paketet \"%.250s\" saknar avslutande radbrytning"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"VARNING - flaggor markerade [!] kan tillfoga stor skada till din "
+"installation.\n"
+"Tvingande flaggor markerade [*] är förvalda.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "fillistfilen för paketet \"%.250s\" innehåller tomt filnamn"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "fel vid stängning av fillistfilen för paketet \"%.250s\""
+msgid "unknown force/refuse option '%.*s'"
+msgstr "okänd flagga för force/refuse: \"%.*s\""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Läser databasen ... "
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "föråldrad tvingande/vägrande flagga \"%s\"\n"
 
-#: src/filesdb.c
-#, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d fil och katalog installerad.)\n"
-msgstr[1] "%d filer och kataloger installerade.)\n"
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "ignorerar problem då --force använts:"
 
 #: src/help.c
 msgid "not installed"
@@ -3112,42 +3544,6 @@ msgid ""
 msgstr ""
 "Obs! roots PATH bör vanligtvis innehålla /usr/local/sbin, /usr/sbin och /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "kunde inte kontrollera om \"%.250s\" existerar"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "kan inte läsa infokatalog"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "fel vid öppning av %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "trasig formatfil för informationsdatabasen: \"%s\""
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"infodatabasens format (%d) är tokigt eller för nytt; försök få tag i en "
-"nyare dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "informationsfilen %s/%s inte associerad med något paket"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "fel vid skrivning av \"%s\""
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3193,27 +3589,27 @@ msgstr "Debian \"%s\" pakethanteringsprogram version %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3429,113 +3825,6 @@ msgstr ""
 "\"!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Aktivera alla tvingande flaggor"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Ersätt paket med en lägre version"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Konfigurera godtyckligt paket som kan hjälpa detta"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Hantera oväsentliga paket även när de hålls"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "Försök (av)installera saker även som icke-root"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "PATH saknar viktiga program, problem trolliga"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Installera paket även om autentisering misslyckas"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Hantera även paket med fel versioner"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Skriv över pakets fil med ett annats"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Skriv över omdirigerad fil med ej omdirigerad"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Skriv över ett pakets katalog med ett annats fil"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Utför ej säkra I/O-operationer vid uppackning"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Använd alltid nya konfigurationsfiler, fråga ej"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Använd alltid gamla konfigurationsfiler, fråga ej"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Använd förval för nya konfigurationsfiler om sådant\n"
-"finns, fråga ej. Om inget förval finns tillfrågas du\n"
-"såvida inte flaggorna confold eller confnew också angivit"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Installera alltid saknade konfigurationsfiler"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Erbjud ersätta konfigurationsfiler som saknar nya versioner"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Hantera även paket med fel eller saknad arkitektur"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Installera även om ett annat paket skulle gå sönder"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Tillåt installera paket som är i konflikt"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Gör alla beroendeproblem till varningar"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Gör versionsberoendeproblem till varningar"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Ta bort paket som kräver installation"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Ta bort ett systemkritiskt paket"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Allmänt hjälpsam förloppsinformation"
 
@@ -3666,42 +3955,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s tvingande flaggor - bestämmer vad som händer vid fel:\n"
-"  varna men fortsätt: --force-<sak>,<sak>,...\n"
-"  stanna med fel:     --refuse-<sak>,<sak>,... | --no-force-<sak>,<sak>,...\n"
-" Tvinga saker:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"VARNING - flaggor markerade [!] kan tillfoga stor skada till din "
-"installation.\n"
-"Tvingande flaggor markerade [*] är förvalda.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "okänd flagga för force/refuse: \"%.*s\""
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "föråldrad tvingande/vägrande flagga \"%s\"\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "kunde inte öppna \"%i\" för ström"
 
@@ -3884,6 +4137,12 @@ msgid "Description"
 msgstr "Beskrivning"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "visar fil i bläddrare"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "omdirigering av %s från: %s\n"
@@ -3918,6 +4177,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "paketet \"%s\" är inte installerat och ingen information finns"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Använd dpkg --info (= dpkg-deb --info) för att undersöka arkivfiler,\n"
+"och dpkg --contents (= dpkg-deb --contents) för att visa innehållet.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "paketet \"%s\" är ej tillgängligt"
@@ -3943,9 +4212,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "omdirigerat av %s till: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Använd dpkg --info (= dpkg-deb --info) för att undersöka arkivfiler,\n"
 "och dpkg --contents (= dpkg-deb --contents) för att visa innehållet.\n"
@@ -3986,19 +4258,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "Debian \"%s\" pakethanteringsprogram, frågeverktyg version %s.\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4181,6 +4467,12 @@ msgstr ""
 "fungera korrekt"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "kunde inte byta filsystemsrot till \"%.250s\""
@@ -4334,12 +4626,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4406,67 +4712,11 @@ msgstr "det finns inga överskrivningar"
 msgid "--update is useless for --remove"
 msgstr "--update är oanvändbar tillsammans med --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "felaktig status"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "läser statoverride-fil \"%.250s\""
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "läser statoverride-fil \"%.250s\""
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "kunde inte öppna statoverride-fil"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "kunde inte ta status på statoverride-fil"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "läser statoverride-fil \"%.250s\""
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "statoverride-fil saknar avslutande radbrytning"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "statoverride-fil innehåller tomrad"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "syntaxfel i statoverride-fil"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "användaren \"%s\" i statoverride-filen är okänd"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "oväntat radslut i statoverride-fil"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "gruppen \"%s\" i statoverride-filen är okänd"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "flera statoverride är satta för filen \"%.250s\""
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "föråldrad flagga \"--%s\", använd \"--%s\" istället"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4679,6 +4929,12 @@ msgstr "Avkonfigurerar %s (%s), så att vi kan ta bort %s (%s) ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Avkonfigurerar %s (%s) ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "statoverride-fil innehåller tomrad"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4822,11 +5078,9 @@ msgid "package filesystem archive extraction"
 msgstr "extrahering av paketfilsystem"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "kunde inte läsa dpkg-debs tar-utdata"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "trasig filsystemstarfil - trasigt paketarkiv"
 
 #: src/unpack.c
@@ -4840,16 +5094,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s tar som mest en Packages-fil som argument"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "kunde inte komma åt dpkgs statusområde för sammanslagen uppdatering av "
 "tillgängliga paket"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"sammanslagen uppdatering av tillgängliga paket kräver tillgång till dpkgs "
-"statusområde"
+"kunde inte komma åt dpkgs statusområde för sammanslagen uppdatering av "
+"tillgängliga paket"
 
 #: src/update.c
 #, c-format
@@ -5201,16 +5461,18 @@ msgid "decompressing archive member"
 msgstr "packar upp arkivdel"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "kunde inte byta till katalogen"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "kunde inte skapa katalog"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "kunde inte byta till katalog efter att ha skapat den"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "oväntat filslut i paketnamn på rad %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "kunde inte byta till katalogen"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6035,7 +6297,21 @@ msgstr ""
 "  prioritet i automatiskt läge.\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6045,8 +6321,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6548,8 +6825,84 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "föråldrad flagga \"--%s\", använd \"--%s\" istället"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "kunde inte låsa filen %s för test"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "användaren \"%s\" i statoverride-filen är okänd"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "gruppen \"%s\" i statoverride-filen är okänd"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s saknas"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "\"%.50s\" är ej tillåtet för %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "skräp efter %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "ogiltigt paketnamn (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no i boolskt fält"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "\"%s\"-fältet: referens till \"%.255s\": fel i version"
+
+#~ msgid "empty value for %s"
+#~ msgstr "tomt värde för %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "paketet har status triggers-awaited man inga utlösare väntar"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr "paketet har status triggers-pending men inga utlösare är förstående"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "sammanslagen uppdatering av tillgängliga paket kräver tillgång till dpkgs "
+#~ "statusområde"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "kunde inte läsa dpkg-debs tar-utdata"
+
+#, fuzzy
+#~| msgid "cannot open '%s' control file for package '%s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "kan inte öppna styrfilen \"%s\" för paketet \"%s\""
+
+#, fuzzy
+#~| msgid "cannot stat '%s' control file for package '%s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "kan inte ta status på styrfilen \"%s\" för paketet \"%s\""
+
+#, fuzzy
+#~| msgid "'%s' file for package '%s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "filen \"%s\" för paketet \"%s\" är inte en vanlig fil"
+
+#, fuzzy
+#~| msgid "cannot close '%s' control file for package '%s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "kan inte stänga styrfilen \"%s\" för paketet \"%s\""
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "kunde inte öppna fillistan för paketet \"%.250s\""
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "kunde inte ta status på fillistan för paketet \"%.250s\""
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "fillistfilen för paketet \"%.250s\" är inte en vanlig fil"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "läser fillista för paketet \"%.250s\""
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "kunde inte byta till katalog efter att ha skapat den"
 
 #~ msgid "control file '%s' missing value"
 #~ msgstr "styrfilen \"%s\" saknar värde"
@@ -6617,9 +6970,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "Filslut på stdin vid konfigurationsfilsfrågan"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "oväntat filslut i paketnamn på rad %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "oväntat filslut efter paketnamn på rad %d"
 
@@ -6876,9 +7226,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "det är slav till %s"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "kan inte ta status på %s: %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "misslyckades läsa länken (readlink) %s: %s"
 
@@ -6903,9 +7250,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "kunde inte stänga %s: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "kan inte skriva %s: %s"
-
 #, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "kunde inte byta namn på %s till %s: %s"
@@ -7232,9 +7576,6 @@ msgstr ""
 #~ msgid "cannot open diversions: %s"
 #~ msgstr "kunde inte öppna omdirigeringsfil: %s"
 
-#~ msgid "missing package"
-#~ msgstr "saknat paket"
-
 #~ msgid "rename: rename `%s' to `%s': %s"
 #~ msgstr "namnbyte: namnbyte på \"%s\" till \"%s\": %s"
 
diff --git a/po/th.po b/po/th.po
index 3cfda2185..805aa6ff1 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-06-26 16:13+0200\n"
 "Last-Translator: Theppitak Karoonboonyanan <thep@debian.org>\n"
 "Language-Team: Thai <thai-l10n@googlegroups.com>\n"
@@ -134,7 +134,8 @@ msgstr "เกิดข้อผิดพลาดขณะลบแฟ้มส
 msgid "error creating new backup file '%s'"
 msgstr "เกิดข้อผิดพลาดขณะสร้างแฟ้มสำรองใหม่ '%s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "ไม่สามารถลบ `%.250s'"
@@ -335,20 +336,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "ไม่สามารถเลื่อนไปยังต้นแฟ้ม %.250s หลังจากเติมอักขระเติมช่องว่าง"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "ไม่สามารถเปิดแฟ้มล็อค %s เพื่อทดสอบ"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "ไม่สามารถนำ file descriptor ของไดเรกทอรี '%s' มาใช้ได้"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "ไม่สามารถเปิด/สร้างแฟ้มล็อคสำหรับฐานข้อมูลสถานะ"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "ไม่สามารถเปิด/สร้างแฟ้มล็อคสำหรับฐานข้อมูลสถานะ"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "คุณไม่มีสิทธิ์ล็อคฐานข้อมูลสถานะของ dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "ฐานข้อมูลสถานะของ dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -356,11 +374,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "การดำเนินการที่สั่งต้องอาศัยสิทธิ์ผู้ดูแลระบบ"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "ไม่สามารถเข้าใช้พื้นที่สถานะของ dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "การดำเนินการที่สั่งต้องอาศัยสิทธิ์อ่าน/เขียนในพื้นที่สถานะของ dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -398,6 +420,189 @@ msgstr "ไม่สามารถปิดสถานะใหม่ของ
 msgid "unable to install updated status of '%.250s'"
 msgstr "ไม่สามารถติดตั้งสถานะใหม่ของ `%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "ไม่สามารถตรวจสอบการมีอยู่ของ `%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "ไม่สามารถอ่านไดเรกทอรีสารสนเทศ"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "เกิดข้อผิดพลาดขณะพยายามเปิด %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "แฟ้มฟอร์แมต '%s' ของฐานข้อมูลสารสนเทศแพกเกจเสียหาย"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"ฟอร์แมตของฐานข้อมูลสารสนเทศ (%d) เป็นค่าปลอมหรือใหม่เกินไป ลองติดตั้ง dpkg รุ่นที่ใหม่กว่านี้"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "แฟ้มสารสนเทศ %s/%s ไม่มีความเชื่อมโยงกับแพกเกจใด"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "เกิดข้อผิดพลาดขณะสร้าง hard link `%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "เกิดข้อผิดพลาดขณะเขียน '%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' มีรายการชื่อแฟ้มที่ว่างเปล่า"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read '%s' control file for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "ไม่สามารถอ่านแฟ้มควบคุม '%s' ของแพกเกจ '%s'"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "ไม่สามารถเปิดแฟ้ม diversions"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "ไม่สามารถ fstat แฟ้ม diversions"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "มีการเบนแฟ้มขัดแย้งกันโดยเกี่ยวข้องกับ `%.250s' หรือ `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "เกิดข้อผิดพลาดขณะปิดแฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s' ขาดหายไป จะถือว่าแพกเกจไม่ได้ติดตั้งแฟ้มใดในระบบ"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s' มีรายการชื่อแฟ้มที่ว่างเปล่า"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(กำลังอ่านฐานข้อมูล ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d แฟ้มและไดเรกทอรีติดตั้งอยู่)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "สถานะผิดพลาด"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้ม statoverride '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้ม statoverride '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "ไม่สามารถเปิดแฟ้ม statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "ไม่สามารถ fstat แฟ้ม statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้ม statoverride '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "แฟ้ม statoverride ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "แฟ้ม statoverride มีบรรทัดว่างเปล่า"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "พบรูปแบบผิดพลาดในแฟ้ม statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "พบจุดจบบรรทัดก่อนกำหนดในแฟ้ม statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "มีรายการ statoverride หลายรายการสำหรับ '%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -533,60 +738,73 @@ msgid "internal error"
 msgstr "ข้อผิดพลาดภายใน (บั๊ก)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s ขาดหายไป"
+#, fuzzy
+#| msgid "missing package"
+msgid "is missing a value"
+msgstr "ขาด package"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.50s' มีใน %s ไม่ได้"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "ข้ามบรรทัดที่ไม่ถูกต้อง: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "มีขยะหลัง %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ชื่อแพกเกจใช้ไม่ได้ (%.250s)"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "แพกเกจ '%s' ไม่ได้ติดตั้งไว้"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "เขตข้อมูลรายละเอียดแฟ้ม `%s' ว่างเปล่า"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "มีเขตข้อมูลรายละเอียดแฟ้ม `%s' ในแฟ้มสถานะไม่ได้"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "มีข้อมูลจำนวนมากเกินไปในเขตข้อมูลรายละเอียดแฟ้ม `%s' (เมื่อเทียบกับข้อมูลอื่น)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "มีข้อมูลจำนวนน้อยเกินไปในเขตข้อมูลรายละเอียดแฟ้ม `%s' (เมื่อเทียบกับข้อมูลอื่น)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no ในเขตข้อมูลบูลีน"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "มีการใช้เขตข้อมูล '%s' หรือ '%s' ซึ่งเลิกใช้แล้ว"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "foreign/allowed/same/no ในเขตข้อมูลสี่สถานะ"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "'%s' ไม่ใช่ชื่อสถาปัตยกรรมที่สามารถใช้ได้: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "คำในเขตข้อมูล 'Priority'"
 
 #: lib/dpkg/fields.c
@@ -595,25 +813,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "ใช้ค่าสำหรับเขตข้อมูล '%s' ไม่ได้ในบริบทนี้"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "คำแรก (want) ในเขตข้อมูล 'Status'"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "คำที่สอง (error) ในเขตข้อมูล 'Status'"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "คำที่สาม (status) ในเขตข้อมูล 'Status'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "มีข้อผิดพลาดในเขตข้อมูล '%s' ข้อความ '%.250s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "มีการใช้เขตข้อมูล '%s' หรือ '%s' ซึ่งเลิกใช้แล้ว"
 
 #: lib/dpkg/fields.c
@@ -622,12 +848,15 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "ค่าของเขตข้อมูล '%s' มีบรรทัดที่ผิดรูปแบบ '%.*s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "ค่าของ '%s' มีบรรทัดที่ขึ้นต้นด้วยอักขระ '%c' ซึ่งไม่ใช่ช่องว่าง"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "มีการใช้ไดเรกทอรีรากหรือไดเรกทอรีไม่มีชื่อเป็น conffile"
 
 #: lib/dpkg/fields.c
@@ -706,9 +935,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "เขตข้อมูล `%s' อ้างอิงไปยัง `%.255s': เลขรุ่นยังไม่จบ"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "เขตข้อมูล '%s' อ้างอิงไปยัง '%.255s': มีข้อผิดพลาดในเลขรุ่น"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "เขตข้อมูล `%s' อ้างอิงไปยัง `%.255s': เลขรุ่นมีอักขระ `%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -716,8 +946,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "เขตข้อมูล `%s' มีรูปแบบผิดไวยากรณ์หลังจากการอ้างถึงแพกเกจ `%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "ใช้ทางเลือก (`|') ไม่ได้ในเขตข้อมูล %s"
 
 #: lib/dpkg/fields.c
@@ -756,6 +987,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "ไม่สามารถกำหนดสิทธิ์แฟ้มปลายทาง '%.250s'"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "ไม่สามารถ stat %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "แฟ้มค่าตั้ง '%s' ไม่ใช่แฟ้มปกติ"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "ไม่สามารถเขียน %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "ไม่สามารถเขียนต่อท้าย '%s'"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "ไม่สามารถปลดล็อค %s"
@@ -775,10 +1030,23 @@ msgstr "%s ถูกล็อคโดยโพรเซสอื่น"
 msgid "unable to lock %s"
 msgstr "ไม่สามารถล็อค %s"
 
-# Use leading space for English translation
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "แสดงแฟ้มในเครื่องมือเลื่อนหน้า"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "ไม่สามารถเขียนต่อท้าย '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "ไม่สามารถ flush แฟ้ม '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "ไม่สามารถเบนแฟ้ม '%s' เข้าหาตัวเองได้"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -800,13 +1068,13 @@ msgstr "จองหน่วยความจำไม่สำเร็จ"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "dup ไม่สำเร็จสำหรับ std%s"
+msgid "failed to dup for fd %d"
+msgstr "dup ไม่สำเร็จสำหรับ fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "dup ไม่สำเร็จสำหรับ fd %d"
+msgid "failed to dup for std%s"
+msgstr "dup ไม่สำเร็จสำหรับ std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -944,27 +1212,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "ค่าของเขตข้อมูลกำหนดเอง `%.*s' ซ้ำกัน"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "ขาด %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s เป็นค่าว่างเปล่า"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "ค่าของเขตข้อมูล `%s' ซ้ำกัน"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "แพกเกจมีเขตข้อมูล '%s' แต่ขาดสถาปัตยกรรม"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "แพกเกจมีเขตข้อมูล '%s' แต่เป็นสถาปัตยกรรม 'all'"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "มี Config-Version สำหรับแพกเกจที่มีค่า Status ไม่เหมาะสม"
 
 #: lib/dpkg/parse.c
@@ -973,8 +1247,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "แพกเกจอยู่ในสถานะ %s แต่มีการสะกิดที่รอคอยอยู่"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "แพกเกจอยู่ในสถานะ triggers-awaited แต่ไม่มีการสะกิดที่รอคอยอยู่"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "แพกเกจอยู่ในสถานะ %s แต่มีการสะกิดที่รอคอยอยู่"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -982,11 +1258,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "แพกเกจอยู่ในสถานะ %s แต่มีการสะกิดที่คั่งค้างอยู่"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "แพกเกจอยู่ในสถานะ triggers-pending แต่ไม่มีการสะกิดที่คั่งค้างอยู่"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "แพกเกจอยู่ในสถานะ %s แต่มีการสะกิดที่คั่งค้างอยู่"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "แพกเกจสถานะ not-installed มี conffile ดังนั้นจะลบข้อมูลทิ้ง"
 
 #: lib/dpkg/parse.c
@@ -1006,10 +1286,13 @@ msgstr ""
 "โดยมากมาจากการปรับรุ่นจาก dpkg ที่ไม่เป็นทางการ"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr "%s %s (Multi-Arch: %s) ไม่สามารถติดตั้งร่วมกับ %s ซึ่งมีการติดตั้งหลายชุด"
 
 #: lib/dpkg/parse.c
@@ -1195,11 +1478,6 @@ msgstr "ไม่สามารถลบ '%.255s' อย่างปลอด�
 msgid "rm command for cleanup"
 msgstr "คำสั่ง rm เพื่อทำความสะอาด"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "ชื่อแพกเกจ '%s' กำกวม และมีการติดตั้งมากกว่าหนึ่งชุด"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1213,6 +1491,16 @@ msgstr "ความกว้างเขตข้อมูลอยู่นอ
 msgid "missing closing brace"
 msgstr "ขาดปีกกาปิด"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "ชื่อแพกเกจ '%s' กำกวม และมีการติดตั้งมากกว่าหนึ่งชุด"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(ไม่มีคำบรรยาย)"
@@ -1300,6 +1588,70 @@ msgstr "โพรเซสย่อย %s ล้มเหลวด้วยร�
 msgid "wait for %s subprocess failed"
 msgstr "คอยโพรเซสย่อย %s ไม่สำเร็จ"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "ใช้อักขระ '%c' ไม่ได้ในความกว้างเขตข้อมูล"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "ใช้อักขระ '%c' ไม่ได้ในความกว้างเขตข้อมูล"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "สถานะผิดพลาด"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid tar header gid field"
+msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้ม statoverride '%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "ใช้อักขระ '%c' ไม่ได้ในความกว้างเขตข้อมูล"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "พบตัวเลือกที่ไม่รองรับในส่วนหัวของแฟ้ม"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "ไม่รู้จักชนิดของการบีบอัด `%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1319,12 +1671,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "ไดเรกทอรีควบคุมไม่ได้เป็นไดเรกทอรี"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "ไม่สามารถเปิดหรือสร้างแฟ้มล็อคการสะกิด `%.250s'"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "พื้นที่การสะกิด"
 
 #: lib/dpkg/trigdeferred.c
@@ -1539,11 +1894,6 @@ msgstr "เกิดข้อผิดพลาดขณะสร้างไป
 msgid "error creating device '%.255s'"
 msgstr "เกิดข้อผิดพลาดขณะสร้างอุปกรณ์ `%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "เกิดข้อผิดพลาดขณะสร้าง hard link `%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1846,10 +2196,10 @@ msgstr "ไม่สามารถเข้าใช้แฟ้มแพกเ
 msgid "archive '%s' is not a regular file"
 msgstr "แฟ้มค่าตั้ง '%s' ไม่ใช่แฟ้มปกติ"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<เอาต์พุตมาตรฐาน>"
 
@@ -2030,6 +2380,10 @@ msgid "conffile difference visualizer"
 msgstr "เครื่องมือแสดงความต่างของเนื้อหาแฟ้มค่าตั้ง"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "พิมพ์ `exit' เมื่อเสร็จแล้ว\n"
 
@@ -2379,7 +2733,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2388,7 +2756,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2419,6 +2790,12 @@ msgstr ""
 "เมื่อจะลบการเบนแฟ้ม ถ้าระบุ --package หรือ --local และ --divert ก็ต้องระบุให้ตรงกันด้วย\n"
 "สคริปต์ preinst/postrm ของแพกเกจควรระบุ --package และ --divert เสมอ\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2538,6 +2915,13 @@ msgstr "จะข้ามคำสั่งเปลี่ยนชื่อแ
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "ไม่มีการเบน '%s' จึงไม่มีการลบรายการใด\n"
 
@@ -2581,19 +2965,6 @@ msgstr "ชื่อแพกเกจห้ามมีอักขระขึ
 msgid "divert-to may not contain newlines"
 msgstr "divert-to ห้ามมีอักขระขึ้นบรรทัดใหม่"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "ไม่สามารถเปิดแฟ้ม diversions"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "ไม่สามารถ fstat แฟ้ม diversions"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "มีการเบนแฟ้มขัดแย้งกันโดยเกี่ยวข้องกับ `%.250s' หรือ `%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2887,113 +3258,172 @@ msgstr ""
 "แพกเกจ %s ถูกกำหนดให้คงรุ่นไว้ จะไม่ทำอะไรกับแพกเกจดังกล่าว ใช้ตัวเลือก --force-hold "
 "ถ้าจะบังคับให้ทำ\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "จะข้ามปัญหาไปเพราะมีการเปิดตัวเลือก --force:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "บังคับทุกรายการ"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "แทนที่แพกเกจด้วยรุ่นที่เก่ากว่า"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "ตั้งค่าแพกเกจใดก็ตามที่อาจช่วยให้ติดตั้งแพกเกจนี้ได้"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' มีรายการชื่อแฟ้มที่ว่างเปล่า"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "ดำเนินการกับแพกเกจที่ติดขัดอยู่แม้จะถูกกำหนดให้คงรุ่นไว้ก็ตาม"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "ไม่สามารถเปิดแฟ้มควบคุม '%s' ของแพกเกจ '%s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "พยายามติดตั้ง/ถอดถอนแม้จะไม่ใช่ root"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "ไม่สามารถ stat แฟ้มควบคุม '%s' ของแพกเกจ '%s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH ขาดโปรแกรมสำคัญ ซึ่งน่าจะเป็นปัญหา"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "แฟ้ม '%s' ของแพกเกจ '%s' ไม่ใช่แฟ้มธรรมดา"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "ติดตั้งแพกเกจแม้จะไม่ผ่านการตรวจสอบแหล่งต้นตอ"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "ไม่สามารถอ่านแฟ้มควบคุม '%s' ของแพกเกจ '%s'"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "ดำเนินการแม้กับแพกเกจที่ผิดรุ่น"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "ไม่สามารถปิดแฟ้มควบคุม '%s' ของแพกเกจ '%s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "ไม่สามารถเปิดแฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "เขียนทับแฟ้มของแพกเกจอื่น"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "เขียนทับแฟ้มที่เบนอยู่ด้วยฉบับที่ไม่ได้เบน"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "เขียนทับไดเรกทอรีของแพกเกจด้วยแฟ้มของแพกเกจอื่น"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "ไม่ต้องใช้การกระทำ I/O แบบปลอดภัยเมื่อแตกแพกเกจ"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "ใช้แฟ้มค่าตั้งใหม่เสมอโดยไม่ต้องถาม"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "ใช้แฟ้มค่าตั้งเดิมเสมอโดยไม่ต้องถาม"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s' ขาดหายไป จะถือว่าแพกเกจไม่ได้ติดตั้งแฟ้มใดในระบบ"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
+msgstr ""
+"ใช้คำตอบปริยายสำหรับคำถามเกี่ยวกับแฟ้มค่าตั้งใหม่ถ้ามี\n"
+"โดยไม่ต้องถาม ถ้าไม่มีค่าปริยายกำหนดไว้ ก็จะถามคำถาม\n"
+"ยกเว้นมีการกำหนดตัวเลือก confold หรือ confnew ด้วย"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "ไม่สามารถ stat แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "ติดตั้งแฟ้มค่าตั้งที่ขาดหายเสมอ"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s' ไม่ใช่แฟ้มธรรมดา"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "เสนอการแทนที่แฟ้มค่าตั้งที่ไม่มีรุ่นใหม่"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "ดำเนินการแม้กับแพกเกจที่ผิดสถาปัตยกรรมหรือไม่ระบุสถาปัตยกรรม"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "ติดตั้งแพกเกจแม้จะทำให้แพกเกจอื่นพัง"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "ยอมให้ติดตั้งแพกเกจที่ขัดแย้งกัน"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "เปลี่ยนปัญหาความขึ้นต่อกันทั้งหมดของแพกเกจให้เป็นแค่คำเตือน"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "เปลี่ยนปัญหาความขึ้นต่อรุ่นของแพกเกจให้เป็นแค่คำเตือน"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "ถอดถอนแพกเกจที่ต้องการการติดตั้งซ้ำ"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "ถอดถอนแพกเกจจำเป็น"
+
+#: src/force.c
 #, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "เกิดปัญหาขณะอ่านรายชื่อแฟ้มของแพกเกจ '%.250s'"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"ตัวเลือกสำหรับบังคับของ %s - ควบคุมพฤติกรรมเมื่อพบปัญหา:\n"
+"  เตือนแต่ทำต่อไป:       --force-<รายการ>,<รายการ>,...\n"
+"  หยุดเมื่อพบปัญหา:       --refuse-<รายการ>,<รายการ>,... | --no-force-"
+"<รายการ>,...\n"
+" รายการสำหรับการบังคับ:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"*คำเตือน* - การใช้ตัวเลือกที่ทำเครื่องหมาย [!] ไว้ อาจทำให้ระบบเสียหายอย่างร้ายแรงได้\n"
+"รายการการบังคับที่ทำเครื่องหมาย [*] ไว้ จะถูกเปิดใช้โดยปริยายอยู่แล้ว\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s' มีรายการชื่อแฟ้มที่ว่างเปล่า"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "เกิดข้อผิดพลาดขณะปิดแฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s'"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "ไม่รู้จักตัวเลือก force/refuse `%.*s'"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(กำลังอ่านฐานข้อมูล ... "
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "ตัวเลือก force/refuse '%s' เลิกใช้แล้ว\n"
 
-#: src/filesdb.c
-#, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d แฟ้มและไดเรกทอรีติดตั้งอยู่)\n"
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "จะข้ามปัญหาไปเพราะมีการเปิดตัวเลือก --force:"
 
 #: src/help.c
 msgid "not installed"
@@ -3053,41 +3483,6 @@ msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin"
 msgstr "สังเกต: PATH ของ root ควรมี /usr/local/sbin, /usr/sbin และ /sbin ด้วย"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "ไม่สามารถตรวจสอบการมีอยู่ของ `%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "ไม่สามารถอ่านไดเรกทอรีสารสนเทศ"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "เกิดข้อผิดพลาดขณะพยายามเปิด %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "แฟ้มฟอร์แมต '%s' ของฐานข้อมูลสารสนเทศแพกเกจเสียหาย"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"ฟอร์แมตของฐานข้อมูลสารสนเทศ (%d) เป็นค่าปลอมหรือใหม่เกินไป ลองติดตั้ง dpkg รุ่นที่ใหม่กว่านี้"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "แฟ้มสารสนเทศ %s/%s ไม่มีความเชื่อมโยงกับแพกเกจใด"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "เกิดข้อผิดพลาดขณะเขียน '%s'"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3133,27 +3528,27 @@ msgstr "โปรแกรมจัดการแพกเกจ `%s' ของ
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3366,113 +3761,6 @@ msgstr ""
 "ตัวเลือกที่มีเครื่องหมาย [*] จะแสดงข้อมูลมากมาย - ควรไปป์ไปยังคำสั่ง `less' หรือ `more'"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "บังคับทุกรายการ"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "แทนที่แพกเกจด้วยรุ่นที่เก่ากว่า"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "ตั้งค่าแพกเกจใดก็ตามที่อาจช่วยให้ติดตั้งแพกเกจนี้ได้"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "ดำเนินการกับแพกเกจที่ติดขัดอยู่แม้จะถูกกำหนดให้คงรุ่นไว้ก็ตาม"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "พยายามติดตั้ง/ถอดถอนแม้จะไม่ใช่ root"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "PATH ขาดโปรแกรมสำคัญ ซึ่งน่าจะเป็นปัญหา"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "ติดตั้งแพกเกจแม้จะไม่ผ่านการตรวจสอบแหล่งต้นตอ"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "ดำเนินการแม้กับแพกเกจที่ผิดรุ่น"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "เขียนทับแฟ้มของแพกเกจอื่น"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "เขียนทับแฟ้มที่เบนอยู่ด้วยฉบับที่ไม่ได้เบน"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "เขียนทับไดเรกทอรีของแพกเกจด้วยแฟ้มของแพกเกจอื่น"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "ไม่ต้องใช้การกระทำ I/O แบบปลอดภัยเมื่อแตกแพกเกจ"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "ใช้แฟ้มค่าตั้งใหม่เสมอโดยไม่ต้องถาม"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "ใช้แฟ้มค่าตั้งเดิมเสมอโดยไม่ต้องถาม"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"ใช้คำตอบปริยายสำหรับคำถามเกี่ยวกับแฟ้มค่าตั้งใหม่ถ้ามี\n"
-"โดยไม่ต้องถาม ถ้าไม่มีค่าปริยายกำหนดไว้ ก็จะถามคำถาม\n"
-"ยกเว้นมีการกำหนดตัวเลือก confold หรือ confnew ด้วย"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "ติดตั้งแฟ้มค่าตั้งที่ขาดหายเสมอ"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "เสนอการแทนที่แฟ้มค่าตั้งที่ไม่มีรุ่นใหม่"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "ดำเนินการแม้กับแพกเกจที่ผิดสถาปัตยกรรมหรือไม่ระบุสถาปัตยกรรม"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "ติดตั้งแพกเกจแม้จะทำให้แพกเกจอื่นพัง"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "ยอมให้ติดตั้งแพกเกจที่ขัดแย้งกัน"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "เปลี่ยนปัญหาความขึ้นต่อกันทั้งหมดของแพกเกจให้เป็นแค่คำเตือน"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "เปลี่ยนปัญหาความขึ้นต่อรุ่นของแพกเกจให้เป็นแค่คำเตือน"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "ถอดถอนแพกเกจที่ต้องการการติดตั้งซ้ำ"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "ถอดถอนแพกเกจจำเป็น"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "ข้อมูลความคืบหน้าทั่วไปที่เป็นประโยชน์"
 
@@ -3602,42 +3890,6 @@ msgstr "ไม่สามารถลบสถาปัตยกรรม '%s'
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"ตัวเลือกสำหรับบังคับของ %s - ควบคุมพฤติกรรมเมื่อพบปัญหา:\n"
-"  เตือนแต่ทำต่อไป:       --force-<รายการ>,<รายการ>,...\n"
-"  หยุดเมื่อพบปัญหา:       --refuse-<รายการ>,<รายการ>,... | --no-force-"
-"<รายการ>,...\n"
-" รายการสำหรับการบังคับ:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"*คำเตือน* - การใช้ตัวเลือกที่ทำเครื่องหมาย [!] ไว้ อาจทำให้ระบบเสียหายอย่างร้ายแรงได้\n"
-"รายการการบังคับที่ทำเครื่องหมาย [*] ไว้ จะถูกเปิดใช้โดยปริยายอยู่แล้ว\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "ไม่รู้จักตัวเลือก force/refuse `%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "ตัวเลือก force/refuse '%s' เลิกใช้แล้ว\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "ไม่สามารถเปิด `%i' สำหรับสตรีม"
 
@@ -3815,6 +4067,13 @@ msgstr "สถาปัตยกรรม"
 msgid "Description"
 msgstr "คำบรรยาย"
 
+# Use leading space for English translation
+#: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "แสดงแฟ้มในเครื่องมือเลื่อนหน้า"
+
 #: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
@@ -3850,6 +4109,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "แพกเกจ `%s' ไม่ได้ติดตั้งไว้ และไม่มีข้อมูลสำหรับแพกเกจนี้"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"ใช้ dpkg --info (= dpkg-deb --info) ถ้าจะดูข้อมูลของแฟ้มแพกเกจ\n"
+"และ dpkg --contents (= dpkg-deb --contents) ถ้าจะดูเนื้อหาภายใน\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "ไม่มีแพกเกจ '%s'"
@@ -3875,9 +4144,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "ถูกเบนแฟ้มโดย %s ไปยัง: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "ใช้ dpkg --info (= dpkg-deb --info) ถ้าจะดูข้อมูลของแฟ้มแพกเกจ\n"
 "และ dpkg --contents (= dpkg-deb --contents) ถ้าจะดูเนื้อหาภายใน\n"
@@ -3918,19 +4190,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "เครื่องมือสอบถามข้อมูล %s ในชุดโปรแกรมจัดการแพกเกจของเดเบียน รุ่น %s\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4108,6 +4394,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr "admindir ต้องอยู่ภายใต้ instdir เพื่อที่ dpkg จะทำงานได้อย่างถูกต้อง"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "ไม่สามารถ chroot ไปยัง `%.250s'"
@@ -4260,12 +4552,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4330,67 +4636,11 @@ msgstr "ไม่มีรายการ override อยู่"
 msgid "--update is useless for --remove"
 msgstr "--update ไม่มีประโยชน์อะไรสำหรับ --remove"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "สถานะผิดพลาด"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้ม statoverride '%.250s'"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้ม statoverride '%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "ไม่สามารถเปิดแฟ้ม statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "ไม่สามารถ fstat แฟ้ม statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "เกิดข้อผิดพลาดขณะอ่านแฟ้ม statoverride '%.250s'"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "แฟ้ม statoverride ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "แฟ้ม statoverride มีบรรทัดว่างเปล่า"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "พบรูปแบบผิดพลาดในแฟ้ม statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "พบผู้ใช้ '%s' ที่ไม่รู้จักอยู่ในแฟ้ม statoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "พบจุดจบบรรทัดก่อนกำหนดในแฟ้ม statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "พบกลุ่ม '%s' ที่ไม่รู้จักอยู่ในแฟ้ม statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "มีรายการ statoverride หลายรายการสำหรับ '%.250s'"
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "ตัวเลือก '--%s' เลิกใช้แล้ว กรุณาใช้ '--%s' แทน"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4600,6 +4850,12 @@ msgstr "กำลังถอนคืนค่าตั้งของ %s (%s)
 msgid "De-configuring %s (%s) ...\n"
 msgstr "กำลังถอนคืนค่าตั้งของ %s (%s) ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "แฟ้ม statoverride มีบรรทัดว่างเปล่า"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4730,11 +4986,9 @@ msgid "package filesystem archive extraction"
 msgstr "การแตกส่วนระบบแฟ้มของแพกเกจ"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "เกิดข้อผิดพลาดขณะอ่านผลลัพธ์ของ tar จาก dpkg-deb"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "แฟ้ม tar สำหรับแฟ้มที่จะติดตั้งในระบบแฟ้มเสียหาย - แฟ้มแพกเกจเสียหาย"
 
 #: src/unpack.c
@@ -4748,12 +5002,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s ต้องการอาร์กิวเมนต์เป็นชื่อแฟ้ม Packages ไม่เกินหนึ่งรายการ"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "ไม่สามารถเข้าใช้บริเวณเก็บข้อมูลสถานะของ dpkg เพื่อปรับข้อมูลแพกเกจที่มีแบบทั้งชุด"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr "การปรับข้อมูลแพกเกจที่มีแบบทั้งชุดต้องอาศัยสิทธิ์การเขียนในบริเวณเก็บข้อมูลสถานะของ dpkg"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "ไม่สามารถเข้าใช้บริเวณเก็บข้อมูลสถานะของ dpkg เพื่อปรับข้อมูลแพกเกจที่มีแบบทั้งชุด"
 
 #: src/update.c
 #, c-format
@@ -5099,16 +5359,18 @@ msgid "decompressing archive member"
 msgstr "การคลายบีบอัดสมาชิกแพกเกจ"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "เปลี่ยนเข้าไดเรกทอรีไม่สำเร็จ"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "สร้างไดเรกทอรีไม่สำเร็จ"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "เปลี่ยนเข้าไดเรกทอรีหลังจากสร้างแล้วไม่สำเร็จ"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "พบจุดจบแฟ้มก่อนกำหนดในชื่อแพกเกจที่บรรทัด %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "เปลี่ยนเข้าไดเรกทอรีไม่สำเร็จ"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5927,7 +6189,21 @@ msgstr ""
 " \n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -5937,8 +6213,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6428,8 +6705,83 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "ตัวเลือก '--%s' เลิกใช้แล้ว กรุณาใช้ '--%s' แทน"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "ไม่สามารถเปิดแฟ้มล็อค %s เพื่อทดสอบ"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "พบผู้ใช้ '%s' ที่ไม่รู้จักอยู่ในแฟ้ม statoverride"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "พบกลุ่ม '%s' ที่ไม่รู้จักอยู่ในแฟ้ม statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s ขาดหายไป"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "'%.50s' มีใน %s ไม่ได้"
+
+#~ msgid "junk after %s"
+#~ msgstr "มีขยะหลัง %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "ชื่อแพกเกจใช้ไม่ได้ (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no ในเขตข้อมูลบูลีน"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "เขตข้อมูล '%s' อ้างอิงไปยัง '%.255s': มีข้อผิดพลาดในเลขรุ่น"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s เป็นค่าว่างเปล่า"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "แพกเกจอยู่ในสถานะ triggers-awaited แต่ไม่มีการสะกิดที่รอคอยอยู่"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr "แพกเกจอยู่ในสถานะ triggers-pending แต่ไม่มีการสะกิดที่คั่งค้างอยู่"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "การปรับข้อมูลแพกเกจที่มีแบบทั้งชุดต้องอาศัยสิทธิ์การเขียนในบริเวณเก็บข้อมูลสถานะของ dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "เกิดข้อผิดพลาดขณะอ่านผลลัพธ์ของ tar จาก dpkg-deb"
+
+#, fuzzy
+#~| msgid "cannot open '%s' control file for package '%s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "ไม่สามารถเปิดแฟ้มควบคุม '%s' ของแพกเกจ '%s'"
+
+#, fuzzy
+#~| msgid "cannot stat '%s' control file for package '%s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "ไม่สามารถ stat แฟ้มควบคุม '%s' ของแพกเกจ '%s'"
+
+#, fuzzy
+#~| msgid "'%s' file for package '%s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "แฟ้ม '%s' ของแพกเกจ '%s' ไม่ใช่แฟ้มธรรมดา"
+
+#, fuzzy
+#~| msgid "cannot close '%s' control file for package '%s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "ไม่สามารถปิดแฟ้มควบคุม '%s' ของแพกเกจ '%s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "ไม่สามารถเปิดแฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s'"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "ไม่สามารถ stat แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s'"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s' ไม่ใช่แฟ้มธรรมดา"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "เกิดปัญหาขณะอ่านรายชื่อแฟ้มของแพกเกจ '%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "เปลี่ยนเข้าไดเรกทอรีหลังจากสร้างแล้วไม่สำเร็จ"
 
 #~ msgid "control file '%s' missing value"
 #~ msgstr "แฟ้มควบคุม '%s' ขาดข้อมูล"
@@ -6497,9 +6849,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "พบ EOF จาก stdin ที่คำถามเกี่ยวกับแฟ้มค่าตั้ง"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "พบจุดจบแฟ้มก่อนกำหนดในชื่อแพกเกจที่บรรทัด %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "พบจุดจบแฟ้มก่อนกำหนดหลังชื่อแพกเกจที่บรรทัด %d"
 
@@ -6695,9 +7044,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "ทางเลือกนี้เป็นรายการลูกของ %s อยู่"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "ไม่สามารถ stat %s: %s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "readlink(%s) ไม่สำเร็จ: %s"
 
@@ -6722,9 +7068,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "ไม่สามารถปิด %s: %s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "ไม่สามารถเขียน %s: %s"
-
 #~ msgid "malloc failed (%ld bytes)"
 #~ msgstr "malloc ไม่สำเร็จ (%ld ไบต์)"
 
@@ -6892,9 +7235,6 @@ msgstr ""
 #~ msgid "cannot open diversions: %s"
 #~ msgstr "ไม่สามารถเปิดแฟ้ม diversions: %s"
 
-#~ msgid "missing package"
-#~ msgstr "ขาด package"
-
 #~ msgid "rename: rename `%s' to `%s': %s"
 #~ msgstr "rename: เปลี่ยนชื่อ `%s' ไปเป็น `%s': %s"
 
diff --git a/po/tl.po b/po/tl.po
index b18860fc5..911cffd75 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 09:53+0200\n"
 "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
 "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n"
@@ -141,7 +141,8 @@ msgstr "error sa paglikha ng device `%.255s'"
 msgid "error creating new backup file '%s'"
 msgstr "error sa paglikha ng pipe `%.255s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "hindi matanggal ang `%.250s'"
@@ -364,22 +365,36 @@ msgstr "di makapag-seek sa umpisa ng %.250s matapos mag-pad"
 
 #: lib/dpkg/dbmodify.c
 #, fuzzy, c-format
-#| msgid "unable to open tmpfile for vsnprintf"
-msgid "unable to open lock file %s for testing"
-msgstr "hindi mabuksan ang tmpfile para sa vsnprintf"
+#| msgid "unable to read filedescriptor flags for %.250s"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "hindi mabasa ang filedescriptor flags para sa %.250s"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "hindi mabuksan/malikha ang status database lockfile"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "hindi mabuksan/malikha ang status database lockfile"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "wala kayong pahintulot na ialdaba ang dpkg status database"
 
 #: lib/dpkg/dbmodify.c
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "hindi maaldaba ang dpkg status database"
 
 #: lib/dpkg/dbmodify.c
@@ -387,11 +402,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "kailangan ng pribilehiyong superuser ang hiniling na operasyon"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "hindi mabasa ang lugar ng kalagayan ng dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
 "kailangan ng operasyon ng pahintulot sa pagbasa/pagsulat sa lugar ng "
 "kalagayang dpkg"
@@ -431,6 +450,208 @@ msgstr "hindi masarhan ang kalagayang inapdeyt ng `%.250s'"
 msgid "unable to install updated status of '%.250s'"
 msgstr "hindi ma-luklok ang kalagayang inapdeyt ng `%.250s'"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "hindi matiyak ang pagkakaroon ng `%.250s'"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "hindi mabasa ang info directory"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "error habang sinubukang buksan ang %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, fuzzy, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "conffile `%.250s' does not appear in package"
+msgid "info file %s/%s not associated to any package"
+msgstr "conffile `%.250s' ay wala sa pakete"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "error sa paglikha ng hard link `%.255s'"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "error writing `%s'"
+msgid "error while writing '%s'"
+msgstr "error sa pagsulat ng `%s'"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
+"pangalan na blanko"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
+"pangalan na blanko"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
+"pangalan na blanko"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr ""
+"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
+"pangalan na blanko"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
+msgid "loading control file '%s' for package '%s'"
+msgstr "hindi mabasa ang dir ng talaksang pagkaayos `%.250s' (mula `%.250s')"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "bigo sa pagbukas ng talaksang dibersyon"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "bigo sa pag-fstat ng talaksang dibersyon"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "magkatunggaling dibersyon sangkot ang `%.250s' o `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr ""
+"error sa pagsara ng talaksang listahan ng mga talaksan ng pakete `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"dpkg: mabigat na babala: ang talaksan ng listahan ng talaksan para sa "
+"paketeng `%.250s' ay nawawala, ipinagpapalagay na ang pakete ay walang mga "
+"talaksan na kasalukuyang nakaluklok.\n"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
+"pangalan na blanko"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr ""
+"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
+"pangalan na blanko"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Binabasa ang database ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "%d files and directories currently installed.)\n"
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d na talaksan at directory ay kasalukuyang nakaluklok.)\n"
+msgstr[1] "%d na talaksan at directory ay kasalukuyang nakaluklok.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride uid %s"
+msgstr "talaksang statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride gid %s"
+msgstr "talaksang statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "invalid statoverride mode %s"
+msgstr "talaksang statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "bigo sa pagbukas ng talaksang statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "bigo sa pag-fstat ng talaksang statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "statoverride file `%.250s'"
+msgid "reading statoverride file '%.250s'"
+msgstr "talaksang statoverride `%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "statoverride file is missing final newline"
+msgstr "naglalaman ng blankong linya ang talaksang statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "naglalaman ng blankong linya ang talaksang statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "syntax error in statoverride file"
+msgstr "bigo sa pagbukas ng talaksang statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "di inaasahang dulo ng linya sa pangalan ng pakete sa linya %d"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "talaksang statoverride `%.250s'"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 msgid "format version with too big major component"
@@ -560,67 +781,76 @@ msgid "internal error"
 msgstr "%s: internal gzip error: pagbasa: `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s ay nawawala"
+#, fuzzy
+msgid "is missing a value"
+msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "`%.*s' is not allowed for %s"
-msgid "'%.50s' is not allowed for %s"
-msgstr "`%.*s' ay hindi pinapayagan para sa %s"
+#, c-format
+msgid "has invalid value '%.50s'"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "basura matapos ang %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "di tanggap na pangalan ng pakete (%.250s)"
+#, fuzzy, c-format
+#| msgid "Package `%s' is not installed.\n"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Di nakaluklok ang paketeng `%s'.\n"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "walang laman ang saklaw ng detalyeng talaksan `%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr ""
 "hindi pinapayagan ang saklaw ng detalye ng talaksan `%s' sa talaksang estado"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "labis ang dami ng halaga sa saklaw ng detalyeng talaksan `%s' (hinambing sa "
 "iba)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "labis na kakaunti ang halaga sa saklaw ng detalyeng talaksan `%s' (hinambing "
 "sa iba)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "oo/hindi sa saklaw na boolean"
+#, fuzzy, c-format
+#| msgid "obsolete `Revision' or `Package-Revision' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "laos na saklaw ng `Revision' o `Package-Revision' na ginamit"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
+msgstr "saklaw na `%s', tumutukoy sa `%.255s': error sa bersyon: %.255s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "error in Version string `%.250s': %.250s"
+msgid "word in '%s' field: %s"
+msgstr "error sa Version string `%.250s': %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
@@ -629,31 +859,31 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "halaga ng saklaw ng `status' ay hindi pinapayagan sa context na ito"
 
 #: lib/dpkg/fields.c
-#, fuzzy
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+msgid "first (want) word in '%s' field: %s"
 msgstr "pangatlong salitang (status) sa saklaw na `status'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+msgid "second (error) word in '%s' field: %s"
 msgstr "pangatlong salitang (status) sa saklaw na `status'"
 
 #: lib/dpkg/fields.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "pangatlong salitang (status) sa saklaw na `status'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "error in Version string `%.250s': %.250s"
-msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "error sa Version string `%.250s': %.250s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "laos na saklaw ng `Revision' o `Package-Revision' na ginamit"
 
 #: lib/dpkg/fields.c
@@ -665,11 +895,13 @@ msgstr "halaga ng `conffiles' ay may maling anyong linya `%.*s'"
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "halaga ng `conffiles' ay may linyang nag-umpisa ng di-puwang `%c'"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "root o null directory ay nakalista bilang conffile"
 
 #: lib/dpkg/fields.c
@@ -760,9 +992,8 @@ msgstr "saklaw na `%s', tumutukoy sa `%.255s': hindi nagwakas ang bersyon"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "saklaw na `%s', tumutukoy sa `%.255s': error sa bersyon: %.255s"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "saklaw na `%s', tumutukoy sa `%.255s': naglalaman ang bersyon ng `('"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -770,8 +1001,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "saklaw na `%s', syntax error matapos tumukoy sa paketeng `%.255s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "di pinapayagan ang mga halili (`|') sa saklaw na %s"
 
 #: lib/dpkg/fields.c
@@ -811,6 +1043,26 @@ msgstr "hindi matakda ang modo ng bagong dist conffile `%.250s'"
 
 #: lib/dpkg/file.c
 #, fuzzy, c-format
+msgid "cannot stat %s"
+msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "%s is not a regular file"
+msgstr "babala, conffile `%s' ay hindi payak na talaksan\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot read %s"
+msgstr "hindi ma-execute ang %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot open %s"
+msgstr "hindi mabuksan ang talaan`%s': %s\n"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
 msgid "unable to unlock %s"
 msgstr "hindi ma-execute ang %s"
 
@@ -831,8 +1083,19 @@ msgid "unable to lock %s"
 msgstr "hindi ma-execute ang %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy, c-format
+msgid "cannot open file %s"
+msgstr "hindi mabuksan ang talaan`%s': %s\n"
+
+#: lib/dpkg/file.c
+#, fuzzy
+msgid "pager to show file"
+msgstr "hindi maka-flush sa vsnprintf"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot write file %s into the pager"
+msgstr "hindi mabasa ang info directory"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -856,13 +1119,13 @@ msgstr "bigo na likhain ang directory"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "bigo ang pag-dup para sa std%s"
+msgid "failed to dup for fd %d"
+msgstr "bigo ang pag-dup para sa fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "bigo ang pag-dup para sa fd %d"
+msgid "failed to dup for std%s"
+msgstr "bigo ang pag-dup para sa std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -1002,29 +1265,31 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "dinobleng halaga para sa pinapangalanan ng gumagamit na saklaw `%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "kulang na %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "walang halaga para sa %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "nadobleng halaga para sa saklaw na `%s'"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has '%s' field but is missing architecture"
+msgstr " (pakete: "
 
 #: lib/dpkg/parse.c
 #, fuzzy, c-format
-msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr " (pakete: "
 
 #: lib/dpkg/parse.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Configured-Version para sa pakete na may hindi akmang Status"
 
 #: lib/dpkg/parse.c
@@ -1033,7 +1298,8 @@ msgid "package has status %s but triggers are awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
+#, c-format
+msgid "package has status %s but no triggers awaited"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1042,11 +1308,14 @@ msgid "package has status %s but triggers are pending"
 msgstr ""
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
+#, fuzzy, c-format
+msgid "package has status %s but no triggers pending"
+msgstr "  %.250s ay tatanggalin.\n"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Pakete na nasa kalagayang hindi-nakaluklok ay may conffiles, kinalilimutan "
 "sila"
@@ -1066,8 +1335,8 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 
 #: lib/dpkg/parse.c
@@ -1265,11 +1534,6 @@ msgstr "hindi malikha ang `%.255s'"
 msgid "rm command for cleanup"
 msgstr ""
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr ""
-
 #: lib/dpkg/pkg-format.c
 #, fuzzy, c-format
 #| msgid "invalid character `%c' in field width\n"
@@ -1285,6 +1549,16 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "kulang na %s"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(walang paglalarawan)"
@@ -1369,6 +1643,67 @@ msgstr "subprocess %s ay bigo na may wait status code %d"
 msgid "wait for %s subprocess failed"
 msgstr "paghintay sa %s ay bigo"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header size field"
+msgstr "di tanggap na karakter `%c' sa lapad ng saklaw\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header mtime field"
+msgstr "di tanggap na karakter `%c' sa lapad ng saklaw\n"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header uid field"
+msgstr "talaksang statoverride `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+msgid "invalid tar header gid field"
+msgstr "talaksang statoverride `%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character `%c' in field width\n"
+msgid "invalid tar header checksum field"
+msgstr "di tanggap na karakter `%c' sa lapad ng saklaw\n"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "di kilalang uri ng compression `%s'!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 msgid "cannot stat pathname '%s'"
@@ -1387,12 +1722,12 @@ msgstr "hindi mabasa ang info directory"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
 
 #: lib/dpkg/trigdeferred.c
 #, fuzzy
-msgid "triggers area"
+msgid "triggers database lock"
 msgstr "hindi ma-execute ang %s"
 
 #: lib/dpkg/trigdeferred.c
@@ -1603,11 +1938,6 @@ msgstr "error sa paglikha ng pipe `%.255s'"
 msgid "error creating device '%.255s'"
 msgstr "error sa paglikha ng device `%.255s'"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "error sa paglikha ng hard link `%.255s'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1943,10 +2273,10 @@ msgstr "hindi ma-akses ang arkibo"
 msgid "archive '%s' is not a regular file"
 msgstr "babala, conffile `%s' ay hindi payak na talaksan\n"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr ""
 
@@ -2166,6 +2496,10 @@ msgid "conffile difference visualizer"
 msgstr ""
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Ipasok ang `exit' kapag tapos na kayo.\n"
 
@@ -2542,7 +2876,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2559,6 +2896,12 @@ msgid ""
 "divert.\n"
 msgstr ""
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, fuzzy, c-format
 msgid "cannot stat file '%s'"
@@ -2681,6 +3024,13 @@ msgstr ""
 " naman nakaluklok.\n"
 
 #: src/divertcmd.c
+#, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
 #, fuzzy, c-format
 #| msgid " is to be removed.\n"
 msgid "No diversion '%s', none removed.\n"
@@ -2723,19 +3073,6 @@ msgstr "Walang laman ang paketeng `%s' (!)\n"
 msgid "divert-to may not contain newlines"
 msgstr ""
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "bigo sa pagbukas ng talaksang dibersyon"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "bigo sa pag-fstat ng talaksang dibersyon"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "magkatunggaling dibersyon sangkot ang `%.250s' o `%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -3047,141 +3384,167 @@ msgstr ""
 "upang\n"
 "ma-override.\n"
 
-#: src/errors.c
-#, fuzzy
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
 msgstr ""
-"dpkg - babala, problema sa pag-override dahil --force ay naka-enable:\n"
-" "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
-"pangalan na blanko"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "Replace a package with a lower version"
 msgstr ""
-"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
-"pangalan na blanko"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Configure any package which may help this one"
 msgstr ""
-"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
-"pangalan na blanko"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
 msgstr ""
-"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
-"pangalan na blanko"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
 msgstr ""
-"hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `%.250s'"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
 msgstr ""
-"hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `%.250s'"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
 msgstr ""
-"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
-"pangalan na blanko"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read config file dir `%.250s' (from `%.250s')"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "hindi mabasa ang dir ng talaksang pagkaayos `%.250s' (mula `%.250s')"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"error sa pagsara ng talaksang listahan ng mga talaksan ng pakete `%.250s'"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
-"hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `%.250s'"
 
-#: src/filesdb.c
-#, fuzzy, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr ""
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr ""
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"dpkg: mabigat na babala: ang talaksan ng listahan ng talaksan para sa "
-"paketeng `%.250s' ay nawawala, ipinagpapalagay na ang pakete ay walang mga "
-"talaksan na kasalukuyang nakaluklok.\n"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
+#: src/force.c
+msgid "Always install missing config files"
 msgstr ""
-"hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `%.250s'"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
 msgstr ""
-"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
-"pangalan na blanko"
 
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "listahan ng talaksan para sa pakete `%.250s'"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
 
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr ""
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr ""
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "problema sa dependensiya - hindi tatanggalin"
+
+#: src/force.c
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn dependency version problems into warnings"
+msgstr "problema sa dependensiya - hindi tatanggalin"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
 msgstr ""
-"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
-"pangalan na blanko"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
-"pangalan na blanko"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
 msgstr ""
-"error sa pagsara ng talaksang listahan ng mga talaksan ng pakete `%.250s'"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Binabasa ang database ... "
+#: src/force.c
+#, c-format
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
+
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "di kilalang opsyon na force/refuse `%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, fuzzy, c-format
-#| msgid "%d files and directories currently installed.)\n"
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d na talaksan at directory ay kasalukuyang nakaluklok.)\n"
-msgstr[1] "%d na talaksan at directory ay kasalukuyang nakaluklok.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "Babala: laos na opsyon `--%s'\n"
+
+#: src/force.c
+#, fuzzy
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"dpkg - babala, problema sa pag-override dahil --force ay naka-enable:\n"
+" "
 
 #: src/help.c
 msgid "not installed"
@@ -3246,42 +3609,6 @@ msgstr ""
 "NB: ang PATH ni root ay madalas kasama ang /usr/local/sbin, /usr/sbin at /"
 "sbin."
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "hindi matiyak ang pagkakaroon ng `%.250s'"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "hindi mabasa ang info directory"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "error habang sinubukang buksan ang %.250s"
-
-#: src/infodb-format.c
-#, fuzzy, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "hindi mabuksan ang pinagmulan na talaksang `%.250s'"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "conffile `%.250s' does not appear in package"
-msgid "info file %s/%s not associated to any package"
-msgstr "conffile `%.250s' ay wala sa pakete"
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "error writing `%s'"
-msgid "error while writing '%s'"
-msgstr "error sa pagsulat ng `%s'"
-
 #: src/main.c
 #, fuzzy, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3291,27 +3618,27 @@ msgstr "' programang tagapangasiwa ng mga pakete, bersyon "
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3542,114 +3869,6 @@ msgstr ""
 "sa `less' o `more' !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr ""
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr ""
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr ""
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr ""
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr ""
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr ""
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr ""
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr ""
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr ""
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr ""
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr ""
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr ""
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr ""
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr ""
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn all dependency problems into warnings"
-msgstr "problema sa dependensiya - hindi tatanggalin"
-
-#: src/main.c
-#, fuzzy
-#| msgid "dependency problems - not removing"
-msgid "Turn dependency version problems into warnings"
-msgstr "problema sa dependensiya - hindi tatanggalin"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr ""
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr ""
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr ""
 
@@ -3782,33 +4001,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "di kilalang opsyon na force/refuse `%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "Babala: laos na opsyon `--%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "hindi mabuksan ang `%i' para sa stream"
 
@@ -4000,6 +4192,10 @@ msgid "Description"
 msgstr "Paglalarawan"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr ""
+
+#: src/querycmd.c
 #, fuzzy, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "dibertado ng %s"
@@ -4039,6 +4235,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "Di nakaluklok ang paketeng `%s' at walang info tungkol dito.\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Gamitin dpkg --info (= dpkg-deb --info) upang tignan ang talksang arkibo,\n"
+"at dpkg --contents (= dpkg-deb --contents) upang ilista ang nilalaman nila.\n"
+
+#: src/querycmd.c
 #, fuzzy, c-format
 #| msgid "Package `%s' is not available.\n"
 msgid "package '%s' is not available"
@@ -4065,9 +4271,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "dibertado ng %s"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Gamitin dpkg --info (= dpkg-deb --info) upang tignan ang talksang arkibo,\n"
 "at dpkg --contents (= dpkg-deb --contents) upang ilista ang nilalaman nila.\n"
@@ -4116,16 +4325,16 @@ msgstr "' programang tagapangasiwa ng mga pakete, bersyon "
 #, fuzzy, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4340,6 +4549,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr ""
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "bigo sa pag-chroot sa `%.250s'"
@@ -4491,8 +4706,13 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4547,68 +4767,10 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride uid %s"
-msgstr "talaksang statoverride `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride gid %s"
-msgstr "talaksang statoverride `%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "invalid statoverride mode %s"
-msgstr "talaksang statoverride `%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "bigo sa pagbukas ng talaksang statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "bigo sa pag-fstat ng talaksang statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "statoverride file `%.250s'"
-msgid "reading statoverride file '%.250s'"
-msgstr "talaksang statoverride `%.250s'"
-
-#: src/statdb.c
-#, fuzzy
-msgid "statoverride file is missing final newline"
-msgstr "naglalaman ng blankong linya ang talaksang statoverride"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "naglalaman ng blankong linya ang talaksang statoverride"
-
-#: src/statdb.c
-#, fuzzy
-msgid "syntax error in statoverride file"
-msgstr "bigo sa pagbukas ng talaksang statoverride"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "bigo sa pagbukas ng talaksang statoverride"
-
-#: src/statdb.c
-#, fuzzy
-msgid "unexpected end of line in statoverride file"
-msgstr "di inaasahang dulo ng linya sa pangalan ng pakete sa linya %d"
-
-#: src/statdb.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "bigo sa pagbukas ng talaksang statoverride"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "talaksang statoverride `%.250s'"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Babala: laos na opsyon `--%s'\n"
 
 #: src/trigcmd.c
 #, fuzzy
@@ -4825,6 +4987,12 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Tinatanggal ang %s ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "naglalaman ng blankong linya ang talaksang statoverride"
+
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4970,11 +5138,9 @@ msgid "package filesystem archive extraction"
 msgstr ""
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "error sa pagbasa ng dpkg-deb tar output"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "sirang filesystem tarfile - sira ang arkibong pakete"
 
 #: src/unpack.c
@@ -4990,16 +5156,20 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s ay nangangailangan ng isang argumentong talaksang Packages"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "di ma-akses ang dpkg status area para sa maramihang pag-apdeyt ng magagamit"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"kailangan ng akses sa pagsulat sa dpkg status area ng maramihang pag-apdeyt "
-"ng\n"
-"magagamit"
+"di ma-akses ang dpkg status area para sa maramihang pag-apdeyt ng magagamit"
 
 #: src/update.c
 #, c-format
@@ -5389,16 +5559,18 @@ msgid "decompressing archive member"
 msgstr ""
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "bigo na mag-chdir sa directory"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "bigo na likhain ang directory"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "bigo na mag-chdir sa directory matapos likhain ito"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "di inaasahang eof sa pangalan ng pakete sa linya %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "bigo na mag-chdir sa directory"
 
 #: dpkg-deb/extract.c
 #, fuzzy
@@ -6223,8 +6395,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6703,12 +6876,101 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
 #, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Babala: laos na opsyon `--%s'\n"
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "hindi mabuksan ang tmpfile para sa vsnprintf"
 
 #, fuzzy
-#~ msgid "control file '%s' missing value"
-#~ msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "bigo sa pagbukas ng talaksang statoverride"
+
+#, fuzzy
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "bigo sa pagbukas ng talaksang statoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s ay nawawala"
+
+#, fuzzy
+#~| msgid "`%.*s' is not allowed for %s"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "`%.*s' ay hindi pinapayagan para sa %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "basura matapos ang %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "di tanggap na pangalan ng pakete (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "oo/hindi sa saklaw na boolean"
+
+#, fuzzy
+#~| msgid "`%s' field, reference to `%.255s': error in version: %.255s"
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "saklaw na `%s', tumutukoy sa `%.255s': error sa bersyon: %.255s"
+
+#~ msgid "empty value for %s"
+#~ msgstr "walang halaga para sa %s"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "kailangan ng akses sa pagsulat sa dpkg status area ng maramihang pag-"
+#~ "apdeyt ng\n"
+#~ "magagamit"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "error sa pagbasa ng dpkg-deb tar output"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `"
+#~ "%.250s'"
+
+#, fuzzy
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `"
+#~ "%.250s'"
+
+#, fuzzy
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr ""
+#~ "talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
+#~ "pangalan na blanko"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "error sa pagsara ng talaksang listahan ng mga talaksan ng pakete `%.250s'"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr ""
+#~ "hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `"
+#~ "%.250s'"
+
+#, fuzzy
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `"
+#~ "%.250s'"
+
+#, fuzzy
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "talaksan ng listahan ng mga talaksan ng pakete `%.250s' ay naglalaman ng\n"
+#~ "pangalan na blanko"
+
+#, fuzzy
+#~| msgid "files list for package `%.250s'"
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "listahan ng talaksan para sa pakete `%.250s'"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "bigo na mag-chdir sa directory matapos likhain ito"
 
 #, fuzzy
 #~ msgid "control file '%s' missing value separator"
@@ -6785,9 +7047,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "EOF sa stdin sa prompt ng conffile"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "di inaasahang eof sa pangalan ng pakete sa linya %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "di inaasahang eof matapos ng pangalan ng pakete sa linya %d"
 
@@ -7036,10 +7295,6 @@ msgstr ""
 #~ msgstr "--build ay tumatanggap ng hanggang dalawang argumento lamang"
 
 #, fuzzy
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
-
-#, fuzzy
 #~| msgid "failed to exec %s"
 #~ msgid "failed to execute %s: %s"
 #~ msgstr "bigo sa pag-exec ng %s"
@@ -7065,10 +7320,6 @@ msgstr ""
 #~ msgstr "hindi ma-execute ang %s"
 
 #, fuzzy
-#~ msgid "cannot write %s: %s"
-#~ msgstr "hindi ma-execute ang %s"
-
-#, fuzzy
 #~ msgid "unable to rename file '%s' to '%s'"
 #~ msgstr "hindi ma-stat ang %s `%.250s'"
 
diff --git a/po/tr.po b/po/tr.po
index e656f9fe4..85cd8d46c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2017-01-30 18:28+0300\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
+"PO-Revision-Date: 2018-01-03 16:44+0300\n"
 "Last-Translator: Mert Dirik <mertdirik@gmail.com>\n"
 "Language-Team: Turkish <debian-l10n-turkish@lists.debian.org>\n"
 "Language: tr\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.8.7.1\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: lib/dpkg/ar.c
 msgid "failed to fstat archive"
@@ -137,7 +137,8 @@ msgstr "eski yedek dosyası '%s' kaldırılırken sorun yaşandı"
 msgid "error creating new backup file '%s'"
 msgstr "yeni yedek dosyası '%s' oluşturulurken sorun yaşandı"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "'%.250s' kaldırılamadı"
@@ -342,20 +343,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "dolgu yapıldıktan sonra %.250s dosyasının başına gidilemedi"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "kilit dosyası %s denetim amaçlı açılamadı"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "'%s' dizininin dosya tanımlayıcısı alınamadı"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "durum veritabanı kilit dosyası açılamadı/oluşturulamadı"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "durum veritabanı kilit dosyası açılamadı/oluşturulamadı"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "dpkg durum veritabanını kilitlemek için gerekli izine sahip değilsiniz"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg durum veritabanı"
 
 #: lib/dpkg/dbmodify.c
@@ -363,11 +381,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "bu işlem süper kullanıcı ayrıcalıklarına ihtiyaç duyar"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "dpkg durum bölgesine erişilemedi"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "bu işlem dpkg durum bölgesine okuma/yazma erişimi gerektirir"
 
 #: lib/dpkg/dbmodify.c
@@ -405,11 +427,196 @@ msgstr "'%.250s' paketinin güncellenmiş durumu kapatılamadı"
 msgid "unable to install updated status of '%.250s'"
 msgstr "'%.250s' paketinin güncellenmiş durumu kurulamadı"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "'%.250s' dosyasının varlığı denetlenemedi"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "info dizini okunamıyor"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "%.250s açılırken bir sorun yaşandı"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "veritabanı biçim dosyası (%s) bozuk"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"bilgi veritabanı biçimi (%d) geçersiz ya da çok yeni; daha yeni bir dpkg "
+"sürümünü deneyin"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "bilgi dosyası (%s/%s) hiçbir paket ile ilişkili değil"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "'%.255s' sabit bağı oluşturulurken bir sorun yaşandı"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "'%s' yazılırken sorun yaşandı"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"'%2$s' paketinin denetim dosyasının (%1$s) sonundaki yeni satır karakteri "
+"eksik"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "'%2$s' paketinin denetim dosyasında (%1$s) eksik değer var"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"'%2$s' paketinin denetim dosyasında (%1$s) eksik değer ayırıcı karakter var"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "'%2$s' paketinin denetim dosyası (%1$s) boş bir dosya adı içeriyor"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read control file '%s' for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "'%2$s' paketinin denetim dosyası (%1$s) okunamıyor"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "yönlendirme dosyası açılamadı"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "yönlendirme dosyasına fstat çağrısı başarısız"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "yönlendirmeler çakışıyor (hem '%.250s' hem de '%.250s' içeriyor)"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "'%.250s' paketinin dosya listesi dosyası kapatılamadı"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"'%.250s' paketinin dosyalarını listeleyen dosya bulunamadı; paketin "
+"hâlihazırda hiçbir dosyasının olmadığı varsayılıyor"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"'%.250s' paketinin dosya listesi dosyasının sonundaki yeni satır karakteri "
+"eksik"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "'%.250s' paketinin dosya listesi dosyası boş satır içeriyor"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Veritabanı okunuyor ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d dosya veya dizin kurulu durumda.)\n"
+msgstr[1] "%d dosya veya dizin kurulu durumda.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "geçersiz statoverride kullanıcı kimliği (%s)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "geçersiz statoverride grup kimliği (%s)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "geçersiz statoverride kipi (%s)"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "statoverride dosyası açılamadı"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "statoverride dosyasına fstat çağrısı başarısız"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "statoverride dosyası (%.250s) okunuyor"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "statoverride dosyasının sonunda yeni satır karakteri yok"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statoverride dosyası boş satır içeriyor"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "statoverride dosyasında söz dizimi hatası"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "statoverride dosyasında beklenmeyen satır sonu"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "'%.250s' dosyası için birden fazla statoverride dosyası mevcut"
+
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty major component"
 msgid "format version with too big major component"
-msgstr "biçim sürümünün ana bileşeni boş"
+msgstr "biçim sürümünün ana bileşeni çok büyük"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty major component"
@@ -420,10 +627,8 @@ msgid "format version has no dot"
 msgstr "biçim sürümünde nokta yok"
 
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty minor component"
 msgid "format version with too big minor component"
-msgstr "biçim sürümünün ikincil bileşeni boş"
+msgstr "biçim sürümünün ikincil bileşeni çok büyük"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty minor component"
@@ -522,62 +727,75 @@ msgid "internal error"
 msgstr "dâhilî hata"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s eksik"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "'%s' denetim dosyasında eksik değer"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "%2$s için '%1$.50s' değeri kullanılamaz"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Geçersiz satırı atla: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "%s alanından sonraki veriler geçersiz"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "geçersiz paket adı (%.250s)"
+#, fuzzy, c-format
+#| msgid "package name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "paket adı (%s) geçersiz: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "dosya ayrıntıları alanı (%s) boş"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "durum dosyasında dosya ayrıntıları alanı (%s) bulunamaz"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "dosya ayrıntıları alanı (%s) diğer alanlara kıyasla çok fazla değer içeriyor"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "dosya ayrıntıları alanı (%s) diğer alanlara kıyasla çok az değer içeriyor"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "mantıksal alanda evet/hayır değeri"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "artık kullanılmayan '%s' veya '%s' alanları kullanılmış"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "dörtlü değer alanında yabancı/izin verilen/aynı/hayır değerleri"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "'%s', geçerli bir mimari adı değildir: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "'Priority' (öncelik) alanında sözcük"
 
 #: lib/dpkg/fields.c
@@ -586,25 +804,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "'%s' alanı için bu değere bu bağlamda izin verilmez"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "'Status' alanındaki ilk sözcük (want)"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "'Status' alanındaki ikinci sözcük (error)"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "'Status' alanındaki üçüncü sözcük (status)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "'%s' alanının değeri hatalı bir dizgi: '%.250s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "artık kullanılmayan '%s' veya '%s' alanları kullanılmış"
 
 #: lib/dpkg/fields.c
@@ -613,14 +839,17 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "'%s' alanının değeri hatalı biçimlenmiş bir satır içeriyor (%.*s)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "'%s' alanının değeri boşluk olmayan '%c' karakteri ile başlayan bir satır "
 "içeriyor"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr ""
 "kök dizin ya da geçersiz bir dizin yapılandırma dosyası olarak listelenmiş"
 
@@ -702,9 +931,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "'%s' alanı, '%.255s' referansı: sürüm değerinin sonu yok"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "'%s' alanı, '%.255s' referansı: sürüm hatalı"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "'%s' alanı, '%.255s' referansı: sürüm '%c' içeriyor"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -712,8 +942,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "'%s' alanı, '%.255s' paketine olan referanstan sonra söz dizimi hatası"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "%s alanında alternatifler (`|') kullanılamaz"
 
 #: lib/dpkg/fields.c
@@ -752,6 +983,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "hedef dosyanın (%.250s) kipi ayarlanamadı"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat file '%s'"
+msgid "cannot stat %s"
+msgstr "'%s' dosyasına stat çağrısı başarısız"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "archive '%s' is not a regular file"
+msgid "%s is not a regular file"
+msgstr "'%s' arşivi normal bir dosya değil"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot read %s"
+msgstr "'%s' dosyasının sonuna eklenemedi"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "'%s' dosyasının sonuna eklenemedi"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "%s dosyasının kilidi açılamadı"
@@ -772,8 +1027,22 @@ msgid "unable to lock %s"
 msgstr "%s kilitlenemedi"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "dosya sayfalayıcıda görüntüleniyor"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "'%s' dosyasının sonuna eklenemedi"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "'%s' dosyasına flush çağrısı yapılamadı"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "'%s' dosyası kendine yönlendirilemedi"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -795,13 +1064,13 @@ msgstr "bellek ayırma başarısız oldu"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "std%s için dup çağrısı başarısız"
+msgid "failed to dup for fd %d"
+msgstr "%d dosya tanımlayıcısının dup çağrısı başarısız"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "%d dosya tanımlayıcısının dup çağrısı başarısız"
+msgid "failed to dup for std%s"
+msgstr "std%s için dup çağrısı başarısız"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -940,28 +1209,34 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "kullanıcı tanımlı '%.*s' alanındaki değer mükerrer durumda"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "%s eksik"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s değeri belirtilmemiş"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "'%s' alanı için mükerrer değer"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "paketin çoklu mimari alanı '%s' şeklinde ama eksik mimariler var"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr ""
 "paketin çoklu mimari alanı '%s' şeklinde ama mimari alanı 'hepsi' şeklinde"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "'Status' alanı uygun olmayan pakette 'Config-Version' alanı var"
 
 #: lib/dpkg/parse.c
@@ -970,8 +1245,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "paket '%s' durumunda ama beklenen tetikleyiciler var"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "paket 'triggers-awaited' durumunda ama hiçbir tetikleyici beklenmiyor"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "paket '%s' durumunda ama beklenen tetikleyiciler var"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -979,12 +1256,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "paket '%s' durumunda ama askıda olan tetikleyiciler var"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr ""
-"paket 'triggers-pending' durumunda ama askıda olan hiçbir tetikleyici yok"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "paket '%s' durumunda ama askıda olan tetikleyiciler var"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "'not-installed' durumundaki paketin yapılandırma dosyaları var, dosyalar "
 "siliniyor"
@@ -1007,10 +1287,13 @@ msgstr ""
 "kaynaklıdır"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Multi-Arch: %s) paketi birden fazla kurulu örneği mevcut olan %s "
 "paketi ile birlikte kurulamaz"
@@ -1195,11 +1478,6 @@ msgstr "'%.255s' güvenli bir biçimde kaldırılamadı"
 msgid "rm command for cleanup"
 msgstr "temizlik için rm komutu"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "'%s' paket adı birden fazla kurulu pakete işaret ediyor"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1213,6 +1491,16 @@ msgstr "alan genişliği aralığın dışında"
 msgid "missing closing brace"
 msgstr "kapatma parantezi eksik"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "'%s' paket adı birden fazla kurulu pakete işaret ediyor"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(açıklama mevcut değil)"
@@ -1266,38 +1554,97 @@ msgid "fork failed"
 msgstr "fork sistem çağrısı başarısız oldu"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s returned error exit status %d"
+#, c-format
 msgid "%s subprocess returned error exit status %d"
-msgstr "alt süreç %s %d çıkış kodu ile sona erdi"
+msgstr "%s alt süreci %d hatalı çıkış kodu ile sona erdi"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was interrupted"
+#, c-format
 msgid "%s subprocess was interrupted"
 msgstr "%s alt süreci kesintiye uğradı"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was killed by signal (%s)%s"
+#, c-format
 msgid "%s subprocess was killed by signal (%s)%s"
-msgstr "%s alt süreci %s sinyali ile öldürüldü %s"
+msgstr "%s alt süreci (%s)%s sinyali ile sona erdirildi"
 
 #: lib/dpkg/subproc.c
 msgid ", core dumped"
 msgstr ", bellek dökümü yapıldı"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s failed with wait status code %d"
+#, c-format
 msgid "%s subprocess failed with wait status code %d"
-msgstr "alt süreç %s %d durum kodu döndürerek başarısız oldu"
+msgstr "%s alt süreci %d durum kodu döndürerek başarısız oldu"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "wait for subprocess %s failed"
+#, c-format
 msgid "wait for %s subprocess failed"
-msgstr "%s alt süreci wait çağrısı başarısız oldu"
+msgstr "%s alt sürecini bekleme çağrısı başarısız oldu"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "alan genişliğinde geçersiz '%c' karakteri"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "alan genişliğinde geçersiz '%c' karakteri"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "geçersiz statoverride kullanıcı kimliği (%s)"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "geçersiz statoverride grup kimliği (%s)"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "alan genişliğinde geçersiz '%c' karakteri"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "dosya başlığında desteklenmeyen seçenekler var"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "bilinmeyen sıkıştırma türü '%s'!"
 
 #: lib/dpkg/treewalk.c
 #, c-format
@@ -1315,12 +1662,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "treewalk kök dizini %s bir dizin değil"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "yeni tetikleyici kilit dosyası (%.250s) açılamadı/oluşturulamadı"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "tetikleyici bölgesi"
 
 #: lib/dpkg/trigdeferred.c
@@ -1542,11 +1892,6 @@ msgstr "'%.255s' borusu oluşturulurken bir sorun yaşandı"
 msgid "error creating device '%.255s'"
 msgstr "'%.255s' aygıtı oluşturulurken bir sorun yaşandı"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "'%.255s' sabit bağı oluşturulurken bir sorun yaşandı"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1873,10 +2218,10 @@ msgstr "'%s' arşivine ulaşılamıyor"
 msgid "archive '%s' is not a regular file"
 msgstr "'%s' arşivi normal bir dosya değil"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<standart çıktı>"
 
@@ -2060,6 +2405,10 @@ msgid "conffile difference visualizer"
 msgstr "yapılandırma dosyası fark görselleştirici"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "İşiniz bittiğinde çıkmak için `exit' yazın.\n"
 
@@ -2415,7 +2764,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2424,7 +2787,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2460,6 +2826,12 @@ msgstr ""
 "zaman\n"
 "belirtmelidir.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2581,6 +2953,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "'%s' yönlendirmesi yok, hiçbir yönlendirme kaldırılmadı.\n"
 
@@ -2624,19 +3003,6 @@ msgstr "paket adı yeni satır karakteri içeremez"
 msgid "divert-to may not contain newlines"
 msgstr "yönlendirme seçeneği yeni satır içeremez"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "yönlendirme dosyası açılamadı"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "yönlendirme dosyasına fstat çağrısı başarısız"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "yönlendirmeler çakışıyor (hem '%.250s' hem de '%.250s' içeriyor)"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2929,115 +3295,172 @@ msgstr ""
 "%s paketi tutuluyor, bu pakete dokunulmayacak. Geçersiz kılmak için\n"
 "  --force-hold seçeneğini kullanabilirsiniz.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "--force seçeneği kullanımda olduğu için sorunlar gözardı ediliyor:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Tüm zorlama seçeneklerini ayarla"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"'%2$s' paketinin denetim dosyasının (%1$s) sonundaki yeni satır karakteri "
-"eksik"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "'%2$s' paketinin denetim dosyasında (%1$s) eksik değer var"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Bir paketi eski bir sürümüyle değiştir"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Bu pakete yardımcı olabilecek tüm paketleri yapılandır"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Paketleri tutuluyor olsalar bile işleme sok"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "root değilken bile paketleri kurmayı/kaldırmayı dene"
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH önemli programları içermiyor, muhtemel sorunlar"
+
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Paketi gerçekliği doğrulanamasa bile kur"
+
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Yanlış sürüme sahip paketleri bile işle"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"'%2$s' paketinin denetim dosyasında (%1$s) eksik değer ayırıcı karakter var"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "'%2$s' paketinin denetim dosyası (%1$s) boş bir dosya adı içeriyor"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "'%2$s' paketinin denetim dosyası (%1$s) açılamıyor"
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Başka bir dosyayı paketin bir dosyasının üzerine yaz"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "'%2$s' paketinin denetim dosyasına (%1$s) stat çağrısı yapılamıyor"
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Yönlendirilmemiş bir dosyayı yönlendirilmiş olanın üzerine yaz"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "'%2$s' paketinin '%1$s' dosyası normal bir dosya değil"
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Bir paketin dosyasını başka bir paketin dizininin üzerine yaz"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "'%2$s' paketinin denetim dosyası (%1$s) okunamıyor"
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Paket açarken güvenli G/Ç işlemlerini kullanma"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "'%2$s' paketinin denetim dosyası (%1$s) kapatılamıyor"
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr "Geliştirici betiği ortamı kök dizinini chroot ile değiştirme"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "'%.250s' paketinin dosyalarını listeleyen dosya açılamadı"
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Her zaman yeni yapılandırma dosyalarını kullan, soru sorma"
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Her zaman eski yapılandırma dosyalarını kullan, soru sorma"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"'%.250s' paketinin dosyalarını listeleyen dosya bulunamadı; paketin "
-"hâlihazırda hiçbir dosyasının olmadığı varsayılıyor"
+"Yeni yapılandırma dosyaları için, eğer varsa öntanımlı ayarı\n"
+"kullan ve soru sorma. Öntanımlı bir ayar yoksa ve confold ya da\n"
+"confnew seçeneklerinden biri belirtilmediyse ne yapılacağı size\n"
+"sorulacaktır"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr ""
-"'%.250s' paketinin dosyalarını listeleyen dosyaya stat çağrısı yapılamadı"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Eksik yapılandırma dosyalarını her zaman kur"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "'%.250s' paketinin dosya listesi sıradan bir dosya değil"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Yeni sürümü olmasa da yapılandırma dosyalarını değiştirmeyi teklif et"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "'%.250s' paketinin dosya listesi okunuyor"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Yanlış mimariye sahip ya da mimarisi olmayan paketleri bile işle"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Başka bir paketi bozacak olsa bile kur"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Çakışan paketlerin kurulumuna izin ver"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Tüm bağımlılık sorunlarını uyarılara dönüştür"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Tüm bağımlılık sürümü sorunlarını uyarılara dönüştür"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Kurulum gerektiren paketleri kaldır"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Temel bir paketi kaldır"
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"'%.250s' paketinin dosya listesi dosyasının sonundaki yeni satır karakteri "
-"eksik"
+"%s zorlama seçenekleri - sorun yaşandığında takınılacak tutum:\n"
+"  uyar ama devam et:  --force-<şey>,<şey>,...\n"
+"  hata ver ve dur:    --refuse-<şey>,<şey>,... | --no-force-<şey>,...\n"
+" Zorlanan şeyler:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "'%.250s' paketinin dosya listesi dosyası boş satır içeriyor"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"UYARI - [!] ile işaretlenmiş seçenekler kurulumunuza ciddi şekilde zarar "
+"verebilir.\n"
+"[*] ile işaretlenmiş seçenekler öntanımlı olarak etkin durumdadır.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "'%.250s' paketinin dosya listesi dosyası kapatılamadı"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Veritabanı okunuyor ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "bilinmeyen zorlama/reddetme seçeneği '%.*s'"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d dosya veya dizin kurulu durumda.)\n"
-msgstr[1] "%d dosya veya dizin kurulu durumda.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "kullanımdan kalkmış zorlama/reddetme seçeneği '%s'"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "--force seçeneği kullanımda olduğu için sorunlar gözardı ediliyor:"
 
 #: src/help.c
 msgid "not installed"
@@ -3105,72 +3528,78 @@ msgstr ""
 "Not: root kullanıcısının PATH ortam değişkeni genelde /usr/local/sbin, /usr/"
 "sbin ve /sbin'i içerir"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "'%.250s' dosyasının varlığı denetlenemedi"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "info dizini okunamıyor"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "%.250s açılırken bir sorun yaşandı"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "veritabanı biçim dosyası (%s) bozuk"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"bilgi veritabanı biçimi (%d) geçersiz ya da çok yeni; daha yeni bir dpkg "
-"sürümünü deneyin"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "bilgi dosyası (%s/%s) hiçbir paket ile ilişkili değil"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "'%s' yazılırken sorun yaşandı"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
 msgstr "Debian '%s' paket yönetim programı sürüm %s.\n"
 
 #: src/main.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -i|--install       <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  --unpack           <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  -A|--record-avail  <.deb file name> ... | -R|--recursive "
+#| "<directory> ...\n"
+#| "  --configure        <package> ... | -a|--pending\n"
+#| "  --triggers-only    <package> ... | -a|--pending\n"
+#| "  -r|--remove        <package> ... | -a|--pending\n"
+#| "  -P|--purge         <package> ... | -a|--pending\n"
+#| "  -V|--verify <package> ...        Verify the integrity of package(s).\n"
+#| "  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+#| "  --set-selections                 Set package selections from stdin.\n"
+#| "  --clear-selections               Deselect every non-essential package.\n"
+#| "  --update-avail [<Packages-file>] Replace available packages info.\n"
+#| "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
+#| "  --clear-avail                    Erase existing available info.\n"
+#| "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "  -C|--audit [<package> ...]       Check for broken package(s).\n"
+#| "  --yet-to-unpack                  Print packages selected for "
+#| "installation.\n"
+#| "  --predep-package                 Print pre-dependencies to unpack.\n"
+#| "  --add-architecture <arch>        Add <arch> to the list of "
+#| "architectures.\n"
+#| "  --remove-architecture <arch>     Remove <arch> from the list of "
+#| "architectures.\n"
+#| "  --print-architecture             Print dpkg architecture.\n"
+#| "  --print-foreign-architectures    Print allowed foreign architectures.\n"
+#| "  --assert-<feature>               Assert support for the specified "
+#| "feature.\n"
+#| "  --validate-<thing> <string>      Validate a <thing>'s <string>.\n"
+#| "  --compare-versions <a> <op> <b>  Compare version numbers - see below.\n"
+#| "  --force-help                     Show help on forcing.\n"
+#| "  -Dh|--debug=help                 Show help on debugging.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3402,114 +3831,6 @@ msgstr ""
 "'more' araçları ile birlikte kullanın !"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Tüm zorlama seçeneklerini ayarla"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Bir paketi eski bir sürümüyle değiştir"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Bu pakete yardımcı olabilecek tüm paketleri yapılandır"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Paketleri tutuluyor olsalar bile işleme sok"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "root değilken bile paketleri kurmayı/kaldırmayı dene"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "PATH önemli programları içermiyor, muhtemel sorunlar"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Paketi gerçekliği doğrulanamasa bile kur"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Yanlış sürüme sahip paketleri bile işle"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Başka bir dosyayı paketin bir dosyasının üzerine yaz"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Yönlendirilmemiş bir dosyayı yönlendirilmiş olanın üzerine yaz"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Bir paketin dosyasını başka bir paketin dizininin üzerine yaz"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Paket açarken güvenli G/Ç işlemlerini kullanma"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr "Geliştirici betiği ortamı kök dizinini chroot ile değiştirme"
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Her zaman yeni yapılandırma dosyalarını kullan, soru sorma"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Her zaman eski yapılandırma dosyalarını kullan, soru sorma"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Yeni yapılandırma dosyaları için, eğer varsa öntanımlı ayarı\n"
-"kullan ve soru sorma. Öntanımlı bir ayar yoksa ve confold ya da\n"
-"confnew seçeneklerinden biri belirtilmediyse ne yapılacağı size\n"
-"sorulacaktır"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Eksik yapılandırma dosyalarını her zaman kur"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Yeni sürümü olmasa da yapılandırma dosyalarını değiştirmeyi teklif et"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Yanlış mimariye sahip ya da mimarisi olmayan paketleri bile işle"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Başka bir paketi bozacak olsa bile kur"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Çakışan paketlerin kurulumuna izin ver"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Tüm bağımlılık sorunlarını uyarılara dönüştür"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Tüm bağımlılık sürümü sorunlarını uyarılara dönüştür"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Kurulum gerektiren paketleri kaldır"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Temel bir paketi kaldır"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Genelde faydalı ilerleme bilgisi"
 
@@ -3643,41 +3964,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s zorlama seçenekleri - sorun yaşandığında takınılacak tutum:\n"
-"  uyar ama devam et:  --force-<şey>,<şey>,...\n"
-"  hata ver ve dur:    --refuse-<şey>,<şey>,... | --no-force-<şey>,...\n"
-" Zorlanan şeyler:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"UYARI - [!] ile işaretlenmiş seçenekler kurulumunuza ciddi şekilde zarar "
-"verebilir.\n"
-"[*] ile işaretlenmiş seçenekler öntanımlı olarak etkin durumdadır.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "bilinmeyen zorlama/reddetme seçeneği '%.*s'"
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "kullanımdan kalkmış zorlama/reddetme seçeneği '%s'"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "'%i' akış için açılamadı"
 
@@ -3860,6 +4146,12 @@ msgid "Description"
 msgstr "Açıklama"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "dosya sayfalayıcıda görüntüleniyor"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "%s tarafından şuradan yönlendirme: %s\n"
@@ -3896,6 +4188,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "'%s' paketi kurulu değil ve hakkında bilgi yok"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Arşiv dosyalarını incelemek için dpkg --info (= dpkg-deb --info), içeriğini\n"
+"listelemek için dpkg --contents (= dpkg-deb --contents) komutunu kullanın.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "'%s' paketi kullanılabilir değil"
@@ -3921,9 +4223,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "%s tarafından şuraya yönlendirilmiş: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Arşiv dosyalarını incelemek için dpkg --info (= dpkg-deb --info), içeriğini\n"
 "listelemek için dpkg --contents (= dpkg-deb --contents) komutunu kullanın.\n"
@@ -3964,19 +4269,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "Debian %s paket yönetim programı sorgulama aracı sürüm %s.\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4165,6 +4484,12 @@ msgstr ""
 "dpkg'ın düzgün çalışabilmesi için 'admindir', 'instdir'in içinde bulunmalıdır"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "'%.250s' konumuna chroot çağrısı başarısız"
@@ -4183,10 +4508,9 @@ msgid "cannot set security execution context for maintainer script"
 msgstr "geliştirici betiğinin güvenlik bağlamı ayarlanamadı"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "installed %s script"
+#, c-format
 msgid "installed %s package %s script"
-msgstr "%s betiği kuruldu"
+msgstr "%s paketi %s betiği kuruldu"
 
 #: src/script.c
 #, c-format
@@ -4194,16 +4518,14 @@ msgid "unable to stat %s '%.250s'"
 msgstr "%s '%.250s' için stat çağrısı başarısız oldu"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "new %s script"
+#, c-format
 msgid "new %s package %s script"
-msgstr "yeni %s betiği"
+msgstr "yeni %s paketi %s betiği"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "old %s script"
+#, c-format
 msgid "old %s package %s script"
-msgstr "eski %s betiği"
+msgstr "eski %s paketi %s betiği"
 
 #: src/script.c
 #, c-format
@@ -4317,12 +4639,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4387,64 +4723,12 @@ msgstr "herhangi bir geçersiz kılma mevcut değil"
 msgid "--update is useless for --remove"
 msgstr "--remove için --update gereksizdir"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "geçersiz statoverride kullanıcı kimliği (%s)"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "geçersiz statoverride grup kimliği (%s)"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "geçersiz statoverride kipi (%s)"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "statoverride dosyası açılamadı"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "statoverride dosyasına fstat çağrısı başarısız"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "statoverride dosyası (%.250s) okunuyor"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "statoverride dosyasının sonunda yeni satır karakteri yok"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "statoverride dosyası boş satır içeriyor"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "statoverride dosyasında söz dizimi hatası"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "'statoverride' dosyasında bilinmeyen '%s' kullanıcısı"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "statoverride dosyasında beklenmeyen satır sonu"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "'statoverride' dosyasında bilinmeyen '%s' grubu"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "'%.250s' dosyası için birden fazla statoverride dosyası mevcut"
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr ""
+"'--%s' seçeneği kullanımdan kalkmıştır; lütfen bunun yerine '--%s' kullanın"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4661,6 +4945,12 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Yapılandırma kaldırılıyor: %s (%s) ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "statoverride dosyası boş satır içeriyor"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4799,11 +5089,9 @@ msgid "package filesystem archive extraction"
 msgstr "paket dosya sistemi arşiv açma"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "dpkg-deb tar çıktısı okunamadı"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "bozuk dosya sistemi tar dosyası - bozuk paket arşivi"
 
 #: src/unpack.c
@@ -4817,16 +5105,22 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s seçeneği en fazla bir adet Paket-dosyası argümanı alır"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "toplu kullanılabilir paketler güncellemesi için dpkg durum alanına "
 "erişilemedi"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"toplu kullanılabilir paketler güncelleştirmesi dpkg durum alanına yazma "
-"erişimi gerektirir"
+"toplu kullanılabilir paketler güncellemesi için dpkg durum alanına "
+"erişilemedi"
 
 #: src/update.c
 #, c-format
@@ -5063,11 +5357,10 @@ msgstr ""
 "'%.250s' dosyası bozuk - arşiv başlığındaki sürüm numarası kısmı geçersiz"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "file '%.250s' is not a debian binary archive (try dpkg-split?)"
+#, c-format
 msgid "file '%.250s' is not a Debian binary archive (try dpkg-split?)"
 msgstr ""
-"'%.250s' dosyası bir debian ikili arşivi değil (dpkg-split kullanmayı "
+"'%.250s' dosyası bir Debian ikili arşivi değil (dpkg-split kullanmayı "
 "deneyin)"
 
 #: dpkg-deb/extract.c
@@ -5114,15 +5407,12 @@ msgid "archive '%.250s' contains two control members, giving up"
 msgstr "'%.250s' arşivi iki denetim öğesine sahip, pes ediliyor"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " new debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd bytes.\n"
+#, c-format
 msgid ""
 " new Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
 msgstr ""
-" yeni debian paketi, sürüm %d.%d.\n"
+" yeni Debian paketi, sürüm %d.%d.\n"
 " boyut %jd bayt: denetim arşivi=%jd bayt.\n"
 
 #: dpkg-deb/extract.c
@@ -5140,15 +5430,12 @@ msgid "cannot skip archive control member from '%s': %s"
 msgstr "'%s' arşivinin arşiv denetim üyesi atlanamıyor: %s"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " old debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd, main archive=%jd.\n"
+#, c-format
 msgid ""
 " old Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgstr ""
-" eski debian paketi, sürüm %d.%d.\n"
+" eski Debian paketi, sürüm %d.%d.\n"
 " boyut %jd bayt: denetim arşivi=%jd, ana arşiv=%jd.\n"
 
 #: dpkg-deb/extract.c
@@ -5160,10 +5447,9 @@ msgstr ""
 " inmiş bir arşive benziyor"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "'%.255s' is not a debian format archive"
+#, c-format
 msgid "'%.255s' is not a Debian format archive"
-msgstr "'%.255s' dosyası debian biçimli bir arşiv değil"
+msgstr "'%.255s' dosyası Debian biçimli bir arşiv değil"
 
 #: dpkg-deb/extract.c
 #, c-format
@@ -5179,16 +5465,17 @@ msgid "decompressing archive member"
 msgstr "sıkıştırılmış arşiv üyesi açılıyor"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "dizine geçilemedi"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "dizin oluşturulamadı"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "dizin oluşturulduktan sonra dizine geçilemedi"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr ""
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "dizine geçilemedi"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5345,31 +5632,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  -v, --verbose                    Enable verbose output.\n"
-#| "  -D, --debug                      Enable debugging output.\n"
-#| "      --showformat=<format>        Use alternative format for --show.\n"
-#| "      --deb-format=<format>        Select archive format.\n"
-#| "                                     Allowed values: 0.939000, 2.0 "
-#| "(default).\n"
-#| "      --nocheck                    Suppress control file check (build "
-#| "bad\n"
-#| "                                     packages).\n"
-#| "      --uniform-compression        Use the compression params on all "
-#| "members.\n"
-#| "  -z#                              Set the compression level when "
-#| "building.\n"
-#| "  -Z<type>                         Set the compression type used when "
-#| "building.\n"
-#| "                                     Allowed types: gzip, xz, none.\n"
-#| "  -S<strategy>                     Set the compression strategy when "
-#| "building.\n"
-#| "                                     Allowed values: none; extreme (xz);\n"
-#| "                                     filtered, huffman, rle, fixed "
-#| "(gzip).\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  -v, --verbose                    Enable verbose output.\n"
@@ -5402,14 +5665,14 @@ msgstr ""
 "      --nocheck                    Denetim dosyasını denetleme (bozuk "
 "paketleri\n"
 "                                     inşa et)\n"
-"      --uniform-compression        Sıkıştırma ayarlarını tüm üyelerde "
+"      --root-owner-group           Sahip ve grupları root yap.\n"
+"      --[no-]uniform-compression   Sıkıştırma ayarlarını tüm üyelerde "
 "kullan\n"
 "  -z#                              İnşa esnasında kullanılacak sıkıştırma "
 "değeri\n"
 "  -Z<tür>                          İnşa esnasında kullanılacak sıkıştırma "
 "türü\n"
-"                                     Türler: gzip, xz, bzip2, none "
-"(hiçbiri)\n"
+"                                     Türler: gzip, xz, none (hiçbiri)\n"
 "  -S<strateji>                     İnşa esnasında kullanılacak sıkıştırma "
 "stra-\n"
 "                                     tejisi. İzin verilen: none; extreme "
@@ -6032,7 +6295,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6042,8 +6319,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6553,18 +6831,87 @@ msgstr ""
 #: utils/update-alternatives.polkit.in
 msgid "Run update-alternatives to modify system alternative selections"
 msgstr ""
+"Sistemdeki alternatif seçimlerini değiştirmek için update-alternatives "
+"komutunu kullanın"
 
 #: utils/update-alternatives.polkit.in
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
+"update-alternatives komutunu çalıştırmak için kimlik doğrulama gerekmektedir"
+
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "kilit dosyası %s denetim amaçlı açılamadı"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "'statoverride' dosyasında bilinmeyen '%s' kullanıcısı"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "'statoverride' dosyasında bilinmeyen '%s' grubu"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s eksik"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "%2$s için '%1$.50s' değeri kullanılamaz"
+
+#~ msgid "junk after %s"
+#~ msgstr "%s alanından sonraki veriler geçersiz"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "geçersiz paket adı (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "mantıksal alanda evet/hayır değeri"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "'%s' alanı, '%.255s' referansı: sürüm hatalı"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s değeri belirtilmemiş"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr ""
+#~ "paket 'triggers-awaited' durumunda ama hiçbir tetikleyici beklenmiyor"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
+#~ msgid "package has status triggers-pending but no triggers pending"
 #~ msgstr ""
-#~ "'--%s' seçeneği kullanımdan kalkmıştır; lütfen bunun yerine '--%s' "
-#~ "kullanın"
+#~ "paket 'triggers-pending' durumunda ama askıda olan hiçbir tetikleyici yok"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "toplu kullanılabilir paketler güncelleştirmesi dpkg durum alanına yazma "
+#~ "erişimi gerektirir"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "dpkg-deb tar çıktısı okunamadı"
+
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "'%2$s' paketinin denetim dosyası (%1$s) açılamıyor"
+
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "'%2$s' paketinin denetim dosyasına (%1$s) stat çağrısı yapılamıyor"
+
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "'%2$s' paketinin '%1$s' dosyası normal bir dosya değil"
+
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "'%2$s' paketinin denetim dosyası (%1$s) kapatılamıyor"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "'%.250s' paketinin dosyalarını listeleyen dosya açılamadı"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "'%.250s' paketinin dosyalarını listeleyen dosyaya stat çağrısı yapılamadı"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "'%.250s' paketinin dosya listesi sıradan bir dosya değil"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "'%.250s' paketinin dosya listesi okunuyor"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "'%s' denetim dosyasında eksik değer"
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "dizin oluşturulduktan sonra dizine geçilemedi"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "'%s' denetim dosyasında eksik bir değer ayırıcı var"
diff --git a/po/vi.po b/po/vi.po
index 8ef4e3253..8ace1b490 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.18.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2016-01-14 08:22+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <debian-l10n-vietnamese@lists.debian.org>\n"
@@ -140,7 +140,8 @@ msgstr "không thể gỡ bỏ tập tin sao lưu dự phòng cũ “%s”"
 msgid "error creating new backup file '%s'"
 msgstr "không thể tạo tập tin sao lưu dự phòng mới “%s”"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "không thể gỡ bỏ “%.250s”"
@@ -344,20 +345,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "không thể tìm vị trí tới đầu của %.250s sau khi đệm lót"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "không thể mở tập tin khóa %s để thử"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "không thể lấy filedescriptor (mô tả tập tin) cho thư mục “%s”"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "không thể mở/tạo tập tin khóa của cơ sở dữ liệu trạng thái"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "không thể mở/tạo tập tin khóa của cơ sở dữ liệu trạng thái"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "bạn không có quyền khóa cơ sở dữ liệu trạng thái của dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "cơ sở dữ liệu trạng thái dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -365,11 +383,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "thao tác đã yêu cầu cần quyền của siêu người dùng (superuser)"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "không thể truy cập vùng trạng thái của dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "thao tác yêu cầu cần có quyền đọc/ghi trong vùng trạng thái của dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -407,6 +429,193 @@ msgstr "không thể đóng trạng thái đã cập nhật của “%.250s”"
 msgid "unable to install updated status of '%.250s'"
 msgstr "không thể cài đặt trạng thái đã cập nhật của “%.250s”"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "không thể kiểm tra sự tồn tại của “%.250s”"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "không thể đọc thư mục thông tin"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "gặp lỗi khi cố mở %.250s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "sai hỏng tập tin định dạng thông tin của cơ sở dữ liệu “%s”"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+"định dạng cơ sở dữ liệu thông tin (%d) là giả hoặc quá mới; hãy thử dpkg bản "
+"mới hơn"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "tập tin thông tin %s/%s không liên quan đến bất kỳ gói nào"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "lỗi tạo liên kết cứng “%.255s”"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "gặp lỗi khi ghi “%s”"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr ""
+"tập tin điều khiển “%s” cho gói “%s” còn thiếu ký tự dòng mới cuối cùng"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr ""
+"tập tin điều khiển “%s” cho gói “%s” còn thiếu ký tự dòng mới cuối cùng"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "control file '%s' for package '%s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr ""
+"tập tin điều khiển “%s” cho gói “%s” còn thiếu ký tự dòng mới cuối cùng"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "tập tin điều khiển “%s” cho gói “%s” có chứa tên tập tin rỗng"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot read '%s' control file for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "không thể đọc tập tin điều khiển “%s” cho gói “%s”"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "lỗi mở tập tin diversions (sự trệch đi)"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "lỗi fstat tập tin diversions (sự trệch đi)"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "diversions (sự trệch đi) xung đột với “%.250s” hay “%.250s”"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "gặp lỗi khi đóng tập tin liệt kê nội dung gói “%.250s”"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"thiếu tập tin liệt kê nội dung gói “%.250s”, coi gói này không có tập tin "
+"hiện thời được cài đặt"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr ""
+"tập tin liệt kê nội dung gói “%.250s” còn thiếu ký tự dòng mới cuối cùng"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "tập tin liệt kê nội dung gói “%.250s” chứa tên tập tin rỗng"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(Đang đọc cơ sở dữ liệu … "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "%d tập tin và thư mục hiện đã được cài đặt.)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "mã số người dùng statoverride không hợp lệ %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "mã số nhóm statoverride không hợp lệ %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "chế độ “statoverride” không hợp lệ %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "gặp lỗi khi mở tập tin statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "gặp lỗi khi fstat tập tin statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "đang đọc tập tin “statoverride” “%.250s”"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "tập tin statoverride còn thiếu ký tự dòng mới cuối cùng"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "tập tin statoverride chứa dòng trống"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "gặp lỗi cú pháp trong tập tin stateoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "gặp kết thúc dòng bất thường trong tập tin stateoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "có nhiều statoverride (sự ghi đè lên trạng thái) cho tập tin “%.250s”"
+
 #: lib/dpkg/deb-version.c
 #, fuzzy
 #| msgid "format version with empty major component"
@@ -542,62 +751,75 @@ msgid "internal error"
 msgstr "lỗi nội bộ (đây là lỗi)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s còn thiếu"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "tập tin điều khiển “%s” thiếu giá trị"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "”%.50s” là không được phép đối với %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Bỏ qua dòng sai: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "rác nằm sau %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "tên gói không hợp lệ (%.250s)"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "chưa cài đặt gói “%s”"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "trường chi tiết tập tin rỗng “%s”"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "không cho phép trường chi tiết tập tin “%s” trong tập tin trạng thái"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr ""
 "quá nhiều giá trị trong trường chi tiết tập tin “%s” (so với những cái khác)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
 "quá ít giá trị trong trường chi tiết tập tin “%s” (so với những cái khác)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "yes/no (có/không hay đúng/sai) trong trường lôgíc"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "đã dùng trường lạc hậu: “%s” hoặc “%s”"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "foreign/allowed/same/no trong trường bộ bốn"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "”%s” không phải là tên kiến trúc hợp lệ: %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "từ trong trường “Priority” (ưu tiên)"
 
 #: lib/dpkg/fields.c
@@ -606,25 +828,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "không cho phép giá trị cho trường “%s” trong ngữ cảnh này"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "từ thứ nhất (want [muốn]) trong trường “Status” (trạng thái)"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
 msgstr "từ thứ hai (error [lỗi]) trong trường “Status” (trạng thái)"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
 msgstr "từ thứ ba (status [trạng thái]) trong trường “Status” (trạng thái)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "lỗi trong trường “%s” chuỗi “%.250s”"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "đã dùng trường lạc hậu: “%s” hoặc “%s”"
 
 #: lib/dpkg/fields.c
@@ -633,13 +863,16 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "giá trị cho trường “%s” có dòng sai định dạng “%.*s”"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
 "giá trị cho trường “%s” có dòng bắt đầu không bằng một khoảng trống “%c”"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "thư mục gốc hay rỗng được liệt kê như là một tập tin cấu hình"
 
 #: lib/dpkg/fields.c
@@ -720,9 +953,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "trường “%s”, tham chiếu đến “%.255s”: phiên bản chưa được kết thúc"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "trường “%s”, tham chiếu đến “%.255s”: gặp lỗi trong phiên bản"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "trường “%s”, tham chiếu đến “%.255s”: phiên bản chứa “%c”"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -730,8 +964,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "trường “%s”, lỗi cú pháp ở sau tham chiếu đến gói “%.255s”"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "không cho phép cái thay thế (“|”) trong trường %s"
 
 #: lib/dpkg/fields.c
@@ -770,6 +1005,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "không thể đặt chế độ của tập tin đích “%.250s”"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat file '%s'"
+msgid "cannot stat %s"
+msgstr "không thể lấy thống kê tập tin “%s”"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "tập tin cấu hình “%s” không phải là một tập tin tiêu chuẩn"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot read %s"
+msgstr "không thể nối thêm vào “%s”"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "không thể nối thêm vào “%s”"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "không thể khóa “%s”"
@@ -790,8 +1049,22 @@ msgid "unable to lock %s"
 msgstr "không thể khóa %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "hiển thị tập tin trên trang"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "không thể nối thêm vào “%s”"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "không thể đẩy dữ liệu của tập tin “%s” lên đĩa"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "không thể chuyển hướng tập tin “%s” tới chính nó"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -813,13 +1086,13 @@ msgstr "lỗi cấp phát bộ nhớ"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "lỗi dup (nhân đôi?) cho std%s"
+msgid "failed to dup for fd %d"
+msgstr "lỗi dup (nhân đôi?) cho fd %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "lỗi dup (nhân đôi?) cho fd %d"
+msgid "failed to dup for std%s"
+msgstr "lỗi dup (nhân đôi?) cho std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -956,27 +1229,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "giá trị nhân đôi cho trường do người dùng xác định “%.*s”"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "thiếu %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "giá trị rỗng cho %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "giá trị nhân đôi cho trường “%s”"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "gói có trường “%s” nhưng lại thiếu kiến trúc"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "gói có trường “%s” nhưng đây là kiến trúc chung"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "Config-Version cho gói với Status (trạng thái) không thích hợp"
 
 #: lib/dpkg/parse.c
@@ -985,8 +1264,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "gói có trạng thái %s nhưng đang cần các bẫy"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "gói có trạng thái mong đợi bẫy nhưng chẳng có bẫy mong đợi nào cả"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "gói có trạng thái %s nhưng đang cần các bẫy"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -994,11 +1275,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "gói có trạng thái %s nhưng có bẫy chưa xử lý"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "gói có trạng thái bẫy chưa xử lý nhưng không có bẫy chưa xử lý nào cả"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "gói có trạng thái %s nhưng có bẫy chưa xử lý"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "Gói trong trạng thái not-installed (chưa cài đặt) có các tập tin cấu hình, "
 "quên chúng đi"
@@ -1020,10 +1305,13 @@ msgstr ""
 "như chắc chắn có căn nguyên do cập nhật từ kho dpkg không chính thức"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr ""
 "%s %s (Đa-kiến-trúc: %s) không “co-installable” với %s cái mà có nhiều minh "
 "dụ đã được cài đặt"
@@ -1212,11 +1500,6 @@ msgstr "không thể gỡ bỏ “%.255s” một cách an toàn"
 msgid "rm command for cleanup"
 msgstr "chạy lệnh “rm” để dọn dẹp"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "tên gói chưa rõ rang “%s” vói nhiều hơn một thực thể được cài đặt"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1230,6 +1513,16 @@ msgstr "độ rộng trường nằm ngoài phạm vi cho phép"
 msgid "missing closing brace"
 msgstr "thiếu dấu ngoặc ôm"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "tên gói chưa rõ rang “%s” vói nhiều hơn một thực thể được cài đặt"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(không có mô tả)"
@@ -1317,6 +1610,70 @@ msgstr "tiến trình con %s bị lỗi với mã trạng thái chờ %d"
 msgid "wait for %s subprocess failed"
 msgstr "gặp lỗi chờ tiến trình con %s"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "ký tự “%c” trong độ rộng trường không hợp lệ"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "ký tự “%c” trong độ rộng trường không hợp lệ"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "mã số người dùng statoverride không hợp lệ %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "mã số nhóm statoverride không hợp lệ %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "ký tự “%c” trong độ rộng trường không hợp lệ"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "các tùy chọn không được hỗ trợ trong phần đầu tập tin"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "không hiểu kiểu nén “%s”!"
+
 #: lib/dpkg/treewalk.c
 #, fuzzy, c-format
 #| msgid "cannot stat file '%s'"
@@ -1336,12 +1693,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "thư mục điều khiển không phải là một thư mục"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "không thể mở/tạo tập tin khóa bẫy “%.250s”"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "khu vực bẫy"
 
 #: lib/dpkg/trigdeferred.c
@@ -1560,11 +1920,6 @@ msgstr "lỗi tạo ống dẫn “%.255s”"
 msgid "error creating device '%.255s'"
 msgstr "lỗi tạo thiết bị “%.255s”"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "lỗi tạo liên kết cứng “%.255s”"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1882,10 +2237,10 @@ msgstr "không thể truy cập kho lưu"
 msgid "archive '%s' is not a regular file"
 msgstr "tập tin cấu hình “%s” không phải là một tập tin tiêu chuẩn"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<đầu ra tiêu chuẩn>"
 
@@ -2070,6 +2425,10 @@ msgid "conffile difference visualizer"
 msgstr "Công cụ quan sát sự khác biệt của tập tin cấu hình"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Gõ “exit” (thoát) một khi hoàn tất.\n"
 
@@ -2425,7 +2784,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2434,7 +2807,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2469,6 +2845,12 @@ msgstr ""
 "Văn lệnh chạy sau khi cài đặt hoặc gỡ bỏ gói thì cũng phải ghi rõ “--"
 "package” và “--divert”.\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2590,6 +2972,13 @@ msgstr ""
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "Không có sự làm trệch “%s” nào nên không gỡ bỏ.\n"
 
@@ -2633,19 +3022,6 @@ msgstr "“package” (gói) không thể chứa ký tự dòng mới"
 msgid "divert-to may not contain newlines"
 msgstr "“divert-to” (chuyển hướng tới) không thể chứa ký tự dòng mới"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "lỗi mở tập tin diversions (sự trệch đi)"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "lỗi fstat tập tin diversions (sự trệch đi)"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "diversions (sự trệch đi) xung đột với “%.250s” hay “%.250s”"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2953,121 +3329,176 @@ msgstr ""
 "Gói %s bị giữ lại nên không thao tác nó. Dùng “--force-hold” (buộc giữ lại) "
 "để đè.\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
+#: src/force.c
+msgid "Set all force options"
+msgstr "Đặt các tùy chọn ép buộc (force)"
+
+#: src/force.c
+msgid "Use MAC based security if available"
 msgstr ""
-"có quyền cao hơn vấn đề này vì tùy chọn “--force” (ép buộc) đã được hiệu "
-"lực: "
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Thay thế một gói bằng một phiên bản cũ hơn"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Cấu hình mọi gói mà nó có thể hỗ trợ gói này"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Xử lý các gói phụ ngay cả khi được giữ lại"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
 msgstr ""
-"tập tin điều khiển “%s” cho gói “%s” còn thiếu ký tự dòng mới cuối cùng"
+"Thử cài/bỏ cài đặt những thứ ngay cả khi không phải siêu người dùng (root)"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "Biến PATH thiếu các chương trình quan trọng, trục trặc có thể xảy ra"
+
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Cài đặt một gói thậm chí ngay cả khi không qua kiểm tra độ tin cậy"
+
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Xử lý thậm chí các gói với phiên bản sai"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
 msgstr ""
-"tập tin điều khiển “%s” cho gói “%s” còn thiếu ký tự dòng mới cuối cùng"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "control file '%s' for package '%s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
 msgstr ""
-"tập tin điều khiển “%s” cho gói “%s” còn thiếu ký tự dòng mới cuối cùng"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "tập tin điều khiển “%s” cho gói “%s” có chứa tên tập tin rỗng"
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Ghi đè lên tập tin từ một gói bằng một cái khác"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot open '%s' control file for package '%s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "không thể mở tập tin điều khiển “%s” cho gói “%s”"
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Ghi đè một tập tin “diverted” bằng một phiên bản “undiverted”"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot stat '%s' control file for package '%s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "không thể lấy thống kê tập tin điều khiển “%s” cho gói “%s”"
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Ghi đè một thư mục của gói bằng tập tin của cái khác"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "'%s' file for package '%s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "tập tin “%s” cho gói “%s” không phải là tập tin thường"
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Không thực hiện các thao tác I/O an toàn khi giải nén gói"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot read '%s' control file for package '%s'"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "không thể đọc tập tin điều khiển “%s” cho gói “%s”"
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot close '%s' control file for package '%s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "không thể đóng tập tin điều khiển “%s” cho gói “%s”"
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Luôn dùng các tập tin cấu hình mới, không cần hỏi"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "không thể mở tập tin liệt kê nội dung gói “%.250s”"
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Luôn dùng các tập tin cấu hình cũ, không cần hỏi"
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"thiếu tập tin liệt kê nội dung gói “%.250s”, coi gói này không có tập tin "
-"hiện thời được cài đặt"
+"Dùng tùy chọn mặc định cho các tập tin cấu hình mới nếu có một\n"
+"cái sẵn để dùng, đừng hỏi lại. Nếu không tìm thấy cái mặc định nào,\n"
+"bạn sẽ được nhắc trừ phi có một tùy chọn cấu hình cũ\n"
+"hoặc mới cũng đồng thời được đưa ra"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "không thể lấy thống kê về tập tin liệt kê nội dung gói “%.250s”"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "Luôn cài đặt các tập tin cấu hình còn thiếu"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "tập tin liệt kê nội dung gói “%.250s” không phải là tập tin thường"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "Đề nghị thay thế tập tin cấu hình bằng cái có phiên bản không mới hơn"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "đọc danh sách tập tin từ gói “%.250s”"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Xử lý ngay cả khi các gói có kiến trúc sai hoặc không có kiến trúc"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Cài đặt ngay cả khi nó có thể làm hỏng gói khác"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Cho phép sự cài đặt của các gói xung đột"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Đặt tất cả các vấn đề liên quan đến phụ thuộc thành cảnh báo"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Đặt tất cả các vấn đề liên quan đến phiên bản thành cảnh báo"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Gõ bỏ các gói, cái mà được yêu cầu cài đặt"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Gỡ bỏ một gói cơ bản"
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
 msgstr ""
-"tập tin liệt kê nội dung gói “%.250s” còn thiếu ký tự dòng mới cuối cùng"
+"các tùy chọn ép buộc cho %s - điều khiển cách ứng xử khi trục trặc nảy "
+"sinh:\n"
+"  cảnh báo nhưng vẫn tiếp tục:  --force-<thứ>,<thứ>,…\n"
+"  dừng lại với lỗi:             --refuse-<thứ>,<thứ>,… | --no-force-<thứ>,…\n"
+" Các “thứ” ép buộc là:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "tập tin liệt kê nội dung gói “%.250s” chứa tên tập tin rỗng"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"CẢNH BÁO - dùng các tùy chọn được đánh dấu [!] có thể\n"
+"gây nên các lỗi nghiêm trong đối với việc cài đặt của bạn.\n"
+"Ép buộc các tùy chọn được đánh dấu [*] được bật theo mặc định.\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "gặp lỗi khi đóng tập tin liệt kê nội dung gói “%.250s”"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Đang đọc cơ sở dữ liệu … "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "không rõ tùy chọn ép buộc hoặc từ chối “%.*s”"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "%d tập tin và thư mục hiện đã được cài đặt.)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "tùy chọn ép buộc hoặc từ chối đã lạc hậu “%s”"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr ""
+"có quyền cao hơn vấn đề này vì tùy chọn “--force” (ép buộc) đã được hiệu "
+"lực: "
 
 #: src/help.c
 msgid "not installed"
@@ -3132,42 +3563,6 @@ msgstr ""
 "Chú ý: biến PATH của siêu người dùng thường nên chứa “/usr/local/sbin”, “/"
 "usr/sbin” và “/sbin”"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "không thể kiểm tra sự tồn tại của “%.250s”"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "không thể đọc thư mục thông tin"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "gặp lỗi khi cố mở %.250s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "sai hỏng tập tin định dạng thông tin của cơ sở dữ liệu “%s”"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-"định dạng cơ sở dữ liệu thông tin (%d) là giả hoặc quá mới; hãy thử dpkg bản "
-"mới hơn"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "tập tin thông tin %s/%s không liên quan đến bất kỳ gói nào"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "gặp lỗi khi ghi “%s”"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3218,27 +3613,27 @@ msgstr "Chương trình quản lý gói Debian “%s”, phiên bản %s.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3483,115 +3878,6 @@ msgstr ""
 "“more”!"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "Đặt các tùy chọn ép buộc (force)"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "Thay thế một gói bằng một phiên bản cũ hơn"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "Cấu hình mọi gói mà nó có thể hỗ trợ gói này"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "Xử lý các gói phụ ngay cả khi được giữ lại"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr ""
-"Thử cài/bỏ cài đặt những thứ ngay cả khi không phải siêu người dùng (root)"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "Biến PATH thiếu các chương trình quan trọng, trục trặc có thể xảy ra"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "Cài đặt một gói thậm chí ngay cả khi không qua kiểm tra độ tin cậy"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "Xử lý thậm chí các gói với phiên bản sai"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "Ghi đè lên tập tin từ một gói bằng một cái khác"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "Ghi đè một tập tin “diverted” bằng một phiên bản “undiverted”"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "Ghi đè một thư mục của gói bằng tập tin của cái khác"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "Không thực hiện các thao tác I/O an toàn khi giải nén gói"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "Luôn dùng các tập tin cấu hình mới, không cần hỏi"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "Luôn dùng các tập tin cấu hình cũ, không cần hỏi"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"Dùng tùy chọn mặc định cho các tập tin cấu hình mới nếu có một\n"
-"cái sẵn để dùng, đừng hỏi lại. Nếu không tìm thấy cái mặc định nào,\n"
-"bạn sẽ được nhắc trừ phi có một tùy chọn cấu hình cũ\n"
-"hoặc mới cũng đồng thời được đưa ra"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "Luôn cài đặt các tập tin cấu hình còn thiếu"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "Đề nghị thay thế tập tin cấu hình bằng cái có phiên bản không mới hơn"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "Xử lý ngay cả khi các gói có kiến trúc sai hoặc không có kiến trúc"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "Cài đặt ngay cả khi nó có thể làm hỏng gói khác"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "Cho phép sự cài đặt của các gói xung đột"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "Đặt tất cả các vấn đề liên quan đến phụ thuộc thành cảnh báo"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "Đặt tất cả các vấn đề liên quan đến phiên bản thành cảnh báo"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "Gõ bỏ các gói, cái mà được yêu cầu cài đặt"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "Gỡ bỏ một gói cơ bản"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "Đại để, thông tin nào về tiến trình hữu dụng"
 
@@ -3725,42 +4011,6 @@ msgstr ""
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"các tùy chọn ép buộc cho %s - điều khiển cách ứng xử khi trục trặc nảy "
-"sinh:\n"
-"  cảnh báo nhưng vẫn tiếp tục:  --force-<thứ>,<thứ>,…\n"
-"  dừng lại với lỗi:             --refuse-<thứ>,<thứ>,… | --no-force-<thứ>,…\n"
-" Các “thứ” ép buộc là:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"CẢNH BÁO - dùng các tùy chọn được đánh dấu [!] có thể\n"
-"gây nên các lỗi nghiêm trong đối với việc cài đặt của bạn.\n"
-"Ép buộc các tùy chọn được đánh dấu [*] được bật theo mặc định.\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "không rõ tùy chọn ép buộc hoặc từ chối “%.*s”"
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "tùy chọn ép buộc hoặc từ chối đã lạc hậu “%s”"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "không thể mở “%i” cho luồng dữ liệu"
 
@@ -3941,6 +4191,12 @@ msgid "Description"
 msgstr "Mô tả"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "hiển thị tập tin trên trang"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "bị trệch bởi %s từ: %s\n"
@@ -3975,6 +4231,20 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "Gói “%s” không được cài đặt và không có thông tin nào cả"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"Dùng lệnh:\n"
+"“dpkg --info” (= “dpkg-deb --info”)\n"
+"\t\tđể kiểm tra xem các tập tin kho lưu,\n"
+"và\n"
+"“dpkg --contents” (= “dpkg-deb --contents”)\n"
+"\t\tđể liệt kê nội dung của chúng.\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "gói “%s” không sẵn sàng"
@@ -4000,9 +4270,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "bị trệch bởi %s tới: %s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "Dùng lệnh:\n"
 "“dpkg --info” (= “dpkg-deb --info”)\n"
@@ -4047,19 +4320,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "Chương trình quản lý gói %s của Debian, phiên bản %s.\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4243,6 +4530,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr "“admindir” phải nằm trong “instdir” để dpkg có thể hoạt động đúng đắn"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "lỗi chroot (chuyển gốc) tới “%.250s”"
@@ -4396,12 +4689,26 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4466,64 +4773,11 @@ msgstr "không có ghi đè hiện diện"
 msgid "--update is useless for --remove"
 msgstr "tùy chọn “--update” (cập nhật) vô ích khi có dùng “--remove” (gỡ bỏ)"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "mã số người dùng statoverride không hợp lệ %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "mã số nhóm statoverride không hợp lệ %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "chế độ “statoverride” không hợp lệ %s"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "gặp lỗi khi mở tập tin statoverride"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "gặp lỗi khi fstat tập tin statoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "đang đọc tập tin “statoverride” “%.250s”"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "tập tin statoverride còn thiếu ký tự dòng mới cuối cùng"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "tập tin statoverride chứa dòng trống"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "gặp lỗi cú pháp trong tập tin stateoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "gặp người dùng chưa biết “%s” trong tập tin stateoverride"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "gặp kết thúc dòng bất thường trong tập tin stateoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr " nhóm chưa biết “%s” trong tập tin stateoverride"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "có nhiều statoverride (sự ghi đè lên trạng thái) cho tập tin “%.250s”"
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "tùy chọn “--%s” đã lạc hậu; hãy dùng “--%s” để thay thế"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4736,6 +4990,12 @@ msgstr "Đang hủy cấu hình %s (%s), để cho phép gỡ bỏ %s (%s) …\n
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Đang hủy cấu hình %s (%s) …\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "tập tin statoverride chứa dòng trống"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4871,11 +5131,9 @@ msgid "package filesystem archive extraction"
 msgstr "sự rút trích hệ thống tập tin kho lưu của gói"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "gặp lỗi khi đọc kết xuất tar của “dpkg-deb”"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "tập tin .tar của hệ thống tập tin bị hỏng — kho lưu gói bị hỏng"
 
 #: src/unpack.c
@@ -4889,14 +5147,20 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s cần chính xác một đối số Packages-file"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr ""
 "không thể truy cập vùng trạng thái dpkg cho việc cập nhật sẵn sàng hàng loạt"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
 msgstr ""
-"việc cập nhật sẵn sàng hàng loạt yêu cầu quyền ghi vào vùng trạng thái dpkg"
+"không thể truy cập vùng trạng thái dpkg cho việc cập nhật sẵn sàng hàng loạt"
 
 #: src/update.c
 #, c-format
@@ -5248,16 +5512,18 @@ msgid "decompressing archive member"
 msgstr "giải nén thành viên kho lưu"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "gặp lỗi khi chdir (chuyển đổi thư mục) sang thư mục"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "gặp lỗi khi tạo thư mục"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "gặp lỗi khi chdir (chuyển đổi thư mục) sang thư mục sau khi tạo nó"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "gặp kết thúc tập tin bất thường trong tên gói trên dòng %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "gặp lỗi khi chdir (chuyển đổi thư mục) sang thư mục"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6102,7 +6368,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6112,8 +6392,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6625,11 +6906,85 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "tùy chọn “--%s” đã lạc hậu; hãy dùng “--%s” để thay thế"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "không thể mở tập tin khóa %s để thử"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "gặp người dùng chưa biết “%s” trong tập tin stateoverride"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr " nhóm chưa biết “%s” trong tập tin stateoverride"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s còn thiếu"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "”%.50s” là không được phép đối với %s"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "tập tin điều khiển “%s” thiếu giá trị"
+#~ msgid "junk after %s"
+#~ msgstr "rác nằm sau %s"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "tên gói không hợp lệ (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no (có/không hay đúng/sai) trong trường lôgíc"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "trường “%s”, tham chiếu đến “%.255s”: gặp lỗi trong phiên bản"
+
+#~ msgid "empty value for %s"
+#~ msgstr "giá trị rỗng cho %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "gói có trạng thái mong đợi bẫy nhưng chẳng có bẫy mong đợi nào cả"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "gói có trạng thái bẫy chưa xử lý nhưng không có bẫy chưa xử lý nào cả"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr ""
+#~ "việc cập nhật sẵn sàng hàng loạt yêu cầu quyền ghi vào vùng trạng thái "
+#~ "dpkg"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "gặp lỗi khi đọc kết xuất tar của “dpkg-deb”"
+
+#, fuzzy
+#~| msgid "cannot open '%s' control file for package '%s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "không thể mở tập tin điều khiển “%s” cho gói “%s”"
+
+#, fuzzy
+#~| msgid "cannot stat '%s' control file for package '%s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "không thể lấy thống kê tập tin điều khiển “%s” cho gói “%s”"
+
+#, fuzzy
+#~| msgid "'%s' file for package '%s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "tập tin “%s” cho gói “%s” không phải là tập tin thường"
+
+#, fuzzy
+#~| msgid "cannot close '%s' control file for package '%s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "không thể đóng tập tin điều khiển “%s” cho gói “%s”"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "không thể mở tập tin liệt kê nội dung gói “%.250s”"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "không thể lấy thống kê về tập tin liệt kê nội dung gói “%.250s”"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "tập tin liệt kê nội dung gói “%.250s” không phải là tập tin thường"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "đọc danh sách tập tin từ gói “%.250s”"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "gặp lỗi khi chdir (chuyển đổi thư mục) sang thư mục sau khi tạo nó"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "tập tin điều khiển “%s” thiếu giá trị ngăn cách"
@@ -6697,9 +7052,6 @@ msgstr ""
 #~ msgstr ""
 #~ "gặp kết thúc tập tin trên thiết bị nhập chuẩn ở dấu nhắc tập tin cấu hình"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "gặp kết thúc tập tin bất thường trong tên gói trên dòng %d"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "gặp kết thúc tập tin bất thường sau tên gói trên dòng %d"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f876b1195..c4f9c5fc5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,31 +9,32 @@
 # Anthony Wong <ypwong@debian.org.hk>, 2007.
 # Deng Xiyue <manphiz-guest@users.alioth.debian.org>, 2007, 2008, 2009.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
-# Zhou Mo <cdluminate@gmail.com>, 2014, 2015, 2016, 2017.
-# Boyuan Yang <073plan@gmail.com>, 2017.
+# Zhou Mo <cdluminate@gmail.com>, 2014, 2015, 2016, 2017, 2018, 2019.
+# Boyuan Yang <073plan@gmail.com>, 2017, 2018.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.18.x\n"
+"Project-Id-Version: dpkg 1.19.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2017-07-04 03:00+0000\n"
-"Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
+"PO-Revision-Date: 2019-01-12 00:00+0000\n"
+"Last-Translator: Mo Zhou <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.0.6\n"
 
 #: lib/dpkg/ar.c
 msgid "failed to fstat archive"
-msgstr "fstat 包文件失败"
+msgstr "在包文件上执行 fstat 失败"
 
 #: lib/dpkg/ar.c
 #, c-format
 msgid "failed to read archive '%.255s'"
-msgstr "读取包文件 %.255s 失败"
+msgstr "读取归档 %.255s 失败"
 
 #: lib/dpkg/ar.c lib/dpkg/dbmodify.c
 #, c-format
@@ -143,7 +144,8 @@ msgstr "删除旧备份文件 '%s' 时出错"
 msgid "error creating new backup file '%s'"
 msgstr "新建备份文件 '%s' 时出错"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "无法移除 %.250s"
@@ -183,7 +185,7 @@ msgstr "%s: 对等拷贝出错: %s"
 #: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding input to gzip stream"
-msgstr "%s：将输入绑定到 gzip 流出错"
+msgstr "%s：将输入绑定到 gzip 流时出错"
 
 #: lib/dpkg/compress.c
 #, c-format
@@ -198,7 +200,7 @@ msgstr "%s：内部 gzip 写入错误"
 #: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding output to gzip stream"
-msgstr "%s：将输出绑定到 gzip 流出错"
+msgstr "%s：将输出绑定到 gzip 流时出错"
 
 #: lib/dpkg/compress.c
 #, c-format
@@ -218,7 +220,7 @@ msgstr "%s：内部 gzip 写入错误：%s"
 #: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding input to bzip2 stream"
-msgstr "%s：将输入绑定到 bzip2 流失败"
+msgstr "%s：将输入绑定到 bzip2 流时失败"
 
 #: lib/dpkg/compress.c
 #, c-format
@@ -233,7 +235,7 @@ msgstr "%s：内部 bzip2 写入错误"
 #: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
-msgstr "%s：将输出绑定到 bzip2 流出错"
+msgstr "%s：将输出绑定到 bzip2 流时出错"
 
 #: lib/dpkg/compress.c
 #, c-format
@@ -275,7 +277,7 @@ msgstr "未预期的输入结束"
 
 #: lib/dpkg/compress.c
 msgid "file format not recognized"
-msgstr "无法识别文件格式"
+msgstr "文件格式无法识别"
 
 #: lib/dpkg/compress.c
 msgid "unsupported type of integrity check"
@@ -344,20 +346,39 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "补齐后无法找到 %.250s 的起始位置"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "无法打开锁文件 %s 以进行测试"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "无法获得目录 '%s' 的文件描述符"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "unable to open/create frontend lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
+msgstr "无法打开或创建前端锁"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
-msgstr "无法打开/创建状态数据库的锁文件"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "无法打开或创建状态数据库锁"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "您没有锁定 dpkg 的状态数据库的权限"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg frontend"
+msgid "dpkg frontend lock"
+msgstr "dpkg 前端"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg 状态数据库"
 
 #: lib/dpkg/dbmodify.c
@@ -365,75 +386,252 @@ msgid "requested operation requires superuser privilege"
 msgstr "所请求的操作需要超级用户权限"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "无法访问 dpkg 状态区域"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "该操作需要读写 dpkg 状态区域的权限"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "failed to remove my own update file %.255s"
-msgstr "删除自身的更新文件 %.255s 失败"
+msgstr "删除自身的更新文件 %.255s 时失败"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to write updated status of '%.250s'"
-msgstr "无法写入 %.250s 的更新状态"
+msgstr "无法写入 %.250s 的新状态"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to flush updated status of '%.250s'"
-msgstr "无法刷新 %.250s 的更新状态"
+msgstr "无法刷新 %.250s 的新状态"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to truncate for updated status of '%.250s'"
-msgstr "无法截断 %.250s 的更新状态"
+msgstr "无法截断 %.250s 的新状态"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to fsync updated status of '%.250s'"
-msgstr "无法同步 %.250s 的更新状态"
+msgstr "无法同步 %.250s 的新状态"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to close updated status of '%.250s'"
-msgstr "无法关闭 %.250s 的更新状态"
+msgstr "无法关闭 %.250s 的新状态"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to install updated status of '%.250s'"
-msgstr "无法安装 %.250s 的更新状态"
+msgstr "无法安装 %.250s 的新状态"
+
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "无法判断 %.250s 是否存在"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "无法读取 info 目录"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "试图打开 %.250s 出错"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "损坏的信息库格式文件 %s"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr "信息数据库格式(%d)是伪造的或者太新；建议尝试新版本的 dpkg"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "info file %s/%s not associated to any package"
+msgstr "info 文件 %s/%s 与任何软件包都无关"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "新建硬链接 %.255s 时出错"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "写入 %s 时发生错误"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少结尾换行符"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少值"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少值分隔符"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "软件包 '%2$s' 的控制文件 '%1$s' 含有空文件名"
+
+#: lib/dpkg/db-fsys-digest.c
+#, c-format
+msgid "loading control file '%s' for package '%s'"
+msgstr "正在读取软件包 '%2$s' 的 '%1$s' 控制文件"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "无法打开转移文件"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "无法 fstat 转移文件"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "转移项间存在着冲突关系， %.250s 和 %.250s 中只能取其一"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "loading files list file for package '%s'"
+msgstr "正在载入软件包 %s 的文件列表"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr ""
+"无法找到软件包 %.250s 的文件名列表文件，现假定该软件包目前没有任何文件被安装"
+"在系统里。"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "软件包 %.250s 的文件名列表文件缺少最后结尾的换行符"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "软件包 %.250s 的文件名列表文件含有空的文件名"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "(正在读取数据库 ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "系统当前共安装有 %d 个文件和目录。)\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride uid %s"
+msgstr "无效的 statoverride 用户ID(uid) %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "无效的 statoverride 组ID(gid) %s"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "无效的 statoverride 权限位(mode) %s"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "无法打开 statoverride 文件"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "无法 fstat statoverride 文件"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "读取 statoverride 文件 '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "statoverride 文件结尾处缺失换行符"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statoverride 文件含有空行"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "statoverride 文件中有语法错误"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "statoverride 文件有非预期的行结束符"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "存在多个 statoverride 用于文件  %.250s"
 
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty major component"
 msgid "format version with too big major component"
-msgstr "格式版本的主版本为空"
+msgstr "格式版本的主版本部分过大"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty major component"
-msgstr "格式版本的主版本为空"
+msgstr "格式版本的主版本部分为空"
 
 #: lib/dpkg/deb-version.c
 msgid "format version has no dot"
 msgstr "格式版本没有点号"
 
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty minor component"
 msgid "format version with too big minor component"
-msgstr "格式版本的次版本为空"
+msgstr "格式版本的次版本部分过大"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty minor component"
-msgstr "格式版本的次版本为空"
+msgstr "格式版本的次版本部分为空"
 
 #: lib/dpkg/deb-version.c
 msgid "format version followed by junk"
-msgstr "格式版本后缀多余"
+msgstr "格式版本含有多余成分"
 
 #: lib/dpkg/dir.c
 #, c-format
@@ -464,7 +662,7 @@ msgstr "无法同步文件 %s"
 #: lib/dpkg/dump.c
 #, c-format
 msgid "failed to write details of '%.50s' to '%.250s'"
-msgstr "将 %.50s 的详情写入至 %.250s 失败"
+msgstr "将 %.50s 的详情写入至 %.250s 时失败"
 
 #: lib/dpkg/dump.c
 #, c-format
@@ -474,7 +672,7 @@ msgstr "无法为数据库文件 %s 设置缓冲区"
 #: lib/dpkg/dump.c
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
-msgstr "将从 %2$.50s 到 %3$.250s 的资料写入 %1$s 数据库记录失败"
+msgstr "将关于 %2$.50s 的 %1$s 数据库记录写入 %3$.250s 时失败"
 
 #: lib/dpkg/ehandle.c utils/update-alternatives.c
 msgid "error"
@@ -511,7 +709,7 @@ msgstr "内存不足，建立清理条目的参数过多"
 
 #: lib/dpkg/ehandle.c
 msgid "unrecoverable fatal error, aborting"
-msgstr "无法从致命错误中恢复，中止"
+msgstr "无法恢复的致命错误，中止"
 
 #: lib/dpkg/ehandle.c
 msgid "outside error context, aborting"
@@ -522,60 +720,73 @@ msgid "internal error"
 msgstr "内部错误"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s 缺失"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "control 文件 %s 中缺少值"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.50s' 不被 %s 允许"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "跳过无效行：%s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "忽略 %s 后的数据"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "软件包名称无效(%.250s)"
+#, fuzzy, c-format
+#| msgid "package name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "软件包名 %s 无效: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
-msgstr "文件描述字段 %s 为空"
+#, fuzzy, c-format
+#| msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
+msgstr "档案详情字段 %s 为空"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
-msgstr "状态文件不允许文件描述字段 ‘%s’ "
+#, fuzzy, c-format
+#| msgid "archive details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
+msgstr "状态文件不允许档案详情字段 ‘%s’ "
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
-msgstr "文件描述字段 %s 的值过多(和其他的相比)"
+#, fuzzy, c-format
+#| msgid "too many values in archive details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
+msgstr "档案详情字段 %s 的值过多(和其他的相比)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
-msgstr "文件描述字段 %s 的值过少(和其他的相比)"
+#, fuzzy, c-format
+#| msgid "too few values in archive details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
+msgstr "档案详情字段 %s 的值过少(和其他的相比)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "布尔型字段的 yes/no"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "使用了废弃字段 %s 或者 %s "
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
-msgstr "四态字段的 foreign/allowed/same/no"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
+msgstr "四值字段中的 foreign/allowed/same/no"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "'%s' 不是有效的体系结构名称： %s"
 
 #: lib/dpkg/fields.c
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr " Priority 字段中的文字"
 
 #: lib/dpkg/fields.c
@@ -584,25 +795,33 @@ msgid "value for '%s' field not allowed in this context"
 msgstr "此处不允许 '%s' 字段的值"
 
 #: lib/dpkg/fields.c
-msgid "first (want) word in 'Status' field"
-msgstr " Status 字段的第一个词(want)"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
+msgstr " Status 字段的第一个 (want) 词"
 
 #: lib/dpkg/fields.c
-msgid "second (error) word in 'Status' field"
-msgstr " Status 字段的第二个词(error)"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
+msgstr " Status 字段的第二个 (error) 词"
 
 #: lib/dpkg/fields.c
-msgid "third (status) word in 'Status' field"
-msgstr " Status 字段的第三个词(status)"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
+msgstr " Status 字段的第三个 (status) 词"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "error in '%s' field string '%.250s'"
+#, fuzzy, c-format
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
 msgstr "'%s' 字段的字符串 %.250s 中有错误"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "obsolete '%s' or '%s' field used"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
 msgstr "使用了废弃字段 %s 或者 %s "
 
 #: lib/dpkg/fields.c
@@ -611,19 +830,22 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "'%s' 字段的值有行格式有误: '%.*s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "value for '%s' has line starting with non-space '%c'"
+#, fuzzy, c-format
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr "'%s' 字段的值有以非空格字符 '%c' 开头的行"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
-msgstr "根目录或是空目录也被列为 conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
+msgstr "根目录或空目录被列为 conffile"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid ""
 "'%s' field, missing package name, or garbage where package name expected"
-msgstr "%s\" 字段缺少软件包名，或者填写的软件包名无意义"
+msgstr "%s\" 字段中缺少软件包名，或者填写的软件包名无效"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -635,7 +857,7 @@ msgstr "%s 字段，无效的软件包名 %.255s :%s"
 msgid ""
 "'%s' field, missing architecture name, or garbage where architecture name "
 "expected"
-msgstr "'%s' 字段缺少体系结构名，或者填写的体系结构名称无意义"
+msgstr "'%s' 字段缺少体系结构名，或者填写的体系结构名称无效"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -658,8 +880,8 @@ msgid ""
 "'%s' field, reference to '%.255s':\n"
 " '%c' is obsolete, use '%c=' or '%c%c' instead"
 msgstr ""
-"%s 字段，引用 %.255s :\n"
-"  %c  已被废弃，请使用 %c= 或者 %c%c "
+"'%s' 字段，引用 '%.255s' :\n"
+" '%c'  已被废弃，请使用 '%c=' 或者 '%c%c' "
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -667,8 +889,8 @@ msgid ""
 "'%s' field, reference to '%.255s':\n"
 " implicit exact match on version number, suggest using '=' instead"
 msgstr ""
-"%s 字段，引用 %.255s :\n"
-" 未明确要求版本号完全一致，建议使用 ‘=‘"
+"'%s' 字段，引用 '%.255s' :\n"
+" 未明确要求版本号完全一致，建议使用 '='"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -681,33 +903,35 @@ msgid ""
 "'%s' field, reference to '%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
-"%s 字段，引用 %.255s :\n"
+"'%s' 字段，引用 '%.255s' :\n"
 " 版本号以非字母数字字符开头，建议加一个空格"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, reference to '%.255s': version contains '%c'"
-msgstr "%s 字段，引用 %.255s ：版本号含有 %c "
+msgstr "'%s' 字段，引用 '%.255s' ：版本号含有 '%c' "
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, reference to '%.255s': version unterminated"
-msgstr "%s 字段，引用 %.255s ：版本号未终止"
+msgstr "'%s' 字段，引用 '%.255s' ：版本号未终止"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "%s 字段，引用 %.255s ：版本号错误"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "'%s' 字段，引用 '%.255s' ：版本号含有 '%c' "
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, syntax error after reference to package '%.255s'"
-msgstr "%s 字段，在引用软件包 %.255s 后有语法错误"
+msgstr "'%s' 字段，在引用软件包 '%.255s' 后有语法错误"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
-msgstr "%s 字段不能含有可替换符('|')"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
+msgstr "%s 字段不能含有可替换符 ('|')"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -746,6 +970,26 @@ msgstr "无法设置文件 %.250s 的权限位"
 
 #: lib/dpkg/file.c
 #, c-format
+msgid "cannot stat %s"
+msgstr "无法 stat %s"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "%s is not a regular file"
+msgstr "%s 不是普通文件"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot read %s"
+msgstr "无法读取 %s"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot open %s"
+msgstr "无法打开 %s"
+
+#: lib/dpkg/file.c
+#, c-format
 msgid "unable to unlock %s"
 msgstr "无法解锁 %s"
 
@@ -765,8 +1009,18 @@ msgid "unable to lock %s"
 msgstr "无法锁定 %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "在分页器中显示文件内容"
+#, c-format
+msgid "cannot open file %s"
+msgstr "无法打开文件 %s"
+
+#: lib/dpkg/file.c
+msgid "pager to show file"
+msgstr "用于显示文件的分页器"
+
+#: lib/dpkg/file.c
+#, c-format
+msgid "cannot write file %s into the pager"
+msgstr "无法写入文件 %s 到分页器"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -775,7 +1029,7 @@ msgstr "无法打开日志文件 %s ：%s"
 
 #: lib/dpkg/log.c
 msgid "<package status and progress file descriptor>"
-msgstr "<包状态和进度文件描述符>"
+msgstr "<软件包状态和进度文件描述符>"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -788,13 +1042,13 @@ msgstr "分配内存失败"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "无法 dup std%s"
+msgid "failed to dup for fd %d"
+msgstr "无法 dup 文件描述符 %d"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "无法 dup 文件描述符 %d"
+msgid "failed to dup for std%s"
+msgstr "无法 dup std%s"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -898,7 +1152,7 @@ msgstr "-%c 选项不需要参数"
 #: lib/dpkg/options.c dpkg-split/main.c
 #, c-format
 msgid "invalid integer for --%s: '%.250s'"
-msgstr "--%s 有一个无效的整数： %.250s"
+msgstr "--%s 接受到无效的整数： %.250s"
 
 #: lib/dpkg/options.c
 #, c-format
@@ -931,27 +1185,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "有多个值对应于用户自定义字段 %.*s "
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "找不到 %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s 的值为空"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "有多个值对应于字段 %s "
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "软件包有 '%s' 字段，但缺失体系结构"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "软件包有 %s 字段，但体系结构为“全部”"
 
 #: lib/dpkg/parse.c
-msgid "Config-Version for package with inappropriate Status"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "软件包有 Config-Version 的标志，但与安装状态不符"
 
 #: lib/dpkg/parse.c
@@ -960,8 +1220,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "软件包有 %s 状态，但触发器在等待"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "软件包处于触发器等待状态，但没有触发器在等待"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "软件包有 %s 状态，但触发器在等待"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -969,11 +1231,15 @@ msgid "package has status %s but triggers are pending"
 msgstr "软件包处于 %s 状态，但是触发器处于未决状态"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "软件包处于触发器未决状态，但没有触发器处于未决状态"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "软件包处于 %s 状态，但是触发器处于未决状态"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "该软件包的状态是尚未安装，但它有 conffiles ，忽略它们"
 
 #: lib/dpkg/parse.c
@@ -991,10 +1257,13 @@ msgstr ""
 "进行过升级"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr "%s %s (多体系结构: %s) 不能与 %s 共存，它有多个安装实例"
 
 #: lib/dpkg/parse.c
@@ -1169,11 +1438,6 @@ msgstr "无法安全删除 %.255s "
 msgid "rm command for cleanup"
 msgstr "用于清理的 rm 命令"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "软件包名 '%s' 含糊不清， 它有一个以上的安装实例"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1187,9 +1451,19 @@ msgstr "字段宽度超出范围"
 msgid "missing closing brace"
 msgstr "缺少右大括号"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr "无法获取软件包 %s 的文件系统最后一次修改时间"
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "软件包名 '%s' 含糊不清， 它有一个以上的安装实例"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
-msgstr "(无可用描述)"
+msgstr "(无描述)"
 
 #: lib/dpkg/pkg-show.c
 #, c-format
@@ -1240,38 +1514,85 @@ msgid "fork failed"
 msgstr "fork 失败"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s returned error exit status %d"
+#, c-format
 msgid "%s subprocess returned error exit status %d"
-msgstr "子进程 %s 返回错误状态 %d"
+msgstr "%s 子进程返回错误状态 %d"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was interrupted"
+#, c-format
 msgid "%s subprocess was interrupted"
-msgstr "子进程 %s 被中断"
+msgstr "%s 子进程被中断"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was killed by signal (%s)%s"
+#, c-format
 msgid "%s subprocess was killed by signal (%s)%s"
-msgstr "子进程 %s 被信号(%s)%s 终止了"
+msgstr "%s 子进程被信号(%s)%s 终止了"
 
 #: lib/dpkg/subproc.c
 msgid ", core dumped"
 msgstr "，核心已转储"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s failed with wait status code %d"
+#, c-format
 msgid "%s subprocess failed with wait status code %d"
-msgstr "子进程 %s 失败，获得的等待状态号为 %d"
+msgstr "%s 子进程失败，获得的等待状态号为 %d"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "wait for subprocess %s failed"
+#, c-format
 msgid "wait for %s subprocess failed"
-msgstr "等待子进程 %s 失败"
+msgstr "等待 %s 子进程失败"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header size field"
+msgstr "tar 头部的尺寸字段无效"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header mtime field"
+msgstr "tar 头部的 mtime 字段无效"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header uid field"
+msgstr "tar 头部的 uid 字段无效"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header gid field"
+msgstr "tar 头部的 gid 字段无效"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum field"
+msgstr "tar 头部的校验和字段无效"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr "tar 头部校验和无效"
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr "部分读取的 tar 头部"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr "无效的 tar 头部，名称字段为空"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr "不支持的 GNU tar 头部类型 '%c'"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "不支持的 Solaris tar 头部类型 ‘%c'"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr "不支持的 PAX tar 头部类型 '%c'"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unknown tar header type '%c'"
+msgstr "未知的 tar 头部类型 '%c'"
 
 #: lib/dpkg/treewalk.c
 #, c-format
@@ -1286,15 +1607,18 @@ msgstr "无法打开目录 '%s'"
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "treewalk root %s is not a directory"
-msgstr "treewalk 根节点 %s 不是一个目录"
+msgstr "treewalk 的根节点 %s 不是一个目录"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
-msgstr "无法打开/创建触发器锁文件 %.250s"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
+msgstr "无法打开或创建触发器锁文件 %.250s"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "触发器区域"
 
 #: lib/dpkg/trigdeferred.c
@@ -1503,11 +1827,6 @@ msgstr "新建管道 %.255s 时出错"
 msgid "error creating device '%.255s'"
 msgstr "新建设备文件 %.255s 时出错"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "新建硬链接 %.255s 时出错"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1804,10 +2123,10 @@ msgstr "无法访问归档 '%s'"
 msgid "archive '%s' is not a regular file"
 msgstr "归档 '%s' 不是普通文件"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<标准输出>"
 
@@ -1986,6 +2305,10 @@ msgid "conffile difference visualizer"
 msgstr "conffile 差异观察器"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr "有帮助的环境变量：\n"
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "当您完成操作后，请输入 “exit”。\n"
 
@@ -2229,12 +2552,12 @@ msgstr "  已安装 %.250s，但安装的版本是 %.250s。\n"
 #: src/depcon.c
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
-msgstr "  已解包 %.250s，但仍未配置。\n"
+msgstr "  已解压 %.250s，但仍未配置。\n"
 
 #: src/depcon.c
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
-msgstr "  已解包 %.250s，但它的版本是 %.250s。\n"
+msgstr "  已解压 %.250s，但它的版本是 %.250s。\n"
 
 #: src/depcon.c
 #, c-format
@@ -2344,7 +2667,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2356,7 +2682,10 @@ msgstr ""
 "  --local                  所有软件包的版本均会被转移。\n"
 "  --divert <转移目标名>    其它软件包版本将转而使用的文件名。\n"
 "  --rename                 实际上把该文件挪开(或是还原)。\n"
+"  --no-rename              不将文件移动至旁边(或者移回)(默认)。\n"
 "  --admindir <目录名>      设置转移文件所在的目录。\n"
+"  --instdir <目录名>       设置根目录，但不包括管理员目录。\n"
+"  --root <目录名>          设置根文件系统的目录。\n"
 "  --test                   仅仅演示要进行的操作，而不是真正的执行它们。\n"
 "  --quiet                  安静模式，输出尽可能少的信息。<\n"
 "  --help                   显示本帮助信息。\n"
@@ -2376,6 +2705,12 @@ msgstr ""
 "在删除本地转移项的时候，--package 或 --local 选项和 --divert 选项必须一致。\n"
 "软件包的 preinst 和 postrm 脚本通常应当指定 --package 和 --divert 选项。\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr "请显式指定 --no-rename ，默认选项将会在 1.20.x 版本中变为 --rename 。"
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2447,7 +2782,7 @@ msgstr "被 %2$s 转移的 %1$s"
 #: src/divertcmd.c
 #, c-format
 msgid "diversion of %s to %s by %s"
-msgstr "%3$s 导致 %1$s 转移到 %2$s"
+msgstr "通过 %3$s 从 %1$s 到 %2$s 的转移"
 
 #: src/divertcmd.c
 #, c-format
@@ -2476,7 +2811,7 @@ msgstr "无法转移文件 %s 到其本身"
 #: src/divertcmd.c
 #, c-format
 msgid "Leaving '%s'\n"
-msgstr "正在离开 %s\n"
+msgstr "正在忽略 %s\n"
 
 #: src/divertcmd.c
 #, c-format
@@ -2495,6 +2830,14 @@ msgstr "忽略重命名 %s 的要求，该文件属主为转移软件包 %s\n"
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+"从至关重要的软件包中转移文件 '%s' 并重命名是非常危险的，请用 --no-rename"
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "没有转移项 %s，因此没有删除。\n"
 
@@ -2538,19 +2881,6 @@ msgstr "软件包不可以含有换行符"
 msgid "divert-to may not contain newlines"
 msgstr "转移目标名不可以含有换行符"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "无法打开转移文件"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "无法 fstat 转移文件"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "转移项间存在着冲突关系， %.250s 和 %.250s 中只能取其一"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2834,108 +3164,170 @@ msgstr ""
 "软件包 %s 被要求保持原来的版本，因而不会去改动它。请使用 --force-hold 选项来"
 "忽略该设置。\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "由于开启了 --force 选项，以下问题被忽略："
+#: src/force.c
+msgid "Set all force options"
+msgstr "设置所有的强制选项"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少结尾换行符"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少值"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "以旧版本的软件包来代替现有软件包"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少值分隔符"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "配置任何可能与这有关的软件包"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "软件包 '%2$s' 的控制文件 '%1$s' 含有空文件名"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "处理意外的软件包，即使它处于搁置状态"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "无法打开软件包 %2$s 的 %1$s 控制文件"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "以非 root 权限尝试（反）安装这些东西"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "无法取得软件包 %2$s 的 %1$s 控制文件状态"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "环境变量 PATH 里缺失重要的程序，问题可能"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "软件包 '%2$s' 的 '%1$s' 控制文件文件不是常规文件"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "安装一个软件包，即使它的真实性检查失败"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "无法读取软件包 '%2$s' 的 '%1$s' 控制文件"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "继续处理，即使软件包版本错误"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "无法关闭软件包 '%2$s' 的 '%1$s' 控制文件"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "无法打开软件包 %.250s 的文件名列表文件"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "将一个软件包的文件覆盖到另一个包的文件上"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "以原封未动的文件覆盖一个转移文件"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "用其他软件包的文件覆盖一个软件包的目录"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "不要在解压的时候进行安全I/O操作"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr "不要 chroot 到维护者脚本环境中"
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "总是使用新的配置文件，不提示"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "总是使用旧的配置文件，不提示"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
 msgstr ""
-"无法找到软件包 %.250s 的文件名列表文件，现假定该软件包目前没有任何文件被安装"
-"在系统里。"
+"当有新的配置文件时使用默认选项，不要提示。\n"
+"如果找不到默认设置，将会有提示，除非打开\n"
+"confold 或 confnew 选项"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "无法取得软件包 %.250s 的文件名列表文件"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "总是安装缺失的配置文件"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "软件包 %.250s 的文件名列表文件不是一个常规文件"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "建议不以新版本配置文件取代原有版本"
 
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "正在读取软件包 %.250s 的文件列表"
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "继续处理，即使软件包没有体系结构或者体系结构错误"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "继续安装，即使它会损坏另一个软件包"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "允许安装存在冲突的软件包"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "将所有依赖问题转为警告"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "将所有依赖版本问题转为警告"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "移除要求安装的软件包"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "移除一个至关重要的软件包"
+
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "软件包 %.250s 的文件名列表文件缺少最后结尾的换行符"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"%s 强制选项 - 当遇到问题时控制软件行为：\n"
+"  警告后仍然继续:     --force-<手段>,<手段>,...\n"
+"  遇错即停:           --refuse-<手段>,<手段>,... | --no-force-<手段>,...\n"
+" 可强制执行的“手段”:\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "软件包 %.250s 的文件名列表文件含有空的文件名"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"【警告】- 使用标记有 [!] 的选项会严重破坏您的安装。\n"
+"标记有 [*] 的强制选项默认为开启。\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "关闭软件包 %.250s 的文件名列表文件时出错"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(正在读取数据库 ... "
+#: src/force.c
+#, c-format
+msgid "unknown force/refuse option '%.*s'"
+msgstr "无法识别的 force/refuse 选项 %.*s "
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "系统当前共安装有 %d 个文件和目录。)\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "废弃的强制或拒绝选项 '%s'"
+
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "由于开启了 --force 选项，以下问题被忽略："
 
 #: src/help.c
 msgid "not installed"
@@ -2951,7 +3343,7 @@ msgstr "由于移除或安装失败而处于残损的状态"
 
 #: src/help.c
 msgid "unpacked but not configured"
-msgstr "已解包，但尚未配置"
+msgstr "已解压，但尚未配置"
 
 #: src/help.c
 msgid "broken due to postinst failure"
@@ -2996,40 +3388,6 @@ msgid ""
 msgstr ""
 "提示：root 的 PATH 环境变量通常应当包含 /usr/local/sbin、/usr/sbin 和 /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "无法判断 %.250s 是否存在"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "无法读取 info 目录"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "试图打开 %.250s 出错"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "损坏的信息库格式文件 %s"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr "信息数据库格式(%d)是伪造的或者太新；建议尝试新版本的 dpkg"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "info file %s/%s not associated to any package"
-msgstr "info 文件 %s/%s 与任何软件包都无关"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "写入 %s 时发生错误"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3039,27 +3397,27 @@ msgstr "Debian %s 软件包管理程序 %s 版。\n"
 #, c-format
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3266,113 +3624,6 @@ msgstr ""
 "more ！"
 
 #: src/main.c
-msgid "Set all force options"
-msgstr "设置所有的强制选项"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "以旧版本的软件包来代替现有软件包"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "配置任何可能与这有关的软件包"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "处理意外的软件包，即使它处于搁置状态"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "以非 root 权限尝试（反）安装这些东西"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "环境变量 PATH 里缺失重要的程序，问题可能"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "安装一个软件包，即使它的真实性检查失败"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "继续处理，即使软件包版本错误"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "将一个软件包的文件覆盖到另一个包的文件上"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "以原封未动的文件覆盖一个转移文件"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "用其他软件包的文件覆盖一个软件包的目录"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "不要在解包的时候进行安全I/O操作"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr "不要 chroot 到维护者脚本环境中"
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "总是使用新的配置文件，不提示"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "总是使用旧的配置文件，不提示"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"当有新的配置文件时使用默认选项，不要提示。\n"
-"如果找不到默认设置，将会有提示，除非打开\n"
-"confold 或 confnew 选项"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "总是安装缺失的配置文件"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "建议不以新版本配置文件取代原有版本"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "继续处理，即使软件包没有体系结构或者体系结构错误"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "继续安装，即使它会损坏另一个软件包"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "允许安装存在冲突的软件包"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "将所有依赖问题转为警告"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "将所有依赖版本问题转为警告"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "移除要求安装的软件包"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "移除一个至关重要的软件包"
-
-#: src/main.c
 msgid "Generally helpful progress information"
 msgstr "常规的进度信息"
 
@@ -3502,40 +3753,6 @@ msgstr "无法移除体系结构 %s ，当前它仍被数据库使用"
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s 强制选项 - 当遇到问题时控制软件行为：\n"
-"  警告后仍然继续:     --force-<手段>,<手段>,...\n"
-"  遇错即停:           --refuse-<手段>,<手段>,... | --no-force-<手段>,...\n"
-" 可强制执行的“手段”:\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"【警告】- 使用标记有 [!] 的选项会严重破坏您的安装。\n"
-"标记有 [*] 的强制选项默认为开启。\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "无法识别的 force/refuse 选项 %.*s "
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "废弃的强制或拒绝选项 '%s'"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "无法为流打开 %i"
 
@@ -3714,6 +3931,10 @@ msgid "Description"
 msgstr "描述"
 
 #: src/querycmd.c
+msgid "showing package list on pager"
+msgstr "在分页器中显示软件包列表"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "%s 导致转移自：%s\n"
@@ -3748,6 +3969,10 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "系统没有安装软件包 %s，因而没有相关的信息"
 
 #: src/querycmd.c
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr "使用 dpkg --info (= dpkg-deb --info) 来检测打包好的文件，\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "软件包 %s 现在不可用"
@@ -3774,11 +3999,8 @@ msgstr "被 %s 转移至：%s\n"
 
 #: src/querycmd.c
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
-msgstr ""
-"使用 dpkg --info (= dpkg-deb --info) 来检测打包好的文件，\n"
-"还可以通过 dpkg --contents (= dpkg-deb --contents) 来列出它们的内容。\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
+msgstr "通过 dpkg --contents (= dpkg-deb --contents) 来列出档案文件清单。\n"
 
 #: src/querycmd.c dpkg-deb/info.c
 #, c-format
@@ -3819,30 +4041,30 @@ msgstr "Debian %s 软件包管理程序查询工具 %s 版。\n"
 #, c-format
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
 "命令：\n"
-"  -s|--status <软件包> ...         显示软件包详尽的状态信息。\n"
-"  -p|--print-avail <软件包> ...    显示当前可供安装的版本的详细信息。\n"
-"  -L|--listfiles <软件包> ...      列出所有属于这个(些)软件包的文件。\n"
-"  -l|--list [<表达式> ...]         简要地列出软件包。\n"
-"  -W|--show <表达式> ...           显示软件包的相关信息。\n"
-"  -S|--search <表达式> ...         搜寻拥有该文件(或多个文件)的软件包。\n"
-"     --control-list <软件包>       打印软件包控制文件列表。\n"
-"     --control-show <软件包> <文件>\n"
+"  -s, --status <软件包> ...        显示软件包详尽的状态信息。\n"
+"  -p, --print-avail <软件包> ...   显示当前可供安装的版本的详细信息。\n"
+"  -L, --listfiles <软件包> ...     列出所有属于这个(些)软件包的文件。\n"
+"  -l, --list [<表达式> ...]        简要地列出软件包。\n"
+"  -W, --show <表达式> ...          显示软件包的相关信息。\n"
+"  -S, --search <表达式> ...        搜寻拥有该文件(或多个文件)的软件包。\n"
+"      --control-list <软件包>      打印软件包控制文件列表。\n"
+"      --control-show <软件包> <文件>\n"
 "                                   显示软件包控制文件。\n"
-"  -c|--control-path <软件包> [<文件>]\n"
+"  -c, --control-path <软件包> [<文件>]\n"
 "                                   显示软件包控制文件的路径。\n"
 "\n"
 
@@ -4004,6 +4226,14 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr "为了使dpkg正常工作，管理目录必须在安装目录中"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+"没有足够权限通过 --force-not-root 改变根目录，考虑用 --force-script-"
+"chrootless ?"
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "无法 chroot 到 %.250s 目录"
@@ -4022,10 +4252,9 @@ msgid "cannot set security execution context for maintainer script"
 msgstr "无法为维护者脚本设置安全执行上下文"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "installed %s script"
+#, c-format
 msgid "installed %s package %s script"
-msgstr "已安装 %s 脚本"
+msgstr "已安装 %s 软件包 %s 脚本"
 
 #: src/script.c
 #, c-format
@@ -4033,16 +4262,14 @@ msgid "unable to stat %s '%.250s'"
 msgstr "无法获取 %s  %.250s 的状态"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "new %s script"
+#, c-format
 msgid "new %s package %s script"
-msgstr "新的 %s 脚本"
+msgstr "新的 %s 软件包 %s 脚本"
 
 #: src/script.c
-#, fuzzy, c-format
-#| msgid "old %s script"
+#, c-format
 msgid "old %s package %s script"
-msgstr "旧的 %s 脚本"
+msgstr "旧的 %s 软件包 %s 脚本"
 
 #: src/script.c
 #, c-format
@@ -4149,12 +4376,29 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --admindir <directory>   set the directory with the statoverride file.\n"
+#| "  --instdir <directory>    set the root directory, but not the admin "
+#| "dir.\n"
+#| "  --root <directory>       set the directory of the root filesystem.\n"
+#| "  --update                 immediately update <path> permissions.\n"
+#| "  --force                  force an action even if a sanity check fails.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -4162,6 +4406,8 @@ msgid ""
 msgstr ""
 "选项：\n"
 "  --admindir <目录>        设置 statoverride 文件的目录。\n"
+"  --instdir <directory>    设置根目录，但不包括管理员目录。\n"
+"  --root <directory>       设置根文件系统的目录。\n"
 "  --update                 立即更新 <路径> 的权限。\n"
 "  --force                  就算没有通过自检，也强制执行操作。\n"
 "  --quiet                  安静模式，输出尽可能少的信息。不显示输出信息。\n"
@@ -4215,64 +4461,11 @@ msgstr "override 不存在。"
 msgid "--update is useless for --remove"
 msgstr "对于 --remove，--update 是无效的"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "无效的 statoverride 用户ID(uid) %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "无效的 statoverride 组ID(gid) %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "无效的 statoverride 权限位(mode) %s"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "无法打开 statoverride 文件"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "无法 fstat statoverride 文件"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "读取 statoverride 文件 '%.250s'"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "statoverride 文件结尾处缺失换行符"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "statoverride 文件含有空行"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "statoverride 文件中有语法错误"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "在 statoverride 文件中有未知用户 '%s'"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "statoverride 文件有非预期的行结束符"
-
-#: src/statdb.c
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "statoverride 文件有无效组 %s "
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "存在多个 statoverride 用于文件  %.250s"
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "废弃的选项 --%s，请使用 --%s 代替"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4482,6 +4675,10 @@ msgstr "正在反配置 %s (%s)，以允许删除 %s (%s) ...\n"
 msgid "De-configuring %s (%s) ...\n"
 msgstr "正在反配置 %s (%s) ...\n"
 
+#: src/unpack.c
+msgid "conffile file contains an empty line"
+msgstr "conffile 文件含有空行"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4590,34 +4787,30 @@ msgstr "从 %2$s 获得的关于 %1$s 的信息。\n"
 #: src/unpack.c
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
-msgstr "软件包体系架构(%s)与本机系统体系结构(%s)不符"
+msgstr "软件包体系结构(%s)与本机系统体系结构(%s)不符"
 
 #: src/unpack.c
 #, c-format
 msgid "Preparing to unpack %s ...\n"
-msgstr "正准备解包 %s  ...\n"
+msgstr "准备解压 %s  ...\n"
 
 #: src/unpack.c
 #, c-format
 msgid "Unpacking %s (%s) ...\n"
-msgstr "正在解包 %s (%s) ...\n"
+msgstr "正在解压 %s (%s) ...\n"
 
 #: src/unpack.c
 #, c-format
 msgid "Unpacking %s (%s) over (%s) ...\n"
-msgstr "正在将 %s (%s) 解包到 (%s) 上 ...\n"
+msgstr "正在解压 %s (%s) 并覆盖 (%s) ...\n"
 
 #: src/unpack.c
 msgid "package filesystem archive extraction"
 msgstr "软件包文件系统归档提取"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "无法读取 dpkg-deb 输出的 tar 文件"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
-msgstr "文件系统的 tar 文件已损坏 - 软件包文件已毁损"
+msgid "corrupted filesystem tarfile in package archive"
+msgstr "软件库中的文件系统 tar 文件已损坏"
 
 #: src/unpack.c
 #, c-format
@@ -4630,12 +4823,18 @@ msgid "--%s takes at most one Packages-file argument"
 msgstr "--%s 只需要一个“软件包文件名”作为参数"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "无法访问 dpkg 的状态区域，以进行批量的可用软件包更新"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr "进行批量可用软件包的更新，需要拥有对 dpkg 状态区域的写权限"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "无法访问 dpkg 的状态区域，以进行批量的可用软件包更新"
 
 #: src/update.c
 #, c-format
@@ -4862,10 +5061,9 @@ msgid "file '%.250s' is corrupt - bad archive header magic"
 msgstr "文件 %.250s 损毁 - 归档头部魔数无效"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "file '%.250s' is not a debian binary archive (try dpkg-split?)"
+#, c-format
 msgid "file '%.250s' is not a Debian binary archive (try dpkg-split?)"
-msgstr "文件 %.250s 不是 debian 的二进制包文件(不妨尝试 dpkg-split?)"
+msgstr "文件 %.250s 不是 Debian 的二进制包文件(不妨尝试 dpkg-split?)"
 
 #: dpkg-deb/extract.c
 msgid "archive information header member"
@@ -4873,7 +5071,7 @@ msgstr "归档信息头成员"
 
 #: dpkg-deb/extract.c
 msgid "archive has no newlines in header"
-msgstr "包文件的文件头中没有换行"
+msgstr "归档文件的文件头中没有换行"
 
 #: dpkg-deb/extract.c
 #, c-format
@@ -4906,15 +5104,12 @@ msgid "archive '%.250s' contains two control members, giving up"
 msgstr "归档 %.250s 含有两个控制成员，放弃操作"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " new debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd bytes.\n"
+#, c-format
 msgid ""
 " new Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
 msgstr ""
-" 新格式的 debian 软件包，格式版本 %d.%d。\n"
+" 新格式的 Debian 软件包，格式版本 %d.%d。\n"
 " 大小 %jd 字节：主控包=%jd 字节。\n"
 
 #: dpkg-deb/extract.c
@@ -4932,16 +5127,13 @@ msgid "cannot skip archive control member from '%s': %s"
 msgstr "无法跳过 %s 中的归档 control 成员：%s"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " old debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd, main archive=%jd.\n"
+#, c-format
 msgid ""
 " old Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgstr ""
-" 旧格式的 debian 软件包，版本 %d.%d。\n"
-" 大小 %jd 字节：control 包= %jd 字节，数据及程序包= %jd。\n"
+" 旧格式的 Debian 软件包，版本 %d.%d。\n"
+" 大小 %jd 字节：主控包= %jd 字节，数据及程序包= %jd。\n"
 
 #: dpkg-deb/extract.c
 msgid ""
@@ -4952,10 +5144,9 @@ msgstr ""
 " 使用的是 ASCII 模式，从而导致了包文件被损坏"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "'%.255s' is not a debian format archive"
+#, c-format
 msgid "'%.255s' is not a Debian format archive"
-msgstr "%.255s 并非 debian 格式的包文件"
+msgstr "%.255s 并非 Debian 格式的包文件"
 
 #: dpkg-deb/extract.c
 #, c-format
@@ -4971,16 +5162,17 @@ msgid "decompressing archive member"
 msgstr "解压缩归档成员"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "chdir 到目录失败"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "新建目录失败"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "新建目录后，chdir 到该目录失败"
+#, c-format
+msgid "unexpected pre-existing pathname %s"
+msgstr "未预期的已存在路径 %s"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "chdir 到目录失败"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5131,31 +5323,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  -v, --verbose                    Enable verbose output.\n"
-#| "  -D, --debug                      Enable debugging output.\n"
-#| "      --showformat=<format>        Use alternative format for --show.\n"
-#| "      --deb-format=<format>        Select archive format.\n"
-#| "                                     Allowed values: 0.939000, 2.0 "
-#| "(default).\n"
-#| "      --nocheck                    Suppress control file check (build "
-#| "bad\n"
-#| "                                     packages).\n"
-#| "      --uniform-compression        Use the compression params on all "
-#| "members.\n"
-#| "  -z#                              Set the compression level when "
-#| "building.\n"
-#| "  -Z<type>                         Set the compression type used when "
-#| "building.\n"
-#| "                                     Allowed types: gzip, xz, none.\n"
-#| "  -S<strategy>                     Set the compression strategy when "
-#| "building.\n"
-#| "                                     Allowed values: none; extreme (xz);\n"
-#| "                                     filtered, huffman, rle, fixed "
-#| "(gzip).\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  -v, --verbose                    Enable verbose output.\n"
@@ -5179,18 +5347,19 @@ msgid ""
 "                                     filtered, huffman, rle, fixed (gzip).\n"
 "\n"
 msgstr ""
-"Options:\n"
+"选项：\n"
 "  -v, --详细                       启用详细输出。\n"
 "  -D, --debug                      启用调试信息输出。\n"
 "      --showformat=<格式>          对 --show 使用备用的输出格式。\n"
 "      --deb-format=<格式>          选择归档格式。\n"
 "                                   允许的值： 0.939000, 2.0 (默认)\n"
 "      --nocheck                    阻止控制文件的检查。(构建坏的软件包)\n"
-"      --uniform-compression        在所有成员上使用压缩参数。\n"
-"  -z#                              设置建档使用的压缩级别。\n"
-"  -Z<类型>                         设置建档使用的压缩类型。\n"
+"      --root-owner-group           强制设置文件属主和属组为 root。\n"
+"      --[no-]uniform-compression   在所有成员上使用压缩参数。\n"
+"  -z#                              设置构建时使用的压缩级别。\n"
+"  -Z<类型>                         设置构建时使用的压缩类型。\n"
 "                                     可用的类型: gzip, xz, bzip2, none.\n"
-"  -S<策略>                         设置建档时使用的压缩策略。\n"
+"  -S<策略>                         设置构建时使用的压缩策略。\n"
 "                                     可用的值: none; extreme (xz);\n"
 "                                     filtered, huffman, rle, fixed (gzip).\n"
 "\n"
@@ -5796,8 +5965,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -5808,8 +5978,9 @@ msgstr ""
 "  --force                  就算没有通过自检，也强制执行操作。\n"
 "  --skip-auto              在自动模式中跳过设置正确候选项的提示\n"
 "                           (只与 --config 有关)\n"
-"  --verbose                启用详细输出。\n"
 "  --quiet                  安静模式，输出尽可能少的信息。不显示输出信息。\n"
+"  --verbose                启用详细输出。\n"
+"  --debug                  调试输出，信息更多。\n"
 "  --help                   显示本帮助信息。\n"
 "  --version                显示版本信息。\n"
 
@@ -5913,7 +6084,7 @@ msgstr "重复路径 %s"
 msgid ""
 "alternative %s (part of link group %s) doesn't exist; removing from list of "
 "alternatives"
-msgstr "侯选项 %s(链接组 %s 的一部分)不存在；从候选项列表中移除。"
+msgstr "候选项 %s(链接组 %s 的一部分)不存在；从候选项列表中移除。"
 
 #: utils/update-alternatives.c
 msgid "priority"
@@ -6272,17 +6443,80 @@ msgstr "要恢复成自动更新请执行 %s --auto %s。"
 
 #: utils/update-alternatives.polkit.in
 msgid "Run update-alternatives to modify system alternative selections"
-msgstr ""
+msgstr "运行 update-alternatives 工具以修改系统可选项的选择情况"
 
 #: utils/update-alternatives.polkit.in
 msgid "Authentication is required to run update-alternatives"
-msgstr ""
+msgstr "需要认证后才能执行 update-alternatives"
+
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "无法打开锁文件 %s 以进行测试"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "在 statoverride 文件中有未知用户 '%s'"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "statoverride 文件有无效组 %s "
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "废弃的选项 --%s，请使用 --%s 代替"
+#~ msgid "%s is missing"
+#~ msgstr "%s 缺失"
 
-#~ msgid "control file '%s' missing value"
-#~ msgstr "control 文件 %s 中缺少值"
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "'%.50s' 不被 %s 允许"
+
+#~ msgid "junk after %s"
+#~ msgstr "%s 后有多余内容"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "软件包名称无效 (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "布尔型字段中的 yes/no"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "'%s' 字段，引用 '%.255s' ：版本号错误"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s 的值为空"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "软件包处于触发器等待状态，但没有触发器在等待"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr "软件包处于触发器未决状态，但没有触发器处于未决状态"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr "进行批量可用软件包的更新，需要拥有对 dpkg 状态区域的写权限"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "无法读取 dpkg-deb 输出的 tar 文件"
+
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "无法打开软件包 %2$s 的 %1$s 控制文件"
+
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "无法取得软件包 %2$s 的 %1$s 控制文件状态"
+
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "软件包 '%2$s' 的 '%1$s' 控制文件文件不是常规文件"
+
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "无法关闭软件包 '%2$s' 的 '%1$s' 控制文件"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "无法打开软件包 %.250s 的文件名列表文件"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "无法取得软件包 %.250s 的文件名列表文件"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "软件包 %.250s 的文件名列表文件不是一个常规文件"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "正在读取软件包 %.250s 的文件列表"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "新建目录后，chdir 到该目录失败"
 
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "control 文件 %s 缺少值分隔符"
@@ -6347,9 +6581,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "在 conffile 提示输入时在标准输入读到了 EOF "
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "在第 %d 行的软件包名中发现了文件结束符，这出乎我们的意料"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "在第 %d 行的软件包名后发现文件结束符，这出乎我们的意料"
 
@@ -6594,9 +6825,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ msgstr "这是 %s 的一个次要项"
 
-#~ msgid "cannot stat %s: %s"
-#~ msgstr "无法获取 %s 的信息：%s"
-
 #~ msgid "readlink(%s) failed: %s"
 #~ msgstr "readlink(%s) 失败：%s"
 
@@ -6621,9 +6849,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ msgstr "无法关闭 %s：%s"
 
-#~ msgid "cannot write %s: %s"
-#~ msgstr "无法写入 %s：%s"
-
 #, fuzzy
 #~| msgid "unable to open file '%s'"
 #~ msgid "unable to rename file '%s' to '%s'"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index bbdfca239..94405fda4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,14 +4,15 @@
 #
 # Asho Yeh <asho@debian.org.tw>, 2006-2012.
 # imacat <imacat@mail.imacat.idv.tw>, 2012.
+# 林博仁 <Buo.Ren.Lin@gmail.com>, 2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2015-04-07 19:10+0200\n"
-"Last-Translator: imacat <imac@mail.imacat.idv.tw>\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
+"PO-Revision-Date: 2018-04-15 07:06+0800\n"
+"Last-Translator: 林博仁 <Buo.Ren.Lin@gmail.com>\n"
 "Language-Team: Chinese (traditional) <debian-l10n-chinese@lists.debian.org>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -21,23 +22,23 @@ msgstr ""
 
 #: lib/dpkg/ar.c
 msgid "failed to fstat archive"
-msgstr "無法 fstat 取得壓縮檔的檔案資訊"
+msgstr "無法以 fstat 取得壓縮檔的檔案資訊"
 
 #: lib/dpkg/ar.c
 #, c-format
 msgid "failed to read archive '%.255s'"
-msgstr "無法讀取壓縮檔 `%.255s'"
+msgstr "無法讀取「%.255s」封存檔"
 
 #: lib/dpkg/ar.c lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to create '%.255s'"
-msgstr "無法建立 `%.255s'"
+msgstr "無法建立「%.255s」"
 
 #: lib/dpkg/ar.c lib/dpkg/dir.c src/divertcmd.c dpkg-split/join.c
 #: dpkg-split/queue.c utils/update-alternatives.c
 #, c-format
 msgid "unable to close file '%s'"
-msgstr "無法關閉檔案 '%s'"
+msgstr "無法關閉「%s」檔案"
 
 #: lib/dpkg/ar.c
 #, c-format
@@ -88,9 +89,6 @@ msgid "character '%c' not allowed (only letters, digits and characters '%s')"
 msgstr "不可有字元 `%c'（只能用英文字母、數字和字元 `%s'）"
 
 #: lib/dpkg/arch.c
-#, fuzzy
-#| msgctxt "version"
-#| msgid "<none>"
 msgctxt "architecture"
 msgid "<none>"
 msgstr "<無>"
@@ -139,7 +137,8 @@ msgstr "刪除舊備份檔發生錯誤 '%s'"
 msgid "error creating new backup file '%s'"
 msgstr "建立新備份檔發生錯誤 '%s'"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "無法刪除 `%.250s'"
@@ -306,8 +305,7 @@ msgstr "壓縮方式不明"
 msgid ""
 "updates directory contains file '%.250s' whose name is too long (length=%d, "
 "max=%d)"
-msgstr ""
-"更新目錄中包含了檔案 `%.250s'，但它的名稱太長了（長度為 %d，最大為 %d）"
+msgstr "updates 目錄中的「%.250s」檔案名稱太長了（長度為 %d，最長能允許 %d）"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
@@ -341,20 +339,37 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "在填充後無法搜尋到 %.250s 的起始位置"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "無法開啟鎖定檔 %s 測試"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "無法由 '%s' 目錄取得檔案描述"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "無法開啟／建立狀態資料庫的鎖定檔"
 
 #: lib/dpkg/dbmodify.c
-msgid "you do not have permission to lock the dpkg status database"
+#, fuzzy, c-format
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "無法開啟／建立狀態資料庫的鎖定檔"
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy, c-format
+#| msgid "you do not have permission to lock the dpkg status database"
+msgid "you do not have permission to lock the dpkg database directory %s"
 msgstr "您沒有鎖定 dpkg 的狀態資料庫的權限"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg frontend lock"
+msgstr ""
+
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "無法鎖定 dpkg 的狀態資料庫"
 
 #: lib/dpkg/dbmodify.c
@@ -362,11 +377,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "該操作需要超級使用者權限"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to access dpkg status area"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "無法存取 dpkg 狀態庫"
 
 #: lib/dpkg/dbmodify.c
-msgid "operation requires read/write access to dpkg status area"
+#, fuzzy, c-format
+#| msgid "operation requires read/write access to dpkg status area"
+msgid "required read/write access to the dpkg database directory %s"
 msgstr "該操作需要在 dpkg 狀態庫有著讀寫權限"
 
 #: lib/dpkg/dbmodify.c
@@ -404,11 +423,194 @@ msgstr "無法關閉 `%.250s' 的更新狀態"
 msgid "unable to install updated status of '%.250s'"
 msgstr "無法安裝 `%.250s' 的更新狀態"
 
+#: lib/dpkg/db-ctrl-access.c
+#, c-format
+msgid "unable to check existence of '%.250s'"
+msgstr "無法判斷 `%.250s' 是否存在"
+
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
+msgid "cannot read info directory"
+msgstr "無法讀取 info 目錄"
+
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
+#, c-format
+msgid "error trying to open %.250s"
+msgstr "在試圖開啟 %.250s 時發生錯誤"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "corrupt info database format file '%s'"
+msgstr "資訊資料庫格式檔 '%s' 損毀"
+
+#: lib/dpkg/db-ctrl-format.c
+#, c-format
+msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
+msgstr ""
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, fuzzy, c-format
+#| msgid "Info file %s/%s not associated to any package"
+msgid "info file %s/%s not associated to any package"
+msgstr "資訊檔 %s/%s 不屬於任何套件"
+
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
+#, c-format
+msgid "error creating hard link '%.255s'"
+msgstr "在建立實體連結 `%.255s' 時發生錯誤"
+
+#: lib/dpkg/db-ctrl-upgrade.c
+#, c-format
+msgid "error while writing '%s'"
+msgstr "'%s' 寫入錯誤"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing final newline"
+msgstr "套件 '%.250s' 的檔案清單，檔尾沒有換行"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value"
+msgstr "套件 '%.250s' 的檔案清單，檔尾沒有換行"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package '%.250s' is missing final newline"
+msgid "control file '%s' for package '%s' is missing value separator"
+msgstr "套件 '%.250s' 的檔案清單，檔尾沒有換行"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "files list file for package `%.250s' contains empty filename"
+msgid "control file '%s' for package '%s' contains empty filename"
+msgstr "套件 `%.250s' 的檔案清單，內有空檔名"
+
+#: lib/dpkg/db-fsys-digest.c
+#, fuzzy, c-format
+#| msgid "cannot extract control file '%s' from '%s': %s"
+msgid "loading control file '%s' for package '%s'"
+msgstr "無法由 '%2$s' 讀取設定檔 '%1$s'：%3$s"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to open diversions file"
+msgstr "無法開啟移轉檔"
+
+#: lib/dpkg/db-fsys-divert.c
+msgid "failed to fstat diversions file"
+msgstr "無法 fstat 取得移轉檔的檔案資訊"
+
+#: lib/dpkg/db-fsys-divert.c
+#, c-format
+msgid "conflicting diversions involving '%.250s' or '%.250s'"
+msgstr "移轉衝突，涉入其中的有 `%.250s' 及 `%.250s'"
+
+#: lib/dpkg/db-fsys-files.c
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "關閉套件 `%.250s' 的檔案清單時，發生錯誤"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid ""
+"files list file for package '%.250s' missing; assuming package has no files "
+"currently installed"
+msgstr "找不到套件 '%.250s' 的檔案清單，假設該套件目前安裝任何檔案"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' is missing final newline"
+msgstr "套件 '%.250s' 的檔案清單，檔尾沒有換行"
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "files list file for package '%.250s' contains empty filename"
+msgstr "套件 `%.250s' 的檔案清單，內有空檔名"
+
+#: lib/dpkg/db-fsys-files.c
+msgid "(Reading database ... "
+msgstr "（讀取資料庫 ... "
+
+#: lib/dpkg/db-fsys-files.c
+#, c-format
+msgid "%d file or directory currently installed.)\n"
+msgid_plural "%d files and directories currently installed.)\n"
+msgstr[0] "目前共安裝了 %d 個檔案和目錄。）\n"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "invalid status"
+msgid "invalid statoverride uid %s"
+msgstr "狀態無效"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride gid %s"
+msgstr "讀取 statoverride 檔 '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid statoverride mode %s"
+msgstr "讀取 statoverride 檔 '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "無法開啟 statoverride 檔"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr "無法 fstat statoverride 檔"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr "讀取 statoverride 檔 '%.250s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr "statoverride 檔檔尾沒有換行"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr "statoverride 檔有空行"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr "statoverride 檔語法錯誤"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system user '%s' in statoverride file; the system user got removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "statoverride 檔行尾意外中斷"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid ""
+"unknown system group '%s' in statoverride file; the system group got "
+"removed\n"
+"before the override, which is most probably a packaging bug, to recover you\n"
+"can remove the override manually with %s"
+msgstr ""
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "檔案 '%.250s' 有好幾個 statoverride 檔"
+
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty major component"
 msgid "format version with too big major component"
-msgstr "版本格式中缺主版本"
+msgstr "格式版本中的主版本號太大"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty major component"
@@ -419,10 +621,8 @@ msgid "format version has no dot"
 msgstr "版本格式中缺點 (.) 號"
 
 #: lib/dpkg/deb-version.c
-#, fuzzy
-#| msgid "format version with empty minor component"
 msgid "format version with too big minor component"
-msgstr "版本格式中缺次版本"
+msgstr "格式版本中的次版本號太大"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty minor component"
@@ -489,20 +689,12 @@ msgid "out of memory for new error context"
 msgstr "記憶體不足，無法建立錯誤相關資料"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid ""
-#| "%s: error while cleaning up:\n"
-#| " %s\n"
 msgid "error while cleaning up"
-msgstr ""
-"%s: 在清理時發生錯誤：\n"
-" %s\n"
+msgstr "在清理時發生錯誤"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid "%s: too many nested errors during error recovery!!\n"
 msgid "too many nested errors during error recovery"
-msgstr "%s：在錯誤回復時，又發生了更多的層層錯誤！！\n"
+msgstr "在錯誤回復時發生了太多層的錯誤"
 
 #: lib/dpkg/ehandle.c
 msgid "out of memory for new cleanup entry"
@@ -513,140 +705,137 @@ msgid "out of memory for new cleanup entry with many arguments"
 msgstr "記憶體不足，無法建立多參數的新清理項目"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid ""
-#| "%s: unrecoverable fatal error, aborting:\n"
-#| " %s\n"
 msgid "unrecoverable fatal error, aborting"
-msgstr ""
-"%s：無法回復的嚴重錯誤，中止操作：\n"
-" %s\n"
+msgstr "無法回復的致命錯誤，中止程序"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid ""
-#| "%s: outside error context, aborting:\n"
-#| " %s\n"
 msgid "outside error context, aborting"
-msgstr ""
-"%s：在錯誤相關處外，中止操作：\n"
-" %s\n"
+msgstr "非處於錯誤情境中，中止程序"
 
 #: lib/dpkg/ehandle.c
-#, fuzzy
-#| msgid "internal error (bug)"
 msgid "internal error"
-msgstr "內部錯誤 (bug)"
+msgstr "內部錯誤"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "未找到 %s"
+#, fuzzy
+#| msgid "control file '%s' does not exist"
+msgid "is missing a value"
+msgstr "查無控制檔 '%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.50s' 不可用於 %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "忽略無效的行：%s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "在 %s 之後有多餘的資料"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "無效的套件名稱 (%.250s)"
+#, fuzzy, c-format
+#| msgid "package '%s' is not installed"
+msgid "invalid package name in '%s' field: %s"
+msgstr "套件 '%s' 未安裝"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty file details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty file details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "檔案說明欄位 `%s' 是空的"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "file details field '%s' not allowed in status file"
+#, fuzzy, c-format
+#| msgid "file details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "這個檔案說明欄位 `%s' 不可用於狀態檔"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too many values in file details field '%s' (compared to others)"
+msgid "too many values in archive details '%s' field (compared to others)"
 msgstr "檔案說明欄位 `%s' 裡的值太多（和其他的相比）"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in file details field '%s' (compared to others)"
+#, fuzzy, c-format
+#| msgid "too few values in file details field '%s' (compared to others)"
+msgid "too few values in archive details '%s' field (compared to others)"
 msgstr "檔案說明欄位 `%s' 中的值太少（和其他的相比）"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "boolean 欄位的 yes/no"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "使用了已廢棄的「%s」或「%s」欄位"
 
 #: lib/dpkg/fields.c
-msgid "foreign/allowed/same/no in quadstate field"
+#, fuzzy, c-format
+#| msgid "foreign/allowed/same/no in quadstate field"
+msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
 msgstr "四態欄位的 foreign/allowed/same/no"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' is not a valid architecture name: %s"
+#, fuzzy, c-format
+#| msgid "'%s' is not a valid architecture name: %s"
+msgid "'%s' is not a valid architecture name in '%s' field: %s"
 msgstr "不合法的硬體平台名稱 '%s'：%s"
 
 #: lib/dpkg/fields.c
-#, fuzzy
-#| msgid "word in `priority' field"
-msgid "word in 'Priority' field"
-msgstr "`優先等級' 欄位的字串"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
+msgstr "「優先等級」欄位中的字"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "value for `status' field not allowed in this context"
+#, c-format
 msgid "value for '%s' field not allowed in this context"
-msgstr "在此不能使用這個 `status' 欄位的值"
+msgstr "在此情境中不能使用這個「%s」欄位的值"
 
 #: lib/dpkg/fields.c
-#, fuzzy
-#| msgid "first (want) word in `status' field"
-msgid "first (want) word in 'Status' field"
-msgstr "在 `status' 欄位的第一個字 (want)"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
+msgstr "在「status」欄位中的第一個字 (want)"
 
 #: lib/dpkg/fields.c
-#, fuzzy
-#| msgid "second (error) word in `status' field"
-msgid "second (error) word in 'Status' field"
-msgstr "在 `status' 欄位的第二個字 (error)"
+#, fuzzy, c-format
+#| msgid "second (error) word in 'Status' field"
+msgid "second (error) word in '%s' field: %s"
+msgstr "在「status」欄位中的第二個字 (error)"
 
 #: lib/dpkg/fields.c
-#, fuzzy
-#| msgid "third (status) word in `status' field"
-msgid "third (status) word in 'Status' field"
-msgstr "在 `status' 欄位的第三個字 (status)"
+#, fuzzy, c-format
+#| msgid "third (status) word in 'Status' field"
+msgid "third (status) word in '%s' field: %s"
+msgstr "在「status」欄位中的第三個字 (status)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "error in Version string '%.250s'"
-msgid "error in '%s' field string '%.250s'"
-msgstr "版本字串 '%.250s' 有誤"
+#| msgid "error in '%s' field string '%.250s'"
+msgid "'%s' field value '%.250s'"
+msgstr "「%s」欄位的「%.250s」字串有誤"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "obsolete `Revision' or `Package-Revision' field used"
-msgid "obsolete '%s' or '%s' field used"
-msgstr "使用了已廢棄的 `Revision' 或 `Package-Revision' 欄位"
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "obsolete '%s' field used"
+msgstr "使用了已廢棄的「%s」或「%s」欄位"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "value for `conffiles' has malformed line `%.*s'"
+#, c-format
 msgid "value for '%s' field has malformed line '%.*s'"
-msgstr "`conffiles' 的值有行 `%.*s' 的格式錯誤了"
+msgstr "「%s」欄位的值存在格式錯誤之「%.*s」行"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
-#| msgid "value for `conffiles' has line starting with non-space `%c'"
-msgid "value for '%s' has line starting with non-space '%c'"
-msgstr "`conffiles' 的值有行是以非空白字元 `%c' 開頭"
+#| msgid "value for '%s' has line starting with non-space '%c'"
+msgid "value for '%s' field has line starting with non-space '%c'"
+msgstr "「%s」的值包含了「%c」非空白字元開頭的行"
 
 #: lib/dpkg/fields.c
-msgid "root or null directory is listed as a conffile"
+#, fuzzy, c-format
+#| msgid "root or null directory is listed as a conffile"
+msgid "root or empty directory listed as a conffile in '%s' field"
 msgstr "root 或空目錄也被列為 conffile"
 
 #: lib/dpkg/fields.c
@@ -701,10 +890,9 @@ msgstr ""
 " 未明確要求版本號完全一致，建議替而使用 `='"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "Only exact versions may be used for Provides"
+#, c-format
 msgid "only exact versions may be used for '%s' field"
-msgstr "在 Provides 中只能指定明確的版本"
+msgstr "在「%s」欄位中只能使用明確的版本號"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -726,9 +914,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "`%s' 欄位，參照至 `%.255s'：版本號未終止"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "'%s' 欄位，參照 '%.255s'：版本號有誤"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "`%s' 欄位，參照至 `%.255s'：版本號含有 `%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -736,8 +925,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "`%s' 欄位，在參照至套件 `%.255s' 後的語法有誤"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "alternatives ('|') not allowed in %s field"
+#, fuzzy, c-format
+#| msgid "alternatives ('|') not allowed in %s field"
+msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "在 %s 欄位不可有可替換符號 (`|')"
 
 #: lib/dpkg/fields.c
@@ -776,6 +966,30 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "無法設定目標檔案 '%.250s' 的權限"
 
 #: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat file '%s'"
+msgid "cannot stat %s"
+msgstr "無法取得檔案 '%s' 的檔案資訊"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "conffile '%s' is not a plain file"
+msgid "%s is not a regular file"
+msgstr "conffile '%s' 不是普通檔案"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot read %s"
+msgstr "無法加到 '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "無法加到 '%s'"
+
+#: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
 msgstr "無法解除鎖定 %s"
@@ -796,8 +1010,22 @@ msgid "unable to lock %s"
 msgstr "無法鎖定 %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "以可換頁的瀏覽程式瀏覽檔案"
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "無法加到 '%s'"
+
+#: lib/dpkg/file.c
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "無法清除檔案 '%s' 的寫入緩衝"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "無法移轉檔案 '%s' 到自己"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -819,13 +1047,13 @@ msgstr "無法配置記憶體"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for std%s"
-msgstr "無法替 std%s dup"
+msgid "failed to dup for fd %d"
+msgstr "無法替 fd %d dup"
 
 #: lib/dpkg/mlib.c
 #, c-format
-msgid "failed to dup for fd %d"
-msgstr "無法替 fd %d dup"
+msgid "failed to dup for std%s"
+msgstr "無法替 std%s dup"
 
 #: lib/dpkg/mlib.c
 msgid "failed to create pipe"
@@ -937,10 +1165,9 @@ msgid "invalid integer for -%c: '%.250s'"
 msgstr "-%c 的整數無效：'%.250s'"
 
 #: lib/dpkg/options.c
-#, fuzzy, c-format
-#| msgid "obsolete option '--%s'\n"
+#, c-format
 msgid "obsolete option '--%s'"
-msgstr "已作廢選項 '--%s'\n"
+msgstr "已作廢之「--%s」命令列選項"
 
 #: lib/dpkg/options.c
 #, c-format
@@ -963,30 +1190,34 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "有多個值對應至用戶自定的欄位 `%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "missing %s"
+#, fuzzy, c-format
+#| msgid "missing %s"
+msgid "missing '%s' field"
 msgstr "找不到 %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "%s 的值是空的"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "有多個值對應至 `%s' 欄位"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is missing architecture"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is missing architecture"
+msgid "package has '%s' field but is missing architecture"
 msgstr "套件有 '%s' 欄位，但缺硬體平台"
 
 #: lib/dpkg/parse.c
-#, c-format
-msgid "package has field '%s' but is architecture all"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "套件有欄位 '%s'，但適用所有平台"
 
 #: lib/dpkg/parse.c
-#, fuzzy
-#| msgid "Configured-Version for package with inappropriate Status"
-msgid "Config-Version for package with inappropriate Status"
-msgstr "套件的 Configured-Version 和 Status 的內容不符"
+#, fuzzy, c-format
+#| msgid "Config-Version for package with inappropriate Status"
+msgid "'%s' field present for package with inappropriate '%s' field"
+msgstr "套件存在 Configured-Version 但處於錯誤的狀態中"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -994,8 +1225,10 @@ msgid "package has status %s but triggers are awaited"
 msgstr "套件的狀態為 %s 但觸發程式正要執行"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-awaited but no triggers awaited"
-msgstr "套件的狀態為 triggers-awaited 但並沒有觸發程式正要執行"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "套件的狀態為 %s 但觸發程式正要執行"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1003,34 +1236,39 @@ msgid "package has status %s but triggers are pending"
 msgstr "套件的狀態為 %s 但觸發程式尚待執行"
 
 #: lib/dpkg/parse.c
-msgid "package has status triggers-pending but no triggers pending"
-msgstr "套件的狀態為 triggers-pending 但並沒有觸發程式尚待執行"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "套件的狀態為 %s 但觸發程式尚待執行"
 
 #: lib/dpkg/parse.c
-msgid "Package which in state not-installed has conffiles, forgetting them"
+#, fuzzy, c-format
+#| msgid "Package which in state not-installed has conffiles, forgetting them"
+msgid "package has status %s and has conffiles, forgetting them"
 msgstr "該套件的狀態是尚未安裝，但是它卻有 conffile，不去理會它"
 
 #: lib/dpkg/parse.c
-#, fuzzy
-#| msgid "multiple non-coinstallable package instances present"
 msgid ""
 "multiple non-coinstallable package instances present; most probably due to "
 "an upgrade from an unofficial dpkg"
-msgstr "安裝了多個無法同時安裝的套件"
+msgstr "存在多個無法同時安裝的套件；這通常是因為 dpkg 升級自一個非官方的版本"
 
 #: lib/dpkg/parse.c
-#, fuzzy
-#| msgid "mixed non-coinstallable and coinstallable package instances present"
 msgid ""
 "mixed non-coinstallable and coinstallable package instances present; most "
 "probably due to an upgrade from an unofficial dpkg"
-msgstr "混合安裝了可以同時安裝，及無法同時安裝的套件"
+msgstr ""
+"存在混合了可以同時安裝與不可以同時安裝的套件實體；這通常是因為 dpkg 升級自一"
+"個非官方的版本"
 
 #: lib/dpkg/parse.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
+#| "installed instances"
 msgid ""
-"%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-"installed instances"
+"package %s (%s) with field '%s: %s' is not co-installable with %s which has "
+"multiple installed instances"
 msgstr "已安裝多份的 %4$s ，無法同時安裝 %1$s %2$s（多硬體平台：%3$s）"
 
 #: lib/dpkg/parse.c
@@ -1044,10 +1282,9 @@ msgid "can't stat package info file '%.255s'"
 msgstr "無法取得套件的 info 檔 `%.255s' 的檔案資訊"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "reading package info file '%.255s'"
+#, c-format
 msgid "reading package info file '%s': %s"
-msgstr "讀取套件 info 檔 '%.255s'"
+msgstr "正在讀取套件的 info 檔「%s」：%s"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1069,10 +1306,9 @@ msgid "field name '%.*s' cannot start with hyphen"
 msgstr ""
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "EOF after field name `%.*s'"
+#, c-format
 msgid "end of file after field name '%.*s'"
-msgstr "欄位名稱 `%.*s' 後有 EOF"
+msgstr "「%.*s」欄位名稱後有檔案結尾標記(end of file)"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1080,10 +1316,9 @@ msgid "newline in field name '%.*s'"
 msgstr "欄位名稱 `%.*s' 中有換行"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "MSDOS EOF (^Z) in field name `%.*s'"
+#, c-format
 msgid "MSDOS end of file (^Z) in field name '%.*s'"
-msgstr "欄位名稱 `%.*s' 中有 MSDOS EOF (^Z)"
+msgstr "「%.*s」欄位名稱中有 MSDOS 檔案結尾標記(^Z)"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1091,16 +1326,14 @@ msgid "field name '%.*s' must be followed by colon"
 msgstr "欄位名稱 `%.*s' 之後必須有個冒號"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "EOF before value of field `%.*s' (missing final newline)"
+#, c-format
 msgid "end of file before value of field '%.*s' (missing final newline)"
-msgstr "欄位 `%.*s' 的值前面有 EOF（檔尾沒有換行）"
+msgstr "「%.*s」欄位的值前面有檔案結尾標記(end of file)（缺少最末的換行）"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "MSDOS EOF char in value of field `%.*s' (missing newline?)"
+#, c-format
 msgid "MSDOS end of file (^Z) in value of field '%.*s' (missing newline?)"
-msgstr "欄位 `%.*s' 的值之中有 MSDOS EOF 字元（沒有換行？）"
+msgstr "「%.*s」欄位的值之中有 MSDOS 檔案結尾標記(^Z)（沒有換行？）"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1108,10 +1341,9 @@ msgid "blank line in value of field '%.*s'"
 msgstr "欄位 '%.*s' 的值中有空白行"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "EOF during value of field `%.*s' (missing final newline)"
+#, c-format
 msgid "end of file during value of field '%.*s' (missing final newline)"
-msgstr "欄位 `%.*s' 的值之中有 EOF 字元（檔尾沒有換行）"
+msgstr "讀取「%.*s」欄位的值時遇到檔案結尾標記（缺少最末的換行）"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1163,10 +1395,8 @@ msgid "version string has embedded spaces"
 msgstr "版本號裡嵌有空格字元"
 
 #: lib/dpkg/parsehelp.c
-#, fuzzy
-#| msgid "epoch in version is negative"
 msgid "epoch in version is empty"
-msgstr "版本中的 epoch 是負數"
+msgstr "版本號中的 epoch 值是空的"
 
 #: lib/dpkg/parsehelp.c
 msgid "epoch in version is not number"
@@ -1185,14 +1415,10 @@ msgid "nothing after colon in version number"
 msgstr "版本號的冒號後面沒有東西"
 
 #: lib/dpkg/parsehelp.c
-#, fuzzy
-#| msgid "version string is empty"
 msgid "revision number is empty"
-msgstr "版本號是空的"
+msgstr "修訂號是空的"
 
 #: lib/dpkg/parsehelp.c
-#, fuzzy
-#| msgid "version string is empty"
 msgid "version number is empty"
 msgstr "版本號是空的"
 
@@ -1217,11 +1443,6 @@ msgstr "無法安全刪除 '%.255s'"
 msgid "rm command for cleanup"
 msgstr "rm 指令刪除檔案"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
-#, c-format
-msgid "ambiguous package name '%s' with more than one installed instance"
-msgstr "套件名稱 '%s' 曖昧不明，符合多個已安裝套件"
-
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "invalid character '%c' in field width"
@@ -1235,15 +1456,24 @@ msgstr "欄位寬度超出範圍"
 msgid "missing closing brace"
 msgstr "找不到結尾括弧"
 
+#: lib/dpkg/pkg-format.c
+#, c-format
+msgid "cannot get package %s filesystem last modification time"
+msgstr ""
+
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
+#, c-format
+msgid "ambiguous package name '%s' with more than one installed instance"
+msgstr "套件名稱 '%s' 曖昧不明，符合多個已安裝套件"
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "（無相關介紹）"
 
 #: lib/dpkg/pkg-show.c
-#, fuzzy, c-format
-#| msgid "version '%s' has bad syntax: %s"
+#, c-format
 msgid "version '%s' has bad syntax: %s"
-msgstr "版本 '%s' 的語法不正確：%s"
+msgstr "「%s」版本號的語法不正確：%s"
 
 #: lib/dpkg/pkg-spec.c
 #, c-format
@@ -1289,112 +1519,175 @@ msgid "fork failed"
 msgstr "fork 失敗"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s returned error exit status %d"
+#, c-format
 msgid "%s subprocess returned error exit status %d"
-msgstr "子程序 %s 傳回了錯誤退出狀態 %d"
+msgstr "%s 子進程傳回了 %d 錯誤退出狀態碼"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was interrupted"
+#, c-format
 msgid "%s subprocess was interrupted"
-msgstr "子程序 %s 中斷"
+msgstr "%s 子進程被中斷了"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s was killed by signal (%s)%s"
+#, c-format
 msgid "%s subprocess was killed by signal (%s)%s"
-msgstr "子程序 %s 被信號 (%s)%s 終止了"
+msgstr "%s 子進程被 (%s)%s 信號終止了"
 
 #: lib/dpkg/subproc.c
 msgid ", core dumped"
 msgstr ", core dumped"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "subprocess %s failed with wait status code %d"
+#, c-format
 msgid "%s subprocess failed with wait status code %d"
-msgstr "子程序 %s 失敗，並傳回了 wait 狀態碼 %d"
+msgstr "「%s」子進程失敗，並傳回了 %d 等待狀態碼(wait status code)"
 
 #: lib/dpkg/subproc.c
-#, fuzzy, c-format
-#| msgid "wait for subprocess %s failed"
+#, c-format
 msgid "wait for %s subprocess failed"
-msgstr "等待子程序 %s 時失敗"
+msgstr "等待「%s」子程序失敗"
 
-#: lib/dpkg/treewalk.c
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "欄位寬度中有無效的字元 '%c'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "欄位寬度中有無效的字元 '%c'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid status"
+msgid "invalid tar header uid field"
+msgstr "狀態無效"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "reading statoverride file '%.250s'"
+msgid "invalid tar header gid field"
+msgstr "讀取 statoverride 檔 '%.250s'"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "欄位寬度中有無效的字元 '%c'"
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header checksum"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "partially read tar header"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+msgid "invalid tar header with empty name field"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported GNU tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
 #, fuzzy, c-format
-#| msgid "cannot stat file '%s'"
+#| msgid "unsupported options in file header"
+msgid "unsupported Solaris tar header type '%c'"
+msgstr "檔頭選項不支援"
+
+#: lib/dpkg/tarfn.c
+#, c-format
+msgid "unsupported PAX tar header type '%c'"
+msgstr ""
+
+#: lib/dpkg/tarfn.c
+#, fuzzy, c-format
+#| msgid "unknown compression type '%s'!"
+msgid "unknown tar header type '%c'"
+msgstr "未知的壓縮類型 `%s'！"
+
+# 參閱 stat(2)、lstat(2) 的使用手冊頁面(manpage)
+#: lib/dpkg/treewalk.c
+#, c-format
 msgid "cannot stat pathname '%s'"
-msgstr "無法取得檔案 '%s' 的檔案資訊"
+msgstr "無法取得「%s」路徑的資訊"
 
 #: lib/dpkg/treewalk.c
-#, fuzzy, c-format
-#| msgid "cannot scan directory '%.255s'"
+#, c-format
 msgid "cannot open directory '%s'"
-msgstr "無法掃瞄目錄 `%.255s'"
+msgstr "無法開啟「%.255s」目錄"
 
 #: lib/dpkg/treewalk.c
-#, fuzzy, c-format
-#| msgid "control directory is not a directory"
+#, c-format
 msgid "treewalk root %s is not a directory"
-msgstr "控制目錄所在不是目錄"
+msgstr "目錄樹遊走(treewalk)的根節點「%s」不是個目錄"
 
 #: lib/dpkg/trigdeferred.c
-#, c-format
-msgid "unable to open/create triggers lockfile '%.250s'"
-msgstr "無法開啟/建立觸發程式鎖定檔 `%.250s'"
-
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
+msgstr "無法開啟或建立觸發程式鎖定檔「%.250s」"
+
+# file_lock(&lock_fd, FILE_LOCK_WAIT, fn.buf, _("triggers area"));
+# void
+# file_lock(int *lockfd, enum file_lock_flags flags, const char *filename, const char *desc)
+# @param desc The description of the file to lock.
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
-msgstr "觸發程式區"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
+msgstr "觸發程式區域"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to open triggers deferred file '%.250s'"
-msgstr "無法開啟觸發程式延遲檔 `%.250s'"
+msgstr "無法開啟「%.250s」觸發程式延遲檔"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to stat triggers deferred file '%.250s'"
-msgstr "無法取得觸發程式延遲檔 `%.250s' 的檔案資訊"
+msgstr "無法取得「%.250s」觸發程式延遲檔的資訊"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to open/create new triggers deferred file '%.250s'"
-msgstr "無法開啟/建立新的觸發程式延遲檔 `%.250s'"
+msgstr "無法開啟或建立新的觸發程式延遲檔「%.250s」"
 
 #: lib/dpkg/trigdeferred.c
-#, fuzzy, c-format
-#| msgid "syntax error in triggers deferred file '%.250s' at character '%s'%s"
+#, c-format
 msgid ""
 "syntax error in triggers deferred file '%.250s' at line %d character %zd '%s'"
-msgstr "在觸發程式延遲檔 `%.250s' 裡的字元 `%s'%s 裡的語法有誤"
+msgstr "「%.250s」觸發程式延遲檔中的第 %d 行第 %zd 字元「%s」有語法錯誤"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "invalid package name '%.250s' in triggers deferred file '%.250s'"
-msgstr "不正確的套件名稱 `%.250s'，位於觸發程式延遲檔 `%.250s'"
+msgstr "無效的「%.250s」套件名稱位於「%.250s」觸發程式延遲檔"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "error reading triggers deferred file '%.250s'"
-msgstr "在讀取觸發程式延遲檔 `%.250s' 時發生錯誤"
+msgstr "在讀取「%.250s」觸發程式延遲檔時發生錯誤"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to write new triggers deferred file '%.250s'"
-msgstr "無法寫入新的觸發程式延遲檔 `%.250s'"
+msgstr "無法寫入新的觸發程式延遲檔「%.250s」"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to close new triggers deferred file '%.250s'"
-msgstr "無法關閉新的觸發程式延遲檔 `%.250s'"
+msgstr "無法關閉新的觸發程式延遲檔「%.250s」"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
 msgid "unable to install new triggers deferred file '%.250s'"
-msgstr "無法安裝新的觸發程式延遲檔 `%.250s'"
+msgstr "無法安裝新的觸發程式延遲檔「%.250s」"
 
 #: lib/dpkg/triglib.c
 #, c-format
@@ -1559,11 +1852,6 @@ msgstr "在建立輸出入轉向 `%.255s' 時發生錯誤"
 msgid "error creating device '%.255s'"
 msgstr "在建立裝置檔 `%.255s' 時發生錯誤"
 
-#: src/archives.c src/infodb-upgrade.c
-#, c-format
-msgid "error creating hard link '%.255s'"
-msgstr "在建立實體連結 `%.255s' 時發生錯誤"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -1660,10 +1948,9 @@ msgid "archive contained object '%.255s' of unknown type 0x%x"
 msgstr "壓縮檔包含物件 `%.255s'，型別 0x%x 不名"
 
 #: src/archives.c
-#, fuzzy, c-format
-#| msgid "Replacing files in old package %s ...\n"
+#, c-format
 msgid "Replacing files in old package %s (%s) ...\n"
-msgstr "替換成舊套件 %s 的檔案...\n"
+msgstr "正在替換 %s (%s) 舊套件的檔案……\n"
 
 #: src/archives.c
 #, fuzzy, c-format
@@ -1867,10 +2154,10 @@ msgstr "無法存取壓縮檔"
 msgid "archive '%s' is not a regular file"
 msgstr "conffile '%s' 不是普通檔案"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<標準輸出>"
 
@@ -1932,68 +2219,38 @@ msgid "unable to remove newly-extracted version of '%.250s'"
 msgstr "無法移除 `%.250s' 的新解壓版本"
 
 #: src/configure.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
+#, c-format
 msgid "Configuration file '%s'\n"
-msgstr ""
-"\n"
-"設定檔 `%s'"
+msgstr "「%s」設定檔\n"
 
 #: src/configure.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
+#, c-format
 msgid "Configuration file '%s' (actually '%s')\n"
-msgstr ""
-"\n"
-"設定檔 `%s'"
+msgstr "「%s」設定檔（實際上是「%s」）\n"
 
 #: src/configure.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| " ==> File on system created by you or by a script.\n"
-#| " ==> File also in package provided by package maintainer.\n"
+#, c-format
 msgid ""
 " ==> File on system created by you or by a script.\n"
 " ==> File also in package provided by package maintainer.\n"
 msgstr ""
-"\n"
-" ==> 系統中的這個檔案是由您建立或者是由 script 建立的。\n"
-" ==> 套件維護者所提供的套件中也包含了該檔案。\n"
+" ==> 系統中的這個檔案是由您或是一個腳本所建立。\n"
+" ==> 此檔案另外也由套件維護者在套件中提供。\n"
 
 #: src/configure.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "     Not modified since installation.\n"
+#, c-format
 msgid "     Not modified since installation.\n"
-msgstr ""
-"\n"
-"     在安裝後未曾更動。\n"
+msgstr "     自安裝後即未曾被更動。\n"
 
 #: src/configure.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| " ==> Modified (by you or by a script) since installation.\n"
+#, c-format
 msgid " ==> Modified (by you or by a script) since installation.\n"
-msgstr ""
-"\n"
-" ==> 在安裝後曾被（您或某個 script）修改過。\n"
+msgstr " ==> 在安裝後曾被（您或某個腳本）修改過。\n"
 
 #: src/configure.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| " ==> Deleted (by you or by a script) since installation.\n"
+#, c-format
 msgid " ==> Deleted (by you or by a script) since installation.\n"
-msgstr ""
-"\n"
-" ==> 在安裝後被（您或某個 script）刪掉了。\n"
+msgstr " ==> 在安裝後（被您或是某個腳本）刪掉了。\n"
 
 #: src/configure.c
 #, c-format
@@ -2081,6 +2338,10 @@ msgid "conffile difference visualizer"
 msgstr "conffile 差異顯示程式"
 
 #: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
+#: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "完成後，請輸入 `exit'。\n"
 
@@ -2434,7 +2695,21 @@ msgstr ""
 "\n"
 
 #: src/divertcmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --package <package>      name of the package whose copy of <file> will "
+#| "not\n"
+#| "                             be diverted.\n"
+#| "  --local                  all packages' versions are diverted.\n"
+#| "  --divert <divert-to>     the name used by other packages' versions.\n"
+#| "  --rename                 actually move the file aside (or back).\n"
+#| "  --admindir <directory>   set the directory with the diversions file.\n"
+#| "  --test                   don't do anything, just demonstrate.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
+#| "\n"
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2443,7 +2718,10 @@ msgid ""
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -2474,6 +2752,12 @@ msgstr ""
 "在移除時，指定 --package 或 --local 及 --divert 須相符。\n"
 "套件的 preinst/postrm scripts 一定要指定 --package 及 --divert。\n"
 
+#: src/divertcmd.c
+msgid ""
+"please specify --no-rename explicitly, the default will change to --rename "
+"in 1.20.x"
+msgstr ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2595,6 +2879,13 @@ msgstr "忽略重新命名移轉套件 '%2$s' 檔案 '%1$s' 的要求\n"
 
 #: src/divertcmd.c
 #, c-format
+msgid ""
+"diverting file '%s' from an Essential package with rename is dangerous, use "
+"--no-rename"
+msgstr ""
+
+#: src/divertcmd.c
+#, c-format
 msgid "No diversion '%s', none removed.\n"
 msgstr "查無移轉項目 '%s'，無可刪除。\n"
 
@@ -2638,19 +2929,6 @@ msgstr "<套件> 不該包含換行符號"
 msgid "divert-to may not contain newlines"
 msgstr "<移轉目標> 不該包含換行符號"
 
-#: src/divertdb.c
-msgid "failed to open diversions file"
-msgstr "無法開啟移轉檔"
-
-#: src/divertdb.c
-msgid "failed to fstat diversions file"
-msgstr "無法 fstat 取得移轉檔的檔案資訊"
-
-#: src/divertdb.c
-#, c-format
-msgid "conflicting diversions involving '%.250s' or '%.250s'"
-msgstr "移轉衝突，涉入其中的有 `%.250s' 及 `%.250s'"
-
 #: src/enquiry.c
 msgid ""
 "The following packages are in a mess due to serious problems during\n"
@@ -2828,10 +3106,9 @@ msgid "cannot satisfy pre-dependencies for %.250s (wanted due to %.250s)"
 msgstr "無法滿足 %.250s 的預先相依關係（應 %.250s 之要求）"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one package name argument"
+#, c-format
 msgid "--%s takes one <pkgname> argument"
-msgstr "--%s 需要一個套件名稱參數"
+msgstr "--%s 需要一個套件名稱作為引數"
 
 #: src/enquiry.c
 #, fuzzy, c-format
@@ -2840,10 +3117,9 @@ msgid "package name '%s' is invalid: %s"
 msgstr "套件 '%s' 未安裝"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one package name argument"
+#, c-format
 msgid "--%s takes one <trigname> argument"
-msgstr "--%s 需要一個套件名稱參數"
+msgstr "--%s 需要一個 <trigname> 作為引數"
 
 #: src/enquiry.c
 #, fuzzy, c-format
@@ -2852,10 +3128,9 @@ msgid "trigger name '%s' is invalid: %s"
 msgstr "觸發程式的名稱包含了不合法的字元"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one package name argument"
+#, c-format
 msgid "--%s takes one <archname> argument"
-msgstr "--%s 需要一個套件名稱參數"
+msgstr "--%s 需要一個 <archname> 作為引數"
 
 #: src/enquiry.c
 #, fuzzy, c-format
@@ -2864,16 +3139,14 @@ msgid "architecture name '%s' is invalid: %s"
 msgstr "不合法的硬體平台 '%s'：%s"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "--%s takes one argument"
+#, c-format
 msgid "--%s takes one <version> argument"
-msgstr "--%s 需要一個參數"
+msgstr "--%s 需要一個 <version> 引數"
 
 #: src/enquiry.c
-#, fuzzy, c-format
-#| msgid "version '%s' has bad syntax: %s"
+#, c-format
 msgid "version '%s' has bad syntax"
-msgstr "版本 '%s' 的語法不正確：%s"
+msgstr "「%s」版本號的語法不正確"
 
 #: src/enquiry.c
 msgid ""
@@ -2941,115 +3214,170 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "套件 %s 目前保留，不會去變動。用 --force-hold 來忽略該設定。\n"
 
-#: src/errors.c
-msgid "overriding problem because --force enabled:"
-msgstr "使用了 --force 選項，忽略問題："
+#: src/force.c
+msgid "Set all force options"
+msgstr "設定所有強制選項"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "套件 '%.250s' 的檔案清單，檔尾沒有換行"
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "套件 '%.250s' 的檔案清單，檔尾沒有換行"
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "把套件換成舊版"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package '%.250s' is missing final newline"
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "套件 '%.250s' 的檔案清單，檔尾沒有換行"
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "設定和這個套件有關的所有套件"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list file for package `%.250s' contains empty filename"
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "套件 `%.250s' 的檔案清單，內有空檔名"
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "不管保留狀態，處理所有附帶的套件"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to open files list file for package `%.250s'"
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "無法開啟套件 `%.250s' 的檔案清單"
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "即使不是 root，也試著安裝（解安裝）"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "unable to stat files list file for package '%.250s'"
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "無法取得套件 '%.250s' 檔案清單的檔案資訊"
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH 中缺少重要程式，可能是問題"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "files list for package '%.250s' is not a regular file"
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "套件 '%.250s' 的檔案清單，不是普通檔案"
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "就算套件驗證失敗，也還是安裝"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "cannot extract control file '%s' from '%s': %s"
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "無法由 '%2$s' 讀取設定檔 '%1$s'：%3$s"
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "即使套件版本錯誤，也繼續進行"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package `%.250s'"
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "關閉套件 `%.250s' 的檔案清單時，發生錯誤"
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "無法開啟套件 `%.250s' 的檔案清單"
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
 
-#: src/filesdb.c
-#, c-format
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "用一個套件的檔案，取代另外一個套件的檔案"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "用未移轉的檔案，取代移轉的檔案"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "用一個套件的檔案，取代另一個套件的目錄"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "解壓縮時，不執行安全輸出入操作"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr ""
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "永遠採用新的設定檔，不另行詢問"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "永遠採用舊的設定檔，不另行詢問"
+
+#: src/force.c
 msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr "找不到套件 '%.250s' 的檔案清單，假設該套件目前安裝任何檔案"
+"Use the default option for new config files if one\n"
+"is available, don't prompt. If no default can be found,\n"
+"you will be prompted unless one of the confold or\n"
+"confnew options is also given"
+msgstr ""
+"若有新設定檔，則用預設選項，不再詢問。若沒有預設選項，\n"
+"除非有設定 confold 或 confnew 選項，否則會詢問你"
 
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "無法取得套件 '%.250s' 檔案清單的檔案資訊"
+#: src/force.c
+msgid "Always install missing config files"
+msgstr "永遠安裝缺的設定檔"
 
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "套件 '%.250s' 的檔案清單，不是普通檔案"
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "即使沒有新設定檔，也詢要問不要取代舊設定檔"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "即使套件沒有設硬體平台，或硬體平台有誤，也繼續進行"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "即使會破壞其它套件，也要安裝"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "允許安裝相衝的討件"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "把所有相依問題當作警告"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "把所有相依版本問題當作警告"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "移除需要安裝的套件"
 
-#: src/filesdb.c
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "移除核心套件"
+
+#: src/force.c
 #, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "讀取套件 '%.250s' 的檔案清單"
+msgid ""
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"
+msgstr ""
+"%s 強制選項 - 發生問題時，程式的行為控制：\n"
+"  警告後繼續：  --force-<項目>,<項目>,...\n"
+"  錯誤終止：    --refuse-<項目>,<項目>,... | --no-force-<項目>,...\n"
+" 強制項目：\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "套件 '%.250s' 的檔案清單，檔尾沒有換行"
+msgid ""
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"
+msgstr ""
+"\n"
+"警告 - 使用標記 [!] 的選項，會嚴重破壞系統。\n"
+"預設啟用標記 [*] 的強制選項。\n"
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "套件 `%.250s' 的檔案清單，內有空檔名"
+msgid ""
+"\n"
+"Currently enabled options:\n"
+" %s\n"
+msgstr ""
 
-#: src/filesdb.c
+#: src/force.c
 #, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "關閉套件 `%.250s' 的檔案清單時，發生錯誤"
+msgid "unknown force/refuse option '%.*s'"
+msgstr "未知的 force/refuse 選項 `%.*s'"
 
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "（讀取資料庫 ... "
+#: src/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "已作廢的 force/refuse 選項 '%s'\n"
 
-#: src/filesdb.c
-#, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] "目前共安裝了 %d 個檔案和目錄。）\n"
+#: src/force.c
+msgid "overriding problem because --force enabled:"
+msgstr "使用了 --force 選項，忽略問題："
 
 #: src/help.c
 msgid "not installed"
@@ -3109,41 +3437,6 @@ msgid ""
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin"
 msgstr "注意：root 的 PATH 通常都包括 /usr/local/sbin、/usr/sbin 和 /sbin"
 
-#: src/infodb-access.c
-#, c-format
-msgid "unable to check existence of '%.250s'"
-msgstr "無法判斷 `%.250s' 是否存在"
-
-#: src/infodb-access.c src/infodb-upgrade.c
-msgid "cannot read info directory"
-msgstr "無法讀取 info 目錄"
-
-#: src/infodb-format.c src/unpack.c
-#, c-format
-msgid "error trying to open %.250s"
-msgstr "在試圖開啟 %.250s 時發生錯誤"
-
-#: src/infodb-format.c
-#, c-format
-msgid "corrupt info database format file '%s'"
-msgstr "資訊資料庫格式檔 '%s' 損毀"
-
-#: src/infodb-format.c
-#, c-format
-msgid "info database format (%d) is bogus or too new; try getting a newer dpkg"
-msgstr ""
-
-#: src/infodb-upgrade.c
-#, fuzzy, c-format
-#| msgid "Info file %s/%s not associated to any package"
-msgid "info file %s/%s not associated to any package"
-msgstr "資訊檔 %s/%s 不屬於任何套件"
-
-#: src/infodb-upgrade.c
-#, c-format
-msgid "error while writing '%s'"
-msgstr "'%s' 寫入錯誤"
-
 #: src/main.c
 #, c-format
 msgid "Debian '%s' package management program version %s.\n"
@@ -3163,52 +3456,59 @@ msgstr "Debian `%s' 套件管理程式版本%s。\n"
 #| "  --triggers-only    <package> ... | -a|--pending\n"
 #| "  -r|--remove        <package> ... | -a|--pending\n"
 #| "  -P|--purge         <package> ... | -a|--pending\n"
+#| "  -V|--verify <package> ...        Verify the integrity of package(s).\n"
 #| "  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
 #| "  --set-selections                 Set package selections from stdin.\n"
 #| "  --clear-selections               Deselect every non-essential package.\n"
-#| "  --update-avail <Packages-file>   Replace available packages info.\n"
-#| "  --merge-avail <Packages-file>    Merge with info from file.\n"
+#| "  --update-avail [<Packages-file>] Replace available packages info.\n"
+#| "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 #| "  --clear-avail                    Erase existing available info.\n"
 #| "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
 #| "  -s|--status <package> ...        Display package status details.\n"
 #| "  -p|--print-avail <package> ...   Display available version details.\n"
-#| "  -L|--listfiles <package> ...     List files `owned' by package(s).\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
 #| "  -l|--list [<pattern> ...]        List packages concisely.\n"
 #| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-#| "  -C|--audit                       Check for broken package(s).\n"
+#| "  -C|--audit [<package> ...]       Check for broken package(s).\n"
+#| "  --yet-to-unpack                  Print packages selected for "
+#| "installation.\n"
+#| "  --predep-package                 Print pre-dependencies to unpack.\n"
 #| "  --add-architecture <arch>        Add <arch> to the list of "
 #| "architectures.\n"
 #| "  --remove-architecture <arch>     Remove <arch> from the list of "
 #| "architectures.\n"
 #| "  --print-architecture             Print dpkg architecture.\n"
 #| "  --print-foreign-architectures    Print allowed foreign architectures.\n"
+#| "  --assert-<feature>               Assert support for the specified "
+#| "feature.\n"
+#| "  --validate-<thing> <string>      Validate a <thing>'s <string>.\n"
 #| "  --compare-versions <a> <op> <b>  Compare version numbers - see below.\n"
 #| "  --force-help                     Show help on forcing.\n"
 #| "  -Dh|--debug=help                 Show help on debugging.\n"
 #| "\n"
 msgid ""
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for "
 "installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
@@ -3225,7 +3525,7 @@ msgid ""
 "  -Dh|--debug=help                 Show help on debugging.\n"
 "\n"
 msgstr ""
-"指令：\n"
+"子指令：\n"
 "  -i|--install       <.deb 檔> ... | -R|--recursive <目錄> ...\n"
 "  --unpack           <.deb 檔> ... | -R|--recursive <目錄> ...\n"
 "  -A|--record-avail  <.deb 檔> ... | -R|--recursive <目錄> ...\n"
@@ -3233,23 +3533,28 @@ msgstr ""
 "  --triggers-only    <套件> ...    | -a|--pending\n"
 "  -r|--remove        <套件> ...    | -a|--pending\n"
 "  -P|--purge         <套件> ...    | -a|--pending\n"
-"  --get-selections [<表達式> ...]  將選擇清單，列印到標準輸出。\n"
-"  --set-selections                 從標準輸入，取得套件選擇清單。\n"
-"  --clear-selections               取消所有的非核心套件。\n"
+"  -V|--verify <package> ...        驗證套件的完整性。\n"
+"  --get-selections [<表達式> ...]  取得選擇清單並輸出到標準輸出裝置。\n"
+"  --set-selections                 從標準輸入裝置讀入並設定套件選擇清單。\n"
+"  --clear-selections               取消選擇所有的非必備套件。\n"
 "  --update-avail <Packages 檔>     取代可用套件資訊。\n"
-"  --merge-avail <Packages 檔>      由檔案合併可用套件資訊。\n"
+"  --merge-avail <Packages 檔>      自檔案合併可用套件資訊。\n"
 "  --clear-avail                    清除可用套件資訊。\n"
 "  --forget-old-unavail             清除已移除且無法再安裝的套件。\n"
-"  -s|--status <套件> ...           顯示套件詳情。\n"
+"  -s|--status <套件> ...           顯示套件狀態詳情。\n"
 "  -p|--print-avail <套件> ...      顯示可用版本詳情。\n"
-"  -L|--listfiles <套件> ...        列出 `屬於' 套件的檔案。\n"
-"  -l|--list [<表達式> ...]         簡要列出套件。\n"
+"  -L|--listfiles <套件> ...        列出套件所「擁有」的檔案。\n"
+"  -l|--list [<表達式> ...]         簡要地列出套件。\n"
 "  -S|--search <表達式> ...         搜尋擁有該檔案的套件。\n"
-"  -C|--audit                       檢查有沒有損毀的套件。\n"
+"  -C|--audit [<套件> ...]               檢查有沒有損毀的套件。\n"
+"  --yet-to-unpack                  印出選取待安裝的套件。\n"
+"  --predep-package                 印出解包需要的預先依賴軟體。\n"
 "  --add-architecture <硬體平台>    把 <硬體平台> 加到硬體平台清單中。\n"
 "  --remove-architecture <硬體平台> 由硬體平台清單移除 <硬體平台>。\n"
 "  --print-architecture             顯示 dpkg 的硬體平台。\n"
 "  --print-foreign-architectures    顯示可用的異質硬體平台。\n"
+"  --assert-<特色>                  假定(Assert)指定特色的支援。\n"
+"  --validate-<thing> <string>      驗證 <thing> 的 <string>。\n"
 "  --compare-versions <a> <op> <b>  比較版本 - 請參閱下文。\n"
 "  --force-help                     顯示強制選項的說明。\n"
 "  -Dh|--debug=help                 顯示偵錯模式的說明。\n"
@@ -3267,22 +3572,14 @@ msgstr ""
 "\n"
 
 #: src/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "For internal use: dpkg --assert-support-predepends | --predep-package |\n"
-#| "  --assert-working-epoch | --assert-long-filenames | --assert-multi-"
-#| "conrep |\n"
-#| "  --assert-multi-arch.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Assertable features: support-predepends, working-epoch, long-filenames,\n"
 "  multi-conrep, multi-arch, versioned-provides.\n"
 "\n"
 msgstr ""
-"內部使用：dpkg --assert-support-predepends | --predep-package |\n"
-"  --assert-working-epoch | --assert-long-filenames | --assert-multi-conrep "
-"|\n"
-"  --assert-multi-arch。\n"
+"可假定的特色(assertable features)：support-predepends、working-epoch、long-"
+"filenames、multi-conrep、multi-arch、versioned-provides。\n"
 "\n"
 
 #: src/main.c
@@ -3311,45 +3608,7 @@ msgstr ""
 "\n"
 
 #: src/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --admindir=<directory>     Use <directory> instead of %s.\n"
-#| "  --root=<directory>         Install on a different root directory.\n"
-#| "  --instdir=<directory>      Change installation dir without changing "
-#| "admin dir.\n"
-#| "  --path-exclude=<pattern>   Do not install paths which match a shell "
-#| "pattern.\n"
-#| "  --path-include=<pattern>   Re-include a pattern after a previous "
-#| "exclusion.\n"
-#| "  -O|--selected-only         Skip packages not selected for install/"
-#| "upgrade.\n"
-#| "  -E|--skip-same-version     Skip packages whose same version is "
-#| "installed.\n"
-#| "  -G|--refuse-downgrade      Skip packages with earlier version than "
-#| "installed.\n"
-#| "  -B|--auto-deconfigure      Install even if it would break some other "
-#| "package.\n"
-#| "  --[no-]triggers            Skip or force consequential trigger "
-#| "processing.\n"
-#| "  --no-debsig                Do not try to verify package signatures.\n"
-#| "  --no-act|--dry-run|--simulate\n"
-#| "                             Just say what we would do - don't do it.\n"
-#| "  -D|--debug=<octal>         Enable debugging (see -Dhelp or --"
-#| "debug=help).\n"
-#| "  --status-fd <n>            Send status change updates to file "
-#| "descriptor <n>.\n"
-#| "  --status-logger=<command>  Send status change updates to <command>'s "
-#| "stdin.\n"
-#| "  --log=<filename>           Log status changes and actions to "
-#| "<filename>.\n"
-#| "  --ignore-depends=<package>,...\n"
-#| "                             Ignore dependencies involving <package>.\n"
-#| "  --force-...                Override problems (see --force-help).\n"
-#| "  --no-force-...|--refuse-...\n"
-#| "                             Stop when problems encountered.\n"
-#| "  --abort-after <n>          Abort after encountering <n> errors.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  --admindir=<directory>     Use <directory> instead of %s.\n"
@@ -3389,25 +3648,26 @@ msgid ""
 msgstr ""
 "選項：\n"
 "  --admindir=<目錄>          使用 <目錄> 代替 %s。\n"
-"  --root=<目錄>              安裝在另一個 root 目錄。\n"
-"  --instdir=<目錄>           變更安裝路徑，不變更 admin dir。\n"
-"  --path-exclude=<表達式>    不安裝符合 shell 表達式的檔案。\n"
-"  --path-include=<表達式>    前項選項排除後，再加上符合表達式的檔案。\n"
+"  --root=<目錄>              安裝在另一個根目錄。\n"
+"  --instdir=<目錄>           不變更 admin dir 的前提下變更安裝目錄。\n"
+"  --path-exclude=<表達式>    不安裝符合 shell 表達式路徑的項目。\n"
+"  --path-include=<表達式>    前項選項排除後，再加上符合表達式式樣的項目。\n"
 "  -O|--selected-only         略過未選擇為要安裝／升級的套件。\n"
-"  -E|--skip-same-version     略過相同版本已安裝的套件。\n"
+"  -E|--skip-same-version     略過已安裝相同版本的套件。\n"
 "  -G|--refuse-downgrade      略過比已安裝版本舊的套件。\n"
 "  -B|--auto-deconfigure      即使會損毀其它套件也要安裝。\n"
-"  --[no-]triggers            略過或強制接下來的觸發程式。\n"
+"  --[no-]triggers            略過或強制執行接下來的觸發程式。\n"
 "  --no-debsig                不試著去驗証套件簽章。\n"
 "  --no-act|--dry-run|--simulate\n"
 "                             只顯示接下來的動作 - 不實際執行。\n"
 "  -D|--debug=<八進制數字>    啟用除錯（參閱 -Dhelp 或 --debug=help）。\n"
-"  --status-fd <n>            傳送狀態異動至檔案敘述 <n>。\n"
-"  --status-logger=<指令>     傳送狀態異動 <指令> 的標準輸入。\n"
+"  --status-fd <n>            傳送狀態異動至檔案描述元(file descriptor) "
+"<n>。\n"
+"  --status-logger=<指令>     傳送狀態異動至 <命令> 的標準輸入。\n"
 "  --log=<檔名>               記錄狀態異動及動作至 <檔名>。\n"
 "  --ignore-depends=<套件>,...\n"
-"                             忽略 <套件> 的相依關係。\n"
-"  --force-...                無視問題（參閱 --force-help）。\n"
+"                             忽略跟 <套件> 有關的軟體相依關係問題。\n"
+"  --force-...                覆載指定問題（參閱 --force-help）。\n"
 "  --no-force-...|--refuse-...\n"
 "                             當發生問題時中止。\n"
 "  --abort-after <n>          碰到 <n> 個錯誤後中止。\n"
@@ -3432,22 +3692,10 @@ msgstr ""
 
 #: src/main.c
 #, fuzzy, c-format
-#| msgid "Use `dselect' or `aptitude' for user-friendly package management.\n"
 msgid "Use 'apt' or 'aptitude' for user-friendly package management.\n"
 msgstr "使用 `dselect' 或 `aptitude' 等介面親和的套件管理程式。\n"
 
 #: src/main.c
-#, fuzzy
-#| msgid ""
-#| "Type dpkg --help for help about installing and deinstalling packages "
-#| "[*];\n"
-#| "Use `dselect' or `aptitude' for user-friendly package management;\n"
-#| "Type dpkg -Dhelp for a list of dpkg debug flag values;\n"
-#| "Type dpkg --force-help for a list of forcing options;\n"
-#| "Type dpkg-deb --help for help about manipulating *.deb files;\n"
-#| "\n"
-#| "Options marked [*] produce a lot of output - pipe it through `less' or "
-#| "`more' !"
 msgid ""
 "Type dpkg --help for help about installing and deinstalling packages [*];\n"
 "Use 'apt' or 'aptitude' for user-friendly package management;\n"
@@ -3458,119 +3706,13 @@ msgid ""
 "Options marked [*] produce a lot of output - pipe it through 'less' or "
 "'more' !"
 msgstr ""
-"輸入 dpkg --help，以參閱安裝和移除套件的說明 [*]。\n"
-"使用 `dselect' 或 `aptitude'，用友善的界面管理套件。\n"
-"輸入 dpkg -Dhelp，以取得 dpkg 除錯旗標值的清單。\n"
-"輸入 dpkg --force-help，以取得強制選項的清單。\n"
-"輸入 dpkg-deb --help，以取得操作 *.deb 檔的說明。\n"
+"輸入 dpkg --help 以參閱安裝和移除套件的說明 [*]；\n"
+"使用 `apt' 或 `aptitude'，用友善的界面管理套件；\n"
+"輸入 dpkg -Dhelp 以取得 dpkg 除錯旗標值的清單；\n"
+"輸入 dpkg --force-help 以取得強制選項的清單；\n"
+"輸入 dpkg-deb --help，以取得操作 *.deb 檔的說明；\n"
 "\n"
-"標示有 [*] 的選項會輸出大量文字 - 可轉輸出至 `less' 或 `more' ！"
-
-#: src/main.c
-msgid "Set all force options"
-msgstr "設定所有強制選項"
-
-#: src/main.c
-msgid "Replace a package with a lower version"
-msgstr "把套件換成舊版"
-
-#: src/main.c
-msgid "Configure any package which may help this one"
-msgstr "設定和這個套件有關的所有套件"
-
-#: src/main.c
-msgid "Process incidental packages even when on hold"
-msgstr "不管保留狀態，處理所有附帶的套件"
-
-#: src/main.c
-msgid "Try to (de)install things even when not root"
-msgstr "即使不是 root，也試著安裝（解安裝）"
-
-#: src/main.c
-msgid "PATH is missing important programs, problems likely"
-msgstr "PATH 中缺少重要程式，可能是問題"
-
-#: src/main.c
-msgid "Install a package even if it fails authenticity check"
-msgstr "就算套件驗證失敗，也還是安裝"
-
-#: src/main.c
-msgid "Process even packages with wrong versions"
-msgstr "即使套件版本錯誤，也繼續進行"
-
-#: src/main.c
-msgid "Overwrite a file from one package with another"
-msgstr "用一個套件的檔案，取代另外一個套件的檔案"
-
-#: src/main.c
-msgid "Overwrite a diverted file with an undiverted version"
-msgstr "用未移轉的檔案，取代移轉的檔案"
-
-#: src/main.c
-msgid "Overwrite one package's directory with another's file"
-msgstr "用一個套件的檔案，取代另一個套件的目錄"
-
-#: src/main.c
-msgid "Do not perform safe I/O operations when unpacking"
-msgstr "解壓縮時，不執行安全輸出入操作"
-
-#: src/main.c
-msgid "Do not chroot into maintainer script environment"
-msgstr ""
-
-#: src/main.c
-msgid "Always use the new config files, don't prompt"
-msgstr "永遠採用新的設定檔，不另行詢問"
-
-#: src/main.c
-msgid "Always use the old config files, don't prompt"
-msgstr "永遠採用舊的設定檔，不另行詢問"
-
-#: src/main.c
-msgid ""
-"Use the default option for new config files if one\n"
-"is available, don't prompt. If no default can be found,\n"
-"you will be prompted unless one of the confold or\n"
-"confnew options is also given"
-msgstr ""
-"若有新設定檔，則用預設選項，不再詢問。若沒有預設選項，\n"
-"除非有設定 confold 或 confnew 選項，否則會詢問你"
-
-#: src/main.c
-msgid "Always install missing config files"
-msgstr "永遠安裝缺的設定檔"
-
-#: src/main.c
-msgid "Offer to replace config files with no new versions"
-msgstr "即使沒有新設定檔，也詢要問不要取代舊設定檔"
-
-#: src/main.c
-msgid "Process even packages with wrong or no architecture"
-msgstr "即使套件沒有設硬體平台，或硬體平台有誤，也繼續進行"
-
-#: src/main.c
-msgid "Install even if it would break another package"
-msgstr "即使會破壞其它套件，也要安裝"
-
-#: src/main.c
-msgid "Allow installation of conflicting packages"
-msgstr "允許安裝相衝的討件"
-
-#: src/main.c
-msgid "Turn all dependency problems into warnings"
-msgstr "把所有相依問題當作警告"
-
-#: src/main.c
-msgid "Turn dependency version problems into warnings"
-msgstr "把所有相依版本問題當作警告"
-
-#: src/main.c
-msgid "Remove packages which require installation"
-msgstr "移除需要安裝的套件"
-
-#: src/main.c
-msgid "Remove an essential package"
-msgstr "移除核心套件"
+"標示有 [*] 的選項會輸出大量文字 - 將其重導向至 less 或 more！"
 
 #: src/main.c
 msgid "Generally helpful progress information"
@@ -3703,41 +3845,6 @@ msgstr "無法移除資料庫正在使用的 '%s' 硬體平台"
 
 #: src/main.c
 #, c-format
-msgid ""
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"
-msgstr ""
-"%s 強制選項 - 發生問題時，程式的行為控制：\n"
-"  警告後繼續：  --force-<項目>,<項目>,...\n"
-"  錯誤終止：    --refuse-<項目>,<項目>,... | --no-force-<項目>,...\n"
-" 強制項目：\n"
-
-#: src/main.c
-#, c-format
-msgid ""
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"
-msgstr ""
-"\n"
-"警告 - 使用標記 [!] 的選項，會嚴重破壞系統。\n"
-"預設啟用標記 [*] 的強制選項。\n"
-
-#: src/main.c
-#, c-format
-msgid "unknown force/refuse option '%.*s'"
-msgstr "未知的 force/refuse 選項 `%.*s'"
-
-#: src/main.c
-#, fuzzy, c-format
-#| msgid "obsolete force/refuse option '%s'\n"
-msgid "obsolete force/refuse option '%s'"
-msgstr "已作廢的 force/refuse 選項 '%s'\n"
-
-#: src/main.c
-#, c-format
 msgid "couldn't open '%i' for stream"
 msgstr "無法開啟 `%i' 讀取資料串流"
 
@@ -3809,10 +3916,9 @@ msgid "  Package %s is to be removed.\n"
 msgstr "  即將移除套件 %s。\n"
 
 #: src/packages.c
-#, fuzzy, c-format
-#| msgid "  Version of %s on system is %s.\n"
+#, c-format
 msgid "  Version of %s on system, provided by %s, is %s.\n"
-msgstr "  %s 在系統上的版本為 %s。\n"
+msgstr "  「%s」，由「%s」所提供，在系統上的版本為 %s。\n"
 
 #: src/packages.c
 #, c-format
@@ -3917,6 +4023,12 @@ msgid "Description"
 msgstr "簡介"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "以可換頁的瀏覽程式瀏覽檔案"
+
+#: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
 msgstr "%s 移轉自：%s\n"
@@ -3951,6 +4063,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr "套件 '%s' 未安裝，無法取得其資訊"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
+msgstr ""
+"使用 dpkg --info (= dpkg-deb --info) 來檢查壓縮檔，\n"
+"以及 dpkg --contents (= dpkg-deb --contents) 來列出壓縮檔內容。\n"
+
+#: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
 msgstr "無法取得套件 '%s'"
@@ -3976,9 +4098,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "被 %s 移轉到：%s\n"
 
 #: src/querycmd.c
+#, fuzzy
+#| msgid ""
+#| "Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
+#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgid ""
-"Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-"and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
+"Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
 "使用 dpkg --info (= dpkg-deb --info) 來檢查壓縮檔，\n"
 "以及 dpkg --contents (= dpkg-deb --contents) 來列出壓縮檔內容。\n"
@@ -4019,19 +4144,33 @@ msgid "Debian %s package management program query tool version %s.\n"
 msgstr "Debian %s 套件管理程式查詢工具版本 %s。\n"
 
 #: src/querycmd.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Commands:\n"
+#| "  -s|--status <package> ...        Display package status details.\n"
+#| "  -p|--print-avail <package> ...   Display available version details.\n"
+#| "  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
+#| "  -l|--list [<pattern> ...]        List packages concisely.\n"
+#| "  -W|--show [<pattern> ...]        Show information on package(s).\n"
+#| "  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
+#| "     --control-list <package>      Print the package control file list.\n"
+#| "     --control-show <package> <file>\n"
+#| "                                   Show the package control file.\n"
+#| "  -c|--control-path <package> [<file>]\n"
+#| "                                   Print path for package control file.\n"
+#| "\n"
 msgid ""
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"
 msgstr ""
@@ -4145,10 +4284,9 @@ msgid "Would remove or purge %s (%s) ...\n"
 msgstr "將要移除或清除 %s ...\n"
 
 #: src/remove.c
-#, fuzzy, c-format
-#| msgid "Removing %s ...\n"
+#, c-format
 msgid "Removing %s (%s) ...\n"
-msgstr "移除 %s ...\n"
+msgstr "正在移除 %s (%s)……\n"
 
 #: src/remove.c src/unpack.c
 #, c-format
@@ -4173,10 +4311,9 @@ msgid "while removing %.250s, directory '%.250s' not empty so not removed"
 msgstr "移除 %.250s 時，目錄 '%.250s' 不是空的，不會刪除"
 
 #: src/remove.c
-#, fuzzy, c-format
-#| msgid "Purging configuration files for %s ...\n"
+#, c-format
 msgid "Purging configuration files for %s (%s) ...\n"
-msgstr "清除 %s 的設定檔 ...\n"
+msgstr "正在清除 %s (%s) 的設定檔……\n"
 
 #: src/remove.c
 #, c-format
@@ -4212,6 +4349,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 msgstr "為使 dpkg 正常執行， admindir 須在 instdir 下"
 
 #: src/script.c
+msgid ""
+"not enough privileges to change root directory with --force-not-root, "
+"consider using --force-script-chrootless?"
+msgstr ""
+
+#: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
 msgstr "無法 chroot 至 `%.250s'"
@@ -4344,14 +4487,7 @@ msgid "Use --help for help about overriding file stat information."
 msgstr "請用 --help，參閱忽略檔案資訊的說明。"
 
 #: src/statcmd.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Commands:\n"
-#| "  --add <owner> <group> <mode> <file>\n"
-#| "                           add a new entry into the database.\n"
-#| "  --remove <file>          remove file from the database.\n"
-#| "  --list [<glob-pattern>]  list current overrides in the database.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Commands:\n"
 "  --add <owner> <group> <mode> <path>\n"
@@ -4360,11 +4496,11 @@ msgid ""
 "  --list [<glob-pattern>]  list current overrides in the database.\n"
 "\n"
 msgstr ""
-"命令：\n"
-"  --add <擁有者> <群組> <模式> <檔案>\n"
-"                           新增一個項目至資料庫。\n"
-"  --remove <檔案>          由資料庫中移除檔案。\n"
-"  --list [<比對表達式>]    列出目前資料庫中的優先選項。\n"
+"子命令：\n"
+"  --add <擁有者> <群組> <模式> <路徑>\n"
+"                           新增一個 <路徑> 項目至資料庫中。\n"
+"  --remove <路徑>          自資料庫移除 <路徑>。\n"
+"  --list [<glob式樣>]      列出目前資料庫中的覆載項目(overrides)。\n"
 "\n"
 
 #: src/statcmd.c
@@ -4372,7 +4508,7 @@ msgstr ""
 #| msgid ""
 #| "Options:\n"
 #| "  --admindir <directory>   set the directory with the statoverride file.\n"
-#| "  --update                 immediately update file permissions.\n"
+#| "  --update                 immediately update <path> permissions.\n"
 #| "  --force                  force an action even if a sanity check fails.\n"
 #| "  --quiet                  quiet operation, minimal output.\n"
 #| "  --help                   show this help message.\n"
@@ -4381,16 +4517,21 @@ msgstr ""
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 "\n"
 msgstr ""
 "選項：\n"
-"  --admindir <目錄>        設定 statoverride 檔的目錄。\n"
-"  --update                 立即更新檔案權限。\n"
+"  --admindir <目錄>        設定 statoverride 檔案的所在目錄。\n"
+"  --update                 立即更新 <路徑> 的權限。\n"
 "  --force                  即使未通過正確性檢查，也強制進行動作。\n"
 "  --quiet                  安靜模式，儘量不顯示訊息。\n"
 "  --help                   顯示這個說明訊息。\n"
@@ -4402,10 +4543,9 @@ msgid "stripping trailing /"
 msgstr "除去結尾的 /"
 
 #: src/statcmd.c
-#, fuzzy, c-format
-#| msgid "control file '%s' does not exist"
+#, c-format
 msgid "user '%s' does not exist"
-msgstr "查無控制檔 '%s'"
+msgstr "查無「%s」使用者"
 
 #: src/statcmd.c
 #, fuzzy, c-format
@@ -4448,69 +4588,11 @@ msgstr "沒有設定強制選項"
 msgid "--update is useless for --remove"
 msgstr "--remove 時 --update 無效"
 
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "invalid status"
-msgid "invalid statoverride uid %s"
-msgstr "狀態無效"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride gid %s"
-msgstr "讀取 statoverride 檔 '%.250s'"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "reading statoverride file '%.250s'"
-msgid "invalid statoverride mode %s"
-msgstr "讀取 statoverride 檔 '%.250s'"
-
-#: src/statdb.c
-msgid "failed to open statoverride file"
-msgstr "無法開啟 statoverride 檔"
-
-#: src/statdb.c
-msgid "failed to fstat statoverride file"
-msgstr "無法 fstat statoverride 檔"
-
-#: src/statdb.c
-#, c-format
-msgid "reading statoverride file '%.250s'"
-msgstr "讀取 statoverride 檔 '%.250s'"
-
-#: src/statdb.c
-msgid "statoverride file is missing final newline"
-msgstr "statoverride 檔檔尾沒有換行"
-
-#: src/statdb.c
-msgid "statoverride file contains empty line"
-msgstr "statoverride 檔有空行"
-
-#: src/statdb.c
-msgid "syntax error in statoverride file"
-msgstr "statoverride 檔語法錯誤"
-
-#: src/statdb.c
-#, fuzzy, c-format
-#| msgid "syntax error: unknown user '%s' in statoverride file"
-msgid "unknown user '%s' in statoverride file"
-msgstr "語法錯誤：statoverride 的使用者 '%s' 不明"
-
-#: src/statdb.c
-msgid "unexpected end of line in statoverride file"
-msgstr "statoverride 檔行尾意外中斷"
-
-#: src/statdb.c
+#: src/statcmd.c
 #, fuzzy, c-format
-#| msgid "syntax error: unknown group '%s' in statoverride file"
-msgid "unknown group '%s' in statoverride file"
-msgstr "語法錯誤：statoverride 檔中未知的 '%s' 群組"
-
-#: src/statdb.c
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "檔案 '%.250s' 有好幾個 statoverride 檔"
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "已作廢選項 '--%s' ；請改用 '--%s'"
 
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4545,18 +4627,7 @@ msgstr ""
 "\n"
 
 #: src/trigcmd.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --admindir=<directory>           Use <directory> instead of %s.\n"
-#| "  --by-package=<package>           Override trigger awaiter (normally "
-#| "set\n"
-#| "                                     by dpkg).\n"
-#| "  --no-await                       No package needs to await the "
-#| "processing.\n"
-#| "  --no-act                         Just test - don't actually change "
-#| "anything.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  --admindir=<directory>           Use <directory> instead of %s.\n"
@@ -4570,11 +4641,12 @@ msgid ""
 "\n"
 msgstr ""
 "選項：\n"
-"  --admindir=<目錄>                用 <目錄> 取代 %s。\n"
+"  --admindir=<目錄>                以 <目錄> 取代 %s。\n"
 "  --by-package=<套件>              強制觸發等待中的觸發程式\n"
 "                                   （通常由 dpkg 設定）。\n"
+"  --await                          套件需要等待處理。\n"
 "  --no-await                       套件不用等待處理。\n"
-"  --no-act                         只有測試 - 不要真的有任何異動。\n"
+"  --no-act                         只是測試 - 不要真的有任何異動。\n"
 "\n"
 
 #: src/trigcmd.c
@@ -4643,22 +4715,18 @@ msgid "dependency problems - leaving triggers unprocessed"
 msgstr "相依問題 - 保留未設定"
 
 #: src/trigproc.c
-#, fuzzy, c-format
-#| msgid ""
-#| "%s: dependency problems, but removing anyway as you requested:\n"
-#| "%s"
+#, c-format
 msgid ""
 "%s: dependency problems, but processing triggers anyway as you requested:\n"
 "%s"
 msgstr ""
-"%s：發生相依上的問題，但還是應您要求強制移除：\n"
+"%s：存在軟體依賴關係問題，但還是應您的要求處理觸發程式：\n"
 "%s"
 
 #: src/trigproc.c
-#, fuzzy, c-format
-#| msgid "Processing triggers for %s ...\n"
+#, c-format
 msgid "Processing triggers for %s (%s) ...\n"
-msgstr "執行 %s 的觸發程式 ...\n"
+msgstr "執行 %s (%s) 的觸發程式……\n"
 
 #: src/unpack.c
 #, c-format
@@ -4731,16 +4799,20 @@ msgid "ignoring pre-dependency problem!"
 msgstr "忽視預先相依問題！"
 
 #: src/unpack.c
-#, fuzzy, c-format
-#| msgid "De-configuring %s, to allow removal of %s ...\n"
+#, c-format
 msgid "De-configuring %s (%s), to allow removal of %s (%s) ...\n"
-msgstr "解除 %s 的設定，以便移除 %s ...\n"
+msgstr "正在解除設定 %s (%s)，以便移除 %s (%s)……\n"
 
 #: src/unpack.c
-#, fuzzy, c-format
-#| msgid "De-configuring %s ...\n"
+#, c-format
 msgid "De-configuring %s (%s) ...\n"
-msgstr "解除 %s 的設定...\n"
+msgstr "正在解除設定 %s (%s)……\n"
+
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "statoverride 檔有空行"
 
 #: src/unpack.c dpkg-deb/build.c
 #, fuzzy, c-format
@@ -4854,10 +4926,9 @@ msgid "package architecture (%s) does not match system (%s)"
 msgstr "套件的系統平台 (%s) 與本機系統 (%s) 不符"
 
 #: src/unpack.c
-#, fuzzy, c-format
-#| msgid "Preparing to replace %s %s (using %s) ...\n"
+#, c-format
 msgid "Preparing to unpack %s ...\n"
-msgstr "正準備替換 %s %s（使用 %s）...\n"
+msgstr "正在準備解包 %s……\n"
 
 #: src/unpack.c
 #, fuzzy, c-format
@@ -4876,11 +4947,9 @@ msgid "package filesystem archive extraction"
 msgstr "套件檔案系統壓縮檔解壓縮"
 
 #: src/unpack.c
-msgid "error reading dpkg-deb tar output"
-msgstr "在讀取 dpkg-deb 輸出的 tar 檔時發生錯誤"
-
-#: src/unpack.c
-msgid "corrupted filesystem tarfile - corrupted package archive"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "檔案系統 tar 檔已損壞 - 套件壓縮檔毀損"
 
 #: src/unpack.c
@@ -4889,18 +4958,23 @@ msgid "cannot zap possible trailing zeros from dpkg-deb: %s"
 msgstr "無法由 dpkg-deb 截掉可能的檔尾 0：%s"
 
 #: src/update.c
-#, fuzzy, c-format
-#| msgid "--%s needs exactly one Packages-file argument"
+#, c-format
 msgid "--%s takes at most one Packages-file argument"
-msgstr "--%s 需要一個套件檔參數，不多不少"
+msgstr "--%s 需要至多一個 Packages-file 作為引數"
 
 #: src/update.c
-msgid "unable to access dpkg status area for bulk available update"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid "unable to access dpkg database directory '%s' for bulk available update"
 msgstr "無法存取 dpkg 的狀態庫，以進行批次可用套件更新"
 
 #: src/update.c
-msgid "bulk available update requires write access to dpkg status area"
-msgstr "要進行批次可用套件更新，需在 dpkg 狀態庫有寫入權限"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area for bulk available update"
+msgid ""
+"required write access to dpkg database directory '%s' for bulk available "
+"update"
+msgstr "無法存取 dpkg 的狀態庫，以進行批次可用套件更新"
 
 #: src/update.c
 #, c-format
@@ -5181,16 +5255,13 @@ msgid "archive '%.250s' contains two control members, giving up"
 msgstr "壓縮檔 '%.250s' 有兩個控制成員，放棄執行"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " new debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd bytes.\n"
+#, c-format
 msgid ""
 " new Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
 msgstr ""
-" 新式 debian 套件，版本 %d.%d。\n"
-" 大小為 %jd 位元組：控制壓縮檔=%jd 位元組。\n"
+" 新式 Debian 套件，版本 %d.%d。\n"
+" 大小為 %jd 位元組：控制資訊封存檔=%jd 位元組。\n"
 
 #: dpkg-deb/extract.c
 msgid "archive control member size"
@@ -5207,16 +5278,13 @@ msgid "cannot skip archive control member from '%s': %s"
 msgstr "無法在 '%s' 中，跳過壓縮檔控制成員：%s"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid ""
-#| " old debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd, main archive=%jd.\n"
+#, c-format
 msgid ""
 " old Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgstr ""
-" 舊式 debian 套件，版本 %d.%d。\n"
-" 大小為 %jd 位元組：控制壓縮檔=%jd，主壓縮檔=%jd。\n"
+" 舊式 Debian 套件，版本 %d.%d。\n"
+" 大小為 %jd 位元組：控制資訊封存檔=%jd，主封存檔=%jd。\n"
 
 #: dpkg-deb/extract.c
 msgid ""
@@ -5227,10 +5295,9 @@ msgstr ""
 "但因為以文字模式下載而損毀"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "'%.255s' is not a debian format archive"
+#, c-format
 msgid "'%.255s' is not a Debian format archive"
-msgstr "`%.255s' 不是 debian 格式的壓縮檔"
+msgstr "「%.255s」不是一個 Debian 格式的封存檔"
 
 #: dpkg-deb/extract.c
 #, c-format
@@ -5246,16 +5313,18 @@ msgid "decompressing archive member"
 msgstr "解壓縮壓縮檔成員"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory"
-msgstr "無法切換到目錄"
-
-#: dpkg-deb/extract.c
 msgid "failed to create directory"
 msgstr "無法建立目錄"
 
 #: dpkg-deb/extract.c
-msgid "failed to chdir to directory after creating it"
-msgstr "建立目錄後，無法切換到該目錄"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "在第 %d 行的套件名稱中有預期之外的 eof"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "無法切換到目錄"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5281,10 +5350,9 @@ msgid "--%s takes at most two arguments (.deb and directory)"
 msgstr "--%s 至多可有兩個參數（.deb 和目錄）"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "--%s needs a .deb filename argument"
+#, c-format
 msgid "--%s needs .deb filename and directory arguments"
-msgstr "--%s 需要一個 .deb 檔名作為參數"
+msgstr "--%s 需要一個 .deb 檔名與目錄作為參數"
 
 #: dpkg-deb/extract.c
 #, c-format
@@ -5352,32 +5420,16 @@ msgid "     not a plain file          %.255s\n"
 msgstr "     不是普通檔案              %.255s\n"
 
 #: dpkg-deb/info.c
-#, fuzzy
-#| msgid "(no 'control' file in control archive!)\n"
 msgid "no 'control' file in control archive!"
-msgstr "（在控制壓縮檔中沒有 `control' 檔！)\n"
+msgstr "在控制資訊封存檔中沒有「control」檔案！"
 
 #: dpkg-deb/main.c
 #, c-format
 msgid "Debian '%s' package archive backend version %s.\n"
-msgstr "Debian `%s' 套件壓縮檔後端版本 %s。\n"
+msgstr "Debian「%s」套件封存檔後端版本 %s。\n"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Commands:\n"
-#| "  -b|--build <directory> [<deb>]   Build an archive.\n"
-#| "  -c|--contents <deb>              List contents.\n"
-#| "  -I|--info <deb> [<cfile> ...]    Show info to stdout.\n"
-#| "  -W|--show <deb>                  Show information on package(s)\n"
-#| "  -f|--field <deb> [<cfield> ...]  Show field(s) to stdout.\n"
-#| "  -e|--control <deb> [<directory>] Extract control info.\n"
-#| "  -x|--extract <deb> <directory>   Extract files.\n"
-#| "  -X|--vextract <deb> <directory>  Extract & list files.\n"
-#| "  -R|--raw-extract <deb> <directory>\n"
-#| "                                   Extract control info and files.\n"
-#| "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
-#| "\n"
+#, c-format
 msgid ""
 "Commands:\n"
 "  -b|--build <directory> [<deb>]   Build an archive.\n"
@@ -5394,18 +5446,19 @@ msgid ""
 "  --fsys-tarfile <deb>             Output filesystem tarfile.\n"
 "\n"
 msgstr ""
-"指令：\n"
-"  -b|--build <目錄> [<deb>]        製作壓縮檔。\n"
-"  -c|--contents <deb>              列出檔案。\n"
-"  -I|--info <deb> [<cfile> ...]    顯示 info 至標準輸出。\n"
+"子命令：\n"
+"  -b|--build <目錄> [<deb>]        建構一個封存檔。\n"
+"  -c|--contents <deb>              列出封存內容。\n"
+"  -I|--info <deb> [<cfile> ...]    將資訊顯示至標準輸出裝置(stdout)。\n"
 "  -W|--show <deb>                  顯示套件資訊\n"
-"  -f|--field <deb> [<cfield> ...]  顯示欄位至標準輸出。\n"
-"  -e|--control <deb> [<目錄>]      解壓縮控制資訊。\n"
-"  -x|--extract <deb> <目錄>        解壓縮檔案。\n"
-"  -X|--vextract <deb> <目錄>       解壓縮並列出檔案。\n"
+"  -f|--field <deb> [<cfield> ...]  顯示指定欄位至標準輸出裝置。\n"
+"  -e|--control <deb> [<目錄>]      解出控制資訊。\n"
+"  -x|--extract <deb> <目錄>        解開檔案。\n"
+"  -X|--vextract <deb> <目錄>       解開並列出檔案。\n"
 "  -R|--raw-extract <deb> <目錄>\n"
 "                                   解壓縮控制資訊和檔案。\n"
-"  --fsys-tarfile <deb>             輸出檔案系統的 tar 檔。\n"
+"  --ctrl-tarfile <deb>             輸出 control tar 檔。\n"
+"  --fsys-tarfile <deb>             輸出檔案系統 tar 檔。\n"
 "\n"
 
 #: dpkg-deb/main.c
@@ -5422,26 +5475,7 @@ msgstr ""
 "\n"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Options:\n"
-#| "  --showformat=<format>            Use alternative format for --show.\n"
-#| "  -v, --verbose                    Enable verbose output.\n"
-#| "  -D                               Enable debugging output.\n"
-#| "  --old, --new                     Select archive format.\n"
-#| "  --nocheck                        Suppress control file check (build "
-#| "bad\n"
-#| "                                     packages).\n"
-#| "  -z#                              Set the compression level when "
-#| "building.\n"
-#| "  -Z<type>                         Set the compression type used when "
-#| "building.\n"
-#| "                                     Allowed types: gzip, xz, bzip2, "
-#| "none.\n"
-#| "  -S<strategy>                     Set the compression strategy when "
-#| "building.\n"
-#| "                                     Allowed values: none, extreme (xz).\n"
-#| "\n"
+#, c-format
 msgid ""
 "Options:\n"
 "  -v, --verbose                    Enable verbose output.\n"
@@ -5465,27 +5499,26 @@ msgid ""
 "                                     filtered, huffman, rle, fixed (gzip).\n"
 "\n"
 msgstr ""
-"選項：\n"
-"  --showformat=<格式>        --show 使用其它輸出格式。\n"
-"  -v, --verbose              啟用詳盡的資訊。\n"
-"  -D                         啟用除錯資訊。\n"
-"  --old, --new               選擇壓縮檔格式。\n"
-"  --nocheck                  不檢查控制檔\n"
-"                             （故意製作損壞的套件）。\n"
-"  -z#                        設定製作時的壓縮等級。\n"
-"  -Z<壓縮法>                 設定製作時的壓縮法。\n"
-"                             可用的壓縮法：gzip、bzip2、lzma、none。\n"
-"  -S<方式>                   在製作時指定壓縮方式。\n"
-"                             可用方式：none、extreme (xz)。\n"
+"命令列選項：\n"
+"  -v, --verbose                    啟用冗餘的程式輸出。\n"
+"  -D, --debug                      啟用除錯資訊。\n"
+"      --showformat=<format>        於 --show 中使用其他的格式。\n"
+"      --deb-format=<format>        選擇封存檔格式\n"
+"                                     允許的值：0.939000, 2.0（預設值）。\n"
+"      --nocheck                    抑制住控制檔檢查\n"
+"                                     （用於故意製作損壞的套件）。\n"
+"      --root-owner-group           強制設定擁有者與擁有群組為 root。\n"
+"      --[no-]uniform-compression   在所有成員中使用相同的壓縮參數。\n"
+"  -z#                              設定建構套件時的壓縮層級。\n"
+"  -Z<壓縮方法>                     設定製作時的壓縮方法。\n"
+"                                     允許的壓縮方法：gzip、xz、none。\n"
+"  -S<策略>                         在建構套件時指定壓縮策略。\n"
+"                                     允許的值為：none、extreme (xz)、\n"
+"                                     filtered、huffman、rle、fixed (gzip)。\n"
 "\n"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Use `dpkg' to install and remove packages from your system, or\n"
-#| "`dselect' or `aptitude' for user-friendly package management.  Packages\n"
-#| "unpacked using `dpkg-deb --extract' will be incorrectly installed !\n"
+#, c-format
 msgid ""
 "\n"
 "Use 'dpkg' to install and remove packages from your system, or\n"
@@ -5493,9 +5526,9 @@ msgid ""
 "unpacked using 'dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 "\n"
-"使用 `dpkg' 來安裝和移除您系統上的套件，或是用 `dselect' 或 `aptitude'\n"
-"等較人性化的套件管理程式。用 `dpkg-deb --extract' 來解開套件並不是正確\n"
-"的安裝方式！\n"
+"使用「dpkg」工具來安裝和移除您系統上的套件，或是用「apt」或「aptitude」\n"
+"等較人性化的套件管理工具。被以「dpkg-deb --extract」命令解包的套件將不會\n"
+"被正確安裝！\n"
 
 #: dpkg-deb/main.c
 msgid ""
@@ -5506,16 +5539,14 @@ msgstr ""
 "輸入 dpkg --help 以取得如何安裝和移除套件的說明。"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid "archive has invalid format version: %s"
+#, c-format
 msgid "invalid deb format version: %s"
-msgstr "壓縮檔格式版號無效：%s"
+msgstr "無效的deb格式版本：%s"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid "unknown option '%s'"
+#, c-format
 msgid "unknown deb format version: %s"
-msgstr "選項不明 '%s'"
+msgstr "未知的 deb 格式版本：「%s」"
 
 #: dpkg-deb/main.c
 #, c-format
@@ -5533,16 +5564,14 @@ msgid "unknown compression type '%s'!"
 msgstr "未知的壓縮類型 `%s'！"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid "deprecated compression type '%s'; use xz instead"
+#, c-format
 msgid "obsolete compression type '%s'; use xz instead"
-msgstr "不建議使用的壓縮法 '%s'，請改用 xz"
+msgstr "「%s」為以棄用的壓縮類型，請改用 xz"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid "deprecated compression type '%s'; use xz instead"
+#, c-format
 msgid "obsolete compression type '%s'; use xz or gzip instead"
-msgstr "不建議使用的壓縮法 '%s'，請改用 xz"
+msgstr "「%s」為已棄用之壓縮類型；請改用 xz 或是 gzip"
 
 #: dpkg-deb/main.c
 #, c-format
@@ -5550,10 +5579,9 @@ msgid "invalid compressor parameters: %s"
 msgstr "壓縮參數無效：%s"
 
 #: dpkg-deb/main.c
-#, fuzzy, c-format
-#| msgid "unsupported compression preset"
+#, c-format
 msgid "unsupported compression type '%s' with uniform compression"
-msgstr "壓梭設定不支援"
+msgstr "「%s」壓縮類型不適用於 uniform compression"
 
 #: dpkg-split/info.c
 #, c-format
@@ -6080,7 +6108,21 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, c-format
+#, fuzzy, c-format
+#| msgid ""
+#| "Options:\n"
+#| "  --altdir <directory>     change the alternatives directory.\n"
+#| "  --admindir <directory>   change the administrative directory.\n"
+#| "  --log <file>             change the log file.\n"
+#| "  --force                  allow replacing files with alternative links.\n"
+#| "  --skip-auto              skip prompt for alternatives correctly "
+#| "configured\n"
+#| "                           in automatic mode (relevant for --config "
+#| "only)\n"
+#| "  --verbose                verbose operation, more output.\n"
+#| "  --quiet                  quiet operation, minimal output.\n"
+#| "  --help                   show this help message.\n"
+#| "  --version                show the version.\n"
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6090,8 +6132,9 @@ msgid ""
 "  --skip-auto              skip prompt for alternatives correctly "
 "configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 msgstr ""
@@ -6108,10 +6151,9 @@ msgstr ""
 "  --version                顯示版本資訊。\n"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "Use --help for help about overriding file stat information."
+#, c-format
 msgid "Use '%s --help' for program usage information."
-msgstr "請用 --help，參閱忽略檔案資訊的說明。"
+msgstr "請用「%s --help」命令以參閱程式使用相關資訊。"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6251,16 +6293,13 @@ msgid "unable to flush file '%s'"
 msgstr "無法清除檔案 '%s' 的寫入緩衝"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "Current 'best' version is '%s'."
+#, c-format
 msgid "  link best version is %s"
-msgstr "目前 '最佳' 的版本為 '%s'。"
+msgstr "  連結的最佳版本為「%s」"
 
 #: utils/update-alternatives.c
-#, fuzzy
-#| msgid "No versions available."
 msgid "  link best version not available"
-msgstr "沒有可用的版本。"
+msgstr "  連結的最佳版本現不存在"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6272,16 +6311,14 @@ msgid "  link currently absent"
 msgstr "  目前連結失效"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "  %.250s is %s.\n"
+#, c-format
 msgid "  link %s is %s"
-msgstr "  %.250s 現為 %s。\n"
+msgstr "  %s 連結現為 %s"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "  slave %s: %s"
+#, c-format
 msgid "  slave %s is %s"
-msgstr "  次要項目 %s：%s"
+msgstr "   %s 從屬連結為 %s"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6316,11 +6353,9 @@ msgid "Status"
 msgstr "狀態"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid ""
-#| "Press enter to keep the current choice[*], or type selection number: "
+#, c-format
 msgid "Press <enter> to keep the current choice[*], or type selection number: "
-msgstr "按 [enter] 保留目前選項 [*]，或輸入選項編號："
+msgstr "按下 <enter> 鍵以保留目前選項[*]，或是輸入選擇編號："
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6401,23 +6436,19 @@ msgid "renaming %s link from %s to %s"
 msgstr "%s 的連結，由 %s 重新命名為 %s"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "using %s to provide %s (%s) in %s"
+#, c-format
 msgid "using %s to provide %s (%s) in auto mode"
-msgstr "以 %1$s 提供 %4$s 中的 %2$s (%3$s)"
+msgstr "在自動模式下以 %1$s 來提供 %2$s (%3$s)"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid "using %s to provide %s (%s) in %s"
+#, c-format
 msgid "using %s to provide %s (%s) in manual mode"
-msgstr "以 %1$s 提供 %4$s 中的 %2$s (%3$s)"
+msgstr "在手動模式下以 %1$s 來提供 %2$s (%3$s)"
 
 #: utils/update-alternatives.c
-#, fuzzy, c-format
-#| msgid ""
-#| "forcing reinstallation of alternative %s because link group %s is broken"
+#, c-format
 msgid "updating alternative %s because link group %s has changed slave links"
-msgstr "連結群組 %2$s 損壞，強制重新安裝替換項目 %1$s"
+msgstr "因為 %2$s 連結群組變更了從屬連結故正在更新 %1$s 替代方案"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6513,10 +6544,8 @@ msgid "priority must be an integer"
 msgstr "優先權必須為整數"
 
 #: utils/update-alternatives.c
-#, fuzzy
-#| msgid "priority of %s is out of range: %s"
 msgid "priority is out of range"
-msgstr "%s 的優先權超出範圍：%s"
+msgstr "優先權數值超出範圍"
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6586,13 +6615,86 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "已作廢選項 '--%s' ；請改用 '--%s'"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "無法開啟鎖定檔 %s 測試"
 
 #, fuzzy
-#~| msgid "control file '%s' does not exist"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "查無控制檔 '%s'"
+#~| msgid "syntax error: unknown user '%s' in statoverride file"
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "語法錯誤：statoverride 的使用者 '%s' 不明"
+
+#, fuzzy
+#~| msgid "syntax error: unknown group '%s' in statoverride file"
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "語法錯誤：statoverride 檔中未知的 '%s' 群組"
+
+#~ msgid "%s is missing"
+#~ msgstr "未找到 %s"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "'%.50s' 不可用於 %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "在 %s 之後有多餘的資料"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "無效的套件名稱 (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "boolean 欄位的 yes/no"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "'%s' 欄位，參照 '%.255s'：版本號有誤"
+
+#~ msgid "empty value for %s"
+#~ msgstr "%s 的值是空的"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "套件的狀態為 triggers-awaited 但並沒有觸發程式正要執行"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr "套件的狀態為 triggers-pending 但並沒有觸發程式尚待執行"
+
+#~ msgid "bulk available update requires write access to dpkg status area"
+#~ msgstr "要進行批次可用套件更新，需在 dpkg 狀態庫有寫入權限"
+
+#~ msgid "error reading dpkg-deb tar output"
+#~ msgstr "在讀取 dpkg-deb 輸出的 tar 檔時發生錯誤"
+
+#, fuzzy
+#~| msgid "unable to open files list file for package `%.250s'"
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr "無法開啟套件 `%.250s' 的檔案清單"
+
+#, fuzzy
+#~| msgid "unable to stat files list file for package '%.250s'"
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr "無法取得套件 '%.250s' 檔案清單的檔案資訊"
+
+#, fuzzy
+#~| msgid "files list for package '%.250s' is not a regular file"
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr "套件 '%.250s' 的檔案清單，不是普通檔案"
+
+#, fuzzy
+#~| msgid "error closing files list file for package `%.250s'"
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr "關閉套件 `%.250s' 的檔案清單時，發生錯誤"
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr "無法開啟套件 `%.250s' 的檔案清單"
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr "無法取得套件 '%.250s' 檔案清單的檔案資訊"
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr "套件 '%.250s' 的檔案清單，不是普通檔案"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "讀取套件 '%.250s' 的檔案清單"
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "建立目錄後，無法切換到該目錄"
 
 #, fuzzy
 #~| msgid "control file '%s' does not exist"
@@ -6659,9 +6761,6 @@ msgstr ""
 #~ msgid "EOF on stdin at conffile prompt"
 #~ msgstr "在 conffile 提示輸入時，由 stdin 中讀到了 EOF"
 
-#~ msgid "unexpected eof in package name at line %d"
-#~ msgstr "在第 %d 行的套件名稱中有預期之外的 eof"
-
 #~ msgid "unexpected eof after package name at line %d"
 #~ msgstr "在第 %d 行的套件名稱後有預期之外的 eof"
 
diff --git a/run-script b/run-script
index dbc5dcc06..5f68a8749 100755
--- a/run-script
+++ b/run-script
@@ -1,11 +1,13 @@
 #!/bin/sh
 
-top_srcdir="`dirname "$0"`"
+set -e
+
+top_srcdir="$(dirname "$0")"
 
 # To avoid using «readlink -f» or «realpath» we just change into the
 # desired directory and work from there.
 cd "$top_srcdir"
-cwd="`pwd`"
+cwd="$(pwd)"
 cd "$OLDPWD"
 
 # Set up the environment, to use local perl modules and data files.
@@ -16,4 +18,4 @@ export DPKG_DATADIR="$cwd/data"
 script="$1"
 shift 1
 
-exec $PERL $PERL_PROFILE "$cwd/$script" "$@"
+exec "$PERL" "$cwd/$script" "$@"
diff --git a/scripts/.gitignore b/scripts/.gitignore
index 0d1f29ac9..a93412826 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,3 +1,4 @@
+Build.PL
 dpkg-architecture
 dpkg-buildflags
 dpkg-buildpackage
diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
new file mode 100644
index 000000000..b8f62d26f
--- /dev/null
+++ b/scripts/Build.PL.in
@@ -0,0 +1,143 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+eval {
+    require Module::Build;
+} or do {
+    die "error: Missing Module::Build module, cannot proceed.\n";
+};
+
+if (-e 'Build.PL.in') {
+    die "error: This is an in-tree build, not a proper perl distribution.\n" .
+        "To create one please configure normally and then run 'make dist'.\n";
+}
+
+my $class = Module::Build->subclass(
+    class => 'Module::Build::Dpkg',
+    code => q{
+        sub subst {
+            my ($self, $file) = @_;
+            my $path = $self->install_path();
+            my $version = $self->dist_version();
+
+            unlink "blib/$file"
+                or die "error: cannot remove blib/$file: $!\n";
+            open my $fhin, '<', $file
+                or die "error: cannot open $file: $!\n";
+            open my $fhout, '>', "blib/$file"
+                or die "error: cannot create blib/$file: $!\n";
+            while (<$fhin>) {
+                s{our \$PROGVERSION = .*;}{our \$PROGVERSION = '$version';};
+                s{our \$CONFDIR = .*;}{our \$CONFDIR = '$path->{conf}';};
+                s{our \$DATADIR = .*;}{our \$DATADIR = '$path->{data}';};
+                s{our \$ADMINDIR = .*;}{our \$ADMINDIR = '$path->{admin}';};
+                s{our \$LIBDIR = .*;}{our \$LIBDIR = '$path->{libexec}';};
+                print { $fhout } $_;
+            }
+            close $fhout or die "error: cannot write blib/$file: $!\n";
+            close $fhin;
+        }
+
+        sub ACTION_build {
+            my $self = shift;
+
+            $self->SUPER::ACTION_build;
+            $self->subst('lib/Dpkg.pm');
+        }
+        sub ACTION_test {
+            my $self = shift;
+
+            local $ENV{LANG} = 'C';
+            local $ENV{LC_ALL} = 'C';
+            local $ENV{DPKG_TEST_MODE} = 'cpan';
+            local $ENV{DPKG_DATADIR} = 'data';
+            local $ENV{DPKG_ORIGINS_DIR} = 't/origins';
+            $self->SUPER::ACTION_test;
+        }
+    },
+);
+
+my $build = $class->new(
+    dist_name       => '@PACKAGE_CPAN_NAME@',
+    dist_abstract   => 'Debian Package Manager Perl modules',
+    dist_version    => '@PACKAGE_VERSION@',
+    dist_author     => '@PACKAGE_COPYRIGHT_HOLDER@ <@PACKAGE_BUGREPORT@>',
+    license         => 'GPL_2',
+
+    release_status  => @PACKAGE_DIST_IS_RELEASE@ ? 'stable' : 'testing',
+
+    # Set only to avoid warnings.
+    module_name     => '@PACKAGE_CPAN_NAME@',
+
+    meta_merge => {
+        'meta-spec' => {
+            version => 2,
+        },
+        prereqs => {
+            test => {
+                recommends => {
+                    'Test::Pod'             => 0,
+                    'Test::Strict'          => 0,
+                },
+            },
+            develop => {
+                recommends => {
+                    'Test::MinimumVersion'  => 0,
+                    'Test::Perl::Critic'    => 0,
+                    'Test::Pod::Coverage'   => 0,
+                    'Test::Spelling'        => 0,
+                    'Test::Synopsis'        => 0,
+                },
+            },
+        },
+        resources => {
+            homepage => '@PACKAGE_URL@',
+            repository => {
+                type => '@PACKAGE_VCS_TYPE@',
+                url => '@PACKAGE_VCS_URL@',
+                web => '@PACKAGE_VCS_WEB@',
+            },
+            bugtracker => {
+                web => '@PACKAGE_BUG_WEB@',
+            },
+        },
+        keywords => [ qw(dpkg debian perl) ],
+    },
+
+    sign            => @PACKAGE_DIST_IS_RELEASE@,
+    dynamic_config  => 0,
+
+    configure_requires => {
+        'Module::Build'         => '0.4004',
+    },
+    test_requires => {
+        'TAP::Harness'          => 0,
+        'Test::More'            => 0,
+    },
+    recommends => {
+        'Algorithm::Merge'      => 0,
+        'File::FcntlLock'       => 0,
+        'Locale::gettext'       => 0,
+
+    },
+    requires => {
+        'perl'                  => '@PERL_MIN_VERSION@',
+    },
+
+    data_files => {
+        map { $_ => $_ } glob 'data/*'
+    },
+    install_path => {
+        conf => '/etc/dpkg',
+        data => '/usr/share/dpkg',
+        admin => '/var/lib/dpkg',
+        libexec => '/usr/lib/dpkg',
+    },
+);
+
+$build->add_build_element('data');
+$build->create_build_script();
+
+1;
diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm
index 0d171c080..9d06b4145 100644
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -24,12 +24,14 @@ Dpkg - module with core variables
 The Dpkg module provides a set of variables with information concerning
 this system installation.
 
+It is also the entry point to the Dpkg module hierarchy.
+
 =cut
 
 use strict;
 use warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '2.00';
 our @EXPORT_OK = qw(
     $PROGNAME
     $PROGVERSION
@@ -41,13 +43,6 @@ our @EXPORT_OK = qw(
     $LIBDIR
     $DATADIR
 );
-our @EXPORT = qw(
-    $version
-    $progname
-    $admindir
-    $dpkglibdir
-    $pkgdatadir
-);
 
 use Exporter qw(import);
 
@@ -99,7 +94,7 @@ Contains the path to the dpkg architecture tables directory.
 our ($PROGNAME) = $0 =~ m{(?:.*/)?([^/]*)};
 
 # The following lines are automatically fixed at install time
-our $PROGVERSION = '1.19.x';
+our $PROGVERSION = '1.20.x';
 our $PROGMAKE = $ENV{DPKG_PROGMAKE} // 'make';
 our $PROGTAR = $ENV{DPKG_PROGTAR} // 'tar';
 our $PROGPATCH = $ENV{DPKG_PROGPATCH} // 'patch';
@@ -107,20 +102,183 @@ our $PROGPATCH = $ENV{DPKG_PROGPATCH} // 'patch';
 our $CONFDIR = '/etc/dpkg';
 our $ADMINDIR = '/var/lib/dpkg';
 our $LIBDIR = '.';
-our $DATADIR = '..';
+our $DATADIR = '../data';
 
 $DATADIR = $ENV{DPKG_DATADIR} if defined $ENV{DPKG_DATADIR};
 
-# XXX: Backwards compatibility, to be removed on VERSION 2.00.
-## no critic (Variables::ProhibitPackageVars)
-our $version = $PROGVERSION;
-our $admindir = $ADMINDIR;
-our $dpkglibdir = $LIBDIR;
-our $pkgdatadir = $DATADIR;
-## use critic
+=head1 MODULES
+
+The following is the list of public modules within the Dpkg hierarchy. Only
+modules with versions 1.00 or higher, and only the interfaces documented in
+their POD are considered public.
+
+=over
+
+=item L<Dpkg>
+
+This module, core variables.
+
+=item L<Dpkg::Arch>
+
+Architecture handling functions.
+
+=item L<Dpkg::Build::Info>
+
+Build information functions.
+
+=item L<Dpkg::BuildFlags>
+
+Set, modify and query compilation build flags.
+
+=item L<Dpkg::BuildOptions>
+
+Parse and manipulate B<DEB_BUILD_OPTIONS>.
+
+=item L<Dpkg::BuildProfiles>
+
+Parse and manipulate build profiles.
+
+=item L<Dpkg::Changelog>
+
+Parse changelogs.
+
+=item L<Dpkg::Changelog::Entry>
+
+Represents a changelog entry.
+
+=item L<Dpkg::Changelog::Parse>
+
+Generic changelog parser for F<dpkg-parsechangelog>.
+
+=item L<Dpkg::Checksums>
+
+Generate and parse checksums.
+
+=item L<Dpkg::Compression>
+
+Simple database of available compression methods.
+
+=item L<Dpkg::Compression::FileHandle>
+
+Transparently compress and decompress files.
+
+=item L<Dpkg::Compression::Process>
+
+Wrapper around compression tools.
+
+=item L<Dpkg::Conf>
+
+Parse F<dpkg> configuration files.
+
+=item L<Dpkg::Control>
+
+Parse and manipulate Debian control information (F<.dsc>, F<.changes>,
+F<Packages>/F<Sources> entries, etc.).
+
+=item L<Dpkg::Control::Changelog>
+
+Represent fields output by F<dpkg-parsechangelog>.
+
+=item L<Dpkg::Control::Fields>
+
+Manage (list of known) control fields.
+
+=item L<Dpkg::Control::Hash>
+
+Parse and manipulate a block of RFC822-like fields.
+
+=item L<Dpkg::Control::Info>
+
+Parse files like F<debian/control>.
+
+=item L<Dpkg::Control::Tests>
+
+Parse files like F<debian/tests/control>.
+
+=item L<Dpkg::Control::Tests::Entry>
+
+Represents a F<debian/tests/control> stanza.
+
+=item L<Dpkg::Deps>
+
+Parse and manipulate dependencies.
+
+=item L<Dpkg::Deps::Simple>
+
+Represents a single dependency statement.
+
+=item L<Dpkg::Deps::Multiple>
+
+Base module to represent multiple dependencies.
+
+=item L<Dpkg::Deps::Union>
+
+List of unrelated dependencies.
+
+=item L<Dpkg::Deps::AND>
+
+List of AND dependencies.
+
+=item L<Dpkg::Deps::OR>
+
+List of OR dependencies.
+
+=item L<Dpkg::Deps::KnownFacts>
+
+List of installed and virtual packages.
+
+=item L<Dpkg::Exit>
+
+Push, pop and run exit handlers.
+
+=item L<Dpkg::Gettext>
+
+Wrapper around L<Locale::gettext>.
+
+=item L<Dpkg::IPC>
+
+Spawn sub-processes and feed/retrieve data.
+
+=item L<Dpkg::Index>
+
+Collections of L<Dpkg::Control> (F<Packages>/F<Sources> files for example).
+
+=item L<Dpkg::Interface::Storable>
+
+Base object serializer.
+
+=item L<Dpkg::Path>
+
+Common path handling functions.
+
+=item L<Dpkg::Source::Format>
+
+Parse and manipulate debian/source/format files.
+
+=item L<Dpkg::Source::Package>
+
+Extract Debian source packages.
+
+=item L<Dpkg::Substvars>
+
+Substitute variables in strings.
+
+=item L<Dpkg::Vendor>
+
+Identify current distribution vendor.
+
+=item L<Dpkg::Version>
+
+Parse and manipulate Debian package versions.
+
+=back
 
 =head1 CHANGES
 
+=head2 Version 2.00 (dpkg 1.20.0)
+
+Remove variables: $version, $progname, $admindir, $dpkglibdir and $pkgdatadir.
+
 =head2 Version 1.03 (dpkg 1.18.24)
 
 New variable: $PROGPATCH.
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index db6be6b2f..531bc118e 100644
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -36,7 +36,7 @@ use strict;
 use warnings;
 use feature qw(state);
 
-our $VERSION = '1.02';
+our $VERSION = '1.03';
 our @EXPORT_OK = qw(
     get_raw_build_arch
     get_raw_host_arch
@@ -601,17 +601,25 @@ sub debarch_is_wildcard($)
     return 0;
 }
 
-=item $bool = debarch_is_illegal($arch)
+=item $bool = debarch_is_illegal($arch, %options)
 
 Validate an architecture name.
 
+If the "positive" option is set to a true value, only positive architectures
+will be accepted, otherwise negated architectures are allowed.
+
 =cut
 
 sub debarch_is_illegal
 {
-    my ($arch) = @_;
+    my ($arch, %opts) = @_;
+    my $arch_re = qr/[a-zA-Z0-9][a-zA-Z0-9-]*/;
 
-    return $arch !~ m/^!?[a-zA-Z0-9][a-zA-Z0-9-]*$/;
+    if ($opts{positive}) {
+        return $arch !~ m/^$arch_re$/;
+    } else {
+        return $arch !~ m/^!?$arch_re$/;
+    }
 }
 
 =item $bool = debarch_is_concerned($arch, @arches)
@@ -653,15 +661,18 @@ sub debarch_is_concerned
 
 Parse an architecture list.
 
+If the "positive" option is set to a true value, only positive architectures
+will be accepted, otherwise negated architectures are allowed.
+
 =cut
 
 sub debarch_list_parse
 {
-    my $arch_list = shift;
+    my ($arch_list, %opts) = @_;
     my @arch_list = split ' ', $arch_list;
 
     foreach my $arch (@arch_list) {
-        if (debarch_is_illegal($arch)) {
+        if (debarch_is_illegal($arch, %opts)) {
             error(g_("'%s' is not a legal architecture in list '%s'"),
                   $arch, $arch_list);
         }
@@ -678,6 +689,11 @@ __END__
 
 =head1 CHANGES
 
+=head2 Version 1.03 (dpkg 1.19.1)
+
+New argument: Accept a "positive" option in debarch_is_illegal() and
+debarch_list_parse().
+
 =head2 Version 1.02 (dpkg 1.18.19)
 
 New import tags: ":all", ":getters", ":parsers", ":mappers", ":operators".
diff --git a/scripts/Dpkg/Build/Types.pm b/scripts/Dpkg/Build/Types.pm
index 45a81d3ba..9fd0344df 100644
--- a/scripts/Dpkg/Build/Types.pm
+++ b/scripts/Dpkg/Build/Types.pm
@@ -33,6 +33,7 @@ our @EXPORT = qw(
     build_is
     set_build_type
     set_build_type_from_options
+    set_build_type_from_targets
     get_build_options_from_type
 );
 
@@ -108,6 +109,15 @@ my %build_types = (
     any => BUILD_ARCH_DEP,
     all => BUILD_ARCH_INDEP,
 );
+my %build_targets = (
+    'clean' => BUILD_SOURCE,
+    'build' => BUILD_BINARY,
+    'build-arch' => BUILD_ARCH_DEP,
+    'build-indep' => BUILD_ARCH_INDEP,
+    'binary' => BUILD_BINARY,
+    'binary-arch' => BUILD_ARCH_DEP,
+    'binary-indep' => BUILD_ARCH_INDEP,
+);
 
 =back
 
@@ -193,9 +203,10 @@ sub set_build_type
     $current_option = $build_option;
 }
 
-=item set_build_type_from_options($build_type, $build_option, %opts)
+=item set_build_type_from_options($build_types, $build_option, %opts)
 
-Set the current build type from a list of build type components.
+Set the current build type from a list of comma-separated build type
+components.
 
 The function will check and abort on incompatible build type assignments,
 this behavior can be disabled by using the boolean option "nocheck".
@@ -216,6 +227,28 @@ sub set_build_type_from_options
     set_build_type($build_type, $build_option, %opts);
 }
 
+=item set_build_type_from_targets($build_targets, $build_option, %opts)
+
+Set the current build type from a list of comma-separated build target
+components.
+
+The function will check and abort on incompatible build type assignments,
+this behavior can be disabled by using the boolean option "nocheck".
+
+=cut
+
+sub set_build_type_from_targets
+{
+    my ($build_targets, $build_option, %opts) = @_;
+
+    my $build_type = 0;
+    foreach my $target (split /,/, $build_targets) {
+        $build_type |= $build_targets{$target} // BUILD_BINARY;
+    }
+
+    set_build_type($build_type, $build_option, %opts);
+}
+
 =item get_build_options_from_type()
 
 Get the current build type as a set of comma-separated string options.
diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm
index 0533b12b5..53b3cad00 100644
--- a/scripts/Dpkg/BuildFlags.pm
+++ b/scripts/Dpkg/BuildFlags.pm
@@ -18,12 +18,11 @@ package Dpkg::BuildFlags;
 use strict;
 use warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '1.04';
 
 use Dpkg ();
 use Dpkg::Gettext;
 use Dpkg::Build::Env;
-use Dpkg::BuildOptions;
 use Dpkg::ErrorHandling;
 use Dpkg::Vendor qw(run_vendor_hook);
 
@@ -35,7 +34,7 @@ Dpkg::BuildFlags - query build flags
 
 =head1 DESCRIPTION
 
-The Dpkg::BuildFlags object is used by dpkg-buildflags and can be used
+This class is used by dpkg-buildflags and can be used
 to query the same information.
 
 =head1 METHODS
@@ -69,21 +68,16 @@ Reset the flags stored to the default set provided by the vendor.
 sub load_vendor_defaults {
     my $self = shift;
 
-    $self->{options} = {};
-    $self->{source} = {};
     $self->{features} = {};
-    my $build_opts = Dpkg::BuildOptions->new();
-    $self->{build_options} = $build_opts;
-    my $default_flags = $build_opts->has('noopt') ? '-g -O0' : '-g -O2';
     $self->{flags} = {
 	CPPFLAGS => '',
-	CFLAGS   => $default_flags,
-	CXXFLAGS => $default_flags,
-	OBJCFLAGS   => $default_flags,
-	OBJCXXFLAGS => $default_flags,
-	GCJFLAGS => $default_flags,
-	FFLAGS   => $default_flags,
-	FCFLAGS  => $default_flags,
+	CFLAGS   => '',
+	CXXFLAGS => '',
+	OBJCFLAGS   => '',
+	OBJCXXFLAGS => '',
+	GCJFLAGS => '',
+	FFLAGS   => '',
+	FCFLAGS  => '',
 	LDFLAGS  => '',
     };
     $self->{origin} = {
@@ -218,6 +212,20 @@ sub load_config {
     $self->load_maintainer_config();
 }
 
+=item $bf->unset($flag)
+
+Unset the build flag $flag, so that it will not be known anymore.
+
+=cut
+
+sub unset {
+    my ($self, $flag) = @_;
+
+    delete $self->{flags}->{$flag};
+    delete $self->{origin}->{$flag};
+    delete $self->{maintainer}->{$flag};
+}
+
 =item $bf->set($flag, $value, $source, $maint)
 
 Update the build flag $flag with value $value and record its origin as
@@ -446,6 +454,10 @@ sub list {
 
 =head1 CHANGES
 
+=head2 Version 1.04 (dpkg 1.20.0)
+
+New method: $bf->unset().
+
 =head2 Version 1.03 (dpkg 1.16.5)
 
 New method: $bf->get_feature_areas() to list possible values for
diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index 057dfc1e3..e03ea320b 100644
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -34,7 +34,7 @@ Dpkg::BuildOptions - parse and update build options
 
 =head1 DESCRIPTION
 
-The Dpkg::BuildOptions object can be used to manipulate options stored
+This class can be used to manipulate options stored
 in environment variables like DEB_BUILD_OPTIONS and
 DEB_BUILD_MAINT_OPTIONS.
 
@@ -164,7 +164,7 @@ Each feature is prefixed with a ‘B<+>’ or a ‘B<->’ character as a marker
 to enable or disable it. The special feature “B<all>” can be used to act
 on all known features.
 
-Unknown of malformed features will emit warnings.
+Unknown or malformed features will emit warnings.
 
 =cut
 
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index db8e3eb09..04fa511ec 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -24,7 +24,7 @@ Dpkg::Changelog - base class to implement a changelog parser
 
 Dpkg::Changelog is a class representing a changelog file
 as an array of changelog entries (Dpkg::Changelog::Entry).
-By deriving this object and implementing its parse method, you
+By deriving this class and implementing its parse method, you
 add the ability to fill this object with changelog entries.
 
 =cut
@@ -34,7 +34,7 @@ package Dpkg::Changelog;
 use strict;
 use warnings;
 
-our $VERSION = '1.01';
+our $VERSION = '2.00';
 
 use Carp;
 
@@ -74,12 +74,6 @@ sub new {
     return $self;
 }
 
-=item $c->load($filename)
-
-Parse $filename as a changelog.
-
-=cut
-
 =item $c->set_options(%opts)
 
 Change the value of some options. "verbose" (defaults to 1) defines
@@ -96,6 +90,22 @@ sub set_options {
     $self->{$_} = $opts{$_} foreach keys %opts;
 }
 
+=item $count = $c->parse($fh, $description)
+
+Read the filehandle and parse a changelog in it. The data in the object is
+reset before parsing new data.
+
+Returns the number of changelog entries that have been parsed with success.
+
+This method needs to be implemented by one of the specialized changelog
+format subclasses.
+
+=item $count = $c->load($filename)
+
+Parse $filename contents for a changelog.
+
+Returns the number of changelog entries that have been parsed with success.
+
 =item $c->reset_parse_errors()
 
 Can be used to delete all information about errors occurred during
@@ -254,7 +264,7 @@ sub __sanity_check_range {
         push @versions, $version->as_string();
     }
     if ((defined($r->{since}) and not exists $versions{$r->{since}})) {
-        warning(g_("'%s' option specifies non-existing version"), 'since');
+        warning(g_("'%s' option specifies non-existing version '%s'"), 'since', $r->{since});
         warning(g_('use newest entry that is earlier than the one specified'));
         foreach my $v (@versions) {
             if (version_compare_relation($v, REL_LT, $r->{since})) {
@@ -270,7 +280,7 @@ sub __sanity_check_range {
         }
     }
     if ((defined($r->{from}) and not exists $versions{$r->{from}})) {
-        warning(g_("'%s' option specifies non-existing version"), 'from');
+        warning(g_("'%s' option specifies non-existing version '%s'"), 'from', $r->{from});
         warning(g_('use oldest entry that is later than the one specified'));
         my $oldest;
         foreach my $v (@versions) {
@@ -281,12 +291,12 @@ sub __sanity_check_range {
         if (defined($oldest)) {
             $r->{from} = $oldest;
         } else {
-            warning(g_("no such entry found, ignoring '%s' parameter"), 'from');
+            warning(g_("no such entry found, ignoring '%s' parameter '%s'"), 'from', $r->{from});
             delete $r->{from}; # No version was oldest
         }
     }
     if (defined($r->{until}) and not exists $versions{$r->{until}}) {
-        warning(g_("'%s' option specifies non-existing version"), 'until');
+        warning(g_("'%s' option specifies non-existing version '%s'"), 'until', $r->{until});
         warning(g_('use oldest entry that is later than the one specified'));
         my $oldest;
         foreach my $v (@versions) {
@@ -297,12 +307,12 @@ sub __sanity_check_range {
         if (defined($oldest)) {
             $r->{until} = $oldest;
         } else {
-            warning(g_("no such entry found, ignoring '%s' parameter"), 'until');
+            warning(g_("no such entry found, ignoring '%s' parameter '%s'"), 'until', $r->{until});
             delete $r->{until}; # No version was oldest
         }
     }
     if (defined($r->{to}) and not exists $versions{$r->{to}}) {
-        warning(g_("'%s' option specifies non-existing version"), 'to');
+        warning(g_("'%s' option specifies non-existing version '%s'"), 'to', $r->{to});
         warning(g_('use newest entry that is earlier than the one specified'));
         foreach my $v (@versions) {
             if (version_compare_relation($v, REL_LT, $r->{to})) {
@@ -312,17 +322,17 @@ sub __sanity_check_range {
         }
         if (not exists $versions{$r->{to}}) {
             # No version was earlier
-            warning(g_("no such entry found, ignoring '%s' parameter"), 'to');
+            warning(g_("no such entry found, ignoring '%s' parameter '%s'"), 'to', $r->{to});
             delete $r->{to};
         }
     }
 
     if (defined($r->{since}) and $data->[0]->get_version() eq $r->{since}) {
-	warning(g_("'since' option specifies most recent version, ignoring"));
+	warning(g_("'since' option specifies most recent version '%s', ignoring"), $r->{since});
 	delete $r->{since};
     }
     if (defined($r->{until}) and $data->[-1]->get_version() eq $r->{until}) {
-	warning(g_("'until' option specifies oldest version, ignoring"));
+	warning(g_("'until' option specifies oldest version '%s', ignoring"), $r->{until});
 	delete $r->{until};
     }
     ## use critic
@@ -332,11 +342,12 @@ sub get_range {
     my ($self, $range) = @_;
     $range //= {};
     my $res = $self->_data_range($range);
-    if (defined $res) {
-	return @$res if wantarray;
-	return $res;
+    return unless defined $res;
+    if (wantarray) {
+        return reverse @{$res} if $range->{reverse};
+        return @{$res};
     } else {
-	return;
+	return $res;
     }
 }
 
@@ -442,11 +453,7 @@ sub abort_early {
     return;
 }
 
-=item $c->save($filename)
-
-Save the changelog in the given file.
-
-=item $c->output()
+=item $str = $c->output()
 
 =item "$c"
 
@@ -475,6 +482,12 @@ sub output {
     return $str;
 }
 
+=item $c->save($filename)
+
+Save the changelog in the given file.
+
+=cut
+
 our ( @URGENCIES, %URGENCIES );
 BEGIN {
     @URGENCIES = qw(low medium high critical emergency);
@@ -657,36 +670,6 @@ sub format_range {
     }
 }
 
-=item $control = $c->dpkg($range)
-
-This is a deprecated alias for $c->format_range('dpkg', $range).
-
-=cut
-
-sub dpkg {
-    my ($self, $range) = @_;
-
-    warnings::warnif('deprecated',
-                     'deprecated method, please use format_range("dpkg", $range) instead');
-
-    return $self->format_range('dpkg', $range);
-}
-
-=item @controls = $c->rfc822($range)
-
-This is a deprecated alias for C<scalar c->format_range('rfc822', $range)>.
-
-=cut
-
-sub rfc822 {
-    my ($self, $range) = @_;
-
-    warnings::warnif('deprecated',
-                     'deprecated method, please use format_range("rfc822", $range) instead');
-
-    return scalar $self->format_range('rfc822', $range);
-}
-
 =back
 
 =head1 RANGE SELECTION
@@ -766,6 +749,10 @@ with only one of the options specified.
 
 =head1 CHANGES
 
+=head2 Version 2.00 (dpkg 1.20.0)
+
+Remove methods: $c->dpkg(), $c->rfc822().
+
 =head2 Version 1.01 (dpkg 1.18.8)
 
 New method: $c->format_range().
diff --git a/scripts/Dpkg/Changelog/Debian.pm b/scripts/Dpkg/Changelog/Debian.pm
index a44ac666c..a85f3af12 100644
--- a/scripts/Dpkg/Changelog/Debian.pm
+++ b/scripts/Dpkg/Changelog/Debian.pm
@@ -24,6 +24,12 @@ Dpkg::Changelog::Debian - parse Debian changelogs
 
 =head1 DESCRIPTION
 
+This class represents a Debian changelog file as an array of changelog
+entries (Dpkg::Changelog::Entry::Debian).
+It implements the generic interface Dpkg::Changelog.
+Only methods specific to this implementation are described below,
+the rest are inherited.
+
 Dpkg::Changelog::Debian parses Debian changelogs as described in
 deb-changelog(5).
 
@@ -118,10 +124,11 @@ my $ancient_delimiter_re = qr{
 
 =over 4
 
-=item $c->parse($fh, $description)
+=item $count = $c->parse($fh, $description)
 
-Read the filehandle and parse a Debian changelog in it. The data in the
-object is reset before parsing new data.
+Read the filehandle and parse a Debian changelog in it, to store the entries
+as an array of Dpkg::Changelog::Entry::Debian objects.
+Any previous entries in the object are reset before parsing new data.
 
 Returns the number of changelog entries that have been parsed with success.
 
@@ -162,9 +169,13 @@ sub parse {
 	    $expect= START_CHANGES;
 	    @blanklines = ();
 	} elsif (m/^(?:;;\s*)?Local variables:/io) {
-	    last; # skip Emacs variables at end of file
+            # Save any trailing Emacs variables at end of file.
+            $self->set_unparsed_tail("$_\n" . (file_slurp($fh) // ''));
+            last;
 	} elsif (m/^vim:/io) {
-	    last; # skip Vim modelines at end of file
+            # Save any trailing Vim modelines at end of file.
+            $self->set_unparsed_tail("$_\n" . (file_slurp($fh) // ''));
+            last;
 	} elsif (m/^\$\w+:.*\$/o) {
 	    next; # skip stuff that look like a RCS keyword
 	} elsif (m/^\# /o) {
diff --git a/scripts/Dpkg/Changelog/Entry.pm b/scripts/Dpkg/Changelog/Entry.pm
index 144dacb0f..d6ce55601 100644
--- a/scripts/Dpkg/Changelog/Entry.pm
+++ b/scripts/Dpkg/Changelog/Entry.pm
@@ -39,7 +39,7 @@ Dpkg::Changelog::Entry - represents a changelog entry
 
 =head1 DESCRIPTION
 
-This object represents a changelog entry. It is composed
+This class represents a changelog entry. It is composed
 of a set of lines with specific purpose: an header line, changes lines, a
 trailer line. Blank lines can be between those kind of lines.
 
diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm
index 3d1888638..1e7daf55b 100644
--- a/scripts/Dpkg/Changelog/Entry/Debian.pm
+++ b/scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -19,10 +19,8 @@ package Dpkg::Changelog::Entry::Debian;
 use strict;
 use warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '2.00';
 our @EXPORT_OK = qw(
-    $regex_header
-    $regex_trailer
     match_header
     match_trailer
     find_closes
@@ -47,20 +45,18 @@ Dpkg::Changelog::Entry::Debian - represents a Debian changelog entry
 
 =head1 DESCRIPTION
 
-This object represents a Debian changelog entry. It implements the
-generic interface Dpkg::Changelog::Entry. Only functions specific to this
-implementation are described below.
+This class represents a Debian changelog entry.
+It implements the generic interface Dpkg::Changelog::Entry.
+Only functions specific to this implementation are described below,
+the rest are inherited.
 
 =cut
 
 my $name_chars = qr/[-+0-9a-z.]/i;
 
-# XXX: Backwards compatibility, stop exporting on VERSION 2.00.
-## no critic (Variables::ProhibitPackageVars)
-
 # The matched content is the source package name ($1), the version ($2),
 # the target distributions ($3) and the options on the rest of the line ($4).
-our $regex_header = qr{
+my $regex_header = qr{
     ^
     (\w$name_chars*)                    # Package name
     \ \(([^\(\) \t]+)\)                 # Package version
@@ -73,7 +69,7 @@ our $regex_header = qr{
 # The matched content is the maintainer name ($1), its email ($2),
 # some blanks ($3) and the timestamp ($4), which is decomposed into
 # day of week ($6), date-time ($7) and this into month name ($8).
-our $regex_trailer = qr<
+my $regex_trailer = qr<
     ^
     \ \-\-                              # Trailer marker
     \ (.*)                              # Maintainer name
@@ -100,8 +96,6 @@ my %month_name = map { $_ => } qw(
     August September October November December
 );
 
-## use critic
-
 =head1 METHODS
 
 =over 4
@@ -236,7 +230,7 @@ sub parse_trailer {
 	            push @errors, sprintf(g_('invalid abbreviated month name \'%s\''), $8);
 	        }
 	    }
-	    push @errors, sprintf(g_("cannot parse non-comformant date '%s'"), $7);
+	    push @errors, sprintf(g_("cannot parse non-conformant date '%s'"), $7);
 	};
 	$self->{trailer_timestamp_date} = $4;
     } else {
@@ -245,36 +239,6 @@ sub parse_trailer {
     return @errors;
 }
 
-=item $entry->check_header()
-
-Obsolete method. Use parse_header() instead.
-
-=cut
-
-sub check_header {
-    my $self = shift;
-
-    warnings::warnif('deprecated',
-                     'obsolete check_header(), use parse_header() instead');
-
-    return $self->parse_header();
-}
-
-=item $entry->check_trailer()
-
-Obsolete method. Use parse_trailer() instead.
-
-=cut
-
-sub check_trailer {
-    my $self = shift;
-
-    warnings::warnif('deprecated',
-                     'obsolete check_trailer(), use parse_trailer() instead');
-
-    return $self->parse_header();
-}
-
 =item $entry->normalize()
 
 Normalize the content. Strip whitespaces at end of lines, use a single
@@ -465,6 +429,12 @@ sub find_closes {
 
 =head1 CHANGES
 
+=head2 Version 2.00 (dpkg 1.20.0)
+
+Remove methods: $entry->check_header(), $entry->check_trailer().
+
+Hide variables: $regex_header, $regex_trailer.
+
 =head2 Version 1.03 (dpkg 1.18.8)
 
 New methods: $entry->get_timepiece().
diff --git a/scripts/Dpkg/Changelog/Parse.pm b/scripts/Dpkg/Changelog/Parse.pm
index e107dcf6d..8140e25a6 100644
--- a/scripts/Dpkg/Changelog/Parse.pm
+++ b/scripts/Dpkg/Changelog/Parse.pm
@@ -33,10 +33,8 @@ package Dpkg::Changelog::Parse;
 use strict;
 use warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '2.00';
 our @EXPORT = qw(
-    changelog_parse_debian
-    changelog_parse_plugin
     changelog_parse
 );
 
@@ -56,12 +54,16 @@ sub _changelog_detect_format {
     if ($file ne '-') {
         local $_;
 
-        open my $format_fh, '-|', 'tail', '-n', '40', $file
-            or syserr(g_('cannot create pipe for %s'), 'tail');
+        open my $format_fh, '<', $file
+            or syserr(g_('cannot open file %s'), $file);
+        if (-s $format_fh > 4096) {
+            seek $format_fh, -4096, 2
+                or syserr(g_('cannot seek into file %s'), $file);
+        }
         while (<$format_fh>) {
             $format = $1 if m/\schangelog-format:\s+([0-9a-z]+)\W/;
         }
-        close $format_fh or subprocerr(g_('tail of %s'), $file);
+        close $format_fh;
     }
 
     return $format;
@@ -71,40 +73,6 @@ sub _changelog_detect_format {
 
 =over 4
 
-=item $fields = changelog_parse_debian(%opt)
-
-This function is deprecated, use changelog_parse() instead, with the changelog
-format set to "debian".
-
-=cut
-
-sub changelog_parse_debian {
-    my (%options) = @_;
-
-    warnings::warnif('deprecated',
-                     'deprecated function changelog_parse_debian, use changelog_parse instead');
-
-    # Force the plugin to be debian.
-    $options{changelogformat} = 'debian';
-
-    return _changelog_parse(%options);
-}
-
-=item $fields = changelog_parse_plugin(%opt)
-
-This function is deprecated, use changelog_parse() instead.
-
-=cut
-
-sub changelog_parse_plugin {
-    my (%options) = @_;
-
-    warnings::warnif('deprecated',
-                     'deprecated function changelog_parse_plugin, use changelog_parse instead');
-
-    return _changelog_parse(%options);
-}
-
 =item $fields = changelog_parse(%opt)
 
 This function will parse a changelog. In list context, it returns as many
@@ -133,22 +101,16 @@ All the other keys in %opt are forwarded to the parser module constructor.
 
 =cut
 
-sub _changelog_parse {
+sub changelog_parse {
     my (%options) = @_;
 
-    # Setup and sanity checks.
-    if (exists $options{libdir}) {
-        warnings::warnif('deprecated',
-                         'obsolete libdir option, changelog parsers are now perl modules');
-    }
-
     $options{file} //= 'debian/changelog';
     $options{label} //= $options{file};
     $options{changelogformat} //= _changelog_detect_format($options{file});
     $options{format} //= 'dpkg';
     $options{compression} //= $options{file} ne 'debian/changelog';
 
-    my @range_opts = qw(since until from to offset count all);
+    my @range_opts = qw(since until from to offset count reverse all);
     $options{all} = 1 if exists $options{all};
     if (none { defined $options{$_} } @range_opts) {
         $options{count} = 1;
@@ -191,19 +153,15 @@ sub _changelog_parse {
     }
 }
 
-sub changelog_parse {
-    my (%options) = @_;
+=back
 
-    if (exists $options{forceplugin}) {
-        warnings::warnif('deprecated', 'obsolete forceplugin option');
-    }
+=head1 CHANGES
 
-    return _changelog_parse(%options);
-}
+=head2 Version 2.00 (dpkg 1.20.0)
 
-=back
+Remove functions: changelog_parse_debian(), changelog_parse_plugin().
 
-=head1 CHANGES
+Remove warnings: For options 'forceplugin', 'libdir'.
 
 =head2 Version 1.03 (dpkg 1.19.0)
 
@@ -213,7 +171,7 @@ New option: 'compression' in changelog_parse().
 
 Deprecated functions: changelog_parse_debian(), changelog_parse_plugin().
 
-Obsolete options: $forceplugin, $libdir.
+Obsolete options: forceplugin, libdir.
 
 =head2 Version 1.01 (dpkg 1.18.2)
 
diff --git a/scripts/Dpkg/Checksums.pm b/scripts/Dpkg/Checksums.pm
index 1237e8b89..93bdf4bd8 100644
--- a/scripts/Dpkg/Checksums.pm
+++ b/scripts/Dpkg/Checksums.pm
@@ -20,7 +20,7 @@ package Dpkg::Checksums;
 use strict;
 use warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '1.04';
 our @EXPORT = qw(
     checksums_is_supported
     checksums_get_list
@@ -41,7 +41,7 @@ Dpkg::Checksums - generate and manipulate file checksums
 
 =head1 DESCRIPTION
 
-This module provides an object that can generate and manipulate
+This module provides a class that can generate and manipulate
 various file checksums as well as some methods to query information
 about supported checksums.
 
@@ -106,10 +106,6 @@ whether the checksum algorithm is considered cryptographically strong.
 sub checksums_get_property($$) {
     my ($alg, $property) = @_;
 
-    if ($property eq 'program') {
-        warnings::warnif('deprecated', 'obsolete checksums program property');
-    }
-
     return unless checksums_is_supported($alg);
     return $CHECKSUMS->{lc($alg)}{$property};
 }
@@ -400,6 +396,10 @@ sub export_to_control {
 
 =head1 CHANGES
 
+=head2 Version 1.04 (dpkg 1.20.0)
+
+Remove warning: For obsolete property 'program'.
+
 =head2 Version 1.03 (dpkg 1.18.5)
 
 New property: Add new 'strong' property.
diff --git a/scripts/Dpkg/Compression.pm b/scripts/Dpkg/Compression.pm
index 3dbc4adf0..5bbe7f427 100644
--- a/scripts/Dpkg/Compression.pm
+++ b/scripts/Dpkg/Compression.pm
@@ -19,9 +19,8 @@ package Dpkg::Compression;
 use strict;
 use warnings;
 
-our $VERSION = '1.02';
+our $VERSION = '2.00';
 our @EXPORT = qw(
-    $compression_re_file_ext
     compression_is_supported
     compression_get_list
     compression_get_property
@@ -98,14 +97,11 @@ if ($Config{cf_by} eq 'Debian Project') {
     push @{$COMP->{gzip}->{comp_prog}}, '--rsyncable';
 }
 
-# XXX: Backwards compatibility, stop exporting on VERSION 2.00.
-## no critic (Variables::ProhibitPackageVars)
-our $default_compression = 'xz';
-our $default_compression_level = undef;
+my $default_compression = 'xz';
+my $default_compression_level = undef;
 
 my $regex = join '|', map { $_->{file_ext} } values %$COMP;
-our $compression_re_file_ext = qr/(?:$regex)/;
-## use critic
+my $compression_re_file_ext = qr/(?:$regex)/;
 
 =head1 FUNCTIONS
 
@@ -250,6 +246,11 @@ sub compression_is_valid_level {
 
 =head1 CHANGES
 
+=head2 Version 2.00 (dpkg 1.20.0)
+
+Hide variables: $default_compression, $default_compression_level
+and $compression_re_file_ext.
+
 =head2 Version 1.02 (dpkg 1.17.2)
 
 New function: compression_get_file_extension_regex()
diff --git a/scripts/Dpkg/Compression/FileHandle.pm b/scripts/Dpkg/Compression/FileHandle.pm
index 23b39841a..c0d4b0787 100644
--- a/scripts/Dpkg/Compression/FileHandle.pm
+++ b/scripts/Dpkg/Compression/FileHandle.pm
@@ -31,14 +31,14 @@ use Dpkg::ErrorHandling;
 use parent qw(IO::File Tie::Handle);
 
 # Useful reference to understand some kludges required to
-# have the object behave like a filehandle
+# have the class behave like a filehandle
 # http://blog.woobling.org/2009/10/are-filehandles-objects.html
 
 =encoding utf8
 
 =head1 NAME
 
-Dpkg::Compression::FileHandle - object dealing transparently with file compression
+Dpkg::Compression::FileHandle - class dealing transparently with file compression
 
 =head1 SYNOPSIS
 
@@ -76,7 +76,7 @@ Dpkg::Compression::FileHandle - object dealing transparently with file compressi
 
 =head1 DESCRIPTION
 
-Dpkg::Compression::FileHandle is an object that can be used
+Dpkg::Compression::FileHandle is a class that can be used
 like any filehandle and that deals transparently with compressed
 files. By default, the compression scheme is guessed from the filename
 but you can override this behaviour with the method C<set_compression>.
@@ -102,8 +102,8 @@ and you can't seek on a pipe.
 
 =head1 FileHandle METHODS
 
-The object inherits from IO::File so all methods that work on this
-object should work for Dpkg::Compression::FileHandle too. There
+The class inherits from IO::File so all methods that work on this
+class should work for Dpkg::Compression::FileHandle too. There
 may be exceptions though.
 
 =head1 PUBLIC METHODS
@@ -121,7 +121,7 @@ obviously incompatible with automatic detection of the compression method.
 
 =cut
 
-# Object methods
+# Class methods
 sub new {
     my ($this, %args) = @_;
     my $class = ref($this) || $this;
@@ -378,7 +378,7 @@ sub use_compression {
 =item $real_fh = $fh->get_filehandle()
 
 Returns the real underlying filehandle. Useful if you want to pass it
-along in a derived object.
+along in a derived class.
 
 =cut
 
@@ -444,9 +444,9 @@ sub _cleanup {
 
 =back
 
-=head1 DERIVED OBJECTS
+=head1 DERIVED CLASSES
 
-If you want to create an object that inherits from
+If you want to create a class that inherits from
 Dpkg::Compression::FileHandle you must be aware that
 the object is a reference to a GLOB that is returned by Symbol::gensym()
 and as such it's not a HASH.
diff --git a/scripts/Dpkg/Conf.pm b/scripts/Dpkg/Conf.pm
index ca98cd3a7..028a2939f 100644
--- a/scripts/Dpkg/Conf.pm
+++ b/scripts/Dpkg/Conf.pm
@@ -18,7 +18,7 @@ package Dpkg::Conf;
 use strict;
 use warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '1.04';
 
 use Carp;
 
@@ -85,22 +85,6 @@ sub get_options {
     return @{$self->{options}};
 }
 
-=item get()
-
-=item set()
-
-Obsolete functions, use get_options() instead. They will croak.
-
-=cut
-
-sub get {
-    croak 'obsolete function, use get_options instead';
-}
-
-sub set {
-    croak 'obsolete function, use get_options instead';
-}
-
 =item $conf->load($file)
 
 Read options from a file. Return the number of options parsed.
@@ -215,13 +199,11 @@ sub filter {
     my $remove = $opts{remove} // sub { 0 };
     my $keep = $opts{keep} // sub { 1 };
 
-    croak 'obsolete option format_argv' if exists $opts{format_argv};
-
     @{$self->{options}} = grep { not $remove->($_) and $keep->($_) }
                                @{$self->{options}};
 }
 
-=item $string = $conf->output($fh)
+=item $string = $conf->output([$fh])
 
 Write the options in the given filehandle (if defined) and return a string
 representation of the content (that would be) written.
@@ -230,10 +212,6 @@ representation of the content (that would be) written.
 
 Return a string representation of the content.
 
-=item $conf->save($file)
-
-Save the options in a file.
-
 =cut
 
 sub output {
@@ -249,10 +227,20 @@ sub output {
     return $ret;
 }
 
+=item $conf->save($file)
+
+Save the options in a file.
+
 =back
 
 =head1 CHANGES
 
+=head2 Version 1.04 (dpkg 1.20.0)
+
+Remove croak: For 'format_argv' in $conf->filter().
+
+Remove methods: $conf->get(), $conf->set().
+
 =head2 Version 1.03 (dpkg 1.18.8)
 
 Obsolete option: 'format_argv' in $conf->filter().
diff --git a/scripts/Dpkg/Control/Changelog.pm b/scripts/Dpkg/Control/Changelog.pm
index 1f65127c4..9184cedbc 100644
--- a/scripts/Dpkg/Control/Changelog.pm
+++ b/scripts/Dpkg/Control/Changelog.pm
@@ -32,7 +32,7 @@ Dpkg::Control::Changelog - represent info fields output by dpkg-parsechangelog
 
 =head1 DESCRIPTION
 
-This object derives directly from Dpkg::Control with the type
+This class derives directly from Dpkg::Control with the type
 CTRL_CHANGELOG.
 
 =head1 METHODS
diff --git a/scripts/Dpkg/Control/Fields.pm b/scripts/Dpkg/Control/Fields.pm
index 4a584e413..33beeec56 100644
--- a/scripts/Dpkg/Control/Fields.pm
+++ b/scripts/Dpkg/Control/Fields.pm
@@ -32,11 +32,14 @@ foreach my $op (run_vendor_hook('register-custom-fields')) {
     next if not (defined $op and ref $op); # Skip when not implemented by vendor
     my $func = shift @$op;
     if ($func eq 'register') {
-        &field_register(@$op);
+        my ($field, $allowed_type, @opts) = @{$op};
+        field_register($field, $allowed_type, @opts);
     } elsif ($func eq 'insert_before') {
-        &field_insert_before(@$op);
+        my ($type, $ref, @fields) = @{$op};
+        field_insert_before($type, $ref, @fields);
     } elsif ($func eq 'insert_after') {
-        &field_insert_after(@$op);
+        my ($type, $ref, @fields) = @{$op};
+        field_insert_after($type, $ref, @fields);
     } else {
         croak "vendor hook register-custom-fields sent bad data: @$op";
     }
diff --git a/scripts/Dpkg/Control/FieldsCore.pm b/scripts/Dpkg/Control/FieldsCore.pm
index b100366e1..f460433fc 100644
--- a/scripts/Dpkg/Control/FieldsCore.pm
+++ b/scripts/Dpkg/Control/FieldsCore.pm
@@ -176,6 +176,11 @@ our %FIELDS = (
         allowed => CTRL_INFO_PKG,
         separator => FIELD_SEP_SPACE,
     },
+    'build-tainted-by' => {
+        name => 'Build-Tainted-By',
+        allowed => CTRL_FILE_BUILDINFO,
+        separator => FIELD_SEP_SPACE,
+    },
     'built-for-profiles' => {
         name => 'Built-For-Profiles',
         allowed => ALL_PKG | CTRL_FILE_CHANGES,
@@ -634,7 +639,7 @@ our %FIELD_ORDER = (
         qw(format source binary architecture version binary-only-changes),
         @src_checksums_fields,
         qw(build-origin build-architecture build-kernel-version build-date
-        build-path installed-build-depends environment),
+        build-path build-tainted-by installed-build-depends environment),
     ],
     CTRL_FILE_CHANGES() => [
         qw(format date source binary binary-only built-for-profiles architecture
diff --git a/scripts/Dpkg/Control/HashCore.pm b/scripts/Dpkg/Control/HashCore.pm
index e83522729..04a8a574b 100644
--- a/scripts/Dpkg/Control/HashCore.pm
+++ b/scripts/Dpkg/Control/HashCore.pm
@@ -43,7 +43,7 @@ Dpkg::Control::HashCore - parse and manipulate a block of RFC822-like fields
 
 =head1 DESCRIPTION
 
-The Dpkg::Control::Hash object is a hash-like representation of a set of
+The Dpkg::Control::Hash class is a hash-like representation of a set of
 RFC822-like fields. The fields names are case insensitive and are always
 capitalized the same when output (see field_capitalize function in
 Dpkg::Control::Fields).
@@ -160,11 +160,6 @@ sub get_option {
     return $$self->{$k};
 }
 
-=item $c->load($file)
-
-Parse the content of $file. Exits in case of errors. Returns true if some
-fields have been parsed.
-
 =item $c->parse_error($file, $fmt, ...)
 
 Prints an error message and dies on syntax parse errors.
@@ -284,6 +279,11 @@ sub parse {
     return defined($cf);
 }
 
+=item $c->load($file)
+
+Parse the content of $file. Exits in case of errors. Returns true if some
+fields have been parsed.
+
 =item $c->find_custom_field($name)
 
 Scan the fields and look for a user specific field whose name matches the
@@ -313,11 +313,6 @@ sub get_custom_field {
     return;
 }
 
-=item $c->save($filename)
-
-Write the string representation of the control information to a
-file.
-
 =item $str = $c->output()
 
 =item "$c"
@@ -386,6 +381,10 @@ sub output {
     return $str;
 }
 
+=item $c->save($filename)
+
+Write the string representation of the control information to a file.
+
 =item $c->set_output_order(@fields)
 
 Define the order in which fields will be displayed in the output() method.
@@ -441,7 +440,7 @@ sub apply_substvars {
 
 package Dpkg::Control::HashCore::Tie;
 
-# This object is used to tie a hash. It implements hash-like functions by
+# This class is used to tie a hash. It implements hash-like functions by
 # normalizing the name of fields received in keys (using
 # Dpkg::Control::Fields::field_capitalize). It also stores the order in
 # which fields have been added in order to be able to dump them in the
diff --git a/scripts/Dpkg/Control/Info.pm b/scripts/Dpkg/Control/Info.pm
index a5eae8732..5759ab5ad 100644
--- a/scripts/Dpkg/Control/Info.pm
+++ b/scripts/Dpkg/Control/Info.pm
@@ -38,7 +38,7 @@ Dpkg::Control::Info - parse files like debian/control
 
 =head1 DESCRIPTION
 
-It provides an object to access data of files that follow the same
+It provides a class to access data of files that follow the same
 syntax as F<debian/control>.
 
 =head1 METHODS
@@ -90,11 +90,6 @@ sub reset {
     $self->{packages} = [];
 }
 
-=item $c->load($file)
-
-Load the content of $file. Exits in case of errors. If file is "-", it
-loads from the standard input.
-
 =item $c->parse($fh, $description)
 
 Parse a control file from the given filehandle. Exits in case of errors.
@@ -129,6 +124,11 @@ sub parse {
     }
 }
 
+=item $c->load($file)
+
+Load the content of $file. Exits in case of errors. If file is "-", it
+loads from the standard input.
+
 =item $c->[0]
 
 =item $c->get_source()
@@ -182,9 +182,10 @@ sub get_packages {
     return @{$self->{packages}};
 }
 
-=item $c->output($filehandle)
+=item $str = $c->output([$fh])
 
-Dump the content into a filehandle.
+Return the content info into a string. If $fh is specified print it into
+the filehandle.
 
 =cut
 
diff --git a/scripts/Dpkg/Control/Tests.pm b/scripts/Dpkg/Control/Tests.pm
index 439eee8c8..3c8d1c006 100644
--- a/scripts/Dpkg/Control/Tests.pm
+++ b/scripts/Dpkg/Control/Tests.pm
@@ -34,7 +34,7 @@ Dpkg::Control::Tests - parse files like debian/tests/control
 
 =head1 DESCRIPTION
 
-It provides an object to access data of files that follow the same
+It provides a class to access data of files that follow the same
 syntax as F<debian/tests/control>.
 
 =head1 METHODS
diff --git a/scripts/Dpkg/Control/Tests/Entry.pm b/scripts/Dpkg/Control/Tests/Entry.pm
index 92eea49f4..001a6f429 100644
--- a/scripts/Dpkg/Control/Tests/Entry.pm
+++ b/scripts/Dpkg/Control/Tests/Entry.pm
@@ -34,7 +34,7 @@ Dpkg::Control::Tests::Entry - represents a test suite entry
 
 =head1 DESCRIPTION
 
-This object represents a test suite entry.
+This class represents a test suite entry.
 
 =head1 METHODS
 
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index 3560e1a72..80d249019 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -1,3 +1,8 @@
+# Copyright © 1998 Richard Braakman
+# Copyright © 1999 Darren Benham
+# Copyright © 2000 Sean 'Shaleh' Perry
+# Copyright © 2004 Frank Lichtenheld
+# Copyright © 2006 Russ Allbery
 # Copyright © 2007-2009 Raphaël Hertzog <hertzog@debian.org>
 # Copyright © 2008-2009,2012-2014 Guillem Jover <guillem@debian.org>
 #
@@ -13,14 +18,6 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
-#########################################################################
-# Several parts are inspired by lib/Dep.pm from lintian (same license)
-#
-# Copyright © 1998 Richard Braakman
-# Portions Copyright © 1999 Darren Benham
-# Portions Copyright © 2000 Sean 'Shaleh' Perry
-# Portions Copyright © 2004 Frank Lichtenheld
-# Portions Copyright © 2006 Russ Allbery
 
 package Dpkg::Deps;
 
@@ -32,7 +29,7 @@ Dpkg::Deps - parse and manipulate dependencies of Debian packages
 
 =head1 DESCRIPTION
 
-The Dpkg::Deps module provides objects implementing various types of
+The Dpkg::Deps module provides classes implementing various types of
 dependencies.
 
 The most important function is deps_parse(), it turns a dependency line in
@@ -49,7 +46,7 @@ All the deps_* functions are exported by default.
 use strict;
 use warnings;
 
-our $VERSION = '1.06';
+our $VERSION = '1.07';
 our @EXPORT = qw(
     deps_concat
     deps_parse
@@ -66,6 +63,11 @@ use Dpkg::Arch qw(get_host_arch get_build_arch debarch_to_debtuple);
 use Dpkg::BuildProfiles qw(get_build_profiles);
 use Dpkg::ErrorHandling;
 use Dpkg::Gettext;
+use Dpkg::Deps::Simple;
+use Dpkg::Deps::Union;
+use Dpkg::Deps::AND;
+use Dpkg::Deps::OR;
+use Dpkg::Deps::KnownFacts;
 
 =item deps_eval_implication($rel_p, $v_p, $rel_q, $v_q)
 
@@ -233,6 +235,12 @@ them if set.
 If set to 1, returns a Dpkg::Deps::Union instead of a Dpkg::Deps::AND. Use
 this when parsing non-dependency fields like Conflicts.
 
+=item virtual (defaults to 0)
+
+If set to 1, allow only virtual package version relations, that is none,
+or “=”.
+This should be set whenever working with Provides fields.
+
 =item build_dep (defaults to 0)
 
 If set to 1, allow build-dep only arch qualifiers, that is “:native”.
@@ -263,6 +271,7 @@ sub deps_parse {
     $options{reduce_profiles} //= 0;
     $options{reduce_restrictions} //= 0;
     $options{union} //= 0;
+    $options{virtual} //= 0;
     $options{build_dep} //= 0;
     $options{tests_dep} //= 0;
 
@@ -299,6 +308,12 @@ sub deps_parse {
 		warning(g_("can't parse dependency %s"), $dep_or);
 		return;
 	    }
+            if ($options{virtual} && defined $dep_simple->{relation} &&
+                $dep_simple->{relation} ne '=') {
+                warning(g_('virtual dependency contains invalid relation: %s'),
+                        $dep_simple->output);
+                return;
+            }
 	    $dep_simple->{arches} = undef if not $options{use_arch};
             if ($options{reduce_arch}) {
 		$dep_simple->reduce_arch($options{host_arch});
@@ -414,15 +429,12 @@ sub deps_compare {
     }
 }
 
-
-package Dpkg::Deps::Simple;
-
-=head1 OBJECTS - Dpkg::Deps::*
+=head1 CLASSES - Dpkg::Deps::*
 
 There are several kind of dependencies. A Dpkg::Deps::Simple dependency
 represents a single dependency statement (it relates to one package only).
-Dpkg::Deps::Multiple dependencies are built on top of this object
-and combine several dependencies in a different manners. Dpkg::Deps::AND
+Dpkg::Deps::Multiple dependencies are built on top of this class
+and combine several dependencies in different manners. Dpkg::Deps::AND
 represents the logical "AND" between dependencies while Dpkg::Deps::OR
 represents the logical "OR". Dpkg::Deps::Multiple objects can contain
 Dpkg::Deps::Simple object as well as other Dpkg::Deps::Multiple objects.
@@ -431,1101 +443,16 @@ In practice, the code is only meant to handle the realistic cases which,
 given Debian's dependencies structure, imply those restrictions: AND can
 contain Simple or OR objects, OR can only contain Simple objects.
 
-Dpkg::Deps::KnownFacts is a special object that is used while evaluating
+Dpkg::Deps::KnownFacts is a special class that is used while evaluating
 dependencies and while trying to simplify them. It represents a set of
 installed packages along with the virtual packages that they might
 provide.
 
-=head2 COMMON METHODS
-
-=over 4
-
-=item $dep->is_empty()
-
-Returns true if the dependency is empty and doesn't contain any useful
-information. This is true when a Dpkg::Deps::Simple object has not yet
-been initialized or when a (descendant of) Dpkg::Deps::Multiple contains
-an empty list of dependencies.
-
-=item $dep->get_deps()
-
-Returns a list of sub-dependencies. For Dpkg::Deps::Simple it returns
-itself.
-
-=item $dep->output([$fh])
-
-=item "$dep"
-
-Returns a string representing the dependency. If $fh is set, it prints
-the string to the filehandle.
-
-=item $dep->implies($other_dep)
-
-Returns 1 when $dep implies $other_dep. Returns 0 when $dep implies
-NOT($other_dep). Returns undef when there's no implication. $dep and
-$other_dep do not need to be of the same type.
-
-=item $dep->sort()
-
-Sorts alphabetically the internal list of dependencies. It's a no-op for
-Dpkg::Deps::Simple objects.
-
-=item $dep->arch_is_concerned($arch)
-
-Returns true if the dependency applies to the indicated architecture. For
-multiple dependencies, it returns true if at least one of the
-sub-dependencies apply to this architecture.
-
-=item $dep->reduce_arch($arch)
-
-Simplifies the dependency to contain only information relevant to the given
-architecture. A Dpkg::Deps::Simple object can be left empty after this
-operation. For Dpkg::Deps::Multiple objects, the non-relevant
-sub-dependencies are simply removed.
-
-This trims off the architecture restriction list of Dpkg::Deps::Simple
-objects.
-
-=item $dep->get_evaluation($facts)
-
-Evaluates the dependency given a list of installed packages and a list of
-virtual packages provided. Those lists are part of the
-Dpkg::Deps::KnownFacts object given as parameters.
-
-Returns 1 when it's true, 0 when it's false, undef when some information
-is lacking to conclude.
-
-=item $dep->simplify_deps($facts, @assumed_deps)
-
-Simplifies the dependency as much as possible given the list of facts (see
-object Dpkg::Deps::KnownFacts) and a list of other dependencies that are
-known to be true.
-
-=item $dep->has_arch_restriction()
-
-For a simple dependency, returns the package name if the dependency
-applies only to a subset of architectures.  For multiple dependencies, it
-returns the list of package names that have such a restriction.
-
-=item $dep->reset()
-
-Clears any dependency information stored in $dep so that $dep->is_empty()
-returns true.
-
-=back
-
-=head2 Dpkg::Deps::Simple
-
-Such an object has four interesting properties:
-
-=over 4
-
-=item package
-
-The package name (can be undef if the dependency has not been initialized
-or if the simplification of the dependency lead to its removal).
-
-=item relation
-
-The relational operator: "=", "<<", "<=", ">=" or ">>". It can be
-undefined if the dependency had no version restriction. In that case the
-following field is also undefined.
-
-=item version
-
-The version.
-
-=item arches
-
-The list of architectures where this dependency is applicable. It's
-undefined when there's no restriction, otherwise it's an
-array ref. It can contain an exclusion list, in that case each
-architecture is prefixed with an exclamation mark.
-
-=item archqual
-
-The arch qualifier of the dependency (can be undef if there's none).
-In the dependency "python:any (>= 2.6)", the arch qualifier is "any".
-
-=back
-
-=head3 METHODS
-
-=over 4
-
-=item $simple_dep->parse_string('dpkg-dev (>= 1.14.8) [!hurd-i386]')
-
-Parses the dependency and modifies internal properties to match the parsed
-dependency.
-
-=item $simple_dep->merge_union($other_dep)
-
-Returns true if $simple_dep could be modified to represent the union of
-both dependencies. Otherwise returns false.
-
-=back
-
-=cut
-
-use strict;
-use warnings;
-
-use Carp;
-
-use Dpkg::Arch qw(debarch_is_concerned debarch_list_parse);
-use Dpkg::BuildProfiles qw(parse_build_profiles evaluate_restriction_formula);
-use Dpkg::Version;
-use Dpkg::ErrorHandling;
-use Dpkg::Gettext;
-
-use parent qw(Dpkg::Interface::Storable);
-
-sub new {
-    my ($this, $arg, %opts) = @_;
-    my $class = ref($this) || $this;
-    my $self = {};
-    bless $self, $class;
-    $self->reset();
-    $self->{host_arch} = $opts{host_arch};
-    $self->{build_arch} = $opts{build_arch};
-    $self->{build_dep} = $opts{build_dep} // 0;
-    $self->{tests_dep} = $opts{tests_dep} // 0;
-    $self->parse_string($arg) if defined($arg);
-    return $self;
-}
-
-sub reset {
-    my $self = shift;
-    $self->{package} = undef;
-    $self->{relation} = undef;
-    $self->{version} = undef;
-    $self->{arches} = undef;
-    $self->{archqual} = undef;
-    $self->{restrictions} = undef;
-}
-
-sub parse {
-    my ($self, $fh, $desc) = @_;
-    my $line = <$fh>;
-    chomp($line);
-    return $self->parse_string($line);
-}
-
-sub parse_string {
-    my ($self, $dep) = @_;
-
-    my $pkgname_re;
-    if ($self->{tests_dep}) {
-        $pkgname_re = qr/[\@a-zA-Z0-9][\@a-zA-Z0-9+.-]*/;
-    } else {
-        $pkgname_re = qr/[a-zA-Z0-9][a-zA-Z0-9+.-]*/;
-    }
-
-    return if not $dep =~
-           m{^\s*                           # skip leading whitespace
-              ($pkgname_re)                 # package name
-              (?:                           # start of optional part
-                :                           # colon for architecture
-                ([a-zA-Z0-9][a-zA-Z0-9-]*)  # architecture name
-              )?                            # end of optional part
-              (?:                           # start of optional part
-                \s* \(                      # open parenthesis for version part
-                \s* (<<|<=|=|>=|>>|[<>])    # relation part
-                \s* ([^\)\s]+)              # do not attempt to parse version
-                \s* \)                      # closing parenthesis
-              )?                            # end of optional part
-              (?:                           # start of optional architecture
-                \s* \[                      # open bracket for architecture
-                \s* ([^\]]+)                # don't parse architectures now
-                \s* \]                      # closing bracket
-              )?                            # end of optional architecture
-              (
-                (?:                         # start of optional restriction
-                \s* <                       # open bracket for restriction
-                \s* [^>]+                   # do not parse restrictions now
-                \s* >                       # closing bracket
-                )+
-              )?                            # end of optional restriction
-              \s*$                          # trailing spaces at end
-            }x;
-    if (defined($2)) {
-	return if $2 eq 'native' and not $self->{build_dep};
-	$self->{archqual} = $2;
-    }
-    $self->{package} = $1;
-    $self->{relation} = version_normalize_relation($3) if defined($3);
-    if (defined($4)) {
-	$self->{version} = Dpkg::Version->new($4);
-    }
-    if (defined($5)) {
-	$self->{arches} = [ debarch_list_parse($5) ];
-    }
-    if (defined($6)) {
-	$self->{restrictions} = [ parse_build_profiles($6) ];
-    }
-}
-
-sub output {
-    my ($self, $fh) = @_;
-    my $res = $self->{package};
-    if (defined($self->{archqual})) {
-	$res .= ':' . $self->{archqual};
-    }
-    if (defined($self->{relation})) {
-	$res .= ' (' . $self->{relation} . ' ' . $self->{version} .  ')';
-    }
-    if (defined($self->{arches})) {
-	$res .= ' [' . join(' ', @{$self->{arches}}) . ']';
-    }
-    if (defined($self->{restrictions})) {
-        for my $restrlist (@{$self->{restrictions}}) {
-            $res .= ' <' . join(' ', @{$restrlist}) . '>';
-        }
-    }
-    if (defined($fh)) {
-	print { $fh } $res;
-    }
-    return $res;
-}
-
-# _arch_is_superset(\@p, \@q)
-#
-# Returns true if the arch list @p is a superset of arch list @q.
-# The arguments can also be undef in case there's no explicit architecture
-# restriction.
-sub _arch_is_superset {
-    my ($p, $q) = @_;
-    my $p_arch_neg = defined($p) && $p->[0] =~ /^!/;
-    my $q_arch_neg = defined($q) && $q->[0] =~ /^!/;
-
-    # If "p" has no arches, it is a superset of q and we should fall through
-    # to the version check.
-    if (not defined $p) {
-	return 1;
-    }
-
-    # If q has no arches, it is a superset of p and there are no useful
-    # implications.
-    elsif (not defined $q) {
-	return 0;
-    }
-
-    # Both have arches.  If neither are negated, we know nothing useful
-    # unless q is a subset of p.
-    elsif (not $p_arch_neg and not $q_arch_neg) {
-	my %p_arches = map { $_ => 1 } @{$p};
-	my $subset = 1;
-	for my $arch (@{$q}) {
-	    $subset = 0 unless $p_arches{$arch};
-	}
-	return 0 unless $subset;
-    }
-
-    # If both are negated, we know nothing useful unless p is a subset of
-    # q (and therefore has fewer things excluded, and therefore is more
-    # general).
-    elsif ($p_arch_neg and $q_arch_neg) {
-	my %q_arches = map { $_ => 1 } @{$q};
-	my $subset = 1;
-	for my $arch (@{$p}) {
-	    $subset = 0 unless $q_arches{$arch};
-	}
-	return 0 unless $subset;
-    }
-
-    # If q is negated and p isn't, we'd need to know the full list of
-    # arches to know if there's any relationship, so bail.
-    elsif (not $p_arch_neg and $q_arch_neg) {
-	return 0;
-    }
-
-    # If p is negated and q isn't, q is a subset of p if none of the
-    # negated arches in p are present in q.
-    elsif ($p_arch_neg and not $q_arch_neg) {
-	my %q_arches = map { $_ => 1 } @{$q};
-	my $subset = 1;
-	for my $arch (@{$p}) {
-	    $subset = 0 if $q_arches{substr($arch, 1)};
-	}
-	return 0 unless $subset;
-    }
-    return 1;
-}
-
-# _arch_qualifier_implies($p, $q)
-#
-# Returns true if the arch qualifier $p and $q are compatible with the
-# implication $p -> $q, false otherwise. $p/$q can be undef/"any"/"native"
-# or an architecture string.
-#
-# Because we are handling dependencies in isolation, and the full context
-# of the implications are only known when doing dependency resolution at
-# run-time, we can only assert that they are implied if they are equal.
-sub _arch_qualifier_implies {
-    my ($p, $q) = @_;
-
-    return $p eq $q if defined $p and defined $q;
-    return 1 if not defined $p and not defined $q;
-    return 0;
-}
-
-# _restrictions_imply($p, $q)
-#
-# Returns true if the restrictions $p and $q are compatible with the
-# implication $p -> $q, false otherwise.
-# NOTE: We don't try to be very clever here, so we may conservatively
-# return false when there is an implication.
-sub _restrictions_imply {
-    my ($p, $q) = @_;
-
-    if (not defined $p) {
-       return 1;
-    } elsif (not defined $q) {
-       return 0;
-    } else {
-       # Check whether set difference is empty.
-       my %restr;
-
-       for my $restrlist (@{$q}) {
-           my $reststr = join ' ', sort @{$restrlist};
-           $restr{$reststr} = 1;
-       }
-       for my $restrlist (@{$p}) {
-           my $reststr = join ' ', sort @{$restrlist};
-           delete $restr{$reststr};
-       }
-
-       return keys %restr == 0;
-    }
-}
-
-# Returns true if the dependency in parameter can deduced from the current
-# dependency. Returns false if it can be negated. Returns undef if nothing
-# can be concluded.
-sub implies {
-    my ($self, $o) = @_;
-    if ($o->isa('Dpkg::Deps::Simple')) {
-	# An implication is only possible on the same package
-	return if $self->{package} ne $o->{package};
-
-	# Our architecture set must be a superset of the architectures for
-	# o, otherwise we can't conclude anything.
-	return unless _arch_is_superset($self->{arches}, $o->{arches});
-
-	# The arch qualifier must not forbid an implication
-	return unless _arch_qualifier_implies($self->{archqual},
-	                                      $o->{archqual});
-
-	# Our restrictions must imply the restrictions for o
-	return unless _restrictions_imply($self->{restrictions},
-	                                  $o->{restrictions});
-
-	# If o has no version clause, then our dependency is stronger
-	return 1 if not defined $o->{relation};
-	# If o has a version clause, we must also have one, otherwise there
-	# can't be an implication
-	return if not defined $self->{relation};
-
-	return Dpkg::Deps::deps_eval_implication($self->{relation},
-		$self->{version}, $o->{relation}, $o->{version});
-
-    } elsif ($o->isa('Dpkg::Deps::AND')) {
-	# TRUE: Need to imply all individual elements
-	# FALSE: Need to NOT imply at least one individual element
-	my $res = 1;
-	foreach my $dep ($o->get_deps()) {
-	    my $implication = $self->implies($dep);
-	    unless (defined($implication) && $implication == 1) {
-		$res = $implication;
-		last if defined $res;
-	    }
-	}
-	return $res;
-    } elsif ($o->isa('Dpkg::Deps::OR')) {
-	# TRUE: Need to imply at least one individual element
-	# FALSE: Need to not apply all individual elements
-	# UNDEF: The rest
-	my $res = undef;
-	foreach my $dep ($o->get_deps()) {
-	    my $implication = $self->implies($dep);
-	    if (defined($implication)) {
-		if (not defined $res) {
-		    $res = $implication;
-		} else {
-		    if ($implication) {
-			$res = 1;
-		    } else {
-			$res = 0;
-		    }
-		}
-		last if defined($res) && $res == 1;
-	    }
-	}
-	return $res;
-    } else {
-	croak 'Dpkg::Deps::Simple cannot evaluate implication with a ' .
-	      ref($o);
-    }
-}
-
-sub get_deps {
-    my $self = shift;
-    return $self;
-}
-
-sub sort {
-    # Nothing to sort
-}
-
-sub arch_is_concerned {
-    my ($self, $host_arch) = @_;
-
-    return 0 if not defined $self->{package}; # Empty dep
-    return 1 if not defined $self->{arches};  # Dep without arch spec
-
-    return debarch_is_concerned($host_arch, @{$self->{arches}});
-}
-
-sub reduce_arch {
-    my ($self, $host_arch) = @_;
-    if (not $self->arch_is_concerned($host_arch)) {
-	$self->reset();
-    } else {
-	$self->{arches} = undef;
-    }
-}
-
-sub has_arch_restriction {
-    my $self = shift;
-    if (defined $self->{arches}) {
-	return $self->{package};
-    } else {
-	return ();
-    }
-}
-
-sub profile_is_concerned {
-    my ($self, $build_profiles) = @_;
-
-    return 0 if not defined $self->{package}; # Empty dep
-    return 1 if not defined $self->{restrictions}; # Dep without restrictions
-    return evaluate_restriction_formula($self->{restrictions}, $build_profiles);
-}
-
-sub reduce_profiles {
-    my ($self, $build_profiles) = @_;
-
-    if (not $self->profile_is_concerned($build_profiles)) {
-        $self->reset();
-    } else {
-        $self->{restrictions} = undef;
-    }
-}
-
-sub get_evaluation {
-    my ($self, $facts) = @_;
-    return if not defined $self->{package};
-    return $facts->_evaluate_simple_dep($self);
-}
-
-sub simplify_deps {
-    my ($self, $facts) = @_;
-    my $eval = $self->get_evaluation($facts);
-    $self->reset() if defined $eval and $eval == 1;
-}
-
-sub is_empty {
-    my $self = shift;
-    return not defined $self->{package};
-}
-
-sub merge_union {
-    my ($self, $o) = @_;
-    return 0 if not $o->isa('Dpkg::Deps::Simple');
-    return 0 if $self->is_empty() or $o->is_empty();
-    return 0 if $self->{package} ne $o->{package};
-    return 0 if defined $self->{arches} or defined $o->{arches};
-
-    if (not defined $o->{relation} and defined $self->{relation}) {
-	# Union is the non-versioned dependency
-	$self->{relation} = undef;
-	$self->{version} = undef;
-	return 1;
-    }
-
-    my $implication = $self->implies($o);
-    my $rev_implication = $o->implies($self);
-    if (defined($implication)) {
-	if ($implication) {
-	    $self->{relation} = $o->{relation};
-	    $self->{version} = $o->{version};
-	    return 1;
-	} else {
-	    return 0;
-	}
-    }
-    if (defined($rev_implication)) {
-	if ($rev_implication) {
-	    # Already merged...
-	    return 1;
-	} else {
-	    return 0;
-	}
-    }
-    return 0;
-}
-
-package Dpkg::Deps::Multiple;
-
-=head2 Dpkg::Deps::Multiple
-
-This is the base class for Dpkg::Deps::{AND,OR,Union}. It implements
-the following methods:
-
-=over 4
-
-=item $mul->add($dep)
-
-Adds a new dependency object at the end of the list.
-
-=back
-
-=cut
-
-use strict;
-use warnings;
-
-use Carp;
-
-use Dpkg::ErrorHandling;
-
-use parent qw(Dpkg::Interface::Storable);
-
-sub new {
-    my $this = shift;
-    my $class = ref($this) || $this;
-    my $self = { list => [ @_ ] };
-    bless $self, $class;
-    return $self;
-}
-
-sub reset {
-    my $self = shift;
-    $self->{list} = [];
-}
-
-sub add {
-    my $self = shift;
-    push @{$self->{list}}, @_;
-}
-
-sub get_deps {
-    my $self = shift;
-    return grep { not $_->is_empty() } @{$self->{list}};
-}
-
-sub sort {
-    my $self = shift;
-    my @res = ();
-    @res = sort { Dpkg::Deps::deps_compare($a, $b) } @{$self->{list}};
-    $self->{list} = [ @res ];
-}
-
-sub arch_is_concerned {
-    my ($self, $host_arch) = @_;
-    my $res = 0;
-    foreach my $dep (@{$self->{list}}) {
-	$res = 1 if $dep->arch_is_concerned($host_arch);
-    }
-    return $res;
-}
-
-sub reduce_arch {
-    my ($self, $host_arch) = @_;
-    my @new;
-    foreach my $dep (@{$self->{list}}) {
-	$dep->reduce_arch($host_arch);
-	push @new, $dep if $dep->arch_is_concerned($host_arch);
-    }
-    $self->{list} = [ @new ];
-}
-
-sub has_arch_restriction {
-    my $self = shift;
-    my @res;
-    foreach my $dep (@{$self->{list}}) {
-	push @res, $dep->has_arch_restriction();
-    }
-    return @res;
-}
-
-sub profile_is_concerned {
-    my ($self, $build_profiles) = @_;
-    my $res = 0;
-
-    foreach my $dep (@{$self->{list}}) {
-        $res = 1 if $dep->profile_is_concerned($build_profiles);
-    }
-    return $res;
-}
-
-sub reduce_profiles {
-    my ($self, $build_profiles) = @_;
-    my @new;
-
-    foreach my $dep (@{$self->{list}}) {
-        $dep->reduce_profiles($build_profiles);
-        push @new, $dep if $dep->profile_is_concerned($build_profiles);
-    }
-    $self->{list} = [ @new ];
-}
-
-sub is_empty {
-    my $self = shift;
-    return scalar @{$self->{list}} == 0;
-}
-
-sub merge_union {
-    croak 'method merge_union() is only valid for Dpkg::Deps::Simple';
-}
-
-package Dpkg::Deps::AND;
-
-=head2 Dpkg::Deps::AND
-
-This object represents a list of dependencies who must be met at the same
-time.
-
-=over 4
-
-=item $and->output([$fh])
-
-The output method uses ", " to join the list of sub-dependencies.
-
-=back
-
-=cut
-
-use strict;
-use warnings;
-
-use parent -norequire, qw(Dpkg::Deps::Multiple);
-
-sub output {
-    my ($self, $fh) = @_;
-    my $res = join(', ', map { $_->output() } grep { not $_->is_empty() } $self->get_deps());
-    if (defined($fh)) {
-	print { $fh } $res;
-    }
-    return $res;
-}
-
-sub implies {
-    my ($self, $o) = @_;
-    # If any individual member can imply $o or NOT $o, we're fine
-    foreach my $dep ($self->get_deps()) {
-	my $implication = $dep->implies($o);
-	return 1 if defined($implication) && $implication == 1;
-	return 0 if defined($implication) && $implication == 0;
-    }
-    # If o is an AND, we might have an implication, if we find an
-    # implication within us for each predicate in o
-    if ($o->isa('Dpkg::Deps::AND')) {
-	my $subset = 1;
-	foreach my $odep ($o->get_deps()) {
-	    my $found = 0;
-	    foreach my $dep ($self->get_deps()) {
-		$found = 1 if $dep->implies($odep);
-	    }
-	    $subset = 0 if not $found;
-	}
-	return 1 if $subset;
-    }
-    return;
-}
-
-sub get_evaluation {
-    my ($self, $facts) = @_;
-    # Return 1 only if all members evaluates to true
-    # Return 0 if at least one member evaluates to false
-    # Return undef otherwise
-    my $result = 1;
-    foreach my $dep ($self->get_deps()) {
-	my $eval = $dep->get_evaluation($facts);
-	if (not defined $eval) {
-	    $result = undef;
-	} elsif ($eval == 0) {
-	    $result = 0;
-	    last;
-	} elsif ($eval == 1) {
-	    # Still possible
-	}
-    }
-    return $result;
-}
-
-sub simplify_deps {
-    my ($self, $facts, @knowndeps) = @_;
-    my @new;
-
-WHILELOOP:
-    while (@{$self->{list}}) {
-	my $dep = shift @{$self->{list}};
-	my $eval = $dep->get_evaluation($facts);
-	next if defined($eval) and $eval == 1;
-	foreach my $odep (@knowndeps, @new) {
-	    next WHILELOOP if $odep->implies($dep);
-	}
-        # When a dependency is implied by another dependency that
-        # follows, then invert them
-        # "a | b, c, a"  becomes "a, c" and not "c, a"
-        my $i = 0;
-	foreach my $odep (@{$self->{list}}) {
-            if (defined $odep and $odep->implies($dep)) {
-                splice @{$self->{list}}, $i, 1;
-                unshift @{$self->{list}}, $odep;
-                next WHILELOOP;
-            }
-            $i++;
-	}
-	push @new, $dep;
-    }
-    $self->{list} = [ @new ];
-}
-
-
-package Dpkg::Deps::OR;
-
-=head2 Dpkg::Deps::OR
-
-This object represents a list of dependencies of which only one must be met
-for the dependency to be true.
-
-=over 4
-
-=item $or->output([$fh])
-
-The output method uses " | " to join the list of sub-dependencies.
-
-=back
-
-=cut
-
-use strict;
-use warnings;
-
-use parent -norequire, qw(Dpkg::Deps::Multiple);
-
-sub output {
-    my ($self, $fh) = @_;
-    my $res = join(' | ', map { $_->output() } grep { not $_->is_empty() } $self->get_deps());
-    if (defined($fh)) {
-	print { $fh } $res;
-    }
-    return $res;
-}
-
-sub implies {
-    my ($self, $o) = @_;
-
-    # Special case for AND with a single member, replace it by its member
-    if ($o->isa('Dpkg::Deps::AND')) {
-	my @subdeps = $o->get_deps();
-	if (scalar(@subdeps) == 1) {
-	    $o = $subdeps[0];
-	}
-    }
-
-    # In general, an OR dependency can't imply anything except if each
-    # of its member implies a member in the other OR dependency
-    if ($o->isa('Dpkg::Deps::OR')) {
-	my $subset = 1;
-	foreach my $dep ($self->get_deps()) {
-	    my $found = 0;
-	    foreach my $odep ($o->get_deps()) {
-		$found = 1 if $dep->implies($odep);
-	    }
-	    $subset = 0 if not $found;
-	}
-	return 1 if $subset;
-    }
-    return;
-}
-
-sub get_evaluation {
-    my ($self, $facts) = @_;
-    # Returns false if all members evaluates to 0
-    # Returns true if at least one member evaluates to true
-    # Returns undef otherwise
-    my $result = 0;
-    foreach my $dep ($self->get_deps()) {
-	my $eval = $dep->get_evaluation($facts);
-	if (not defined $eval) {
-	    $result = undef;
-	} elsif ($eval == 1) {
-	    $result = 1;
-	    last;
-	} elsif ($eval == 0) {
-	    # Still possible to have a false evaluation
-	}
-    }
-    return $result;
-}
-
-sub simplify_deps {
-    my ($self, $facts) = @_;
-    my @new;
-
-WHILELOOP:
-    while (@{$self->{list}}) {
-	my $dep = shift @{$self->{list}};
-	my $eval = $dep->get_evaluation($facts);
-	if (defined($eval) and $eval == 1) {
-	    $self->{list} = [];
-	    return;
-	}
-	foreach my $odep (@new, @{$self->{list}}) {
-	    next WHILELOOP if $odep->implies($dep);
-	}
-	push @new, $dep;
-    }
-    $self->{list} = [ @new ];
-}
-
-package Dpkg::Deps::Union;
-
-=head2 Dpkg::Deps::Union
-
-This object represents a list of relationships.
-
-=over 4
-
-=item $union->output([$fh])
-
-The output method uses ", " to join the list of relationships.
-
-=item $union->implies($other_dep)
-
-=item $union->get_evaluation($other_dep)
-
-Those methods are not meaningful for this object and always return undef.
-
-=item $union->simplify_deps($facts)
-
-The simplification is done to generate an union of all the relationships.
-It uses $simple_dep->merge_union($other_dep) to get its job done.
-
-=back
-
-=cut
-
-use strict;
-use warnings;
-
-use parent -norequire, qw(Dpkg::Deps::Multiple);
-
-sub output {
-    my ($self, $fh) = @_;
-    my $res = join(', ', map { $_->output() } grep { not $_->is_empty() } $self->get_deps());
-    if (defined($fh)) {
-	print { $fh } $res;
-    }
-    return $res;
-}
-
-sub implies {
-    # Implication test are not useful on Union
-    return;
-}
-
-sub get_evaluation {
-    # Evaluation are not useful on Union
-    return;
-}
-
-sub simplify_deps {
-    my ($self, $facts) = @_;
-    my @new;
-
-WHILELOOP:
-    while (@{$self->{list}}) {
-	my $odep = shift @{$self->{list}};
-	foreach my $dep (@new) {
-	    next WHILELOOP if $dep->merge_union($odep);
-	}
-	push @new, $odep;
-    }
-    $self->{list} = [ @new ];
-}
-
-package Dpkg::Deps::KnownFacts;
-
-=head2 Dpkg::Deps::KnownFacts
-
-This object represents a list of installed packages and a list of virtual
-packages provided (by the set of installed packages).
-
-=over 4
-
-=item $facts = Dpkg::Deps::KnownFacts->new();
-
-Creates a new object.
-
-=cut
-
-use strict;
-use warnings;
-
-use Dpkg::Version;
-
-sub new {
-    my $this = shift;
-    my $class = ref($this) || $this;
-    my $self = {
-	pkg => {},
-	virtualpkg => {},
-    };
-    bless $self, $class;
-    return $self;
-}
-
-=item $facts->add_installed_package($package, $version, $arch, $multiarch)
-
-Records that the given version of the package is installed. If
-$version/$arch is undefined we know that the package is installed but we
-don't know which version/architecture it is. $multiarch is the Multi-Arch
-field of the package. If $multiarch is undef, it will be equivalent to
-"Multi-Arch: no".
-
-Note that $multiarch is only used if $arch is provided.
-
-=cut
-
-sub add_installed_package {
-    my ($self, $pkg, $ver, $arch, $multiarch) = @_;
-    my $p = {
-	package => $pkg,
-	version => $ver,
-	architecture => $arch,
-	multiarch => $multiarch // 'no',
-    };
-    $self->{pkg}{"$pkg:$arch"} = $p if defined $arch;
-    push @{$self->{pkg}{$pkg}}, $p;
-}
-
-=item $facts->add_provided_package($virtual, $relation, $version, $by)
-
-Records that the "$by" package provides the $virtual package. $relation
-and $version correspond to the associated relation given in the Provides
-field (if present).
-
-=cut
-
-sub add_provided_package {
-    my ($self, $pkg, $rel, $ver, $by) = @_;
-
-    $self->{virtualpkg}{$pkg} //= [];
-    push @{$self->{virtualpkg}{$pkg}}, [ $by, $rel, $ver ];
-}
-
-=item ($check, $param) = $facts->check_package($package)
-
-$check is one when the package is found. For a real package, $param
-contains the version. For a virtual package, $param contains an array
-reference containing the list of packages that provide it (each package is
-listed as [ $provider, $relation, $version ]).
-
-This function is obsolete and should not be used. Dpkg::Deps::KnownFacts
-is only meant to be filled with data and then passed to Dpkg::Deps
-methods where appropriate, but it should not be directly queried.
-
-=back
-
-=cut
-
-sub check_package {
-    my ($self, $pkg) = @_;
-
-    warnings::warnif('deprecated', 'obsolete function, pass ' .
-                     'Dpkg::Deps::KnownFacts to Dpkg::Deps methods instead');
-
-    if (exists $self->{pkg}{$pkg}) {
-	return (1, $self->{pkg}{$pkg}[0]{version});
-    }
-    if (exists $self->{virtualpkg}{$pkg}) {
-	return (1, $self->{virtualpkg}{$pkg});
-    }
-    return (0, undef);
-}
-
-## The functions below are private to Dpkg::Deps
-
-sub _find_package {
-    my ($self, $dep, $lackinfos) = @_;
-    my ($pkg, $archqual) = ($dep->{package}, $dep->{archqual});
-    return if not exists $self->{pkg}{$pkg};
-    my $host_arch = $dep->{host_arch} // Dpkg::Arch::get_host_arch();
-    my $build_arch = $dep->{build_arch} // Dpkg::Arch::get_build_arch();
-    foreach my $p (@{$self->{pkg}{$pkg}}) {
-	my $a = $p->{architecture};
-	my $ma = $p->{multiarch};
-	if (not defined $a) {
-	    $$lackinfos = 1;
-	    next;
-	}
-	if (not defined $archqual) {
-	    return $p if $ma eq 'foreign';
-	    return $p if $a eq $host_arch or $a eq 'all';
-	} elsif ($archqual eq 'any') {
-	    return $p if $ma eq 'allowed';
-	} elsif ($archqual eq 'native') {
-	    return $p if $a eq $build_arch and $ma ne 'foreign';
-	} else {
-	    return $p if $a eq $archqual;
-	}
-    }
-    return;
-}
-
-sub _find_virtual_packages {
-    my ($self, $pkg) = @_;
-    return () if not exists $self->{virtualpkg}{$pkg};
-    return @{$self->{virtualpkg}{$pkg}};
-}
+=head1 CHANGES
 
-sub _evaluate_simple_dep {
-    my ($self, $dep) = @_;
-    my ($lackinfos, $pkg) = (0, $dep->{package});
-    my $p = $self->_find_package($dep, \$lackinfos);
-    if ($p) {
-	if (defined $dep->{relation}) {
-	    if (defined $p->{version}) {
-		return 1 if version_compare_relation($p->{version},
-		                           $dep->{relation}, $dep->{version});
-	    } else {
-		$lackinfos = 1;
-	    }
-	} else {
-	    return 1;
-	}
-    }
-    foreach my $virtpkg ($self->_find_virtual_packages($pkg)) {
-	next if defined $virtpkg->[1] and $virtpkg->[1] ne REL_EQ;
-
-	if (defined $dep->{relation}) {
-	    next if not defined $virtpkg->[2];
-	    return 1 if version_compare_relation($virtpkg->[2],
-	                                         $dep->{relation},
-	                                         $dep->{version});
-	} else {
-	    return 1;
-	}
-    }
-    return if $lackinfos;
-    return 0;
-}
+=head2 Version 1.07 (dpkg 1.20.0)
 
-=head1 CHANGES
+New option: Add virtual option to Dpkg::Deps::deps_parse().
 
 =head2 Version 1.06 (dpkg 1.18.7; module version bumped on dpkg 1.18.24)
 
@@ -1540,9 +467,6 @@ New function: Dpkg::Deps::deps_iterate().
 New options: Add use_profiles, build_profiles, reduce_profiles and
 reduce_restrictions to Dpkg::Deps::deps_parse().
 
-New methods: Add $dep->profile_is_concerned() and $dep->reduce_profiles()
-for all dependency objects.
-
 =head2 Version 1.03 (dpkg 1.17.0)
 
 New option: Add build_arch option to Dpkg::Deps::deps_parse().
@@ -1553,16 +477,7 @@ New function: Dpkg::Deps::deps_concat()
 
 =head2 Version 1.01 (dpkg 1.16.1)
 
-New method: Add $dep->reset() for all dependency objects.
-
-New property: Dpkg::Deps::Simple now recognizes the arch qualifier "any"
-and stores it in the "archqual" property when present.
-
-New option: Dpkg::Deps::KnownFacts->add_installed_package() now accepts 2
-supplementary parameters ($arch and $multiarch).
-
-Deprecated method: Dpkg::Deps::KnownFacts->check_package() is obsolete,
-it should not have been part of the public API.
+<Used to document changes to Dpkg::Deps::* modules before they were split.>
 
 =head2 Version 1.00 (dpkg 1.15.6)
 
diff --git a/scripts/Dpkg/Deps/AND.pm b/scripts/Dpkg/Deps/AND.pm
new file mode 100644
index 000000000..7b403c237
--- /dev/null
+++ b/scripts/Dpkg/Deps/AND.pm
@@ -0,0 +1,182 @@
+# Copyright © 1998 Richard Braakman
+# Copyright © 1999 Darren Benham
+# Copyright © 2000 Sean 'Shaleh' Perry
+# Copyright © 2004 Frank Lichtenheld
+# Copyright © 2006 Russ Allbery
+# Copyright © 2007-2009 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2009, 2012-2014 Guillem Jover <guillem@debian.org>
+#
+# This program is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package Dpkg::Deps::AND;
+
+=encoding utf8
+
+=head1 NAME
+
+Dpkg::Deps::AND - list of AND dependencies
+
+=head1 DESCRIPTION
+
+This class represents a list of dependencies that must be met at the same
+time. It inherits from Dpkg::Deps::Multiple.
+
+=cut
+
+use strict;
+use warnings;
+
+our $VERSION = '1.00';
+
+use parent qw(Dpkg::Deps::Multiple);
+
+=head1 METHODS
+
+=over 4
+
+=item $dep->output([$fh])
+
+The output method uses ", " to join the list of sub-dependencies.
+
+=cut
+
+sub output {
+    my ($self, $fh) = @_;
+
+    my $res = join(', ', map {
+        $_->output()
+    } grep {
+        not $_->is_empty()
+    } $self->get_deps());
+
+    if (defined $fh) {
+        print { $fh } $res;
+    }
+    return $res;
+}
+
+=item $dep->implies($other_dep)
+
+Returns 1 when $dep implies $other_dep. Returns 0 when $dep implies
+NOT($other_dep). Returns undef when there's no implication. $dep and
+$other_dep do not need to be of the same type.
+
+=cut
+
+sub implies {
+    my ($self, $o) = @_;
+
+    # If any individual member can imply $o or NOT $o, we're fine
+    foreach my $dep ($self->get_deps()) {
+        my $implication = $dep->implies($o);
+        return 1 if defined $implication and $implication == 1;
+        return 0 if defined $implication and $implication == 0;
+    }
+
+    # If o is an AND, we might have an implication, if we find an
+    # implication within us for each predicate in o
+    if ($o->isa('Dpkg::Deps::AND')) {
+        my $subset = 1;
+        foreach my $odep ($o->get_deps()) {
+            my $found = 0;
+            foreach my $dep ($self->get_deps()) {
+                $found = 1 if $dep->implies($odep);
+            }
+            $subset = 0 if not $found;
+        }
+        return 1 if $subset;
+    }
+    return;
+}
+
+=item $dep->get_evaluation($facts)
+
+Evaluates the dependency given a list of installed packages and a list of
+virtual packages provided. These lists are part of the Dpkg::Deps::KnownFacts
+object given as parameters.
+
+Returns 1 when it's true, 0 when it's false, undef when some information
+is lacking to conclude.
+
+=cut
+
+sub get_evaluation {
+    my ($self, $facts) = @_;
+
+    # Return 1 only if all members evaluates to true
+    # Return 0 if at least one member evaluates to false
+    # Return undef otherwise
+    my $result = 1;
+    foreach my $dep ($self->get_deps()) {
+        my $eval = $dep->get_evaluation($facts);
+        if (not defined $eval) {
+            $result = undef;
+        } elsif ($eval == 0) {
+            $result = 0;
+            last;
+        } elsif ($eval == 1) {
+            # Still possible
+        }
+    }
+    return $result;
+}
+
+=item $dep->simplify_deps($facts, @assumed_deps)
+
+Simplifies the dependency as much as possible given the list of facts (see
+object Dpkg::Deps::KnownFacts) and a list of other dependencies that are
+known to be true.
+
+=cut
+
+sub simplify_deps {
+    my ($self, $facts, @knowndeps) = @_;
+    my @new;
+
+WHILELOOP:
+    while (@{$self->{list}}) {
+        my $dep = shift @{$self->{list}};
+        my $eval = $dep->get_evaluation($facts);
+        next if defined $eval and $eval == 1;
+        foreach my $odep (@knowndeps, @new) {
+            next WHILELOOP if $odep->implies($dep);
+        }
+        # When a dependency is implied by another dependency that
+        # follows, then invert them
+        # "a | b, c, a"  becomes "a, c" and not "c, a"
+        my $i = 0;
+        foreach my $odep (@{$self->{list}}) {
+            if (defined $odep and $odep->implies($dep)) {
+                splice @{$self->{list}}, $i, 1;
+                unshift @{$self->{list}}, $odep;
+                next WHILELOOP;
+            }
+            $i++;
+        }
+        push @new, $dep;
+    }
+    $self->{list} = [ @new ];
+}
+
+=back
+
+=head1 CHANGES
+
+=head2 Version 1.00 (dpkg 1.15.6)
+
+Mark the module as public.
+
+=cut
+
+1;
diff --git a/scripts/Dpkg/Deps/KnownFacts.pm b/scripts/Dpkg/Deps/KnownFacts.pm
new file mode 100644
index 000000000..ef8655fdd
--- /dev/null
+++ b/scripts/Dpkg/Deps/KnownFacts.pm
@@ -0,0 +1,218 @@
+# Copyright © 1998 Richard Braakman
+# Copyright © 1999 Darren Benham
+# Copyright © 2000 Sean 'Shaleh' Perry
+# Copyright © 2004 Frank Lichtenheld
+# Copyright © 2006 Russ Allbery
+# Copyright © 2007-2009 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2009, 2012-2014 Guillem Jover <guillem@debian.org>
+#
+# This program is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package Dpkg::Deps::KnownFacts;
+
+=encoding utf8
+
+=head1 NAME
+
+Dpkg::Deps::KnownFacts - list of installed real and virtual packages
+
+=head1 DESCRIPTION
+
+This class represents a list of installed packages and a list of virtual
+packages provided (by the set of installed packages).
+
+=cut
+
+use strict;
+use warnings;
+
+our $VERSION = '2.00';
+
+use Dpkg::Version;
+
+=head1 METHODS
+
+=over 4
+
+=item $facts = Dpkg::Deps::KnownFacts->new();
+
+Creates a new object.
+
+=cut
+
+sub new {
+    my $this = shift;
+    my $class = ref($this) || $this;
+    my $self = {
+        pkg => {},
+        virtualpkg => {},
+    };
+
+    bless $self, $class;
+    return $self;
+}
+
+=item $facts->add_installed_package($package, $version, $arch, $multiarch)
+
+Records that the given version of the package is installed. If
+$version/$arch is undefined we know that the package is installed but we
+don't know which version/architecture it is. $multiarch is the Multi-Arch
+field of the package. If $multiarch is undef, it will be equivalent to
+"Multi-Arch: no".
+
+Note that $multiarch is only used if $arch is provided.
+
+=cut
+
+sub add_installed_package {
+    my ($self, $pkg, $ver, $arch, $multiarch) = @_;
+    my $p = {
+        package => $pkg,
+        version => $ver,
+        architecture => $arch,
+        multiarch => $multiarch // 'no',
+    };
+
+    $self->{pkg}{"$pkg:$arch"} = $p if defined $arch;
+    push @{$self->{pkg}{$pkg}}, $p;
+}
+
+=item $facts->add_provided_package($virtual, $relation, $version, $by)
+
+Records that the "$by" package provides the $virtual package. $relation
+and $version correspond to the associated relation given in the Provides
+field (if present).
+
+=cut
+
+sub add_provided_package {
+    my ($self, $pkg, $rel, $ver, $by) = @_;
+    my $v = {
+        package => $pkg,
+        relation => $rel,
+        version => $ver,
+        provider => $by,
+    };
+
+    $self->{virtualpkg}{$pkg} //= [];
+    push @{$self->{virtualpkg}{$pkg}}, $v;
+}
+
+##
+## The functions below are private to Dpkg::Deps::KnownFacts.
+##
+
+sub _find_package {
+    my ($self, $dep, $lackinfos) = @_;
+    my ($pkg, $archqual) = ($dep->{package}, $dep->{archqual});
+
+    return if not exists $self->{pkg}{$pkg};
+
+    my $host_arch = $dep->{host_arch} // Dpkg::Arch::get_host_arch();
+    my $build_arch = $dep->{build_arch} // Dpkg::Arch::get_build_arch();
+
+    foreach my $p (@{$self->{pkg}{$pkg}}) {
+        my $a = $p->{architecture};
+        my $ma = $p->{multiarch};
+
+        if (not defined $a) {
+            $$lackinfos = 1;
+            next;
+        }
+        if (not defined $archqual) {
+            return $p if $ma eq 'foreign';
+            return $p if $a eq $host_arch or $a eq 'all';
+        } elsif ($archqual eq 'any') {
+            return $p if $ma eq 'allowed';
+        } elsif ($archqual eq 'native') {
+            return if $ma eq 'foreign';
+            return $p if $a eq $build_arch or $a eq 'all';
+        } else {
+            return $p if $a eq $archqual;
+        }
+    }
+    return;
+}
+
+sub _find_virtual_packages {
+    my ($self, $pkg) = @_;
+
+    return () if not exists $self->{virtualpkg}{$pkg};
+    return @{$self->{virtualpkg}{$pkg}};
+}
+
+=item $facts->evaluate_simple_dep()
+
+This method is private and should not be used except from within Dpkg::Deps.
+
+=cut
+
+sub evaluate_simple_dep {
+    my ($self, $dep) = @_;
+    my ($lackinfos, $pkg) = (0, $dep->{package});
+
+    my $p = $self->_find_package($dep, \$lackinfos);
+    if ($p) {
+        if (defined $dep->{relation}) {
+            if (defined $p->{version}) {
+                return 1 if version_compare_relation($p->{version},
+                                                     $dep->{relation},
+                                                     $dep->{version});
+            } else {
+                $lackinfos = 1;
+            }
+        } else {
+            return 1;
+        }
+    }
+    foreach my $virtpkg ($self->_find_virtual_packages($pkg)) {
+        next if defined $virtpkg->{relation} and
+                $virtpkg->{relation} ne REL_EQ;
+
+        if (defined $dep->{relation}) {
+            next if not defined $virtpkg->{version};
+            return 1 if version_compare_relation($virtpkg->{version},
+                                                 $dep->{relation},
+                                                 $dep->{version});
+        } else {
+            return 1;
+        }
+    }
+    return if $lackinfos;
+    return 0;
+}
+
+=back
+
+=head1 CHANGES
+
+=head2 Version 2.00 (dpkg 1.20.0)
+
+Remove method: $facts->check_package().
+
+=head2 Version 1.01 (dpkg 1.16.1)
+
+New option: Dpkg::Deps::KnownFacts->add_installed_package() now accepts 2
+supplementary parameters ($arch and $multiarch).
+
+Deprecated method: Dpkg::Deps::KnownFacts->check_package() is obsolete,
+it should not have been part of the public API.
+
+=head2 Version 1.00 (dpkg 1.15.6)
+
+Mark the module as public.
+
+=cut
+
+1;
diff --git a/scripts/Dpkg/Deps/Multiple.pm b/scripts/Dpkg/Deps/Multiple.pm
new file mode 100644
index 000000000..da12f5184
--- /dev/null
+++ b/scripts/Dpkg/Deps/Multiple.pm
@@ -0,0 +1,250 @@
+# Copyright © 1998 Richard Braakman
+# Copyright © 1999 Darren Benham
+# Copyright © 2000 Sean 'Shaleh' Perry
+# Copyright © 2004 Frank Lichtenheld
+# Copyright © 2006 Russ Allbery
+# Copyright © 2007-2009 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2009, 2012-2014 Guillem Jover <guillem@debian.org>
+#
+# This program is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package Dpkg::Deps::Multiple;
+
+=encoding utf8
+
+=head1 NAME
+
+Dpkg::Deps::Multiple - base module to represent multiple dependencies
+
+=head1 DESCRIPTION
+
+The Dpkg::Deps::Multiple module provides objects implementing various types
+of dependencies. It is the base class for Dpkg::Deps::{AND,OR,Union}.
+
+=cut
+
+use strict;
+use warnings;
+
+our $VERSION = '1.02';
+
+use Carp;
+
+use Dpkg::ErrorHandling;
+
+use parent qw(Dpkg::Interface::Storable);
+
+=head1 METHODS
+
+=over 4
+
+=item $dep = Dpkg::Deps::Multiple->new(%opts);
+
+Creates a new object.
+
+=cut
+
+sub new {
+    my $this = shift;
+    my $class = ref($this) || $this;
+    my $self = { list => [ @_ ] };
+
+    bless $self, $class;
+    return $self;
+}
+
+=item $dep->reset()
+
+Clears any dependency information stored in $dep so that $dep->is_empty()
+returns true.
+
+=cut
+
+sub reset {
+    my $self = shift;
+
+    $self->{list} = [];
+}
+
+=item $dep->add(@deps)
+
+Adds new dependency objects at the end of the list.
+
+=cut
+
+sub add {
+    my $self = shift;
+
+    push @{$self->{list}}, @_;
+}
+
+=item $dep->get_deps()
+
+Returns a list of sub-dependencies.
+
+=cut
+
+sub get_deps {
+    my $self = shift;
+
+    return grep { not $_->is_empty() } @{$self->{list}};
+}
+
+=item $dep->sort()
+
+Sorts alphabetically the internal list of dependencies.
+
+=cut
+
+sub sort {
+    my $self = shift;
+
+    my @res = ();
+    @res = sort { Dpkg::Deps::deps_compare($a, $b) } @{$self->{list}};
+    $self->{list} = [ @res ];
+}
+
+=item $dep->arch_is_concerned($arch)
+
+Returns true if at least one of the sub-dependencies apply to this
+architecture.
+
+=cut
+
+sub arch_is_concerned {
+    my ($self, $host_arch) = @_;
+
+    my $res = 0;
+    foreach my $dep (@{$self->{list}}) {
+        $res = 1 if $dep->arch_is_concerned($host_arch);
+    }
+    return $res;
+}
+
+=item $dep->reduce_arch($arch)
+
+Simplifies the dependencies to contain only information relevant to the
+given architecture. The non-relevant sub-dependencies are simply removed.
+
+This trims off the architecture restriction list of Dpkg::Deps::Simple
+objects.
+
+=cut
+
+sub reduce_arch {
+    my ($self, $host_arch) = @_;
+
+    my @new;
+    foreach my $dep (@{$self->{list}}) {
+        $dep->reduce_arch($host_arch);
+        push @new, $dep if $dep->arch_is_concerned($host_arch);
+    }
+    $self->{list} = [ @new ];
+}
+
+=item $dep->has_arch_restriction()
+
+Returns the list of package names that have such a restriction.
+
+=cut
+
+sub has_arch_restriction {
+    my $self = shift;
+
+    my @res;
+    foreach my $dep (@{$self->{list}}) {
+        push @res, $dep->has_arch_restriction();
+    }
+    return @res;
+}
+
+=item $dep->profile_is_concerned()
+
+Returns true if at least one of the sub-dependencies apply to this profile.
+
+=cut
+
+sub profile_is_concerned {
+    my ($self, $build_profiles) = @_;
+
+    my $res = 0;
+    foreach my $dep (@{$self->{list}}) {
+        $res = 1 if $dep->profile_is_concerned($build_profiles);
+    }
+    return $res;
+}
+
+=item $dep->reduce_profiles()
+
+Simplifies the dependencies to contain only information relevant to the
+given profile. The non-relevant sub-dependencies are simply removed.
+
+This trims off the profile restriction list of Dpkg::Deps::Simple objects.
+
+=cut
+
+sub reduce_profiles {
+    my ($self, $build_profiles) = @_;
+
+    my @new;
+    foreach my $dep (@{$self->{list}}) {
+        $dep->reduce_profiles($build_profiles);
+        push @new, $dep if $dep->profile_is_concerned($build_profiles);
+    }
+    $self->{list} = [ @new ];
+}
+
+=item $dep->is_empty()
+
+Returns true if the dependency is empty and doesn't contain any useful
+information. This is true when a (descendant of) Dpkg::Deps::Multiple
+contains an empty list of dependencies.
+
+=cut
+
+sub is_empty {
+    my $self = shift;
+
+    return scalar @{$self->{list}} == 0;
+}
+
+=item $dep->merge_union($other_dep)
+
+This method is not meaningful for this object, and will always croak.
+
+=cut
+
+sub merge_union {
+    croak 'method merge_union() is only valid for Dpkg::Deps::Simple';
+}
+
+=back
+
+=head1 CHANGES
+
+=head2 Version 1.02 (dpkg 1.17.10)
+
+New methods: Add $dep->profile_is_concerned() and $dep->reduce_profiles().
+
+=head2 Version 1.01 (dpkg 1.16.1)
+
+New method: Add $dep->reset().
+
+=head2 Version 1.00 (dpkg 1.15.6)
+
+Mark the module as public.
+
+=cut
+
+1;
diff --git a/scripts/Dpkg/Deps/OR.pm b/scripts/Dpkg/Deps/OR.pm
new file mode 100644
index 000000000..4ce5c9818
--- /dev/null
+++ b/scripts/Dpkg/Deps/OR.pm
@@ -0,0 +1,174 @@
+# Copyright © 1998 Richard Braakman
+# Copyright © 1999 Darren Benham
+# Copyright © 2000 Sean 'Shaleh' Perry
+# Copyright © 2004 Frank Lichtenheld
+# Copyright © 2006 Russ Allbery
+# Copyright © 2007-2009 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2009, 2012-2014 Guillem Jover <guillem@debian.org>
+#
+# This program is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package Dpkg::Deps::OR;
+
+=encoding utf8
+
+=head1 NAME
+
+Dpkg::Deps::OR - list of OR dependencies
+
+=head1 DESCRIPTION
+
+This class represents a list of dependencies of which only one must be met
+for the dependency to be true. It inherits from Dpkg::Deps::Multiple.
+
+=cut
+
+use strict;
+use warnings;
+
+our $VERSION = '1.00';
+
+use parent qw(Dpkg::Deps::Multiple);
+
+=head1 METHODS
+
+=over 4
+
+=item $dep->output([$fh])
+
+The output method uses " | " to join the list of sub-dependencies.
+
+=cut
+
+sub output {
+    my ($self, $fh) = @_;
+
+    my $res = join(' | ', map {
+        $_->output()
+    } grep {
+        not $_->is_empty()
+    } $self->get_deps());
+
+    if (defined $fh) {
+        print { $fh } $res;
+    }
+    return $res;
+}
+
+=item $dep->implies($other_dep)
+
+Returns 1 when $dep implies $other_dep. Returns 0 when $dep implies
+NOT($other_dep). Returns undef when there's no implication. $dep and
+$other_dep do not need to be of the same type.
+
+=cut
+
+sub implies {
+    my ($self, $o) = @_;
+
+    # Special case for AND with a single member, replace it by its member
+    if ($o->isa('Dpkg::Deps::AND')) {
+        my @subdeps = $o->get_deps();
+        if (scalar(@subdeps) == 1) {
+            $o = $subdeps[0];
+        }
+    }
+
+    # In general, an OR dependency can't imply anything except if each
+    # of its member implies a member in the other OR dependency
+    if ($o->isa('Dpkg::Deps::OR')) {
+        my $subset = 1;
+        foreach my $dep ($self->get_deps()) {
+            my $found = 0;
+            foreach my $odep ($o->get_deps()) {
+                $found = 1 if $dep->implies($odep);
+            }
+            $subset = 0 if not $found;
+        }
+        return 1 if $subset;
+    }
+    return;
+}
+
+=item $dep->get_evaluation($facts)
+
+Evaluates the dependency given a list of installed packages and a list of
+virtual packages provided. These lists are part of the Dpkg::Deps::KnownFacts
+object given as parameters.
+
+Returns 1 when it's true, 0 when it's false, undef when some information
+is lacking to conclude.
+
+=cut
+
+sub get_evaluation {
+    my ($self, $facts) = @_;
+
+    # Returns false if all members evaluates to 0
+    # Returns true if at least one member evaluates to true
+    # Returns undef otherwise
+    my $result = 0;
+    foreach my $dep ($self->get_deps()) {
+        my $eval = $dep->get_evaluation($facts);
+        if (not defined $eval) {
+            $result = undef;
+        } elsif ($eval == 1) {
+            $result = 1;
+            last;
+        } elsif ($eval == 0) {
+            # Still possible to have a false evaluation
+        }
+    }
+    return $result;
+}
+
+=item $dep->simplify_deps($facts, @assumed_deps)
+
+Simplifies the dependency as much as possible given the list of facts (see
+object Dpkg::Deps::KnownFacts) and a list of other dependencies that are
+known to be true.
+
+=cut
+
+sub simplify_deps {
+    my ($self, $facts) = @_;
+    my @new;
+
+WHILELOOP:
+    while (@{$self->{list}}) {
+        my $dep = shift @{$self->{list}};
+        my $eval = $dep->get_evaluation($facts);
+        if (defined $eval and $eval == 1) {
+            $self->{list} = [];
+            return;
+        }
+        foreach my $odep (@new, @{$self->{list}}) {
+            next WHILELOOP if $odep->implies($dep);
+        }
+        push @new, $dep;
+    }
+    $self->{list} = [ @new ];
+}
+
+=back
+
+=head1 CHANGES
+
+=head2 Version 1.00 (dpkg 1.15.6)
+
+Mark the module as public.
+
+=cut
+
+1;
diff --git a/scripts/Dpkg/Deps/Simple.pm b/scripts/Dpkg/Deps/Simple.pm
new file mode 100644
index 000000000..aa23e7da2
--- /dev/null
+++ b/scripts/Dpkg/Deps/Simple.pm
@@ -0,0 +1,670 @@
+# Copyright © 1998 Richard Braakman
+# Copyright © 1999 Darren Benham
+# Copyright © 2000 Sean 'Shaleh' Perry
+# Copyright © 2004 Frank Lichtenheld
+# Copyright © 2006 Russ Allbery
+# Copyright © 2007-2009 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2009, 2012-2014 Guillem Jover <guillem@debian.org>
+#
+# This program is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package Dpkg::Deps::Simple;
+
+=encoding utf8
+
+=head1 NAME
+
+Dpkg::Deps::Simple - represents a single dependency statement
+
+=head1 DESCRIPTION
+
+This class represents a single dependency statement.
+It has several interesting properties:
+
+=over 4
+
+=item package
+
+The package name (can be undef if the dependency has not been initialized
+or if the simplification of the dependency lead to its removal).
+
+=item relation
+
+The relational operator: "=", "<<", "<=", ">=" or ">>". It can be
+undefined if the dependency had no version restriction. In that case the
+following field is also undefined.
+
+=item version
+
+The version.
+
+=item arches
+
+The list of architectures where this dependency is applicable. It is
+undefined when there's no restriction, otherwise it is an
+array ref. It can contain an exclusion list, in that case each
+architecture is prefixed with an exclamation mark.
+
+=item archqual
+
+The arch qualifier of the dependency (can be undef if there is none).
+In the dependency "python:any (>= 2.6)", the arch qualifier is "any".
+
+=item restrictions
+
+The restrictions formula for this dependency. It is undefined when there
+is no restriction formula. Otherwise it is an array ref.
+
+=back
+
+=head1 METHODS
+
+=over 4
+
+=cut
+
+use strict;
+use warnings;
+
+our $VERSION = '1.02';
+
+use Carp;
+
+use Dpkg::Arch qw(debarch_is_concerned debarch_list_parse);
+use Dpkg::BuildProfiles qw(parse_build_profiles evaluate_restriction_formula);
+use Dpkg::Version;
+use Dpkg::ErrorHandling;
+use Dpkg::Gettext;
+
+use parent qw(Dpkg::Interface::Storable);
+
+=item $dep = Dpkg::Deps::Simple->new([$dep[, %opts]]);
+
+Creates a new object. Some options can be set through %opts:
+
+=over
+
+=item host_arch
+
+Sets the host architecture.
+
+=item build_arch
+
+Sets the build architecture.
+
+=item build_dep
+
+Specifies whether the parser should consider it a build dependency.
+Defaults to 0.
+
+=item tests_dep
+
+Specifies whether the parser should consider it a tests dependency.
+Defaults to 0.
+
+=back
+
+=cut
+
+sub new {
+    my ($this, $arg, %opts) = @_;
+    my $class = ref($this) || $this;
+    my $self = {};
+
+    bless $self, $class;
+    $self->reset();
+    $self->{host_arch} = $opts{host_arch};
+    $self->{build_arch} = $opts{build_arch};
+    $self->{build_dep} = $opts{build_dep} // 0;
+    $self->{tests_dep} = $opts{tests_dep} // 0;
+    $self->parse_string($arg) if defined $arg;
+    return $self;
+}
+
+=item $dep->reset()
+
+Clears any dependency information stored in $dep so that $dep->is_empty()
+returns true.
+
+=cut
+
+sub reset {
+    my $self = shift;
+
+    $self->{package} = undef;
+    $self->{relation} = undef;
+    $self->{version} = undef;
+    $self->{arches} = undef;
+    $self->{archqual} = undef;
+    $self->{restrictions} = undef;
+}
+
+=item $dep->parse_string($dep_string)
+
+Parses the dependency string and modifies internal properties to match the
+parsed dependency.
+
+=cut
+
+sub parse_string {
+    my ($self, $dep) = @_;
+
+    my $pkgname_re;
+    if ($self->{tests_dep}) {
+        $pkgname_re = qr/[\@a-zA-Z0-9][\@a-zA-Z0-9+.-]*/;
+    } else {
+        $pkgname_re = qr/[a-zA-Z0-9][a-zA-Z0-9+.-]*/;
+    }
+
+    return if not $dep =~
+           m{^\s*                           # skip leading whitespace
+              ($pkgname_re)                 # package name
+              (?:                           # start of optional part
+                :                           # colon for architecture
+                ([a-zA-Z0-9][a-zA-Z0-9-]*)  # architecture name
+              )?                            # end of optional part
+              (?:                           # start of optional part
+                \s* \(                      # open parenthesis for version part
+                \s* (<<|<=|=|>=|>>|[<>])    # relation part
+                \s* ([^\)\s]+)              # do not attempt to parse version
+                \s* \)                      # closing parenthesis
+              )?                            # end of optional part
+              (?:                           # start of optional architecture
+                \s* \[                      # open bracket for architecture
+                \s* ([^\]]+)                # don't parse architectures now
+                \s* \]                      # closing bracket
+              )?                            # end of optional architecture
+              (
+                (?:                         # start of optional restriction
+                \s* <                       # open bracket for restriction
+                \s* [^>]+                   # do not parse restrictions now
+                \s* >                       # closing bracket
+                )+
+              )?                            # end of optional restriction
+              \s*$                          # trailing spaces at end
+            }x;
+    if (defined $2) {
+        return if $2 eq 'native' and not $self->{build_dep};
+        $self->{archqual} = $2;
+    }
+    $self->{package} = $1;
+    $self->{relation} = version_normalize_relation($3) if defined $3;
+    if (defined $4) {
+        $self->{version} = Dpkg::Version->new($4);
+    }
+    if (defined $5) {
+        $self->{arches} = [ debarch_list_parse($5) ];
+    }
+    if (defined $6) {
+        $self->{restrictions} = [ parse_build_profiles($6) ];
+    }
+}
+
+=item $dep->parse($fh, $desc)
+
+Parse a dependency line from a filehandle.
+
+=cut
+
+sub parse {
+    my ($self, $fh, $desc) = @_;
+
+    my $line = <$fh>;
+    chomp $line;
+    return $self->parse_string($line);
+}
+
+=item $dep->load($filename)
+
+Parse a dependency line from $filename.
+
+=item $dep->output([$fh])
+
+=item "$dep"
+
+Returns a string representing the dependency. If $fh is set, it prints
+the string to the filehandle.
+
+=cut
+
+sub output {
+    my ($self, $fh) = @_;
+
+    my $res = $self->{package};
+    if (defined $self->{archqual}) {
+        $res .= ':' . $self->{archqual};
+    }
+    if (defined $self->{relation}) {
+        $res .= ' (' . $self->{relation} . ' ' . $self->{version} .  ')';
+    }
+    if (defined $self->{arches}) {
+        $res .= ' [' . join(' ', @{$self->{arches}}) . ']';
+    }
+    if (defined $self->{restrictions}) {
+        for my $restrlist (@{$self->{restrictions}}) {
+            $res .= ' <' . join(' ', @{$restrlist}) . '>';
+        }
+    }
+    if (defined $fh) {
+        print { $fh } $res;
+    }
+    return $res;
+}
+
+=item $dep->save($filename)
+
+Save the dependency into the given $filename.
+
+=cut
+
+# _arch_is_superset(\@p, \@q)
+#
+# Returns true if the arch list @p is a superset of arch list @q.
+# The arguments can also be undef in case there's no explicit architecture
+# restriction.
+sub _arch_is_superset {
+    my ($p, $q) = @_;
+    my $p_arch_neg = defined $p and $p->[0] =~ /^!/;
+    my $q_arch_neg = defined $q and $q->[0] =~ /^!/;
+
+    # If "p" has no arches, it is a superset of q and we should fall through
+    # to the version check.
+    if (not defined $p) {
+        return 1;
+    }
+    # If q has no arches, it is a superset of p and there are no useful
+    # implications.
+    elsif (not defined $q) {
+        return 0;
+    }
+    # Both have arches.  If neither are negated, we know nothing useful
+    # unless q is a subset of p.
+    elsif (not $p_arch_neg and not $q_arch_neg) {
+        my %p_arches = map { $_ => 1 } @{$p};
+        my $subset = 1;
+        for my $arch (@{$q}) {
+            $subset = 0 unless $p_arches{$arch};
+        }
+        return 0 unless $subset;
+    }
+    # If both are negated, we know nothing useful unless p is a subset of
+    # q (and therefore has fewer things excluded, and therefore is more
+    # general).
+    elsif ($p_arch_neg and $q_arch_neg) {
+        my %q_arches = map { $_ => 1 } @{$q};
+        my $subset = 1;
+        for my $arch (@{$p}) {
+            $subset = 0 unless $q_arches{$arch};
+        }
+        return 0 unless $subset;
+    }
+    # If q is negated and p isn't, we'd need to know the full list of
+    # arches to know if there's any relationship, so bail.
+    elsif (not $p_arch_neg and $q_arch_neg) {
+        return 0;
+    }
+    # If p is negated and q isn't, q is a subset of p if none of the
+    # negated arches in p are present in q.
+    elsif ($p_arch_neg and not $q_arch_neg) {
+        my %q_arches = map { $_ => 1 } @{$q};
+        my $subset = 1;
+        for my $arch (@{$p}) {
+            $subset = 0 if $q_arches{substr($arch, 1)};
+        }
+        return 0 unless $subset;
+    }
+    return 1;
+}
+
+# _arch_qualifier_implies($p, $q)
+#
+# Returns true if the arch qualifier $p and $q are compatible with the
+# implication $p -> $q, false otherwise. $p/$q can be undef/"any"/"native"
+# or an architecture string.
+#
+# Because we are handling dependencies in isolation, and the full context
+# of the implications are only known when doing dependency resolution at
+# run-time, we can only assert that they are implied if they are equal.
+#
+# For example dependencies with different arch-qualifiers cannot be simplified
+# as these depend on the state of Multi-Arch field in the package depended on.
+sub _arch_qualifier_implies {
+    my ($p, $q) = @_;
+
+    return $p eq $q if defined $p and defined $q;
+    return 1 if not defined $p and not defined $q;
+    return 0;
+}
+
+# _restrictions_imply($p, $q)
+#
+# Returns true if the restrictions $p and $q are compatible with the
+# implication $p -> $q, false otherwise.
+# NOTE: We don't try to be very clever here, so we may conservatively
+# return false when there is an implication.
+sub _restrictions_imply {
+    my ($p, $q) = @_;
+
+    if (not defined $p) {
+       return 1;
+    } elsif (not defined $q) {
+       return 0;
+    } else {
+       # Check whether set difference is empty.
+       my %restr;
+
+       for my $restrlist (@{$q}) {
+           my $reststr = join ' ', sort @{$restrlist};
+           $restr{$reststr} = 1;
+       }
+       for my $restrlist (@{$p}) {
+           my $reststr = join ' ', sort @{$restrlist};
+           delete $restr{$reststr};
+       }
+
+       return keys %restr == 0;
+    }
+}
+
+=item $dep->implies($other_dep)
+
+Returns 1 when $dep implies $other_dep. Returns 0 when $dep implies
+NOT($other_dep). Returns undef when there is no implication. $dep and
+$other_dep do not need to be of the same type.
+
+=cut
+
+sub implies {
+    my ($self, $o) = @_;
+
+    if ($o->isa('Dpkg::Deps::Simple')) {
+        # An implication is only possible on the same package
+        return if $self->{package} ne $o->{package};
+
+        # Our architecture set must be a superset of the architectures for
+        # o, otherwise we can't conclude anything.
+        return unless _arch_is_superset($self->{arches}, $o->{arches});
+
+        # The arch qualifier must not forbid an implication
+        return unless _arch_qualifier_implies($self->{archqual},
+                                              $o->{archqual});
+
+        # Our restrictions must imply the restrictions for o
+        return unless _restrictions_imply($self->{restrictions},
+                                          $o->{restrictions});
+
+        # If o has no version clause, then our dependency is stronger
+        return 1 if not defined $o->{relation};
+        # If o has a version clause, we must also have one, otherwise there
+        # can't be an implication
+        return if not defined $self->{relation};
+
+        return Dpkg::Deps::deps_eval_implication($self->{relation},
+                $self->{version}, $o->{relation}, $o->{version});
+    } elsif ($o->isa('Dpkg::Deps::AND')) {
+        # TRUE: Need to imply all individual elements
+        # FALSE: Need to NOT imply at least one individual element
+        my $res = 1;
+        foreach my $dep ($o->get_deps()) {
+            my $implication = $self->implies($dep);
+            unless (defined $implication and $implication == 1) {
+                $res = $implication;
+                last if defined $res;
+            }
+        }
+        return $res;
+    } elsif ($o->isa('Dpkg::Deps::OR')) {
+        # TRUE: Need to imply at least one individual element
+        # FALSE: Need to not apply all individual elements
+        # UNDEF: The rest
+        my $res = undef;
+        foreach my $dep ($o->get_deps()) {
+            my $implication = $self->implies($dep);
+            if (defined $implication) {
+                if (not defined $res) {
+                    $res = $implication;
+                } else {
+                    if ($implication) {
+                        $res = 1;
+                    } else {
+                        $res = 0;
+                    }
+                }
+                last if defined $res and $res == 1;
+            }
+        }
+        return $res;
+    } else {
+        croak 'Dpkg::Deps::Simple cannot evaluate implication with a ' .
+              ref($o);
+    }
+}
+
+=item $dep->get_deps()
+
+Returns a list of sub-dependencies, which for this object it means it
+returns itself.
+
+=cut
+
+sub get_deps {
+    my $self = shift;
+
+    return $self;
+}
+
+=item $dep->sort()
+
+This method is a no-op for this object.
+
+=cut
+
+sub sort {
+    # Nothing to sort
+}
+
+=item $dep->arch_is_concerned($arch)
+
+Returns true if the dependency applies to the indicated architecture.
+
+=cut
+
+sub arch_is_concerned {
+    my ($self, $host_arch) = @_;
+
+    return 0 if not defined $self->{package}; # Empty dep
+    return 1 if not defined $self->{arches};  # Dep without arch spec
+
+    return debarch_is_concerned($host_arch, @{$self->{arches}});
+}
+
+=item $dep->reduce_arch($arch)
+
+Simplifies the dependency to contain only information relevant to the given
+architecture. This object can be left empty after this operation. This trims
+off the architecture restriction list of these objects.
+
+=cut
+
+sub reduce_arch {
+    my ($self, $host_arch) = @_;
+
+    if (not $self->arch_is_concerned($host_arch)) {
+        $self->reset();
+    } else {
+        $self->{arches} = undef;
+    }
+}
+
+=item $dep->has_arch_restriction()
+
+Returns the package name if the dependency applies only to a subset of
+architectures.
+
+=cut
+
+sub has_arch_restriction {
+    my $self = shift;
+
+    if (defined $self->{arches}) {
+        return $self->{package};
+    } else {
+        return ();
+    }
+}
+
+=item $dep->profile_is_concerned()
+
+Returns true if the dependency applies to the indicated profile.
+
+=cut
+
+sub profile_is_concerned {
+    my ($self, $build_profiles) = @_;
+
+    return 0 if not defined $self->{package}; # Empty dep
+    return 1 if not defined $self->{restrictions}; # Dep without restrictions
+    return evaluate_restriction_formula($self->{restrictions}, $build_profiles);
+}
+
+=item $dep->reduce_profiles()
+
+Simplifies the dependency to contain only information relevant to the given
+profile. This object can be left empty after this operation. This trims off
+the profile restriction list of this object.
+
+=cut
+
+sub reduce_profiles {
+    my ($self, $build_profiles) = @_;
+
+    if (not $self->profile_is_concerned($build_profiles)) {
+        $self->reset();
+    } else {
+        $self->{restrictions} = undef;
+    }
+}
+
+=item $dep->get_evaluation($facts)
+
+Evaluates the dependency given a list of installed packages and a list of
+virtual packages provided. These lists are part of the Dpkg::Deps::KnownFacts
+object given as parameters.
+
+Returns 1 when it's true, 0 when it's false, undef when some information
+is lacking to conclude.
+
+=cut
+
+sub get_evaluation {
+    my ($self, $facts) = @_;
+
+    return if not defined $self->{package};
+    return $facts->evaluate_simple_dep($self);
+}
+
+=item $dep->simplify_deps($facts, @assumed_deps)
+
+Simplifies the dependency as much as possible given the list of facts (see
+class Dpkg::Deps::KnownFacts) and a list of other dependencies that are
+known to be true.
+
+=cut
+
+sub simplify_deps {
+    my ($self, $facts) = @_;
+
+    my $eval = $self->get_evaluation($facts);
+    $self->reset() if defined $eval and $eval == 1;
+}
+
+=item $dep->is_empty()
+
+Returns true if the dependency is empty and doesn't contain any useful
+information. This is true when the object has not yet been initialized.
+
+=cut
+
+sub is_empty {
+    my $self = shift;
+
+    return not defined $self->{package};
+}
+
+=item $dep->merge_union($other_dep)
+
+Returns true if $dep could be modified to represent the union of both
+dependencies. Otherwise returns false.
+
+=cut
+
+sub merge_union {
+    my ($self, $o) = @_;
+
+    return 0 if not $o->isa('Dpkg::Deps::Simple');
+    return 0 if $self->is_empty() or $o->is_empty();
+    return 0 if $self->{package} ne $o->{package};
+    return 0 if defined $self->{arches} or defined $o->{arches};
+
+    if (not defined $o->{relation} and defined $self->{relation}) {
+        # Union is the non-versioned dependency
+        $self->{relation} = undef;
+        $self->{version} = undef;
+        return 1;
+    }
+
+    my $implication = $self->implies($o);
+    my $rev_implication = $o->implies($self);
+    if (defined $implication) {
+        if ($implication) {
+            $self->{relation} = $o->{relation};
+            $self->{version} = $o->{version};
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+    if (defined $rev_implication) {
+        if ($rev_implication) {
+            # Already merged...
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+    return 0;
+}
+
+=back
+
+=head1 CHANGES
+
+=head2 Version 1.02 (dpkg 1.17.10)
+
+New methods: Add $dep->profile_is_concerned() and $dep->reduce_profiles().
+
+=head2 Version 1.01 (dpkg 1.16.1)
+
+New method: Add $dep->reset().
+
+New property: recognizes the arch qualifier "any" and stores it in the
+"archqual" property when present.
+
+=head2 Version 1.00 (dpkg 1.15.6)
+
+Mark the module as public.
+
+=cut
+
+1;
diff --git a/scripts/Dpkg/Deps/Union.pm b/scripts/Dpkg/Deps/Union.pm
new file mode 100644
index 000000000..148e38ed3
--- /dev/null
+++ b/scripts/Dpkg/Deps/Union.pm
@@ -0,0 +1,119 @@
+# Copyright © 1998 Richard Braakman
+# Copyright © 1999 Darren Benham
+# Copyright © 2000 Sean 'Shaleh' Perry
+# Copyright © 2004 Frank Lichtenheld
+# Copyright © 2006 Russ Allbery
+# Copyright © 2007-2009 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2009, 2012-2014 Guillem Jover <guillem@debian.org>
+#
+# This program is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package Dpkg::Deps::Union;
+
+=encoding utf8
+
+=head1 NAME
+
+Dpkg::Deps::Union - list of unrelated dependencies
+
+=head1 DESCRIPTION
+
+This class represents a list of relationships.
+It inherits from Dpkg::Deps::Multiple.
+
+=cut
+
+use strict;
+use warnings;
+
+our $VERSION = '1.00';
+
+use parent qw(Dpkg::Deps::Multiple);
+
+=head1 METHODS
+
+=over 4
+
+=item $dep->output([$fh])
+
+The output method uses ", " to join the list of relationships.
+
+=cut
+
+sub output {
+    my ($self, $fh) = @_;
+
+    my $res = join(', ', map {
+        $_->output()
+    } grep {
+        not $_->is_empty()
+    } $self->get_deps());
+
+    if (defined $fh) {
+        print { $fh } $res;
+    }
+    return $res;
+}
+
+=item $dep->implies($other_dep)
+
+=item $dep->get_evaluation($other_dep)
+
+These methods are not meaningful for this object and always return undef.
+
+=cut
+
+sub implies {
+    # Implication test is not useful on Union.
+    return;
+}
+
+sub get_evaluation {
+    # Evaluation is not useful on Union.
+    return;
+}
+
+=item $dep->simplify_deps($facts)
+
+The simplification is done to generate an union of all the relationships.
+It uses $simple_dep->merge_union($other_dep) to get its job done.
+
+=cut
+
+sub simplify_deps {
+    my ($self, $facts) = @_;
+    my @new;
+
+WHILELOOP:
+    while (@{$self->{list}}) {
+        my $odep = shift @{$self->{list}};
+        foreach my $dep (@new) {
+            next WHILELOOP if $dep->merge_union($odep);
+        }
+        push @new, $odep;
+    }
+    $self->{list} = [ @new ];
+}
+
+=back
+
+=head1 CHANGES
+
+=head2 Version 1.00 (dpkg 1.15.6)
+
+Mark the module as public.
+
+=cut
+
+1;
diff --git a/scripts/Dpkg/Dist/Files.pm b/scripts/Dpkg/Dist/Files.pm
index c2c426bd9..28f9d9a7a 100644
--- a/scripts/Dpkg/Dist/Files.pm
+++ b/scripts/Dpkg/Dist/Files.pm
@@ -81,12 +81,14 @@ sub parse {
 
         my $file;
 
-        if (m/^(\S+) (\S+) (\S+)$/) {
+        if (m/^(\S+) (\S+) (\S+)((?:\s+[0-9a-z-]+=\S+)*)$/) {
             $file = $self->parse_filename($1);
             error(g_('badly formed package name in files list file, line %d'), $.)
                 unless defined $file;
             $file->{section} = $2;
             $file->{priority} = $3;
+            my $attrs = $4;
+            $file->{attrs} = { map { split /=/ } split ' ', $attrs };
         } else {
             error(g_('badly formed line in files list file, line %d'), $.);
         }
@@ -131,12 +133,13 @@ sub get_file {
 }
 
 sub add_file {
-    my ($self, $filename, $section, $priority) = @_;
+    my ($self, $filename, $section, $priority, %attrs) = @_;
 
     my $file = $self->parse_filename($filename);
     error(g_('invalid filename %s'), $filename) unless defined $file;
     $file->{section} = $section;
     $file->{priority} = $priority;
+    $file->{attrs} = \%attrs;
 
     $self->{files}->{$filename} = $file;
 
@@ -171,7 +174,15 @@ sub output {
 
     foreach my $filename (sort keys %{$self->{files}}) {
         my $file = $self->{files}->{$filename};
-        my $entry = "$filename $file->{section} $file->{priority}\n";
+        my $entry = "$filename $file->{section} $file->{priority}";
+
+        if (exists $file->{attrs}) {
+            foreach my $attr (sort keys %{$file->{attrs}}) {
+                $entry .= " $attr=$file->{attrs}->{$attr}";
+            }
+        }
+
+        $entry .= "\n";
 
         print { $fh } $entry if defined $fh;
         $str .= $entry;
diff --git a/scripts/Dpkg/Exit.pm b/scripts/Dpkg/Exit.pm
index 5e513b496..70a29b1a6 100644
--- a/scripts/Dpkg/Exit.pm
+++ b/scripts/Dpkg/Exit.pm
@@ -19,7 +19,7 @@ package Dpkg::Exit;
 use strict;
 use warnings;
 
-our $VERSION = '1.01';
+our $VERSION = '2.00';
 our @EXPORT_OK = qw(
     push_exit_handler
     pop_exit_handler
@@ -28,10 +28,7 @@ our @EXPORT_OK = qw(
 
 use Exporter qw(import);
 
-# XXX: Backwards compatibility, stop exporting on VERSION 2.00.
-## no critic (Variables::ProhibitPackageVars)
-our @handlers = ();
-## use critic
+my @handlers = ();
 
 =encoding utf8
 
@@ -55,6 +52,8 @@ Register a code reference into the exit function handlers stack.
 
 sub push_exit_handler {
     my ($func) = shift;
+
+    _setup_exit_handlers() if @handlers == 0;
     push @handlers, $func;
 }
 
@@ -65,6 +64,7 @@ Pop the last registered exit handler from the handlers stack.
 =cut
 
 sub pop_exit_handler {
+    _reset_exit_handlers() if @handlers == 1;
     pop @handlers;
 }
 
@@ -83,14 +83,32 @@ sub _exit_handler {
     exit(127);
 }
 
-$SIG{INT} = \&_exit_handler;
-$SIG{HUP} = \&_exit_handler;
-$SIG{QUIT} = \&_exit_handler;
+my @SIGNAMES = qw(INT HUP QUIT __DIE__);
+my %SIGOLD;
+
+sub _setup_exit_handlers
+{
+    foreach my $signame (@SIGNAMES) {
+        $SIGOLD{$signame} = $SIG{$signame};
+        $SIG{$signame} = \&_exit_handler;
+    }
+}
+
+sub _reset_exit_handlers
+{
+    foreach my $signame (@SIGNAMES) {
+        $SIG{$signame} = $SIGOLD{$signame};
+    }
+}
 
 =back
 
 =head1 CHANGES
 
+=head2 Version 2.00 (dpkg 1.20.0)
+
+Hide variable: @handlers.
+
 =head2 Version 1.01 (dpkg 1.17.2)
 
 New functions: push_exit_handler(), pop_exit_handler(), run_exit_handlers()
diff --git a/scripts/Dpkg/File.pm b/scripts/Dpkg/File.pm
index 884923852..6ba49a6e6 100644
--- a/scripts/Dpkg/File.pm
+++ b/scripts/Dpkg/File.pm
@@ -25,12 +25,26 @@ our @EXPORT = qw(
 );
 
 use Exporter qw(import);
+use Scalar::Util qw(openhandle);
+
+use Dpkg::ErrorHandling;
+use Dpkg::Gettext;
 
 sub file_slurp {
-    my $fh = shift;
+    my $file = shift;
+    my $fh;
+    my $doclose = 0;
 
+    if (openhandle($file)) {
+        $fh = $file;
+    } else {
+        open $fh, '<', $file or syserr(g_('cannot read %s'), $fh);
+        $doclose = 1;
+    }
     local $/;
     my $data = <$fh>;
+    close $fh if $doclose;
+
     return $data;
 }
 
diff --git a/scripts/Dpkg/Gettext.pm b/scripts/Dpkg/Gettext.pm
index 2e3e5042e..e61cdd1a0 100644
--- a/scripts/Dpkg/Gettext.pm
+++ b/scripts/Dpkg/Gettext.pm
@@ -28,15 +28,15 @@ package Dpkg::Gettext;
 
 use strict;
 use warnings;
+use feature qw(state);
 
-our $VERSION = '1.03';
+our $VERSION = '2.00';
 our @EXPORT = qw(
     textdomain
     ngettext
     g_
     P_
     N_
-    _g
 );
 
 use Exporter qw(import);
@@ -88,6 +88,19 @@ our $DEFAULT_TEXT_DOMAIN = 'dpkg-dev';
 
 =over 4
 
+=item $domain = textdomain($new_domain)
+
+Compatibility textdomain() fallback when Locale::gettext is not available.
+
+If $new_domain is not undef, it will set the current domain to $new_domain.
+Returns the current domain, after possibly changing it.
+
+=item $trans = ngettext($msgid, $msgid_plural, $n)
+
+Compatibility ngettext() fallback when Locale::gettext is not available.
+
+Returns $msgid if $n is 1 or $msgid_plural otherwise.
+
 =item $trans = g_($msgid)
 
 Calls dgettext() on the $msgid and returns its translation for the current
@@ -118,41 +131,43 @@ BEGIN {
         $use_gettext = not $@;
     }
     if (not $use_gettext) {
-        eval q{
-            sub g_ {
-                return shift;
-            }
-            sub textdomain {
-            }
-            sub ngettext {
-                my ($msgid, $msgid_plural, $n) = @_;
-                if ($n == 1) {
-                    return $msgid;
-                } else {
-                    return $msgid_plural;
-                }
-            }
-            sub C_ {
-                my ($msgctxt, $msgid) = @_;
+        *g_ = sub {
+            return shift;
+        };
+        *textdomain = sub {
+            my $new_domain = shift;
+            state $domain = $DEFAULT_TEXT_DOMAIN;
+
+            $domain = $new_domain if defined $new_domain;
+
+            return $domain;
+        };
+        *ngettext = sub {
+            my ($msgid, $msgid_plural, $n) = @_;
+            if ($n == 1) {
                 return $msgid;
-            }
-            sub P_ {
-                return ngettext(@_);
+            } else {
+                return $msgid_plural;
             }
         };
+        *C_ = sub {
+            my ($msgctxt, $msgid) = @_;
+            return $msgid;
+        };
+        *P_ = sub {
+            return ngettext(@_);
+        };
     } else {
-        eval q{
-            sub g_ {
-                return dgettext($DEFAULT_TEXT_DOMAIN, shift);
-            }
-            sub C_ {
-                my ($msgctxt, $msgid) = @_;
-                return dgettext($DEFAULT_TEXT_DOMAIN,
-                                $msgctxt . GETTEXT_CONTEXT_GLUE . $msgid);
-            }
-            sub P_ {
-                return dngettext($DEFAULT_TEXT_DOMAIN, @_);
-            }
+        *g_ = sub {
+            return dgettext($DEFAULT_TEXT_DOMAIN, shift);
+        };
+        *C_ = sub {
+            my ($msgctxt, $msgid) = @_;
+            return dgettext($DEFAULT_TEXT_DOMAIN,
+                            $msgctxt . GETTEXT_CONTEXT_GLUE . $msgid);
+        };
+        *P_ = sub {
+            return dngettext($DEFAULT_TEXT_DOMAIN, @_);
         };
     }
 }
@@ -173,18 +188,11 @@ sub N_
     return $msgid;
 }
 
-# XXX: Backwards compatibility, to be removed on VERSION 2.00.
-sub _g ## no critic (Subroutines::ProhibitUnusedPrivateSubroutines)
-{
-    my $msgid = shift;
-
-    warnings::warnif('deprecated',
-                     'obsolete _g() function, please use g_() instead');
+=head1 CHANGES
 
-    return g_($msgid);
-}
+=head2 Version 2.00 (dpkg 1.20.0)
 
-=head1 CHANGES
+Remove function: _g().
 
 =head2 Version 1.03 (dpkg 1.19.0)
 
diff --git a/scripts/Dpkg/Index.pm b/scripts/Dpkg/Index.pm
index bcee6205b..cfe86ba17 100644
--- a/scripts/Dpkg/Index.pm
+++ b/scripts/Dpkg/Index.pm
@@ -19,7 +19,7 @@ package Dpkg::Index;
 use strict;
 use warnings;
 
-our $VERSION = '1.01';
+our $VERSION = '2.00';
 
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
@@ -39,7 +39,7 @@ Dpkg::Index - generic index of control information
 
 =head1 DESCRIPTION
 
-This object represent a set of Dpkg::Control objects.
+This class represent a set of Dpkg::Control objects.
 
 =head1 METHODS
 
@@ -58,7 +58,7 @@ sub new {
     my $self = {
 	items => {},
 	order => [],
-	unique_tuple_key => 0,
+	unique_tuple_key => 1,
 	get_key_func => sub { return $_[0]->{Package} },
 	type => CTRL_UNKNOWN,
     };
@@ -77,8 +77,7 @@ The "type" option is checked first to define default values for other
 options. Here are the relevant options: "get_key_func" is a function
 returning a key for the item passed in parameters, "unique_tuple_key" is
 a boolean requesting whether the default key should be the unique tuple
-(default to false for backwards compatibility, but it will change to true
-in dpkg 1.20.x). The index can only contain one item with a given key.
+(default to true). The index can only contain one item with a given key.
 The "get_key_func" function used depends on the type:
 
 =over
@@ -89,9 +88,9 @@ for CTRL_INFO_SRC, it is the Source field;
 
 =item *
 
-for CTRL_INDEX_SRC and CTRL_PKG_SRC it is the Package field by default,
-or the Package and Version fields (concatenated with "_") when
-"unique_tuple_key" is true;
+for CTRL_INDEX_SRC and CTRL_PKG_SRC it is the Package and Version fields
+(concatenated with "_") when "unique_tuple_key" is true (the default), or
+otherwise the Package field;
 
 =item *
 
@@ -99,9 +98,9 @@ for CTRL_INFO_PKG it is simply the Package field;
 
 =item *
 
-for CTRL_INDEX_PKG and CTRL_PKG_DEB it is the Package field by default,
-or the Package, Version and Architecture fields (concatenated with "_")
-when "unique_tuple_key" is true;
+for CTRL_INDEX_PKG and CTRL_PKG_DEB it is the Package, Version and
+Architecture fields (concatenated with "_") when "unique_tuple_key" is
+true (the default) or otherwise the Package field;
 
 =item *
 
@@ -165,14 +164,10 @@ sub set_options {
                 $self->{get_key_func} = sub {
                     return $_[0]->{Package} . '_' . $_[0]->{Version};
                 };
-            } elsif (not defined $opts{get_key_func}) {
+            } else {
                 $self->{get_key_func} = sub {
                     return $_[0]->{Package};
                 };
-                warnings::warnif('deprecated',
-                    'the default get_key_func for this control type will ' .
-                    'change semantics in dpkg 1.20.x , please set ' .
-                    'unique_tuple_key or get_key_func explicitly');
             }
         } elsif ($t == CTRL_INDEX_PKG or $t == CTRL_PKG_DEB) {
             if ($opts{unique_tuple_key} // $self->{unique_tuple_key}) {
@@ -180,14 +175,10 @@ sub set_options {
                     return $_[0]->{Package} . '_' . $_[0]->{Version} . '_' .
                            $_[0]->{Architecture};
                 };
-            } elsif (not defined $opts{get_key_func}) {
+            } else {
                 $self->{get_key_func} = sub {
                     return $_[0]->{Package};
                 };
-                warnings::warnif('deprecated',
-                    'the default get_key_func for this control type will ' .
-                    'change semantics in dpkg 1.20.x , please set ' .
-                    'unique_tuple_key or get_key_func explicitly');
             }
         } elsif ($t == CTRL_FILE_CHANGES) {
 	    $self->{get_key_func} = sub {
@@ -237,11 +228,6 @@ sub add {
     $self->{items}{$key} = $item;
 }
 
-=item $index->load($file)
-
-Reads the file and creates all items parsed. Returns the number of items
-parsed. Handles compressed files transparently based on their extensions.
-
 =item $index->parse($fh, $desc)
 
 Reads the filehandle and creates all items parsed. When called multiple
@@ -263,10 +249,10 @@ sub parse {
     return $i;
 }
 
-=item $index->save($file)
+=item $index->load($file)
 
-Writes the content of the index in a file. Auto-compresses files
-based on their extensions.
+Reads the file and creates all items parsed. Returns the number of items
+parsed. Handles compressed files transparently based on their extensions.
 
 =item $item = $index->new_item()
 
@@ -404,17 +390,16 @@ sub sort {
     }
 }
 
-=item $str = $index->output()
+=item $str = $index->output([$fh])
 
 =item "$index"
 
-Get a string representation of the index. The Dpkg::Control objects are
+Get a string representation of the index. The L<Dpkg::Control> objects are
 output in the order which they have been read or added except if the order
 have been changed with sort().
 
-=item $index->output($fh)
-
-Print the string representation of the index to a filehandle.
+Print the string representation of the index to a filehandle if $fh has
+been passed.
 
 =cut
 
@@ -432,10 +417,19 @@ sub output {
     return $str;
 }
 
+=item $index->save($file)
+
+Writes the content of the index in a file. Auto-compresses files
+based on their extensions.
+
 =back
 
 =head1 CHANGES
 
+=head2 Version 2.00 (dpkg 1.20.0)
+
+Change behavior: The "unique_tuple_key" option now defaults to true.
+
 =head2 Version 1.01 (dpkg 1.19.0)
 
 New option: Add new "unique_tuple_key" option to $index->set_options() to set
diff --git a/scripts/Dpkg/Interface/Storable.pm b/scripts/Dpkg/Interface/Storable.pm
index eb6078d3b..5ac078ac1 100644
--- a/scripts/Dpkg/Interface/Storable.pm
+++ b/scripts/Dpkg/Interface/Storable.pm
@@ -38,23 +38,23 @@ Dpkg::Interface::Storable - common methods related to object serialization
 =head1 DESCRIPTION
 
 Dpkg::Interface::Storable is only meant to be used as parent
-class for other objects. It provides common methods that are
+class for other classes. It provides common methods that are
 all implemented on top of two basic methods parse() and output().
 
 =head1 BASE METHODS
 
-Those methods must be provided by the object that wish to inherit
+Those methods must be provided by the class that wish to inherit
 from Dpkg::Interface::Storable so that the methods provided can work.
 
 =over 4
 
-=item $obj->parse($fh, $desc)
+=item $obj->parse($fh[, $desc])
 
 This methods initialize the object with the data stored in the
 filehandle. $desc is optional and is a textual description of
 the filehandle used in error messages.
 
-=item $string = $obj->output($fh)
+=item $string = $obj->output([$fh])
 
 This method returns a string representation of the object in $string
 and it writes the same string to $fh (if it's defined).
diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm
index 858d3efcf..f08bd3b12 100644
--- a/scripts/Dpkg/OpenPGP.pm
+++ b/scripts/Dpkg/OpenPGP.pm
@@ -18,6 +18,7 @@ package Dpkg::OpenPGP;
 use strict;
 use warnings;
 
+use POSIX qw(:sys_wait_h);
 use Exporter qw(import);
 use File::Copy;
 
@@ -49,18 +50,21 @@ sub openpgp_sig_to_asc
         if ($is_openpgp_ascii_armor) {
             notice(g_('signature file is already OpenPGP ASCII armor, copying'));
             copy($sig, $asc);
-            return;
+            return $asc;
         }
 
         if (not find_command('gpg')) {
             warning(g_('cannot OpenPGP ASCII armor signature file due to missing gpg'));
         }
 
+        my @gpg_opts = qw(--no-options);
+
         open my $fh_asc, '>', $asc
             or syserr(g_('cannot create signature file %s'), $asc);
-        open my $fh_gpg, '-|', 'gpg', '-o', '-', '--enarmor', $sig
+        open my $fh_gpg, '-|', 'gpg', @gpg_opts, '-o', '-', '--enarmor', $sig
             or syserr(g_('cannot execute %s program'), 'gpg');
         while (my $line = <$fh_gpg>) {
+            next if $line =~ m/^Version: /;
             next if $line =~ m/^Comment: /;
 
             $line =~ s/ARMORED FILE/SIGNATURE/;
@@ -71,10 +75,86 @@ sub openpgp_sig_to_asc
         close $fh_gpg or subprocerr('gpg');
         close $fh_asc or syserr(g_('cannot write signature file %s'), $asc);
 
-        return $sig;
+        return $asc;
     }
 
     return;
 }
 
+sub import_key {
+    my ($asc, %opts) = @_;
+
+    $opts{require_valid_signature} //= 1;
+
+    my @exec;
+    if (find_command('gpg')) {
+        push @exec, 'gpg';
+    } elsif ($opts{require_valid_signature}) {
+        error(g_('cannot import key in %s since GnuPG is not installed'),
+              $asc);
+    } else {
+        warning(g_('cannot import key in %s since GnuPG is not installed'),
+                $asc);
+        return;
+    }
+    push @exec, '--no-options', '--no-default-keyring', '-q', '--import';
+    push @exec, '--keyring', $opts{keyring};
+    push @exec, $asc;
+
+    my ($stdout, $stderr);
+    spawn(exec => \@exec, wait_child => 1, nocheck => 1, timeout => 10,
+          to_string => \$stdout, error_to_string => \$stderr);
+    if (WIFEXITED($?)) {
+        my $status = WEXITSTATUS($?);
+        print { *STDERR } "$stdout$stderr" if $status;
+        if ($status == 1 or ($status && $opts{require_valid_signature})) {
+            error(g_('failed to import key in %s'), $asc);
+        } elsif ($status) {
+            warning(g_('failed to import key in %s'), $asc);
+        }
+    } else {
+        subprocerr("@exec");
+    }
+}
+
+sub verify_signature {
+    my ($sig, %opts) = @_;
+
+    $opts{require_valid_signature} //= 1;
+
+    my @exec;
+    if (find_command('gpgv')) {
+        push @exec, 'gpgv';
+    } elsif (find_command('gpg')) {
+        push @exec, 'gpg', '--no-default-keyring', '-q', '--verify';
+    } elsif ($opts{require_valid_signature}) {
+        error(g_('cannot verify signature on %s since GnuPG is not installed'),
+              $sig);
+    } else {
+        warning(g_('cannot verify signature on %s since GnuPG is not installed'),
+                $sig);
+        return;
+    }
+    foreach my $keyring (@{$opts{keyrings}}) {
+        push @exec, '--keyring', $keyring;
+    }
+    push @exec, $sig;
+    push @exec, $opts{datafile} if exists $opts{datafile};
+
+    my ($stdout, $stderr);
+    spawn(exec => \@exec, wait_child => 1, nocheck => 1, timeout => 10,
+          to_string => \$stdout, error_to_string => \$stderr);
+    if (WIFEXITED($?)) {
+        my $status = WEXITSTATUS($?);
+        print { *STDERR } "$stdout$stderr" if $status;
+        if ($status == 1 or ($status && $opts{require_valid_signature})) {
+            error(g_('failed to verify signature on %s'), $sig);
+        } elsif ($status) {
+            warning(g_('failed to verify signature on %s'), $sig);
+        }
+    } else {
+        subprocerr("@exec");
+    }
+}
+
 1;
diff --git a/scripts/Dpkg/Shlibs.pm b/scripts/Dpkg/Shlibs.pm
index bab5e32a0..bf52cc555 100644
--- a/scripts/Dpkg/Shlibs.pm
+++ b/scripts/Dpkg/Shlibs.pm
@@ -116,8 +116,20 @@ sub setup_library_paths {
 
     # XXX: Deprecated. Update library paths with LD_LIBRARY_PATH.
     if ($ENV{LD_LIBRARY_PATH}) {
+        require Cwd;
+        my $cwd = Cwd::getcwd;
+
         foreach my $path (split /:/, $ENV{LD_LIBRARY_PATH}) {
             $path =~ s{/+$}{};
+
+            my $realpath = Cwd::realpath($path);
+            next unless defined $realpath;
+            if ($realpath =~ m/^\Q$cwd\E/) {
+                warning(g_('deprecated use of LD_LIBRARY_PATH with private ' .
+                           'library directory which interferes with ' .
+                           'cross-building, please use -l option instead'));
+            }
+
             # XXX: This should be added to @custom_librarypaths, but as this
             # is deprecated we do not care as the code will go away.
             push @system_librarypaths, $path;
diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
index 91cc06488..4cee866e7 100644
--- a/scripts/Dpkg/Shlibs/Objdump.pm
+++ b/scripts/Dpkg/Shlibs/Objdump.pm
@@ -1,4 +1,5 @@
 # Copyright © 2007-2010 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2007-2009,2012-2015,2017-2018 Guillem Jover <guillem@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,17 +24,6 @@ our $VERSION = '0.01';
 
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
-use Dpkg::Path qw(find_command);
-use Dpkg::Arch qw(debarch_to_gnutriplet get_build_arch get_host_arch);
-use Dpkg::IPC;
-
-# Decide which objdump to call
-our $OBJDUMP = 'objdump';
-if (get_build_arch() ne get_host_arch()) {
-    my $od = debarch_to_gnutriplet(get_host_arch()) . '-objdump';
-    $OBJDUMP = $od if find_command($od);
-}
-
 
 sub new {
     my $this = shift;
@@ -244,9 +234,12 @@ package Dpkg::Shlibs::Objdump::Object;
 
 use strict;
 use warnings;
+use feature qw(state);
 
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
+use Dpkg::Path qw(find_command);
+use Dpkg::Arch qw(debarch_to_gnutriplet get_build_arch get_host_arch);
 
 sub new {
     my $this = shift;
@@ -268,9 +261,9 @@ sub reset {
 
     $self->{file} = '';
     $self->{id} = '';
-    $self->{SONAME} = '';
     $self->{HASH} = '';
     $self->{GNU_HASH} = '';
+    $self->{INTERP} = 0;
     $self->{SONAME} = '';
     $self->{NEEDED} = [];
     $self->{RPATH} = [];
@@ -281,6 +274,14 @@ sub reset {
     return $self;
 }
 
+sub _select_objdump {
+    # Decide which objdump to call
+    if (get_build_arch() ne get_host_arch()) {
+        my $od = debarch_to_gnutriplet(get_host_arch()) . '-objdump';
+        return $od if find_command($od);
+    }
+    return 'objdump';
+}
 
 sub analyze {
     my ($self, $file) = @_;
@@ -298,6 +299,7 @@ sub analyze {
         return;
     }
 
+    state $OBJDUMP = _select_objdump();
     local $ENV{LC_ALL} = 'C';
     open(my $objdump, '-|', $OBJDUMP, '-w', '-f', '-p', '-T', '-R', $file)
         or syserr(g_('cannot fork for %s'), $OBJDUMP);
@@ -325,7 +327,7 @@ sub parse_objdump_output {
 	    $section = 'dyninfo';
 	    next;
 	} elsif (/^Program Header:/) {
-	    $section = 'header';
+	    $section = 'program';
 	    next;
 	} elsif (/^Version definitions:/) {
 	    $section = 'verdef';
@@ -364,6 +366,10 @@ sub parse_objdump_output {
                     $self->{RPATH} = [ split /:/, $rpath ];
                 }
 	    }
+        } elsif ($section eq 'program') {
+            if (/^\s*INTERP\s+/) {
+                $self->{INTERP} = 1;
+            }
 	} elsif ($section eq 'none') {
 	    if (/^\s*.+:\s*file\s+format\s+(\S+)$/) {
 		$self->{format} = $1;
@@ -536,7 +542,8 @@ sub get_needed_libraries {
 
 sub is_executable {
     my $self = shift;
-    return exists $self->{flags}{EXEC_P} && $self->{flags}{EXEC_P};
+    return (exists $self->{flags}{EXEC_P} && $self->{flags}{EXEC_P}) ||
+           (exists $self->{INTERP} && $self->{INTERP});
 }
 
 sub is_public_library {
diff --git a/scripts/Dpkg/Shlibs/Symbol.pm b/scripts/Dpkg/Shlibs/Symbol.pm
index 802681bf1..142992b89 100644
--- a/scripts/Dpkg/Shlibs/Symbol.pm
+++ b/scripts/Dpkg/Shlibs/Symbol.pm
@@ -33,6 +33,10 @@ use Dpkg::Shlibs::Cppfilt;
 # Supported alias types in the order of matching preference
 use constant ALIAS_TYPES => qw(c++ symver);
 
+# Needed by the deprecated key, which is a correct use.
+no if $Dpkg::Version::VERSION ge '1.02',
+    warnings => qw(Dpkg::Version::semantic_change::overload::bool);
+
 sub new {
     my ($this, %args) = @_;
     my $class = ref($this) || $this;
diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm
index 04d22306c..28b2111c7 100644
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -30,6 +30,10 @@ use Dpkg::Arch qw(get_host_arch);
 
 use parent qw(Dpkg::Interface::Storable);
 
+# Needed by the deprecated key, which is a correct use.
+no if $Dpkg::Version::VERSION ge '1.02',
+    warnings => qw(Dpkg::Version::semantic_change::overload::bool);
+
 my %blacklist = (
     __bss_end__ => 1,                   # arm
     __bss_end => 1,                     # arm
@@ -206,7 +210,7 @@ sub parse {
     my ($self, $fh, $file, %opts) = @_;
     my $state = $opts{state} //= {};
 
-    if (defined $state) {
+    if (exists $state->{seen}) {
 	return if exists $state->{seen}{$file}; # Avoid include loops
     } else {
 	$self->{file} = $file;
@@ -226,7 +230,7 @@ sub parse {
 		error(g_('symbol information must be preceded by a header (file %s, line %s)'), $file, $.);
 	    }
 	    # Symbol specification
-	    my $deprecated = ($1) ? $1 : 0;
+	    my $deprecated = ($1) ? Dpkg::Version->new($1) : 0;
 	    my $sym = _new_symbol($state->{base_symbol}, deprecated => $deprecated);
 	    if ($self->create_symbol($2, base => $sym)) {
 		$self->add_symbol($sym, ${$state->{obj_ref}});
diff --git a/scripts/Dpkg/Source/BinaryFiles.pm b/scripts/Dpkg/Source/BinaryFiles.pm
new file mode 100644
index 000000000..48c84c8fc
--- /dev/null
+++ b/scripts/Dpkg/Source/BinaryFiles.pm
@@ -0,0 +1,161 @@
+# Copyright © 2008-2011 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2015 Guillem Jover <guillem@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package Dpkg::Source::BinaryFiles;
+
+use strict;
+use warnings;
+
+our $VERSION = '0.01';
+
+use Cwd;
+use File::Path qw(make_path);
+use File::Spec;
+use File::Find;
+
+use Dpkg::ErrorHandling;
+use Dpkg::Gettext;
+use Dpkg::Source::Functions qw(is_binary);
+
+sub new {
+    my ($this, $dir) = @_;
+    my $class = ref($this) || $this;
+
+    my $self = {
+        dir => $dir,
+        allowed_binaries => {},
+        seen_binaries => {},
+        include_binaries_path =>
+            File::Spec->catfile($dir, 'debian', 'source', 'include-binaries'),
+    };
+    bless $self, $class;
+    $self->load_allowed_binaries();
+    return $self;
+}
+
+sub new_binary_found {
+    my ($self, $path) = @_;
+
+    $self->{seen_binaries}{$path} = 1;
+}
+
+sub load_allowed_binaries {
+    my $self = shift;
+    my $incbin_file = $self->{include_binaries_path};
+
+    if (-f $incbin_file) {
+        open my $incbin_fh, '<', $incbin_file
+            or syserr(g_('cannot read %s'), $incbin_file);
+        while (<$incbin_fh>) {
+            chomp;
+            s/^\s*//;
+            s/\s*$//;
+            next if /^#/ or length == 0;
+            $self->{allowed_binaries}{$_} = 1;
+        }
+        close $incbin_fh;
+    }
+}
+
+sub binary_is_allowed {
+    my ($self, $path) = @_;
+
+    return 1 if exists $self->{allowed_binaries}{$path};
+    return 0;
+}
+
+sub update_debian_source_include_binaries {
+    my $self = shift;
+
+    my @unknown_binaries = $self->get_unknown_binaries();
+    return unless scalar @unknown_binaries;
+
+    my $incbin_file = $self->{include_binaries_path};
+    make_path(File::Spec->catdir($self->{dir}, 'debian', 'source'));
+    open my $incbin_fh, '>>', $incbin_file
+        or syserr(g_('cannot write %s'), $incbin_file);
+    foreach my $binary (@unknown_binaries) {
+        print { $incbin_fh } "$binary\n";
+        info(g_('adding %s to %s'), $binary, 'debian/source/include-binaries');
+        $self->{allowed_binaries}{$binary} = 1;
+    }
+    close $incbin_fh;
+}
+
+sub get_unknown_binaries {
+    my $self = shift;
+
+    return grep { not $self->binary_is_allowed($_) } $self->get_seen_binaries();
+}
+
+sub get_seen_binaries {
+    my $self = shift;
+    my @seen = sort keys %{$self->{seen_binaries}};
+
+    return @seen;
+}
+
+sub detect_binary_files {
+    my ($self, %opts) = @_;
+
+    my $unwanted_binaries = 0;
+    my $check_binary = sub {
+        if (-f and is_binary($_)) {
+            my $fn = File::Spec->abs2rel($_, $self->{dir});
+            $self->new_binary_found($fn);
+            unless ($opts{include_binaries} or $self->binary_is_allowed($fn)) {
+                errormsg(g_('unwanted binary file: %s'), $fn);
+                $unwanted_binaries++;
+            }
+        }
+    };
+    my $exclude_glob = '{' .
+        join(',', map { s/,/\\,/rg } @{$opts{exclude_globs}}) .
+    '}';
+    my $filter_ignore = sub {
+        # Filter out files that are not going to be included in the debian
+        # tarball due to ignores.
+        my %exclude;
+        my $reldir = File::Spec->abs2rel($File::Find::dir, $self->{dir});
+        my $cwd = getcwd();
+        # Apply the pattern both from the top dir and from the inspected dir
+        chdir $self->{dir}
+            or syserr(g_("unable to chdir to '%s'"), $self->{dir});
+        $exclude{$_} = 1 foreach glob $exclude_glob;
+        chdir $cwd or syserr(g_("unable to chdir to '%s'"), $cwd);
+        chdir $File::Find::dir
+            or syserr(g_("unable to chdir to '%s'"), $File::Find::dir);
+        $exclude{$_} = 1 foreach glob $exclude_glob;
+        chdir $cwd or syserr(g_("unable to chdir to '%s'"), $cwd);
+        my @result;
+        foreach my $fn (@_) {
+            unless (exists $exclude{$fn} or exists $exclude{"$reldir/$fn"}) {
+                push @result, $fn;
+            }
+        }
+        return @result;
+    };
+    find({ wanted => $check_binary, preprocess => $filter_ignore,
+           no_chdir => 1 }, File::Spec->catdir($self->{dir}, 'debian'));
+    error(P_('detected %d unwanted binary file (add it in ' .
+             'debian/source/include-binaries to allow its inclusion).',
+             'detected %d unwanted binary files (add them in ' .
+             'debian/source/include-binaries to allow their inclusion).',
+             $unwanted_binaries), $unwanted_binaries)
+        if $unwanted_binaries;
+}
+
+1;
diff --git a/scripts/Dpkg/Source/Format.pm b/scripts/Dpkg/Source/Format.pm
new file mode 100644
index 000000000..41596a233
--- /dev/null
+++ b/scripts/Dpkg/Source/Format.pm
@@ -0,0 +1,191 @@
+# Copyright © 2008-2011 Raphaël Hertzog <hertzog@debian.org>
+# Copyright © 2008-2018 Guillem Jover <guillem@debian.org>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package Dpkg::Source::Format;
+
+=encoding utf8
+
+=head1 NAME
+
+Dpkg::Source::Format - manipulate debian/source/format files
+
+=head1 DESCRIPTION
+
+This module provides a class that can manipulate Debian source
+package F<debian/source/format> files.
+
+=cut
+
+use strict;
+use warnings;
+
+our $VERSION = '1.00';
+
+use Dpkg::Gettext;
+use Dpkg::ErrorHandling;
+
+use parent qw(Dpkg::Interface::Storable);
+
+=head1 METHODS
+
+=over 4
+
+=item $f = Dpkg::Source::Format->new(%opts)
+
+Creates a new object corresponding to a source package's
+F<debian/source/format> file. When the key B<filename> is set, it will
+be used to parse and set the format. Otherwise if the B<format> key is
+set it will be validated and used to set the format.
+
+=cut
+
+sub new {
+    my ($this, %opts) = @_;
+    my $class = ref($this) || $this;
+    my $self = {
+        filename => undef,
+        major => undef,
+        minor => undef,
+        variant => undef,
+    };
+    bless $self, $class;
+
+    if (exists $opts{filename}) {
+        $self->load($opts{filename}, compression => 0);
+    } elsif ($opts{format}) {
+        $self->set($opts{format});
+    }
+    return $self;
+}
+
+=item $f->set_from_parts($major[, $minor[, $variant]])
+
+Sets the source format from its parts. The $major part is mandatory.
+The $minor and $variant parts are optional.
+
+B<Notice>: This function performs no validation.
+
+=cut
+
+sub set_from_parts {
+    my ($self, $major, $minor, $variant) = @_;
+
+    $self->{major} = $major;
+    $self->{minor} = $minor // 0;
+    $self->{variant} = $variant;
+}
+
+=item ($major, $minor, $variant) = $f->set($format)
+
+Sets (and validates) the source $format specified. Will return the parsed
+format parts as a list, the optional $minor and $variant parts might be
+undef.
+
+=cut
+
+sub set {
+    my ($self, $format) = @_;
+
+    if ($format =~ /^(\d+)(?:\.(\d+))?(?:\s+\(([a-z0-9]+)\))?$/) {
+        my ($major, $minor, $variant) = ($1, $2, $3);
+
+        $self->set_from_parts($major, $minor, $variant);
+
+        return ($major, $minor, $variant);
+    } else {
+        error(g_("source package format '%s' is invalid"), $format);
+    }
+}
+
+=item ($major, $minor, $variant) = $f->get()
+
+=item $format = $f->get()
+
+Gets the source format, either as properly formatted scalar, or as a list
+of its parts, where the optional $minor and $variant parts might be undef.
+
+=cut
+
+sub get {
+    my $self = shift;
+
+    if (wantarray) {
+        return ($self->{major}, $self->{minor}, $self->{variant});
+    } else {
+        my $format = "$self->{major}.$self->{minor}";
+        $format .= " ($self->{variant})" if defined $self->{variant};
+
+        return $format;
+    }
+}
+
+=item $count = $f->parse($fh, $desc)
+
+Parse the source format string from $fh, with filehandle description $desc.
+
+=cut
+
+sub parse {
+    my ($self, $fh, $desc) = @_;
+
+    my $format = <$fh>;
+    chomp $format if defined $format;
+    error(g_('%s is empty'), $desc)
+        unless defined $format and length $format;
+
+    $self->set($format);
+
+    return 1;
+}
+
+=item $count = $f->load($filename)
+
+Parse $filename contents for a source package format string.
+
+=item $str = $f->output([$fh])
+
+=item "$f"
+
+Returns a string representing the source package format version.
+If $fh is set, it prints the string to the filehandle.
+
+=cut
+
+sub output {
+    my ($self, $fh) = @_;
+
+    my $str = $self->get();
+
+    print { $fh } "$str\n" if defined $fh;
+
+    return $str;
+}
+
+=item $f->save($filename)
+
+Save the source package format into the given $filename.
+
+=back
+
+=head1 CHANGES
+
+=head2 Version 1.00 (dpkg 1.19.3)
+
+Mark the module as public.
+
+=cut
+
+1;
diff --git a/scripts/Dpkg/Source/Functions.pm b/scripts/Dpkg/Source/Functions.pm
index 0a940463e..3435f6c5a 100644
--- a/scripts/Dpkg/Source/Functions.pm
+++ b/scripts/Dpkg/Source/Functions.pm
@@ -22,6 +22,7 @@ our $VERSION = '0.01';
 our @EXPORT_OK = qw(
     erasedir
     fixperms
+    chmod_if_needed
     fs_time
     is_binary
 );
@@ -70,6 +71,18 @@ sub fixperms {
     subprocerr("chmod -R -- $modes_set $dir") if $?;
 }
 
+# Only change the pathname permissions if they differ from the desired.
+#
+# To be able to build a source tree, a user needs write permissions on it,
+# but not necessarily ownership of those files.
+sub chmod_if_needed {
+    my ($newperms, $pathname) = @_;
+    my $oldperms = (stat $pathname)[2] & 07777;
+
+    return 1 if $oldperms == $newperms;
+    return chmod $newperms, $pathname;
+}
+
 # Touch the file and read the resulting mtime.
 #
 # If the file doesn't exist, create it, read the mtime and unlink it.
@@ -97,30 +110,15 @@ sub fs_time($) {
 sub is_binary($) {
     my $file = shift;
 
-    # TODO: might want to reimplement what diff does, aka checking if the
-    # file contains \0 in the first 4Kb of data
+    # Perform the same check as diff(1), look for a NUL character in the first
+    # 4 KiB of the file.
+    open my $fh, '<', $file
+        or syserr(g_('cannot open file %s for binary detection'), $file);
+    read $fh, my $buf, 4096, 0;
+    my $res = index $buf, "\0";
+    close $fh;
 
-    # Use diff to check if it's a binary file
-    my $diffgen;
-    my $diff_pid = spawn(
-        exec => [ 'diff', '-u', '--', '/dev/null', $file ],
-        env => { LC_ALL => 'C', LANG => 'C', TZ => 'UTC0' },
-        to_pipe => \$diffgen,
-    );
-    my $result = 0;
-    local $_;
-    while (<$diffgen>) {
-        if (m/^(?:binary|[^-+\@ ].*\bdiffer\b)/i) {
-            $result = 1;
-            last;
-        } elsif (m/^[-+\@ ]/) {
-            $result = 0;
-            last;
-        }
-    }
-    close($diffgen) or syserr('close on diff pipe');
-    wait_child($diff_pid, nocheck => 1, cmdline => "diff -u -- /dev/null $file");
-    return $result;
+    return $res >= 0;
 }
 
 1;
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index f7851d203..337000cb8 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -1,5 +1,5 @@
 # Copyright © 2008-2011 Raphaël Hertzog <hertzog@debian.org>
-# Copyright © 2008-2015 Guillem Jover <guillem@debian.org>
+# Copyright © 2008-2019 Guillem Jover <guillem@debian.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ Dpkg::Source::Package - manipulate Debian source packages
 
 =head1 DESCRIPTION
 
-This module provides an object that can manipulate Debian source
+This module provides a class that can manipulate Debian source
 packages. While it supports both the extraction and the creation
 of source packages, the only API that is officially supported
 is the one that supports the extraction of the source package.
@@ -34,7 +34,7 @@ is the one that supports the extraction of the source package.
 use strict;
 use warnings;
 
-our $VERSION = '1.02';
+our $VERSION = '2.00';
 our @EXPORT_OK = qw(
     get_default_diff_ignore_regex
     set_default_diff_ignore_regex
@@ -44,6 +44,8 @@ our @EXPORT_OK = qw(
 use Exporter qw(import);
 use POSIX qw(:errno_h :sys_wait_h);
 use Carp;
+use File::Temp;
+use File::Copy qw(cp);
 use File::Basename;
 
 use Dpkg::Gettext;
@@ -52,10 +54,11 @@ use Dpkg::Control;
 use Dpkg::Checksums;
 use Dpkg::Version;
 use Dpkg::Compression;
-use Dpkg::Exit qw(run_exit_handlers);
 use Dpkg::Path qw(check_files_are_the_same find_command);
 use Dpkg::IPC;
 use Dpkg::Vendor qw(run_vendor_hook);
+use Dpkg::Source::Format;
+use Dpkg::OpenPGP;
 
 my $diff_ignore_default_regex = '
 # Ignore general backup files
@@ -77,14 +80,8 @@ my $diff_ignore_default_regex = '
 $diff_ignore_default_regex =~ s/^#.*$//mg;
 $diff_ignore_default_regex =~ s/\n//sg;
 
-# Public variables
-# XXX: Backwards compatibility, stop exporting on VERSION 2.00.
-## no critic (Variables::ProhibitPackageVars)
-our $diff_ignore_default_regexp;
-*diff_ignore_default_regexp = \$diff_ignore_default_regex;
-
 no warnings 'qw'; ## no critic (TestingAndDebugging::ProhibitNoWarnings)
-our @tar_ignore_default_pattern = qw(
+my @tar_ignore_default_pattern = qw(
 *.a
 *.la
 *.o
@@ -166,12 +163,15 @@ sub get_default_tar_ignore_pattern {
 
 =over 4
 
-=item $p = Dpkg::Source::Package->new(filename => $dscfile, options => {})
+=item $p = Dpkg::Source::Package->new(%opts, options => {})
 
-Creates a new object corresponding to the source package described
-by the file $dscfile.
+Creates a new object corresponding to a source package. When the key
+B<filename> is set to a F<.dsc> file, it will be used to initialize the
+source package with its description. Otherwise if the B<format> key is
+set to a valid value, the object will be initialized for that format
+(since dpkg 1.19.3).
 
-The options hash supports the following options:
+The B<options> key is a hash ref which supports the following options:
 
 =over 8
 
@@ -204,12 +204,13 @@ source package after its extraction.
 
 =cut
 
-# Object methods
+# Class methods
 sub new {
     my ($this, %args) = @_;
     my $class = ref($this) || $this;
     my $self = {
         fields => Dpkg::Control->new(type => CTRL_PKG_SRC),
+        format => Dpkg::Source::Format->new(),
         options => {},
         checksums => Dpkg::Checksums->new(),
     };
@@ -220,6 +221,10 @@ sub new {
     if (exists $args{filename}) {
         $self->initialize($args{filename});
         $self->init_options();
+    } elsif ($args{format}) {
+        $self->{fields}{Format} = $args{format};
+        $self->upgrade_object_type(0);
+        $self->init_options();
     }
     return $self;
 }
@@ -262,9 +267,8 @@ sub initialize {
     $self->{filename} = $fn;
 
     # Read the fields
-    my $fields = Dpkg::Control->new(type => CTRL_PKG_SRC);
+    my $fields = $self->{fields};
     $fields->load($filename);
-    $self->{fields} = $fields;
     $self->{is_signed} = $fields->get_option('is_pgp_signed');
 
     foreach my $f (qw(Source Version Files)) {
@@ -281,41 +285,28 @@ sub initialize {
 sub upgrade_object_type {
     my ($self, $update_format) = @_;
     $update_format //= 1;
-    $self->{fields}{'Format'} //= '1.0';
-    my $format = $self->{fields}{'Format'};
 
-    if ($format =~ /^([\d\.]+)(?:\s+\((.*)\))?$/) {
-        my ($version, $variant) = ($1, $2);
+    my $format = $self->{fields}{'Format'} // '1.0';
+    my ($major, $minor, $variant) = $self->{format}->set($format);
 
-        if (defined $variant and $variant ne lc $variant) {
-            error(g_("source package format '%s' is not supported: %s"),
-                  $format, g_('format variant must be in lowercase'));
-        }
-
-        my $major = $version =~ s/\.[\d\.]+$//r;
-        my $minor;
-
-        my $module = "Dpkg::Source::Package::V$major";
-        $module .= '::' . ucfirst $variant if defined $variant;
-        eval qq{
-            pop \@INC if \$INC[-1] eq '.';
-            require $module;
-            \$minor = \$${module}::CURRENT_MINOR_VERSION;
-        };
-        $minor //= 0;
-        if ($update_format) {
-            $self->{fields}{'Format'} = "$major.$minor";
-            $self->{fields}{'Format'} .= " ($variant)" if defined $variant;
-        }
-        if ($@) {
-            error(g_("source package format '%s' is not supported: %s"),
-                  $format, $@);
-        }
-        $module->prerequisites() if $module->can('prerequisites');
-        bless $self, $module;
-    } else {
-        error(g_("invalid Format field '%s'"), $format);
+    my $module = "Dpkg::Source::Package::V$major";
+    $module .= '::' . ucfirst $variant if defined $variant;
+    eval qq{
+        pop \@INC if \$INC[-1] eq '.';
+        require $module;
+        \$minor = \$${module}::CURRENT_MINOR_VERSION;
+    };
+    if ($@) {
+        error(g_("source package format '%s' is not supported: %s"),
+              $format, $@);
+    }
+    if ($update_format) {
+        $self->{format}->set_from_parts($major, $minor, $variant);
+        $self->{fields}{'Format'} = $self->{format}->get();
     }
+
+    $module->prerequisites() if $module->can('prerequisites');
+    bless $self, $module;
 }
 
 =item $p->get_filename()
@@ -406,6 +397,33 @@ sub find_original_tarballs {
     return @tar;
 }
 
+=item $p->check_original_tarball_signature($dir, @asc)
+
+Verify the original upstream tarball signatures @asc using the upstream
+public keys. It requires the origin upstream tarballs, their signatures
+and the upstream signing key, as found in an unpacked source tree $dir.
+If any inconsistency is discovered, it immediately errors out.
+
+=cut
+
+sub check_original_tarball_signature {
+    my ($self, $dir, @asc) = @_;
+
+    my $upstream_key = "$dir/debian/upstream/signing-key.asc";
+    if (not -e $upstream_key) {
+        warning(g_('upstream tarball signatures but no upstream signing key'));
+        return;
+    }
+
+    my $keyring = File::Temp->new(UNLINK => 1, SUFFIX => '.gpg');
+    Dpkg::OpenPGP::import_key($upstream_key, keyring => $keyring);
+    foreach my $asc (@asc) {
+        Dpkg::OpenPGP::verify_signature($asc,
+                                        datafile => $asc =~ s/\.asc$//r,
+                                        keyrings => [ $keyring ]);
+    }
+}
+
 =item $bool = $p->is_signed()
 
 Returns 1 if the DSC files contains an embedded OpenPGP signature.
@@ -431,52 +449,18 @@ then any problem will result in a fatal error.
 sub check_signature {
     my $self = shift;
     my $dsc = $self->get_filename();
-    my @exec;
-
-    if (find_command('gpgv2')) {
-        push @exec, 'gpgv2';
-    } elsif (find_command('gpgv')) {
-        push @exec, 'gpgv';
-    } elsif (find_command('gpg2')) {
-        push @exec, 'gpg2', '--no-default-keyring', '-q', '--verify';
-    } elsif (find_command('gpg')) {
-        push @exec, 'gpg', '--no-default-keyring', '-q', '--verify';
+    my @keyrings;
+
+    if (length $ENV{HOME} and -r "$ENV{HOME}/.gnupg/trustedkeys.gpg") {
+        push @keyrings, "$ENV{HOME}/.gnupg/trustedkeys.gpg";
     }
-    if (scalar(@exec)) {
-        if (length $ENV{HOME} and -r "$ENV{HOME}/.gnupg/trustedkeys.gpg") {
-            push @exec, '--keyring', "$ENV{HOME}/.gnupg/trustedkeys.gpg";
-        }
-        foreach my $vendor_keyring (run_vendor_hook('package-keyrings')) {
-            if (-r $vendor_keyring) {
-                push @exec, '--keyring', $vendor_keyring;
-            }
-        }
-        push @exec, $dsc;
-
-        my ($stdout, $stderr);
-        spawn(exec => \@exec, wait_child => 1, nocheck => 1,
-              to_string => \$stdout, error_to_string => \$stderr,
-              timeout => 10);
-        if (WIFEXITED($?)) {
-            my $gpg_status = WEXITSTATUS($?);
-            print { *STDERR } "$stdout$stderr" if $gpg_status;
-            if ($gpg_status == 1 or ($gpg_status &&
-                $self->{options}{require_valid_signature}))
-            {
-                error(g_('failed to verify signature on %s'), $dsc);
-            } elsif ($gpg_status) {
-                warning(g_('failed to verify signature on %s'), $dsc);
-            }
-        } else {
-            subprocerr("@exec");
-        }
-    } else {
-        if ($self->{options}{require_valid_signature}) {
-            error(g_('cannot verify signature on %s since GnuPG is not installed'), $dsc);
-        } else {
-            warning(g_('cannot verify signature on %s since GnuPG is not installed'), $dsc);
+    foreach my $vendor_keyring (run_vendor_hook('package-keyrings')) {
+        if (-r $vendor_keyring) {
+            push @keyrings, $vendor_keyring;
         }
     }
+
+    Dpkg::OpenPGP::verify_signature($dsc, keyrings => \@keyrings);
 }
 
 sub describe_cmdline_options {
@@ -528,31 +512,25 @@ sub extract {
             my $src = File::Spec->catfile($self->{basedir}, $orig);
             my $dst = File::Spec->catfile($destdir, $orig);
             if (not check_files_are_the_same($src, $dst, 1)) {
-                system('cp', '--', $src, $dst);
-                subprocerr("cp $src to $dst") if $?;
+                cp($src, $dst)
+                    or syserror(g_('cannot copy %s to %s'), $src, $dst);
             }
         }
     }
 
     # Try extract
-    eval { $self->do_extract($newdirectory) };
-    if ($@) {
-        run_exit_handlers();
-        die $@;
-    }
+    $self->do_extract($newdirectory);
 
     # Store format if non-standard so that next build keeps the same format
-    if ($self->{fields}{'Format'} ne '1.0' and
+    if ($self->{fields}{'Format'} and
+        $self->{fields}{'Format'} ne '1.0' and
         not $self->{options}{skip_debianization})
     {
         my $srcdir = File::Spec->catdir($newdirectory, 'debian', 'source');
         my $format_file = File::Spec->catfile($srcdir, 'format');
 	unless (-e $format_file) {
 	    mkdir($srcdir) unless -e $srcdir;
-	    open(my $format_fh, '>', $format_file)
-	        or syserr(g_('cannot write %s'), $format_file);
-	    print { $format_fh } $self->{fields}{'Format'} . "\n";
-	    close($format_fh);
+            $self->{format}->save($format_file);
 	}
     }
 
@@ -586,11 +564,8 @@ sub before_build {
 
 sub build {
     my $self = shift;
-    eval { $self->do_build(@_) };
-    if ($@) {
-        run_exit_handlers();
-        die $@;
-    }
+
+    $self->do_build(@_);
 }
 
 sub after_build {
@@ -620,11 +595,8 @@ sub add_file {
 
 sub commit {
     my $self = shift;
-    eval { $self->do_commit(@_) };
-    if ($@) {
-        run_exit_handlers();
-        die $@;
-    }
+
+    $self->do_commit(@_);
 }
 
 sub do_commit {
@@ -671,6 +643,18 @@ sub write_dsc {
 
 =head1 CHANGES
 
+=head2 Version 2.00 (dpkg 1.20.0)
+
+New method: check_original_tarball_signature().
+
+Remove variable: $diff_ignore_default_regexp.
+
+Hide variable: @tar_ignore_default_pattern.
+
+=head2 Version 1.03 (dpkg 1.19.3)
+
+New option: format in new().
+
 =head2 Version 1.02 (dpkg 1.18.7)
 
 New option: require_strong_checksums in check_checksums().
diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm
index 001d9ecd3..d91cea03b 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -267,7 +267,7 @@ sub do_build {
                     'argument (with v1.0 source package)'));
     }
 
-    $sourcestyle =~ y/X/A/;
+    $sourcestyle =~ y/X/a/;
     unless ($sourcestyle =~ m/[akpursnAKPUR]/) {
         usageerr(g_('source handling style -s%s not allowed with -b'),
                  $sourcestyle);
@@ -409,11 +409,18 @@ sub do_build {
 	     $sourcepackage, $tarname);
     }
 
-    $self->add_file($tarname) if $tarname;
-    if ($tarname and -e "$tarname.sig" and not -e "$tarname.asc") {
-        openpgp_sig_to_asc("$tarname.sig", "$tarname.asc");
+    if ($tarname) {
+        $self->add_file($tarname);
+        if (-e "$tarname.sig" and not -e "$tarname.asc") {
+            openpgp_sig_to_asc("$tarname.sig", "$tarname.asc");
+        }
+    }
+    if ($tarsign and -e $tarsign) {
+        info(g_('building %s using existing %s'), $sourcepackage, $tarsign);
+        $self->add_file($tarsign);
+
+        $self->check_original_tarball_signature($tarsign);
     }
-    $self->add_file($tarsign) if $tarsign and -e $tarsign;
 
     if ($sourcestyle =~ m/[kpKP]/) {
         if (stat($origdir)) {
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 818e32ddc..d84fce2dd 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -37,8 +37,9 @@ use Dpkg::Path qw(find_command);
 use Dpkg::Compression;
 use Dpkg::Source::Archive;
 use Dpkg::Source::Patch;
+use Dpkg::Source::BinaryFiles;
 use Dpkg::Exit qw(push_exit_handler pop_exit_handler);
-use Dpkg::Source::Functions qw(erasedir is_binary fs_time);
+use Dpkg::Source::Functions qw(erasedir chmod_if_needed fs_time);
 use Dpkg::Vendor qw(run_vendor_hook);
 use Dpkg::Control;
 use Dpkg::Changelog::Parse;
@@ -399,7 +400,8 @@ sub _generate_patch {
     # Identify original tarballs
     my ($tarfile, %addonfile);
     my $comp_ext_regex = compression_get_file_extension_regex();
-    my @origtarballs;
+    my @origtarfiles;
+    my @origtarsigns;
     foreach my $file (sort $self->find_original_tarballs()) {
         if ($file =~ /\.orig\.tar\.$comp_ext_regex$/) {
             if (defined($tarfile)) {
@@ -407,20 +409,23 @@ sub _generate_patch {
                          'one is allowed'), $tarfile, $file);
             }
             $tarfile = $file;
-            push @origtarballs, $file;
-            $self->add_file($file);
-            if (-e "$file.sig" and not -e "$file.asc") {
-                openpgp_sig_to_asc("$file.sig", "$file.asc");
-            }
-            $self->add_file("$file.asc") if -e "$file.asc";
         } elsif ($file =~ /\.orig-([[:alnum:]-]+)\.tar\.$comp_ext_regex$/) {
             $addonfile{$1} = $file;
-            push @origtarballs, $file;
-            $self->add_file($file);
-            if (-e "$file.sig" and not -e "$file.asc") {
-                openpgp_sig_to_asc("$file.sig", "$file.asc");
-            }
-            $self->add_file("$file.asc") if -e "$file.asc";
+        } else {
+            next;
+        }
+
+        push @origtarfiles, $file;
+        $self->add_file($file);
+
+        # Check for an upstream signature.
+        if (-e "$file.sig" and not -e "$file.asc") {
+            openpgp_sig_to_asc("$file.sig", "$file.asc");
+        }
+        if (-e "$file.asc") {
+            push @origtarfiles, "$file.asc";
+            push @origtarsigns, "$file.asc";
+            $self->add_file("$file.asc")
         }
     }
 
@@ -428,8 +433,12 @@ sub _generate_patch {
           $self->_upstream_tarball_template()) unless $tarfile;
 
     if ($opts{usage} eq 'build') {
-        info(g_('building %s using existing %s'),
-             $self->{fields}{'Source'}, "@origtarballs");
+        foreach my $origtarfile (@origtarfiles) {
+            info(g_('building %s using existing %s'),
+                 $self->{fields}{'Source'}, $origtarfile);
+        }
+
+        $self->check_original_tarball_signature(@origtarsigns);
     }
 
     # Unpack a second copy for comparison
@@ -509,50 +518,12 @@ sub do_build {
     my $basenamerev = $self->get_basename(1);
 
     # Check if the debian directory contains unwanted binary files
-    my $binaryfiles = Dpkg::Source::Package::V2::BinaryFiles->new($dir);
-    my $unwanted_binaries = 0;
-    my $check_binary = sub {
-        if (-f and is_binary($_)) {
-            my $fn = File::Spec->abs2rel($_, $dir);
-            $binaryfiles->new_binary_found($fn);
-            unless ($include_binaries or $binaryfiles->binary_is_allowed($fn)) {
-                errormsg(g_('unwanted binary file: %s'), $fn);
-                $unwanted_binaries++;
-            }
-        }
-    };
-    my $tar_ignore_glob = '{' . join(',',
-        map { s/,/\\,/rg } @{$self->{options}{tar_ignore}}) . '}';
-    my $filter_ignore = sub {
-        # Filter out files that are not going to be included in the debian
-        # tarball due to ignores.
-        my %exclude;
-        my $reldir = File::Spec->abs2rel($File::Find::dir, $dir);
-        my $cwd = getcwd();
-        # Apply the pattern both from the top dir and from the inspected dir
-        chdir $dir or syserr(g_("unable to chdir to '%s'"), $dir);
-        $exclude{$_} = 1 foreach glob($tar_ignore_glob);
-        chdir $cwd or syserr(g_("unable to chdir to '%s'"), $cwd);
-        chdir($File::Find::dir)
-            or syserr(g_("unable to chdir to '%s'"), $File::Find::dir);
-        $exclude{$_} = 1 foreach glob($tar_ignore_glob);
-        chdir $cwd or syserr(g_("unable to chdir to '%s'"), $cwd);
-        my @result;
-        foreach my $fn (@_) {
-            unless (exists $exclude{$fn} or exists $exclude{"$reldir/$fn"}) {
-                push @result, $fn;
-            }
-        }
-        return @result;
-    };
-    find({ wanted => $check_binary, preprocess => $filter_ignore,
-           no_chdir => 1 }, File::Spec->catdir($dir, 'debian'));
-    error(P_('detected %d unwanted binary file (add it in ' .
-             'debian/source/include-binaries to allow its inclusion).',
-             'detected %d unwanted binary files (add them in ' .
-             'debian/source/include-binaries to allow their inclusion).',
-             $unwanted_binaries), $unwanted_binaries)
-         if $unwanted_binaries;
+    my $binaryfiles = Dpkg::Source::BinaryFiles->new($dir);
+
+    $binaryfiles->detect_binary_files(
+        exclude_globs => $self->{options}{tar_ignore},
+        include_binaries => $include_binaries,
+    );
 
     # Handle modified binary files detected by the auto-patch generation
     my $handle_binary = sub {
@@ -616,17 +587,25 @@ sub do_build {
 
 sub _get_patch_header {
     my ($self, $dir) = @_;
+
     my $ph = File::Spec->catfile($dir, 'debian', 'source', 'local-patch-header');
     unless (-f $ph) {
         $ph = File::Spec->catfile($dir, 'debian', 'source', 'patch-header');
     }
-    my $text;
     if (-f $ph) {
-        open(my $ph_fh, '<', $ph) or syserr(g_('cannot read %s'), $ph);
-        $text = file_slurp($ph_fh);
-        close($ph_fh);
-        return $text;
+        return file_slurp($ph);
     }
+
+    if ($self->{options}->{single_debian_patch}) {
+        return <<'AUTOGEN_HEADER';
+This is an autogenerated patch header for a single-debian-patch file. The
+delta against upstream is either kept as a single patch, or maintained
+in some VCS, and exported as a single patch instead of more manageable
+atomic patches.
+
+AUTOGEN_HEADER
+    }
+
     my $ch_info = changelog_parse(offset => 0, count => 1,
         file => File::Spec->catfile($dir, 'debian', 'changelog'));
     return '' if not defined $ch_info;
@@ -642,6 +621,7 @@ it.\n";
     $header->{'Author'} = $ch_info->{'Maintainer'};
     my $yyyy_mm_dd = POSIX::strftime('%Y-%m-%d', gmtime);
 
+    my $text;
     $text = "$header";
     run_vendor_hook('extend-patch-header', \$text, $ch_info);
     $text .= "\n---
@@ -665,7 +645,7 @@ sub register_patch {
     if (-s $patch_file) {
         copy($patch_file, $patch)
             or syserr(g_('failed to copy %s to %s'), $patch_file, $patch);
-        chmod(0666 & ~ umask(), $patch)
+        chmod_if_needed(0666 & ~ umask(), $patch)
             or syserr(g_("unable to change permission of '%s'"), $patch);
         my $applied = File::Spec->catfile($dir, 'debian', 'patches', '.dpkg-source-applied');
         open(my $applied_fh, '>>', $applied)
@@ -706,7 +686,7 @@ sub do_commit {
         error(g_("patch file '%s' doesn't exist"), $tmpdiff) if not -e $tmpdiff;
     }
 
-    my $binaryfiles = Dpkg::Source::Package::V2::BinaryFiles->new($dir);
+    my $binaryfiles = Dpkg::Source::BinaryFiles->new($dir);
     my $handle_binary = sub {
         my ($self, $old, $new, %opts) = @_;
         my $fn = File::Spec->abs2rel($new, $dir);
@@ -749,86 +729,4 @@ sub do_commit {
     info(g_('local changes have been recorded in a new patch: %s'), $patch);
 }
 
-package Dpkg::Source::Package::V2::BinaryFiles;
-
-use Dpkg::ErrorHandling;
-use Dpkg::Gettext;
-
-use File::Path qw(make_path);
-use File::Spec;
-
-sub new {
-    my ($this, $dir) = @_;
-    my $class = ref($this) || $this;
-
-    my $self = {
-        dir => $dir,
-        allowed_binaries => {},
-        seen_binaries => {},
-        include_binaries_path =>
-            File::Spec->catfile($dir, 'debian', 'source', 'include-binaries'),
-    };
-    bless $self, $class;
-    $self->load_allowed_binaries();
-    return $self;
-}
-
-sub new_binary_found {
-    my ($self, $path) = @_;
-
-    $self->{seen_binaries}{$path} = 1;
-}
-
-sub load_allowed_binaries {
-    my $self = shift;
-    my $incbin_file = $self->{include_binaries_path};
-    if (-f $incbin_file) {
-        open(my $incbin_fh, '<', $incbin_file)
-            or syserr(g_('cannot read %s'), $incbin_file);
-        while (<$incbin_fh>) {
-            chomp;
-            s/^\s*//;
-            s/\s*$//;
-            next if /^#/ or length == 0;
-            $self->{allowed_binaries}{$_} = 1;
-        }
-        close($incbin_fh);
-    }
-}
-
-sub binary_is_allowed {
-    my ($self, $path) = @_;
-    return 1 if exists $self->{allowed_binaries}{$path};
-    return 0;
-}
-
-sub update_debian_source_include_binaries {
-    my $self = shift;
-
-    my @unknown_binaries = $self->get_unknown_binaries();
-    return unless scalar(@unknown_binaries);
-
-    my $incbin_file = $self->{include_binaries_path};
-    make_path(File::Spec->catdir($self->{dir}, 'debian', 'source'));
-    open(my $incbin_fh, '>>', $incbin_file)
-        or syserr(g_('cannot write %s'), $incbin_file);
-    foreach my $binary (@unknown_binaries) {
-        print { $incbin_fh } "$binary\n";
-        info(g_('adding %s to %s'), $binary, 'debian/source/include-binaries');
-        $self->{allowed_binaries}{$binary} = 1;
-    }
-    close($incbin_fh);
-}
-
-sub get_unknown_binaries {
-    my $self = shift;
-    return grep { not $self->binary_is_allowed($_) } $self->get_seen_binaries();
-}
-
-sub get_seen_binaries {
-    my $self = shift;
-    my @seen = sort keys %{$self->{seen_binaries}};
-    return @seen;
-}
-
 1;
diff --git a/scripts/Dpkg/Source/Package/V3/Bzr.pm b/scripts/Dpkg/Source/Package/V3/Bzr.pm
index f0752c0b1..13d49c742 100644
--- a/scripts/Dpkg/Source/Package/V3/Bzr.pm
+++ b/scripts/Dpkg/Source/Package/V3/Bzr.pm
@@ -176,7 +176,7 @@ sub do_extract {
 
     my @files = $self->get_files();
     if (@files > 1) {
-        error(g_('format v3.0 uses only one source file'));
+        error(g_('format v3.0 (bzr) uses only one source file'));
     }
     my $tarfile = $files[0];
     my $comp_ext_regex = compression_get_file_extension_regex();
diff --git a/scripts/Dpkg/Source/Package/V3/Native.pm b/scripts/Dpkg/Source/Package/V3/Native.pm
index b53a30f3f..1d0de2b0f 100644
--- a/scripts/Dpkg/Source/Package/V3/Native.pm
+++ b/scripts/Dpkg/Source/Package/V3/Native.pm
@@ -49,7 +49,7 @@ sub do_extract {
     my $comp_ext_regex = compression_get_file_extension_regex();
     foreach my $file ($self->get_files()) {
 	if ($file =~ /^\Q$basenamerev\E\.tar\.$comp_ext_regex$/) {
-            error(g_('multiple tarfiles in v1.0 source package')) if $tarfile;
+            error(g_('multiple tarfiles in native source package')) if $tarfile;
             $tarfile = $file;
 	} else {
 	    error(g_('unrecognized file for a native source package: %s'), $file);
diff --git a/scripts/Dpkg/Source/Package/V3/Quilt.pm b/scripts/Dpkg/Source/Package/V3/Quilt.pm
index 9718ffa2d..45237d26a 100644
--- a/scripts/Dpkg/Source/Package/V3/Quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/Quilt.pm
@@ -28,7 +28,7 @@ use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
 use Dpkg::Version;
 use Dpkg::Source::Patch;
-use Dpkg::Source::Functions qw(erasedir fs_time);
+use Dpkg::Source::Functions qw(erasedir chmod_if_needed fs_time);
 use Dpkg::Source::Quilt;
 use Dpkg::Exit;
 
@@ -142,6 +142,8 @@ sub apply_patches {
 
     return unless scalar($quilt->series());
 
+    info(g_('using patch list from %s'), "debian/patches/$basename");
+
     if ($opts{usage} eq 'preparation' and
         $self->{options}{unapply_patches} eq 'auto') {
         # We're applying the patches in --before-build, remember to unapply
@@ -249,7 +251,7 @@ sub register_patch {
     if (-s $tmpdiff) {
         copy($tmpdiff, $patch)
             or syserr(g_('failed to copy %s to %s'), $tmpdiff, $patch);
-        chmod(0666 & ~ umask(), $patch)
+        chmod_if_needed(0666 & ~ umask(), $patch)
             or syserr(g_("unable to change permission of '%s'"), $patch);
     } elsif (-e $patch) {
         unlink($patch) or syserr(g_('cannot remove %s'), $patch);
diff --git a/scripts/Dpkg/Source/Patch.pm b/scripts/Dpkg/Source/Patch.pm
index e5ad5424b..25d56335d 100644
--- a/scripts/Dpkg/Source/Patch.pm
+++ b/scripts/Dpkg/Source/Patch.pm
@@ -148,7 +148,6 @@ sub add_diff_directory {
     # TODO: make this function more configurable
     # - offer to disable some checks
     my $basedir = $opts{basedirname} || basename($new);
-    my $inc_removal = $opts{include_removal} // 0;
     my $diff_ignore;
     if ($opts{diff_ignore_func}) {
         $diff_ignore = $opts{diff_ignore_func};
@@ -226,11 +225,13 @@ sub add_diff_directory {
         return if $files_in_new{$fn};
         lstat("$old/$fn") or syserr(g_('cannot stat file %s'), "$old/$fn");
         if (-f _) {
-            if ($inc_removal) {
+            if (not defined $opts{include_removal}) {
+                warning(g_('ignoring deletion of file %s'), $fn);
+            } elsif (not $opts{include_removal}) {
+                warning(g_('ignoring deletion of file %s, use --include-removal to override'), $fn);
+            } else {
                 push @diff_files, [$fn, 0, 0, "$old/$fn", '/dev/null',
                                    "$basedir.orig/$fn", '/dev/null'];
-            } else {
-                warning(g_('ignoring deletion of file %s, use --include-removal to override'), $fn);
             }
         } elsif (-d _) {
             warning(g_('ignoring deletion of directory %s'), $fn);
diff --git a/scripts/Dpkg/Source/Quilt.pm b/scripts/Dpkg/Source/Quilt.pm
index 55b3fbaf8..78a4fdf9a 100644
--- a/scripts/Dpkg/Source/Quilt.pm
+++ b/scripts/Dpkg/Source/Quilt.pm
@@ -30,7 +30,7 @@ use File::Basename;
 use Dpkg::Gettext;
 use Dpkg::ErrorHandling;
 use Dpkg::Source::Patch;
-use Dpkg::Source::Functions qw(erasedir fs_time);
+use Dpkg::Source::Functions qw(erasedir chmod_if_needed fs_time);
 use Dpkg::Vendor qw(get_current_vendor);
 
 sub new {
@@ -374,7 +374,7 @@ sub restore_quilt_backup_files {
                 unless (link($_, $target)) {
                     copy($_, $target)
                         or syserr(g_('failed to copy %s to %s'), $_, $target);
-                    chmod((stat(_))[2], $target)
+                    chmod_if_needed((stat _)[2], $target)
                         or syserr(g_("unable to change permission of '%s'"), $target);
                 }
             } else {
diff --git a/scripts/Dpkg/Substvars.pm b/scripts/Dpkg/Substvars.pm
index 1e9f90173..27107fe3d 100644
--- a/scripts/Dpkg/Substvars.pm
+++ b/scripts/Dpkg/Substvars.pm
@@ -19,7 +19,7 @@ package Dpkg::Substvars;
 use strict;
 use warnings;
 
-our $VERSION = '1.06';
+our $VERSION = '2.00';
 
 use Dpkg ();
 use Dpkg::Arch qw(get_host_arch);
@@ -39,8 +39,7 @@ Dpkg::Substvars - handle variable substitution in strings
 
 =head1 DESCRIPTION
 
-It provides some an object which is able to substitute variables in
-strings.
+It provides a class which is able to substitute variables in strings.
 
 =cut
 
@@ -169,25 +168,6 @@ sub mark_as_used {
     $self->{attr}{$key} |= SUBSTVAR_ATTR_USED;
 }
 
-=item $s->no_warn($key)
-
-Obsolete function, use mark_as_used() instead.
-
-=cut
-
-sub no_warn {
-    my ($self, $key) = @_;
-
-    warnings::warnif('deprecated',
-                     'obsolete no_warn() function, use mark_as_used() instead');
-
-    $self->mark_as_used($key);
-}
-
-=item $s->load($file)
-
-Add new substitutions read from $file.
-
 =item $s->parse($fh, $desc)
 
 Add new substitutions read from the filehandle. $desc is used to identify
@@ -217,6 +197,10 @@ sub parse {
     return $count
 }
 
+=item $s->load($file)
+
+Add new substitutions read from $file.
+
 =item $s->set_version_substvars($sourceversion, $binaryversion)
 
 Defines ${binary:Version}, ${source:Version} and
@@ -342,7 +326,8 @@ sub substvars {
                       g_('obsolete substitution variable ${%s}'), $vn);
             }
         } else {
-            warning($opts{msg_prefix} . g_('unknown substitution variable ${%s}'),
+            warning($opts{msg_prefix} .
+                    g_('substitution variable ${%s} used, but is not defined'),
 	            $vn) unless $opts{no_warn};
             $v = $lhs . $rhs;
         }
@@ -366,7 +351,8 @@ sub warn_about_unused {
         # that they are not required in the current situation
         # (example: debhelper's misc:Depends in many cases)
         next if $self->{vars}{$vn} eq '';
-        warning($opts{msg_prefix} . g_('unused substitution variable ${%s}'),
+        warning($opts{msg_prefix} .
+                g_('substitution variable ${%s} unused, but is defined'),
                 $vn);
     }
 }
@@ -403,20 +389,15 @@ sub filter {
     }
 }
 
-=item $s->save($file)
-
-Store all substitutions variables except the automatic ones in the
-indicated file.
-
 =item "$s"
 
 Return a string representation of all substitutions variables except the
 automatic ones.
 
-=item $str = $s->output($fh)
+=item $str = $s->output([$fh])
 
-Print all substitutions variables except the automatic ones in the
-filehandle and return the content written.
+Return all substitutions variables except the automatic ones. If $fh
+is passed print them into the filehandle.
 
 =cut
 
@@ -433,10 +414,19 @@ sub output {
     return $str;
 }
 
+=item $s->save($file)
+
+Store all substitutions variables except the automatic ones in the
+indicated file.
+
 =back
 
 =head1 CHANGES
 
+=head2 Version 2.00 (dpkg 1.20.0)
+
+Remove method: $s->no_warn().
+
 =head2 Version 1.06 (dpkg 1.19.0)
 
 New method: $s->set_desc_substvars().
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index e0fd01113..c3e580da7 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -36,11 +36,11 @@ use parent qw(Dpkg::Vendor::Default);
 
 =head1 NAME
 
-Dpkg::Vendor::Debian - Debian vendor object
+Dpkg::Vendor::Debian - Debian vendor class
 
 =head1 DESCRIPTION
 
-This vendor object customizes the behaviour of dpkg scripts for Debian
+This vendor class customizes the behaviour of dpkg scripts for Debian
 specific behavior and policies.
 
 =cut
@@ -51,9 +51,6 @@ sub run_hook {
     if ($hook eq 'package-keyrings') {
         return ('/usr/share/keyrings/debian-keyring.gpg',
                 '/usr/share/keyrings/debian-maintainers.gpg');
-    } elsif ($hook eq 'keyrings') {
-        warnings::warnif('deprecated', 'deprecated keyrings vendor hook');
-        return $self->run_hook('package-keyrings', @params);
     } elsif ($hook eq 'archive-keyrings') {
         return ('/usr/share/keyrings/debian-archive-keyring.gpg');
     } elsif ($hook eq 'archive-keyrings-historic') {
@@ -81,23 +78,13 @@ sub run_hook {
         $self->_add_build_flags(@params);
     } elsif ($hook eq 'builtin-system-build-paths') {
         return qw(/build/);
+    } elsif ($hook eq 'build-tainted-by') {
+        return $self->_build_tainted_by();
     } else {
         return $self->SUPER::run_hook($hook, @params);
     }
 }
 
-sub _parse_feature_area {
-    my ($self, $area, $use_feature) = @_;
-
-    require Dpkg::BuildOptions;
-
-    # Adjust features based on user or maintainer's desires.
-    my $opts = Dpkg::BuildOptions->new(envvar => 'DEB_BUILD_OPTIONS');
-    $opts->parse_features($area, $use_feature);
-    $opts = Dpkg::BuildOptions->new(envvar => 'DEB_BUILD_MAINT_OPTIONS');
-    $opts->parse_features($area, $use_feature);
-}
-
 sub _add_build_flags {
     my ($self, $flags) = @_;
 
@@ -112,6 +99,7 @@ sub _add_build_flags {
         },
         reproducible => {
             timeless => 1,
+            fixfilepath => 0,
             fixdebugpath => 1,
         },
         sanitize => {
@@ -141,9 +129,15 @@ sub _add_build_flags {
 
     ## Setup
 
+    require Dpkg::BuildOptions;
+
     # Adjust features based on user or maintainer's desires.
+    my $opts_build = Dpkg::BuildOptions->new(envvar => 'DEB_BUILD_OPTIONS');
+    my $opts_maint = Dpkg::BuildOptions->new(envvar => 'DEB_BUILD_MAINT_OPTIONS');
+
     foreach my $area (sort keys %use_feature) {
-        $self->_parse_feature_area($area, $use_feature{$area});
+        $opts_build->parse_features($area, $use_feature{$area});
+        $opts_maint->parse_features($area, $use_feature{$area});
     }
 
     require Dpkg::Arch;
@@ -156,6 +150,22 @@ sub _add_build_flags {
         ($abi, $os, $cpu) = ('', '', '');
     }
 
+    ## Global defaults
+
+    my $default_flags;
+    if ($opts_build->has('noopt')) {
+        $default_flags = '-g -O0';
+    } else {
+        $default_flags = '-g -O2';
+    }
+    $flags->append('CFLAGS', $default_flags);
+    $flags->append('CXXFLAGS', $default_flags);
+    $flags->append('OBJCFLAGS', $default_flags);
+    $flags->append('OBJCXXFLAGS', $default_flags);
+    $flags->append('FFLAGS', $default_flags);
+    $flags->append('FCFLAGS', $default_flags);
+    $flags->append('GCJFLAGS', $default_flags);
+
     ## Area: future
 
     if ($use_feature{future}{lfs}) {
@@ -172,8 +182,21 @@ sub _add_build_flags {
 
     # Warnings that detect actual bugs.
     if ($use_feature{qa}{bug}) {
-        foreach my $warnflag (qw(array-bounds clobbered volatile-register-var
-                                 implicit-function-declaration)) {
+        # C flags
+        my @cflags = qw(
+            implicit-function-declaration
+        );
+        foreach my $warnflag (@cflags) {
+            $flags->append('CFLAGS', "-Werror=$warnflag");
+        }
+
+        # C/C++ flags
+        my @cfamilyflags = qw(
+            array-bounds
+            clobbered
+            volatile-register-var
+        );
+        foreach my $warnflag (@cfamilyflags) {
             $flags->append('CFLAGS', "-Werror=$warnflag");
             $flags->append('CXXFLAGS', "-Werror=$warnflag");
         }
@@ -195,16 +218,18 @@ sub _add_build_flags {
     my $build_path;
 
     # Mask features that might have an unsafe usage.
-    if ($use_feature{reproducible}{fixdebugpath}) {
+    if ($use_feature{reproducible}{fixfilepath} or
+        $use_feature{reproducible}{fixdebugpath}) {
         require Cwd;
 
-        $build_path = $ENV{DEB_BUILD_PATH} || Cwd::cwd();
+        $build_path = $ENV{DEB_BUILD_PATH} || Cwd::getcwd();
 
         # If we have any unsafe character in the path, disable the flag,
         # so that we do not need to worry about escaping the characters
         # on output.
         if ($build_path =~ m/[^-+:.0-9a-zA-Z~\/_]/) {
-            $use_feature{fixdebugpath} = 0;
+            $use_feature{reproducible}{fixfilepath} = 0;
+            $use_feature{reproducible}{fixdebugpath} = 0;
         }
     }
 
@@ -213,9 +238,19 @@ sub _add_build_flags {
        $flags->append('CPPFLAGS', '-Wdate-time');
     }
 
-    # Avoid storing the build path in the debug symbols.
-    if ($use_feature{reproducible}{fixdebugpath}) {
-        my $map = '-fdebug-prefix-map=' . $build_path . '=.';
+    # Avoid storing the build path in the binaries.
+    if ($use_feature{reproducible}{fixfilepath} or
+        $use_feature{reproducible}{fixdebugpath}) {
+        my $map;
+
+        # -ffile-prefix-map is a superset of -fdebug-prefix-map, prefer it
+        # if both are set.
+        if ($use_feature{reproducible}{fixfilepath}) {
+            $map = '-ffile-prefix-map=' . $build_path . '=.';
+        } else {
+            $map = '-fdebug-prefix-map=' . $build_path . '=.';
+        }
+
         $flags->append('CFLAGS', $map);
         $flags->append('CXXFLAGS', $map);
         $flags->append('OBJCFLAGS', $map);
@@ -267,8 +302,24 @@ sub _add_build_flags {
 
     # Mask builtin features that are not enabled by default in the compiler.
     my %builtin_pie_arch = map { $_ => 1 } qw(
-        amd64 arm64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386
-        mips mipsel mips64el powerpc ppc64 ppc64el s390x sparc sparc64
+        amd64
+        arm64
+        armel
+        armhf
+        hurd-i386
+        i386
+        kfreebsd-amd64
+        kfreebsd-i386
+        mips
+        mipsel
+        mips64el
+        powerpc
+        ppc64
+        ppc64el
+        riscv64
+        s390x
+        sparc
+        sparc64
     );
     if (not exists $builtin_pie_arch{$arch}) {
         $builtin_feature{hardening}{pie} = 0;
@@ -295,7 +346,7 @@ sub _add_build_flags {
     }
 
     # Mask features that might be influenced by other flags.
-    if ($flags->{build_options}->has('noopt')) {
+    if ($opts_build->has('noopt')) {
       # glibc 2.16 and later warn when using -O0 and _FORTIFY_SOURCE.
       $use_feature{hardening}{fortify} = 0;
     }
@@ -400,6 +451,38 @@ sub _add_build_flags {
     }
 }
 
+sub _build_tainted_by {
+    my $self = shift;
+    my %tainted;
+
+    foreach my $pathname (qw(/bin /sbin /lib /lib32 /libo32 /libx32 /lib64)) {
+        next unless -l $pathname;
+
+        my $linkname = readlink $pathname;
+        if ($linkname eq "usr$pathname") {
+            $tainted{'merged-usr-via-symlinks'} = 1;
+            last;
+        }
+    }
+
+    require File::Find;
+    my %usr_local_types = (
+        configs => [ qw(etc) ],
+        includes => [ qw(include) ],
+        programs => [ qw(bin sbin) ],
+        libraries => [ qw(lib) ],
+    );
+    foreach my $type (keys %usr_local_types) {
+        File::Find::find({
+            wanted => sub { $tainted{"usr-local-has-$type"} = 1 if -f },
+            no_chdir => 1,
+        }, grep { -d } map { "/usr/local/$_" } @{$usr_local_types{$type}});
+    }
+
+    my @tainted = sort keys %tainted;
+    return @tainted;
+}
+
 =head1 CHANGES
 
 =head2 Version 0.xx
diff --git a/scripts/Dpkg/Vendor/Default.pm b/scripts/Dpkg/Vendor/Default.pm
index 40815efde..42b0f0405 100644
--- a/scripts/Dpkg/Vendor/Default.pm
+++ b/scripts/Dpkg/Vendor/Default.pm
@@ -20,7 +20,7 @@ use warnings;
 
 our $VERSION = '0.01';
 
-# If you use this file as template to create a new vendor object, please
+# If you use this file as template to create a new vendor class, please
 # uncomment the following lines
 #use parent qw(Dpkg::Vendor::Default);
 
@@ -28,12 +28,12 @@ our $VERSION = '0.01';
 
 =head1 NAME
 
-Dpkg::Vendor::Default - default vendor object
+Dpkg::Vendor::Default - default vendor class
 
 =head1 DESCRIPTION
 
-A vendor object is used to provide vendor specific behaviour
-in various places. This is the default object used in case
+A vendor class is used to provide vendor specific behaviour
+in various places. This is the default class used in case
 there's none for the current vendor or in case the vendor could
 not be identified (see Dpkg::Vendor documentation).
 
@@ -140,6 +140,14 @@ field will be created if the current directory is "/build/dpkg-1.18.0". If
 the list contains "/", the path will always be recorded. If the list is
 empty, the current path will never be recorded.
 
+=item build-tainted-by ()
+
+The hook is called by dpkg-genbuildinfo to determine if the current system
+has been tainted in some way that could affect the resulting build, which
+will be recorded in the B<Build-Tainted-By> field (since dpkg 1.19.5). It
+takes no parameters, but returns a (possibly empty) list of tainted reason
+tags (formed by alphanumeric and dash characters).
+
 =back
 
 =cut
@@ -149,9 +157,6 @@ sub run_hook {
 
     if ($hook eq 'before-source-build') {
         my $srcpkg = shift @params;
-    } elsif ($hook eq 'keyrings') {
-        warnings::warnif('deprecated', 'obsolete keyrings vendor hook');
-        return ();
     } elsif ($hook eq 'package-keyrings') {
         return ();
     } elsif ($hook eq 'archive-keyrings') {
@@ -172,6 +177,8 @@ sub run_hook {
 	my $flags = shift @params;
     } elsif ($hook eq 'builtin-system-build-paths') {
         return ();
+    } elsif ($hook eq 'build-tainted-by') {
+        return ();
     }
 
     # Default return value for unknown/unimplemented hooks
diff --git a/scripts/Dpkg/Vendor/Ubuntu.pm b/scripts/Dpkg/Vendor/Ubuntu.pm
index eb2dffefe..ddee2a192 100644
--- a/scripts/Dpkg/Vendor/Ubuntu.pm
+++ b/scripts/Dpkg/Vendor/Ubuntu.pm
@@ -34,11 +34,11 @@ use parent qw(Dpkg::Vendor::Debian);
 
 =head1 NAME
 
-Dpkg::Vendor::Ubuntu - Ubuntu vendor object
+Dpkg::Vendor::Ubuntu - Ubuntu vendor class
 
 =head1 DESCRIPTION
 
-This vendor object customizes the behaviour of dpkg scripts for Ubuntu
+This vendor class customizes the behaviour of dpkg scripts for Ubuntu
 specific behavior and policies.
 
 =cut
@@ -98,6 +98,9 @@ sub run_hook {
     } elsif ($hook eq 'update-buildflags') {
 	my $flags = shift @params;
 
+        # Run the Debian hook to add hardening flags
+        $self->SUPER::run_hook($hook, $flags);
+
         require Dpkg::BuildOptions;
 
 	my $build_opts = Dpkg::BuildOptions->new();
@@ -109,15 +112,14 @@ sub run_hook {
             if (Dpkg::Arch::debarch_eq($arch, 'ppc64el')) {
 		for my $flag (qw(CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS GCJFLAGS
 		                 FFLAGS FCFLAGS)) {
-		    $flags->set($flag, '-g -O3', 'vendor');
+                    my $value = $flags->get($flag);
+                    $value =~ s/-O[0-9]/-O3/;
+                    $flags->set($flag, $value);
 		}
 	    }
 	}
 	# Per https://wiki.ubuntu.com/DistCompilerFlags
-	$flags->set('LDFLAGS', '-Wl,-Bsymbolic-functions', 'vendor');
-
-	# Run the Debian hook to add hardening flags
-	$self->SUPER::run_hook($hook, $flags);
+        $flags->prepend('LDFLAGS', '-Wl,-Bsymbolic-functions');
     } else {
         return $self->SUPER::run_hook($hook, @params);
     }
diff --git a/scripts/Dpkg/Version.pm b/scripts/Dpkg/Version.pm
index 477082b67..51d46c543 100644
--- a/scripts/Dpkg/Version.pm
+++ b/scripts/Dpkg/Version.pm
@@ -20,8 +20,9 @@ package Dpkg::Version;
 
 use strict;
 use warnings;
+use warnings::register qw(semantic_change::overload::bool);
 
-our $VERSION = '1.01';
+our $VERSION = '1.03';
 our @EXPORT = qw(
     version_compare
     version_compare_relation
@@ -55,7 +56,7 @@ use overload
     '<=>' => \&_comparison,
     'cmp' => \&_comparison,
     '""'  => sub { return $_[0]->as_string(); },
-    'bool' => sub { return $_[0]->as_string() if $_[0]->is_valid(); },
+    'bool' => sub { return $_[0]->is_valid(); },
     'fallback' => 1;
 
 =encoding utf8
@@ -121,8 +122,20 @@ sub new {
 =item boolean evaluation
 
 When the Dpkg::Version object is used in a boolean evaluation (for example
-in "if ($v)" or "$v || 'default'") it returns its string representation
-if the version stored is valid ($v->is_valid()) and undef otherwise.
+in "if ($v)" or "$v ? \"$v\" : 'default'") it returns true if the version
+stored is valid ($v->is_valid()) and false otherwise.
+
+B<Notice>: Between dpkg 1.15.7.2 and 1.19.1 this overload used to return
+$v->as_string() if $v->is_valid(), a breaking change in behavior that caused
+"0" versions to be evaluated as false. To catch any possibly intended code
+that relied on those semantics, this overload will emit a warning with
+category "Dpkg::Version::semantic_change::overload::bool" until dpkg 1.20.x.
+Once fixed, or for already valid code the warning can be quiesced with
+
+  no if $Dpkg::Version::VERSION ge '1.02',
+     warnings => qw(Dpkg::Version::semantic_change::overload::bool);
+
+added after the C<use Dpkg::Version>.
 
 =item $v->is_valid()
 
@@ -455,6 +468,14 @@ sub version_check($) {
 
 =head1 CHANGES
 
+=head2 Version 1.03 (dpkg 1.20.0)
+
+Remove deprecation warning from semantic change in 1.02.
+
+=head2 Version 1.02 (dpkg 1.19.1)
+
+Semantic change: bool evaluation semantics restored to their original behavior.
+
 =head2 Version 1.01 (dpkg 1.17.0)
 
 New argument: Accept an options argument in $v->as_string().
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 28bb4a742..ea8aef557 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -79,6 +79,12 @@ nobase_dist_perllib_DATA = \
 	Dpkg/Control/Tests/Entry.pm \
 	Dpkg/Control/Types.pm \
 	Dpkg/Deps.pm \
+	Dpkg/Deps/AND.pm \
+	Dpkg/Deps/KnownFacts.pm \
+	Dpkg/Deps/Multiple.pm \
+	Dpkg/Deps/OR.pm \
+	Dpkg/Deps/Simple.pm \
+	Dpkg/Deps/Union.pm \
 	Dpkg/Dist/Files.pm \
 	Dpkg/ErrorHandling.pm \
 	Dpkg/Exit.pm \
@@ -98,6 +104,8 @@ nobase_dist_perllib_DATA = \
 	Dpkg/Shlibs/SymbolFile.pm \
 	Dpkg/Shlibs/Cppfilt.pm \
 	Dpkg/Source/Archive.pm \
+	Dpkg/Source/BinaryFiles.pm \
+	Dpkg/Source/Format.pm \
 	Dpkg/Source/Functions.pm \
 	Dpkg/Source/Package.pm \
 	Dpkg/Source/Package/V1.pm \
@@ -212,6 +220,7 @@ test_scripts = \
 	t/Dpkg_Shlibs_Cppfilt.t \
 	t/Dpkg_Shlibs.t \
 	t/Dpkg_BuildFlags.t \
+	t/Dpkg_BuildFlags_Ubuntu.t \
 	t/Dpkg_BuildOptions.t \
 	t/Dpkg_BuildProfiles.t \
 	t/Dpkg_Build_Env.t \
@@ -243,6 +252,7 @@ test_scripts = \
 	t/Dpkg_Source_Functions.t \
 	t/Dpkg_Source_Patch.t \
 	t/Dpkg_Source_Quilt.t \
+	t/Dpkg_Source_Format.t \
 	t/Dpkg_Source_Archive.t \
 	t/Dpkg_Source_Package.t \
 	t/Dpkg_Dist_Files.t \
@@ -304,6 +314,7 @@ test_data = \
 	t/Dpkg_Changelog/misplaced-tz \
 	t/Dpkg_Changelog/regressions \
 	t/Dpkg_Changelog/shadow \
+	t/Dpkg_Changelog/stop-modeline \
 	t/Dpkg_Changelog/unreleased \
 	t/Dpkg_Checksums/empty \
 	t/Dpkg_Checksums/data-1 \
@@ -353,6 +364,8 @@ test_data = \
 	t/mk/buildflags.mk \
 	t/mk/buildtools.mk \
 	t/mk/pkg-info.mk \
+	t/mk/vendor-v0.mk \
+	t/mk/vendor-v1.mk \
 	t/mk/vendor.mk \
 	t/origins/debian \
 	t/origins/default \
diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm
index 1b1a5d67e..937f333ba 100644
--- a/scripts/Test/Dpkg.pm
+++ b/scripts/Test/Dpkg.pm
@@ -20,10 +20,13 @@ use warnings;
 
 our $VERSION = '0.00';
 our @EXPORT_OK = qw(
+    all_po_files
     all_perl_files
     all_perl_modules
+    test_get_po_dirs
     test_get_perl_dirs
     test_get_data_path
+    test_get_temp_path
     test_needs_author
     test_needs_module
     test_needs_command
@@ -38,34 +41,98 @@ our %EXPORT_TAGS = (
         test_needs_srcdir_switch
     ) ],
     paths => [ qw(
+        all_po_files
         all_perl_files
         all_perl_modules
+        test_get_po_dirs
         test_get_perl_dirs
         test_get_data_path
+        test_get_temp_path
     ) ],
 );
 
 use Exporter qw(import);
 use File::Find;
+use File::Basename;
+use File::Path qw(make_path);
 use IPC::Cmd qw(can_run);
 use Test::More;
 
+my $test_mode;
+
+BEGIN {
+    $test_mode = $ENV{DPKG_TEST_MODE} // 'dpkg';
+}
+
+sub _test_get_caller_dir
+{
+    my (undef, $path, undef) = caller 1;
+
+    $path =~ s{\.t$}{};
+    $path =~ s{^\./}{};
+
+    return $path;
+}
+
 sub test_get_data_path
 {
     my $path = shift;
 
-    my $srcdir = $ENV{srcdir} || '.';
-    return "$srcdir/$path";
+    if (defined $path) {
+        if ($test_mode eq 'cpan') {
+            return $path;
+        } else {
+            my $srcdir = $ENV{srcdir} || '.';
+            return "$srcdir/$path";
+        }
+    } else {
+        return _test_get_caller_dir();
+    }
+}
+
+sub test_get_temp_path
+{
+    my $path = shift // _test_get_caller_dir();
+    $path = 't.tmp/' . fileparse($path);
+
+    make_path($path);
+    return $path;
+}
+
+sub test_get_po_dirs
+{
+    if ($test_mode eq 'cpan') {
+        return qw();
+    } else {
+        return qw(po scripts/po dselect/po man/po);
+    }
 }
 
 sub test_get_perl_dirs
 {
-    return qw(t src/t lib utils/t scripts dselect);
+    if ($test_mode eq 'cpan') {
+        return qw(t lib);
+    } else {
+        return qw(t src/t lib utils/t scripts dselect);
+    }
+}
+
+sub all_po_files
+{
+    my $filter = shift // qr/\.(?:po|pot)$/;
+    my @files;
+    my $scan_po_files = sub {
+        push @files, $File::Find::name if m/$filter/;
+    };
+
+    find($scan_po_files, test_get_po_dirs());
+
+    return @files;
 }
 
 sub all_perl_files
 {
-    my $filter = shift // qr/\.(?:pl|pm|t)$/;
+    my $filter = shift // qr/\.(?:PL|pl|pm|t)$/;
     my @files;
     my $scan_perl_files = sub {
         push @files, $File::Find::name if m/$filter/;
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 3a9ba5b3d..2c49738b5 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -63,23 +63,24 @@ sub usage {
 'Options:
       --build=<type>[,...]    specify the build <type>: full, source, binary,
                                 any, all (default is \'full\').
-  -F                          normal full build (source and binary; default).
-  -g                          source and arch-indep build.
-  -G                          source and arch-specific build.
-  -b                          binary-only, no source files.
-  -B                          binary-only, only arch-specific files.
-  -A                          binary-only, only arch-indep files.
-  -S                          source-only, no binary files.
+  -F, --build=full            normal full build (source and binary; default).
+  -g, --build=source,all      source and arch-indep build.
+  -G, --build=source,any      source and arch-specific build.
+  -b, --build=binary          binary-only, no source files.
+  -B, --build=any             binary-only, only arch-specific files.
+  -A, --build=all             binary-only, only arch-indep files.
+  -S, --build=source          source-only, no binary files.
   -nc, --no-pre-clean         do not pre clean source tree (implies -b).
-       --pre-clean            pre clean source tree (default).
-  -tc, --post-clean           clean source tree when finished.
-  -D                          check build dependencies and conflicts (default).
-  -d                          do not check build dependencies and conflicts.
-      --[no-]check-builddeps  ditto.
+      --pre-clean             pre clean source tree (default).
+      --no-post-clean         do not post clean source tree (default).
+  -tc, --post-clean           post clean source tree.
+  -D, --check-builddeps       check build dependencies and conflicts (default).
+  -d, --no-check-builddeps    do not check build dependencies and conflicts.
       --ignore-builtin-builddeps
                               do not check builtin build dependencies.
   -P, --build-profiles=<profiles>
-                              assume comma-separated build profiles as active.
+                              assume comma-separated build <profiles> as active.
+      --rules-requires-root   assume legacy Rules-Requires-Root field value.
   -R, --rules-file=<rules>    rules file to execute (default is debian/rules).
   -T, --rules-target=<target> call debian/rules <target>.
       --as-root               ensure -T calls the target with root rights.
@@ -100,7 +101,7 @@ sub usage {
                               pass option <opt> to dpkg-genbuildinfo.
   -p, --sign-command=<command>
                               command to sign .dsc and/or .changes files
-                                (default is gpg2 or gpg).
+                                (default is gpg).
   -k, --sign-key=<keyid>      the key to use for signing.
   -ap, --sign-pause           add pause before starting signature process.
   -us, --unsigned-source      unsigned source package.
@@ -146,8 +147,8 @@ my $admindir;
 my @debian_rules = ('debian/rules');
 my @rootcommand = ();
 my $signcommand;
-my $noclean;
-my $cleansource;
+my $preclean = 1;
+my $postclean = 0;
 my $parallel;
 my $parallel_force = 0;
 my $checkbuilddep = 1;
@@ -169,6 +170,7 @@ my $host_type = '';
 my $target_arch = '';
 my $target_type = '';
 my @build_profiles = ();
+my $rrr_override;
 my @call_target = ();
 my $call_target_as_root = 0;
 my $since;
@@ -291,7 +293,9 @@ while (@ARGV) {
     } elsif (/^-(?:s[nsAkurKUR]|[zZ].*|i.*|I.*)$/) {
 	push @source_opts, $_; # passed to dpkg-source
     } elsif (/^-tc$/ or /^--post-clean$/) {
-	$cleansource = 1;
+        $postclean = 1;
+    } elsif (/^--no-post-clean$/) {
+        $postclean = 0;
     } elsif (/^-t$/ or /^--host-type$/) {
 	$host_type = shift; # Order DOES matter!
     } elsif (/^-t(.*)$/ or /^--host-type=(.*)$/) {
@@ -309,12 +313,14 @@ while (@ARGV) {
     } elsif (/^(?:--target=|--rules-target=|-T)(.+)$/) {
         my $arg = $1;
         push @call_target, split /,/, $arg;
+    } elsif (/^--rules-requires-root$/) {
+        $rrr_override = 'binary-targets';
     } elsif (/^--as-root$/) {
         $call_target_as_root = 1;
     } elsif (/^--pre-clean$/) {
-	$noclean = 0;
+        $preclean = 1;
     } elsif (/^-nc$/ or /^--no-pre-clean$/) {
-	$noclean = 1;
+        $preclean = 0;
     } elsif (/^--build=(.*)$/) {
         set_build_type_from_options($1, $_);
     } elsif (/^-b$/) {
@@ -342,7 +348,7 @@ while (@ARGV) {
     } elsif (m/^-[EW]$/) {
 	# Deprecated option
 	warning(g_('-E and -W are deprecated, they are without effect'));
-    } elsif (/^-R(.*)$/ or /^--rules-target=(.*)$/) {
+    } elsif (/^-R(.*)$/ or /^--rules-file=(.*)$/) {
 	my $arg = $1;
 	@debian_rules = split ' ', $arg;
     } else {
@@ -350,6 +356,11 @@ while (@ARGV) {
     }
 }
 
+if (@call_target) {
+    my $targets = join ',', @call_target;
+    set_build_type_from_targets($targets, '--rules-target', nocheck => 1);
+}
+
 if (build_has_all(BUILD_BINARY)) {
     $buildtarget = 'build';
     $binarytarget = 'binary';
@@ -361,7 +372,7 @@ if (build_has_all(BUILD_BINARY)) {
     $binarytarget = 'binary-indep';
 }
 
-if ($noclean) {
+if (not $preclean) {
     # -nc without -b/-B/-A/-S/-F implies -b
     set_build_type(BUILD_BINARY) if build_has_any(BUILD_DEFAULT);
     # -nc with -S implies no dependency checks
@@ -383,9 +394,7 @@ if ($signcommand) {
     }
 } elsif (($ENV{GNUPGHOME} && -e $ENV{GNUPGHOME}) ||
          ($ENV{HOME} && -e "$ENV{HOME}/.gnupg")) {
-    if (find_command('gpg2')) {
-        $signcommand = 'gpg2';
-    } elsif (find_command('gpg')) {
+    if (find_command('gpg')) {
         $signcommand = 'gpg';
     }
 }
@@ -473,6 +482,8 @@ if (build_has_any(BUILD_ARCH_DEP)) {
 my $pv = "${pkg}_$sversion";
 my $pva = "${pkg}_${sversion}_$arch";
 
+signkey_validate();
+
 if (not $signcommand) {
     $signsource = 0;
     $signbuildinfo = 0;
@@ -531,9 +542,9 @@ foreach my $call_target (@call_target) {
 }
 exit 0 if scalar @call_target;
 
-run_hook('preclean', ! $noclean);
+run_hook('preclean', $preclean);
 
-unless ($noclean) {
+if ($preclean) {
     run_rules_cond_root('clean');
 }
 
@@ -541,19 +552,20 @@ run_hook('source', build_has_any(BUILD_SOURCE));
 
 if (build_has_any(BUILD_SOURCE)) {
     warning(g_('building a source package without cleaning up as you asked; ' .
-               'it might contain undesired files')) if $noclean;
+               'it might contain undesired files')) if not $preclean;
     run_cmd('dpkg-source', @source_opts, '-b', '.');
 }
 
 run_hook('build', build_has_any(BUILD_BINARY));
 
-# XXX Use some heuristics to decide whether to use build-{arch,indep} targets.
-# This is a temporary measure to not break too many packages on a flag day.
-build_target_fallback($ctrl);
-
 my $build_types = get_build_options_from_type();
 
 if (build_has_any(BUILD_BINARY)) {
+    # XXX Use some heuristics to decide whether to use build-{arch,indep}
+    # targets. This is a temporary measure to not break too many packages
+    # on a flag day.
+    build_target_fallback($ctrl);
+
     # If we are building rootless, there is no need to call the build target
     # independently as non-root.
     run_cmd(@debian_rules, $buildtarget) if rules_requires_root($binarytarget);
@@ -587,9 +599,9 @@ $changes->parse($changes_fh, g_('parse changes file'));
 $changes->save($chg);
 close $changes_fh or subprocerr(g_('dpkg-genchanges'));
 
-run_hook('postclean', $cleansource);
+run_hook('postclean', $postclean);
 
-if ($cleansource) {
+if ($postclean) {
     run_rules_cond_root('clean');
 }
 
@@ -615,7 +627,7 @@ if ($signsource) {
         error(g_('failed to sign %s file'), '.dsc');
     }
 
-    # Recompute the checksums as the .dsc have changed now.
+    # Recompute the checksums as the .dsc has changed now.
     my $buildinfo = Dpkg::Control->new(type => CTRL_FILE_BUILDINFO);
     $buildinfo->load("../$pva.buildinfo");
     my $checksums = Dpkg::Checksums->new();
@@ -683,10 +695,12 @@ sub parse_rules_requires_root {
     my $ctrl = shift;
 
     my %rrr;
-    my $rrr = $ctrl->{'Rules-Requires-Root'} // 'binary-targets';
+    my $rrr;
     my $keywords_base;
     my $keywords_impl;
 
+    $rrr = $rrr_override // $ctrl->{'Rules-Requires-Root'} // 'binary-targets';
+
     foreach my $keyword (split ' ', $rrr) {
         if ($keyword =~ m{/}) {
             if ($keyword =~ m{^dpkg/target/(.*)$}p and $target_official{$1}) {
@@ -715,12 +729,18 @@ sub parse_rules_requires_root {
         setup_rootcommand();
     }
 
+    # Notify the children we do support R³.
+    $ENV{DEB_RULES_REQUIRES_ROOT} = join ' ', sort keys %rrr;
+
     if ($keywords_base > 1 or $keywords_base and $keywords_impl) {
         error(g_('%s field contains both global and implementation specific keywords'),
               'Rules-Requires-Root');
     } elsif ($keywords_impl) {
         # Set only on <implementations-keywords>.
-        $ENV{DPKG_GAIN_ROOT_CMD} = join ' ', @rootcommand;
+        $ENV{DEB_GAIN_ROOT_CMD} = join ' ', @rootcommand;
+    } else {
+        # We should not provide the variable otherwise.
+        delete $ENV{DEB_GAIN_ROOT_CMD};
     }
 
     return %rrr;
@@ -794,6 +814,24 @@ sub update_files_field {
     $ctrl->{'Files'} =~ s/^$file_regex$/$md5sum $size $1/m;
 }
 
+sub signkey_validate {
+    return unless defined $signkey;
+    # Make sure this is an hex keyid.
+    return unless $signkey =~ m/^(?:0x)?([[:xdigit:]]+)$/;
+
+    my $keyid = $1;
+
+    if (length $keyid <= 8) {
+        error(g_('short OpenPGP key IDs are broken; ' .
+                 'please use key fingerprints in %s or %s instead'),
+              '-k', 'DEB_SIGN_KEYID');
+    } elsif (length $keyid <= 16) {
+        warning(g_('long OpenPGP key IDs are strongly discouraged; ' .
+                   'please use key fingerprints in %s or %s instead'),
+                '-k', 'DEB_SIGN_KEYID');
+    }
+}
+
 sub signfile {
     my $file = shift;
 
@@ -813,8 +851,8 @@ sub signfile {
            '--output', "$signfile.asc", $signfile);
     my $status = $?;
     if ($status == 0) {
-	system('mv', '--', "$signfile.asc", "../$file")
-	    and subprocerr('mv');
+        move("$signfile.asc", "../$file")
+            or syserror(g_('cannot move %s to %s'), "$signfile.asc", "../$file");
     }
 
     print "\n";
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index 80b309f14..d249ced45 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -22,7 +22,7 @@
 use strict;
 use warnings;
 
-use Getopt::Long qw(:config posix_default bundling no_ignorecase);
+use Getopt::Long qw(:config posix_default bundling_values no_ignorecase);
 
 use Dpkg ();
 use Dpkg::Gettext;
@@ -138,48 +138,47 @@ if ($bc_value) {
 }
 
 if (@unmet) {
-	errormsg(g_('Unmet build dependencies: %s'),
-	         join(' ', map { $_->output() } @unmet));
+    errormsg(g_('Unmet build dependencies: %s'),
+             join(' ', map { $_->output() } @unmet));
 }
 if (@conflicts) {
-	errormsg(g_('Build conflicts: %s'),
-	         join(' ', map { $_->output() } @conflicts));
+    errormsg(g_('Build conflicts: %s'),
+             join(' ', map { $_->output() } @conflicts));
 }
 exit 1 if @unmet || @conflicts;
 
 # Silly little status file parser that returns a Dpkg::Deps::KnownFacts
 sub parse_status {
-	my $status = shift;
-
-	my $facts = Dpkg::Deps::KnownFacts->new();
-	local $/ = '';
-	open(my $status_fh, '<', $status)
-		or syserr(g_('cannot open %s'), $status);
-	while (<$status_fh>) {
-		next unless /^Status: .*ok installed$/m;
-
-		my ($package) = /^Package: (.*)$/m;
-		my ($version) = /^Version: (.*)$/m;
-		my ($arch) = /^Architecture: (.*)$/m;
-		my ($multiarch) = /^Multi-Arch: (.*)$/m;
-		$facts->add_installed_package($package, $version, $arch,
-		                              $multiarch);
-
-		if (/^Provides: (.*)$/m) {
-			my $provides = deps_parse($1, reduce_arch => 1, union => 1);
-			next if not defined $provides;
-			foreach (grep { $_->isa('Dpkg::Deps::Simple') }
-                                 $provides->get_deps())
-			{
-				$facts->add_provided_package($_->{package},
-                                    $_->{relation}, $_->{version},
-                                    $package);
-			}
-		}
-	}
-	close $status_fh;
-
-	return $facts;
+    my $status = shift;
+
+    my $facts = Dpkg::Deps::KnownFacts->new();
+    local $/ = '';
+    open(my $status_fh, '<', $status)
+        or syserr(g_('cannot open %s'), $status);
+    while (<$status_fh>) {
+        next unless /^Status: .*ok installed$/m;
+
+        my ($package) = /^Package: (.*)$/m;
+        my ($version) = /^Version: (.*)$/m;
+        my ($arch) = /^Architecture: (.*)$/m;
+        my ($multiarch) = /^Multi-Arch: (.*)$/m;
+        $facts->add_installed_package($package, $version, $arch, $multiarch);
+
+        if (/^Provides: (.*)$/m) {
+            my $provides = deps_parse($1, reduce_arch => 1, virtual => 1, union => 1);
+            next if not defined $provides;
+            foreach (grep { $_->isa('Dpkg::Deps::Simple') }
+                     $provides->get_deps())
+            {
+                $facts->add_provided_package($_->{package},
+                                             $_->{relation}, $_->{version},
+                                             $package);
+            }
+        }
+    }
+    close $status_fh;
+
+    return $facts;
 }
 
 # This function checks the build dependencies passed in as the first
diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
index 45c45089d..5b2cfe6f7 100755
--- a/scripts/dpkg-genbuildinfo.pl
+++ b/scripts/dpkg-genbuildinfo.pl
@@ -69,6 +69,7 @@ my $buildinfo_format = '1.0';
 my $buildinfo;
 
 my $checksums = Dpkg::Checksums->new();
+my %distbinaries;
 my %archadded;
 my @archvalues;
 
@@ -232,8 +233,7 @@ sub collect_installed_builddeps {
             # virtual package: we cannot know for sure which implementation
             # is the one that has been used, so let's add them all...
             foreach my $provided (@{$facts->{virtualpkg}->{$pkg_name}}) {
-                my ($provided_by, $provided_rel, $provided_ver) = @{$provided};
-                push @unprocessed_pkgs, $provided_by;
+                push @unprocessed_pkgs, $provided->{provider};
             }
         }
         # else: it is a package in an OR dependency that has been otherwise
@@ -386,6 +386,15 @@ if (build_has_any(BUILD_BINARY)) {
         # Make us a bit idempotent.
         next if $file->{filename} =~ m/\.buildinfo$/;
 
+        if (defined $file->{arch}) {
+            my $arch_all = debarch_eq('all', $file->{arch});
+
+            next if build_has_none(BUILD_ARCH_INDEP) and $arch_all;
+            next if build_has_none(BUILD_ARCH_DEP) and not $arch_all;
+
+            $distbinaries{$file->{package}} = 1 if defined $file->{package};
+        }
+
         my $path = "$uploadfilesdir/$file->{filename}";
         $checksums->add_from_file($path, key => $file->{filename});
 
@@ -398,7 +407,7 @@ if (build_has_any(BUILD_BINARY)) {
 
 $fields->{'Format'} = $buildinfo_format;
 $fields->{'Source'} = $spackage;
-$fields->{'Binary'} = join(' ', map { $_->{'Package'} } $control->get_packages());
+$fields->{'Binary'} = join(' ', sort keys %distbinaries);
 # Avoid overly long line by splitting over multiple lines.
 if (length($fields->{'Binary'}) > 980) {
     $fields->{'Binary'} =~ s/(.{0,980}) /$1\n/g;
@@ -424,7 +433,7 @@ if ($use_feature{kernel}) {
     $fields->{'Build-Kernel-Version'} = "$kern_rel $kern_ver";
 }
 
-my $cwd = cwd();
+my $cwd = getcwd();
 if ($use_feature{path}) {
     $fields->{'Build-Path'} = $cwd;
 } else {
@@ -438,6 +447,8 @@ if ($use_feature{path}) {
     }
 }
 
+$fields->{'Build-Tainted-By'} = "\n" . join "\n", run_vendor_hook('build-tainted-by');
+
 $checksums->export_to_control($fields);
 
 $fields->{'Installed-Build-Depends'} = collect_installed_builddeps($control);
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 84bdc4ba6..57d7ced06 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -22,7 +22,7 @@
 use strict;
 use warnings;
 
-use List::Util qw(any none);
+use List::Util qw(any all none);
 use Encode;
 use POSIX qw(:errno_h :locale_h);
 
@@ -221,8 +221,8 @@ if (defined($prev_changelog) and
 {
     warning(g_('the current version (%s) is earlier than the previous one (%s)'),
 	$changelog->{'Version'}, $prev_changelog->{'Version'})
-        # ~bpo and ~vola are backports and have lower version number by definition
-        unless $changelog->{'Version'} =~ /~(?:bpo|vola)/;
+        # Backports have lower version number by definition.
+        unless $changelog->{'Version'} =~ /~(?:bpo|deb)/;
 }
 
 # Scan control info of source package
@@ -353,15 +353,6 @@ foreach my $pkg ($control->get_packages()) {
     my $pkg_type = $pkg->{'Package-Type'} ||
                    $pkg->get_custom_field('Package-Type') || 'deb';
 
-    my @f; # List of files for this binary package
-    push @f, @{$p2f{$p}} if defined $p2f{$p};
-
-    # Add description of all binary packages
-    $d = $substvars->substvars($d);
-    my $desc = encode_utf8(sprintf('%-10s - %-.65s', $p, decode_utf8($d)));
-    $desc .= " ($pkg_type)" if $pkg_type ne 'deb';
-    push @descriptions, $desc;
-
     my @restrictions;
     @restrictions = parse_build_profiles($bp) if defined $bp;
 
@@ -369,7 +360,7 @@ foreach my $pkg ($control->get_packages()) {
 	# No files for this package... warn if it's unexpected
 	if (((build_has_any(BUILD_ARCH_INDEP) and debarch_eq('all', $a)) or
 	     (build_has_any(BUILD_ARCH_DEP) and
-	      (any { debarch_is($host_arch, $_) } debarch_list_parse($a)))) and
+	      (any { debarch_is($host_arch, $_) } debarch_list_parse($a, positive => 1)))) and
 	    (@restrictions == 0 or
 	     evaluate_restriction_formula(\@restrictions, \@profiles)))
 	{
@@ -379,6 +370,15 @@ foreach my $pkg ($control->get_packages()) {
 	next; # and skip it
     }
 
+    # Add description of all binary packages
+    $d = $substvars->substvars($d);
+    my $desc = encode_utf8(sprintf('%-10s - %-.65s', $p, decode_utf8($d)));
+    $desc .= " ($pkg_type)" if $pkg_type ne 'deb';
+    push @descriptions, $desc;
+
+    # List of files for this binary package.
+    my @f = @{$p2f{$p}};
+
     foreach (keys %{$pkg}) {
 	my $v = $pkg->{$_};
 
@@ -388,7 +388,7 @@ foreach my $pkg ($control->get_packages()) {
 	    $f2pricf{$_} = $v foreach (@f);
 	} elsif (m/^Architecture$/) {
 	    if (build_has_any(BUILD_ARCH_DEP) and
-	        (any { debarch_is($host_arch, $_) } debarch_list_parse($v))) {
+	        (any { debarch_is($host_arch, $_) } debarch_list_parse($v, positive => 1))) {
 		$v = $host_arch;
 	    } elsif (!debarch_eq('all', $v)) {
 		$v = '';
@@ -415,18 +415,19 @@ foreach (keys %{$changelog}) {
 }
 
 if ($changesdescription) {
-    open(my $changes_fh, '<', $changesdescription)
-        or syserr(g_('cannot read %s'), $changesdescription);
-    $fields->{'Changes'} = "\n" . file_slurp($changes_fh);
-    close($changes_fh);
+    $fields->{'Changes'} = "\n" . file_slurp($changesdescription);
 }
 
 for my $p (keys %p2f) {
     if (not defined $control->get_pkg_by_name($p)) {
-        # XXX: Skip automatic debugging symbol packages. We should not be
-        # hardcoding packages names here, as this is distribution-specific.
-        # Instead we should use the Auto-Built-Package field.
-        next if $p =~ m/-dbgsym$/;
+        # Skip automatically generated packages (such as debugging symbol
+        # packages), by using the Auto-Built-Package field.
+        next if all {
+            my $file = $dist->get_file($_);
+
+            $file->{attrs}->{automatic} eq 'yes'
+        } @{$p2f{$p}};
+
         warning(g_('package %s listed in files list but not in control info'), $p);
         next;
     }
@@ -464,7 +465,7 @@ if (!defined($fields->{'Date'})) {
     setlocale(LC_TIME, '');
 }
 
-$fields->{'Binary'} = join(' ', map { $_->{'Package'} } $control->get_packages());
+$fields->{'Binary'} = join ' ', sort keys %p2f;
 # Avoid overly long line by splitting over multiple lines
 if (length($fields->{'Binary'}) > 980) {
     $fields->{'Binary'} =~ s/(.{0,980}) /$1\n/g;
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 2e656a246..04a5c68b9 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -217,7 +217,7 @@ foreach (keys %{$pkg}) {
 	if (debarch_eq('all', $v)) {
 	    $fields->{$_} = $v;
 	} else {
-	    my @archlist = debarch_list_parse($v);
+	    my @archlist = debarch_list_parse($v, positive => 1);
 
 	    if (none { debarch_is($host_arch, $_) } @archlist) {
 		error(g_("current host architecture '%s' does not " .
@@ -257,7 +257,7 @@ $facts->add_installed_package($fields->{'Package'}, $fields->{'Version'},
                               $fields->{'Architecture'}, $fields->{'Multi-Arch'});
 if (exists $pkg->{'Provides'}) {
     my $provides = deps_parse($substvars->substvars($pkg->{'Provides'}, no_warn => 1),
-                              reduce_restrictions => 1, union => 1);
+                              reduce_restrictions => 1, virtual => 1, union => 1);
     if (defined $provides) {
 	foreach my $subdep ($provides->get_deps()) {
 	    if ($subdep->isa('Dpkg::Deps::Simple')) {
@@ -335,13 +335,20 @@ if ($binarypackage ne $sourcepackage || $verdiff) {
 
 if (!defined($substvars->get('Installed-Size'))) {
     my $installed_size = 0;
+    my %hardlink;
     my $scan_installed_size = sub {
         lstat or syserr(g_('cannot stat %s'), $File::Find::name);
 
         if (-f _ or -l _) {
+            my ($dev, $ino, $nlink) = (lstat _)[0, 1, 3];
+
             # For filesystem objects with actual content accumulate the size
             # in 1 KiB units.
-            $installed_size += POSIX::ceil((-s _) / 1024);
+            $installed_size += POSIX::ceil((-s _) / 1024)
+                if not exists $hardlink{"$dev:$ino"};
+
+            # Track hardlinks to avoid repeated additions.
+            $hardlink{"$dev:$ino"} = 1 if $nlink > 1;
         } else {
             # For other filesystem objects assume a minimum 1 KiB baseline,
             # as directories are shared resources between packages, and other
@@ -350,7 +357,7 @@ if (!defined($substvars->get('Installed-Size'))) {
             $installed_size += 1;
         }
     };
-    find($scan_installed_size, $packagebuilddir);
+    find($scan_installed_size, $packagebuilddir) if -d $packagebuilddir;
 
     $substvars->set_as_auto('Installed-Size', $installed_size);
 }
@@ -406,7 +413,10 @@ if ($stdout) {
         }
     }
 
-    $dist->add_file($forcefilename, $section, $priority);
+    my %fileattrs;
+    $fileattrs{automatic} = 'yes' if $fields->{'Auto-Built-Package'};
+
+    $dist->add_file($forcefilename, $section, $priority, %fileattrs);
     $dist->save("$fileslistfile.new");
 
     rename "$fileslistfile.new", $fileslistfile
diff --git a/scripts/dpkg-gensymbols.pl b/scripts/dpkg-gensymbols.pl
index 09b0aa6d6..afc84015d 100755
--- a/scripts/dpkg-gensymbols.pl
+++ b/scripts/dpkg-gensymbols.pl
@@ -63,6 +63,7 @@ sub usage {
 'Usage: %s [<option>...]')
     . "\n\n" . g_(
 'Options:
+  -l<library-path>         add directory to private shared library search list.
   -p<package>              generate symbols file for package.
   -P<package-build-dir>    temporary build directory instead of debian/tmp.
   -e<library>              explicitly list libraries to scan.
@@ -97,6 +98,8 @@ while (@ARGV) {
 	$oppackage = ${^POSTMATCH};
 	my $err = pkg_name_is_illegal($oppackage);
 	error(g_("illegal package name '%s': %s"), $oppackage, $err) if $err;
+    } elsif (m/^-l(.*)$/) {
+        Dpkg::Shlibs::add_library_dir($1);
     } elsif (m/^-c(\d)?$/) {
 	$compare = $1 // 1;
     } elsif (m/^-q$/) {
@@ -253,27 +256,34 @@ if ($stdout) {
 
 # Check if generated files differs from reference file
 my $exitcode = 0;
+
+sub compare_problem
+{
+    my ($level, $msg, @args) = @_;
+
+    if ($compare >= $level) {
+        errormsg($msg, @args);
+        $exitcode = $level;
+    } else {
+        warning($msg, @args) unless $quiet;
+    }
+}
+
 if ($compare || ! $quiet) {
     # Compare
     if (my @libs = $symfile->get_new_libs($ref_symfile)) {
-	warning(g_('new libraries appeared in the symbols file: %s'), "@libs")
-	    unless $quiet;
-	$exitcode = 4 if ($compare >= 4);
+        compare_problem(4, g_('new libraries appeared in the symbols file: %s'), "@libs");
     }
     if (my @libs = $symfile->get_lost_libs($ref_symfile)) {
-	warning(g_('some libraries disappeared in the symbols file: %s'), "@libs")
-	    unless $quiet;
-	$exitcode = 3 if ($compare >= 3);
+        compare_problem(3, g_('some libraries disappeared in the symbols file: %s'), "@libs");
     }
     if ($symfile->get_new_symbols($ref_symfile)) {
-	warning(g_('some new symbols appeared in the symbols file: %s'),
-		g_('see diff output below')) unless $quiet;
-	$exitcode = 2 if ($compare >= 2);
+        compare_problem(2, g_('some new symbols appeared in the symbols file: %s'),
+                           g_('see diff output below'));
     }
     if ($symfile->get_lost_symbols($ref_symfile)) {
-	warning(g_('some symbols or patterns disappeared in the symbols file: %s'),
-	        g_('see diff output below')) unless $quiet;
-	$exitcode = 1 if ($compare >= 1);
+        compare_problem(1, g_('some symbols or patterns disappeared in the symbols file: %s'),
+                           g_('see diff output below'))
     }
 }
 
diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh
index 2e5d207bc..a113a938e 100755
--- a/scripts/dpkg-maintscript-helper.sh
+++ b/scripts/dpkg-maintscript-helper.sh
@@ -46,6 +46,8 @@ rm_conffile() {
 	[ -n "$1" ] || error "maintainer script parameters are missing"
 	[ -n "$DPKG_MAINTSCRIPT_NAME" ] || \
 		error "environment variable DPKG_MAINTSCRIPT_NAME is required"
+	[ -n "$DPKG_MAINTSCRIPT_PACKAGE" ] || \
+		error "environment variable DPKG_MAINTSCRIPT_PACKAGE is required"
 	[ "${CONFFILE}" != "${CONFFILE#/}" ] || \
 		error "conffile '$CONFFILE' is not an absolute path"
 	validate_optional_version "$LASTVERSION"
@@ -94,7 +96,7 @@ prepare_rm_conffile() {
 	local md5sum old_md5sum
 	md5sum="$(md5sum "$CONFFILE" | sed -e 's/ .*//')"
 	old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$PACKAGE" | \
-		sed -n -e "\'^ $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
+		sed -n -e "\\'^ $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
 	if [ "$md5sum" != "$old_md5sum" ]; then
 		mv -f "$CONFFILE" "$CONFFILE.dpkg-backup"
 	else
@@ -156,6 +158,8 @@ mv_conffile() {
 	[ -n "$1" ] || error "maintainer script parameters are missing"
 	[ -n "$DPKG_MAINTSCRIPT_NAME" ] || \
 		error "environment variable DPKG_MAINTSCRIPT_NAME is required"
+	[ -n "$DPKG_MAINTSCRIPT_PACKAGE" ] || \
+		error "environment variable DPKG_MAINTSCRIPT_PACKAGE is required"
 	[ "${OLDCONFFILE}" != "${OLDCONFFILE#/}" ] || \
 		error "old-conffile '$OLDCONFFILE' is not an absolute path"
 	[ "${NEWCONFFILE}" != "${NEWCONFFILE#/}" ] || \
@@ -203,7 +207,7 @@ prepare_mv_conffile() {
 	local md5sum old_md5sum
 	md5sum="$(md5sum "$CONFFILE" | sed -e 's/ .*//')"
 	old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$PACKAGE" | \
-		sed -n -e "\'^ $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
+		sed -n -e "\\'^ $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
 	if [ "$md5sum" = "$old_md5sum" ]; then
 		mv -f "$CONFFILE" "$CONFFILE.dpkg-remove"
 	fi
@@ -262,6 +266,8 @@ symlink_to_dir() {
 
 	[ -n "$DPKG_MAINTSCRIPT_NAME" ] || \
 		error "environment variable DPKG_MAINTSCRIPT_NAME is required"
+	[ -n "$DPKG_MAINTSCRIPT_PACKAGE" ] || \
+		error "environment variable DPKG_MAINTSCRIPT_PACKAGE is required"
 	[ -n "$PACKAGE" ] || error "cannot identify the package"
 	[ -n "$SYMLINK" ] || error "symlink parameter is missing"
 	[ "${SYMLINK#/}" = "$SYMLINK" ] && \
@@ -340,6 +346,8 @@ dir_to_symlink() {
 
 	[ -n "$DPKG_MAINTSCRIPT_NAME" ] || \
 		error "environment variable DPKG_MAINTSCRIPT_NAME is required"
+	[ -n "$DPKG_MAINTSCRIPT_PACKAGE" ] || \
+		error "environment variable DPKG_MAINTSCRIPT_PACKAGE is required"
 	[ -n "$PACKAGE" ] || error "cannot identify the package"
 	[ -n "$PATHNAME" ] || error "directory parameter is missing"
 	[ "${PATHNAME#/}" = "$PATHNAME" ] && \
@@ -416,7 +424,7 @@ prepare_dir_to_symlink()
 	# we should not perform the switch.
 	export DPKG_MAINTSCRIPT_HELPER_INTERNAL_API="$version"
 	find "$PATHNAME" -print0 | \
-		xargs -0 -n1 $0 _internal_pkg_must_own_file "$PACKAGE" || \
+		xargs -0 -n1 "$0" _internal_pkg_must_own_file "$PACKAGE" || \
 		error "directory '$PATHNAME' contains files not owned by" \
 		      "package $PACKAGE, cannot switch to symlink"
 	unset DPKG_MAINTSCRIPT_HELPER_INTERNAL_API
@@ -457,7 +465,7 @@ finish_dir_to_symlink()
 		ABS_SYMLINK_TARGET="$SYMLINK_TARGET"
 	fi
 	rm "$PATHNAME/.dpkg-staging-dir"
-	find "$PATHNAME" -mindepth 1 -print0 | \
+	find "$PATHNAME" -mindepth 1 -maxdepth 1 -print0 | \
 		xargs -0 -i% mv -f "%" "$ABS_SYMLINK_TARGET/"
 
 	# Remove the staging directory.
@@ -560,7 +568,7 @@ COLOR_BOLD_WHITE=''
 
 setup_colors()
 {
-	: ${DPKG_COLORS=auto}
+	: "${DPKG_COLORS=auto}"
 
 	case "$DPKG_COLORS" in
 	auto)
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index 7fd11fc96..6216edabb 100755
--- a/scripts/dpkg-mergechangelogs.pl
+++ b/scripts/dpkg-mergechangelogs.pl
@@ -20,7 +20,7 @@ use warnings;
 use strict;
 
 use Scalar::Util qw(blessed);
-use Getopt::Long qw(:config posix_default bundling no_ignorecase);
+use Getopt::Long qw(:config posix_default bundling_values no_ignorecase);
 
 use Dpkg ();
 use Dpkg::Changelog::Debian;
@@ -43,12 +43,10 @@ BEGIN {
         use Algorithm::Merge qw(merge);
     };
     if ($@) {
-        eval q{
-            sub merge {
-                my ($o, $a, $b) = @_;
-                return @$a if join("\n", @$a) eq join("\n", @$b);
-                return get_conflict_block($a, $b);
-            }
+        *merge = sub {
+            my ($o, $a, $b) = @_;
+            return @$a if join("\n", @$a) eq join("\n", @$b);
+            return get_conflict_block($a, $b);
         };
     }
 }
@@ -175,7 +173,7 @@ sub get_items_to_merge {
 }
 
 # Compares the versions taking into account some oddities like the fact
-# that we want backport/volatile versions to sort higher than the version
+# that we want backport versions to sort higher than the version
 # on which they are based.
 sub compare_versions {
     my ($a, $b) = @_;
@@ -184,9 +182,9 @@ sub compare_versions {
     return -1 if not defined $a;
     $a = $a->get_version() if ref($a) and $a->isa('Dpkg::Changelog::Entry');
     $b = $b->get_version() if ref($b) and $b->isa('Dpkg::Changelog::Entry');
-    # Backport and volatile are not real prereleases
-    $a =~ s/~(bpo|vola)/+$1/;
-    $b =~ s/~(bpo|vola)/+$1/;
+    # Backports are not real prereleases.
+    $a =~ s/~(bpo|deb)/+$1/;
+    $b =~ s/~(bpo|deb)/+$1/;
     if ($merge_prereleases) {
 	$a =~ s/~[^~]*$//;
 	$b =~ s/~[^~]*$//;
diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl
index 86c30b451..3d14c4219 100755
--- a/scripts/dpkg-parsechangelog.pl
+++ b/scripts/dpkg-parsechangelog.pl
@@ -56,6 +56,7 @@ sub usage {
 "Parser options:
       --format <output-format>
                            set output format (defaults to 'dpkg').
+      --reverse            include all changes in reverse order.
       --all                include all changes.
   -s, --since <version>    include all changes later than <version>.
   -v <version>             ditto.
@@ -88,6 +89,8 @@ while (@ARGV) {
                           $options{changelogformat} =~ m/^([0-9a-z]+)$/;
     } elsif ($arg eq '--format') {
         $options{format} = shift;
+    } elsif ($arg eq '--reverse') {
+        $options{reverse} = 1;
     } elsif ($arg eq '-l' or $arg eq '--file') {
         $options{file} = shift;
         usageerr(g_('missing changelog filename'))
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 05710ae69..3d727753d 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -20,7 +20,7 @@
 use warnings;
 use strict;
 
-use Getopt::Long qw(:config posix_default bundling no_ignorecase);
+use Getopt::Long qw(:config posix_default bundling_values no_ignorecase);
 use List::Util qw(none);
 use File::Find;
 
@@ -38,10 +38,11 @@ textdomain('dpkg-dev');
 report_options(info_fh => \*STDERR);
 
 my (@samemaint, @changedmaint);
+my @multi_instances;
 my @spuriousover;
 my %packages;
 my %overridden;
-my %hash;
+my @checksums;
 
 my %options = (help            => sub { usage(); exit 0; },
 	       version         => sub { version(); exit 0; },
@@ -174,20 +175,23 @@ sub process_deb {
         if not defined $p;
 
     if (defined($packages{$p}) and not $options{multiversion}) {
-        foreach my $pkg (@{$packages{$p}}) {
-            if (version_compare_relation($fields->{'Version'}, REL_GT,
-                                         $pkg->{'Version'}))
-            {
-                warning(g_('package %s (filename %s) is repeat but newer ' .
-                           'version; used that one and ignored data from %s!'),
-                        $p, $fn, $pkg->{Filename});
-                $packages{$p} = [];
-            } else {
-                warning(g_('package %s (filename %s) is repeat; ' .
-                           'ignored that one and using data from %s!'),
-                        $p, $fn, $pkg->{Filename});
-                return;
-            }
+        my $pkg = ${$packages{$p}}[0];
+
+        @multi_instances = ($pkg->{Filename}) if @multi_instances == 0;
+        push @multi_instances, "$pathprefix$fn";
+
+        if (version_compare_relation($fields->{'Version'}, REL_GT,
+                                     $pkg->{'Version'}))
+        {
+            warning(g_('package %s (filename %s) is repeat but newer ' .
+                       'version; used that one and ignored data from %s!'),
+                    $p, $fn, $pkg->{Filename});
+            $packages{$p} = [];
+        } else {
+            warning(g_('package %s (filename %s) is repeat; ' .
+                       'ignored that one and using data from %s!'),
+                    $p, $fn, $pkg->{Filename});
+            return;
         }
     }
 
@@ -196,10 +200,8 @@ sub process_deb {
     $fields->{'Filename'} = "$pathprefix$fn";
 
     my $sums = Dpkg::Checksums->new();
-    $sums->add_from_file($fn);
-    foreach my $alg (checksums_get_list()) {
-        next if %hash and not $hash{$alg};
-
+    $sums->add_from_file($fn, checksums => \@checksums);
+    foreach my $alg (@checksums) {
         if ($alg eq 'md5') {
             $fields->{'MD5sum'} = $sums->get_checksum($fn, $alg);
         } else {
@@ -223,13 +225,14 @@ if (not (@ARGV >= 1 and @ARGV <= 3)) {
 
 my $type = $options{type} // 'deb';
 my $arch = $options{arch};
-%hash = map { $_ => 1 } split /,/, $options{hash} // '';
+my %hash = map { $_ => 1 } split /,/, $options{hash} // '';
 
 foreach my $alg (keys %hash) {
     if (not checksums_is_supported($alg)) {
         usageerr(g_('unsupported checksum \'%s\''), $alg);
     }
 }
+@checksums = %hash ? keys %hash : checksums_get_list();
 
 my ($binarypath, $override, $pathprefix) = @ARGV;
 
@@ -275,6 +278,10 @@ for my $p (sort keys %packages) {
 }
 close(STDOUT) or syserr(g_("couldn't close stdout"));
 
+if (@multi_instances) {
+    warning(g_('Packages with multiple instances but no --multiversion specified:'));
+    warning($_) foreach (sort @multi_instances);
+}
 if (@changedmaint) {
     warning(g_('Packages in override file with incorrect old maintainer value:'));
     warning($_) foreach (@changedmaint);
diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index 3c793b4e3..d92e980db 100755
--- a/scripts/dpkg-scansources.pl
+++ b/scripts/dpkg-scansources.pl
@@ -20,7 +20,7 @@
 use strict;
 use warnings;
 
-use Getopt::Long qw(:config posix_default bundling no_ignorecase);
+use Getopt::Long qw(:config posix_default bundling_values no_ignorecase);
 use List::Util qw(any);
 use File::Find;
 
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 323fba9e1..8142c85b4 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -227,7 +227,6 @@ foreach my $file (keys %exec) {
     my $file2pkg = find_packages(keys %libfiles, keys %altlibfiles);
     my $symfile = Dpkg::Shlibs::SymbolFile->new();
     my $dumplibs_wo_symfile = Dpkg::Shlibs::Objdump->new();
-    my @soname_wo_symfile;
     SONAME: foreach my $soname (@sonames) {
       # Select the first good entry from the ordered list that we got from
       # find_library(), and skip to the next SONAME.
@@ -236,7 +235,7 @@ foreach my $file (keys %exec) {
 	if (none { $_ ne '' } @{$file2pkg->{$lib}}) {
 	    # The path of the library as calculated is not the
 	    # official path of a packaged file, try to fallback on
-	    # on the realpath() first, maybe this one is part of a package
+	    # the realpath() first, maybe this one is part of a package
 	    my $reallib = realpath($lib);
 	    if (exists $file2pkg->{$reallib}) {
 		$file2pkg->{$lib} = $file2pkg->{$reallib};
@@ -295,7 +294,6 @@ foreach my $file (keys %exec) {
 		    warning(g_('%s has an unexpected SONAME (%s)'), $lib, $id);
 		    $alt_soname{$id} = $soname;
 		}
-		push @soname_wo_symfile, $soname;
 
 		# Only try to generate a dependency for libraries with a SONAME
                 if (not $libobj->is_public_library()) {
@@ -437,8 +435,9 @@ foreach my $file (keys %exec) {
     foreach my $soname (@sonames) {
 	# Adjust minimal version of dependencies with information
 	# extracted from build-dependencies
-	my $dev_pkg = $symfile->get_field($soname, 'Build-Depends-Package');
-	if (defined $dev_pkg) {
+        my $dev_pkgs = $symfile->get_field($soname, 'Build-Depends-Packages') //
+                       $symfile->get_field($soname, 'Build-Depends-Package');
+        foreach my $dev_pkg (split /[,\s]+/, $dev_pkgs // '') {
             debug(1, "Updating dependencies of $soname with build-dependencies");
 	    my $minver = get_min_version_from_deps($build_deps, $dev_pkg);
 	    if (defined $minver) {
@@ -482,8 +481,9 @@ foreach my $soname (keys %global_soname_needed) {
 # Quit now if any missing libraries
 if ($error_count >= 1) {
     my $note = g_('Note: libraries are not searched in other binary packages ' .
-	"that do not have any shlibs or symbols file.\nTo help dpkg-shlibdeps " .
-	'find private libraries, you might need to use -l.');
+                  "that do not have any shlibs or symbols file.\n" .
+                  'To help dpkg-shlibdeps find private libraries, you might ' .
+                  'need to use -l.');
     error(P_('cannot continue due to the error above',
              'cannot continue due to the errors listed above',
              $error_count) . "\n" . $note);
@@ -546,7 +546,8 @@ foreach my $field (reverse @depfields) {
 	    map {
 		# Translate dependency templates into real dependencies
 		my $templ = $_;
-		if ($dependencies{$field}{$templ}) {
+		if ($dependencies{$field}{$templ}->is_valid() and
+		    $dependencies{$field}{$templ}->as_string()) {
 		    $templ =~ s/#MINVER#/(>= $dependencies{$field}{$templ})/g;
 		} else {
 		    $templ =~ s/#MINVER#//g;
@@ -704,11 +705,15 @@ sub add_shlibs_dep {
 
 sub split_soname {
     my $soname = shift;
+
     if ($soname =~ /^(.*)\.so\.(.*)$/) {
+        # Shared library with stable <name>.so.<version> format.
 	return wantarray ? ($1, $2) : 1;
     } elsif ($soname =~ /^(.*)-(\d.*)\.so$/) {
+        # Shared library/module with unstable <name>-<version>.so format.
 	return wantarray ? ($1, $2) : 1;
     } else {
+        # Something else.
 	return wantarray ? () : 0;
     }
 }
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 5c356c31a..17f916600 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -47,6 +47,7 @@ use Dpkg::Substvars;
 use Dpkg::Version;
 use Dpkg::Vars;
 use Dpkg::Changelog::Parse;
+use Dpkg::Source::Format;
 use Dpkg::Source::Package qw(get_default_diff_ignore_regex
                              set_default_diff_ignore_regex
                              get_default_tar_ignore_pattern);
@@ -118,7 +119,7 @@ if (defined($options{opmode}) &&
     }
     if ($dir eq '.') {
 	# . is never correct, adjust automatically
-	$dir = basename(cwd());
+	$dir = basename(getcwd());
 	chdir '..' or syserr(g_("unable to chdir to '%s'"), '..');
     }
     # --format options are not allowed, they would take precedence
@@ -238,9 +239,26 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) {
     # <https://reproducible-builds.org/specs/source-date-epoch/>
     $ENV{SOURCE_DATE_EPOCH} ||= $changelog->{timestamp} || time;
 
-    my $srcpkg = Dpkg::Source::Package->new(options => \%options);
+    # Select the format to use
+    if (not defined $build_format) {
+        my $format_file = "$dir/debian/source/format";
+        if (-e $format_file) {
+            my $format = Dpkg::Source::Format->new(filename => $format_file);
+            $build_format = $format->get();
+        } else {
+            warning(g_('no source format specified in %s, ' .
+                       'see dpkg-source(1)'), 'debian/source/format')
+                if $options{opmode} eq 'build';
+            $build_format = '1.0';
+        }
+    }
+
+    my $srcpkg = Dpkg::Source::Package->new(format => $build_format,
+                                            options => \%options);
     my $fields = $srcpkg->{fields};
 
+    $srcpkg->parse_cmdline_options(@cmdline_options);
+
     my @sourcearch;
     my %archadded;
     my @binarypackages;
@@ -288,13 +306,6 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) {
         $pkg_summary .= ' arch=' . join ',', split ' ', $arch;
 
         if (defined $profile) {
-            # If the string does not contain brackets then it is using the
-            # old syntax. Emit a fatal error.
-            if ($profile !~ m/^\s*<.*>\s*$/) {
-                error(g_('binary package stanza %s is using an obsolete ' .
-                         'Build-Profiles field syntax'), $p);
-            }
-
             # Instead of splitting twice and then joining twice, we just do
             # simple string replacements:
 
@@ -394,29 +405,6 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) {
 	$fields->{'Binary'} =~ s/(.{0,980}), ?/$1,\n/g;
     }
 
-    # Select the format to use
-    if (not defined $build_format) {
-	if (-e "$dir/debian/source/format") {
-	    open(my $format_fh, '<', "$dir/debian/source/format")
-	        or syserr(g_('cannot read %s'), "$dir/debian/source/format");
-	    $build_format = <$format_fh>;
-	    chomp($build_format) if defined $build_format;
-	    error(g_('%s is empty'), "$dir/debian/source/format")
-		unless defined $build_format and length $build_format;
-	    close($format_fh);
-	} else {
-	    warning(g_('no source format specified in %s, ' .
-	               'see dpkg-source(1)'), 'debian/source/format')
-		if $options{opmode} eq 'build';
-	    $build_format = '1.0';
-	}
-    }
-    $fields->{'Format'} = $build_format;
-    $srcpkg->upgrade_object_type(); # Fails if format is unsupported
-    # Parse command line options
-    $srcpkg->init_options();
-    $srcpkg->parse_cmdline_options(@cmdline_options);
-
     if ($options{opmode} eq 'print-format') {
 	print $fields->{'Format'} . "\n";
 	exit(0);
@@ -542,8 +530,8 @@ sub set_testsuite_triggers_field
         deps_iterate($deps, sub { $testdeps{$_[0]->{package}} = 1 });
     }
 
-    # Remove our own binaries and meta-depends.
-    foreach my $pkg (@binarypackages, qw(@ @builddeps@)) {
+    # Remove our own binaries and its meta-depends variant.
+    foreach my $pkg (@binarypackages, qw(@)) {
         delete $testdeps{$pkg};
     }
     $fields->{'Testsuite-Triggers'} = join ', ', sort keys %testdeps;
@@ -573,11 +561,10 @@ sub print_option {
 sub get_format_help {
     $build_format //= '1.0';
 
-    my $srcpkg = Dpkg::Source::Package->new();
-    $srcpkg->{fields}->{'Format'} = $build_format;
-    $srcpkg->upgrade_object_type(); # Fails if format is unsupported
+    my $srcpkg = Dpkg::Source::Package->new(format => $build_format);
 
     my @cmdline = $srcpkg->describe_cmdline_options();
+    return '' unless @cmdline;
 
     my $help_build = my $help_extract = '';
     my $help;
diff --git a/scripts/mk/architecture.mk b/scripts/mk/architecture.mk
index 8520c5b2a..0af96019d 100644
--- a/scripts/mk/architecture.mk
+++ b/scripts/mk/architecture.mk
@@ -4,7 +4,7 @@
 
 dpkg_lazy_eval ?= $$(or $$(value DPKG_CACHE_$(1)),$$(eval DPKG_CACHE_$(1) := $$(shell $(2)))$$(value DPKG_CACHE_$(1)))
 
-dpkg_architecture_setvar = $(1) ?= $(call dpkg_lazy_eval,$(1),dpkg-architecture -q$(1))
+dpkg_architecture_setvar = export $(1) ?= $(call dpkg_lazy_eval,$(1),dpkg-architecture -q$(1))
 
 $(foreach machine,BUILD HOST TARGET,\
   $(foreach var,ARCH ARCH_ABI ARCH_LIBC ARCH_OS ARCH_CPU ARCH_BITS ARCH_ENDIAN GNU_CPU GNU_SYSTEM GNU_TYPE MULTIARCH,\
diff --git a/scripts/mk/buildtools.mk b/scripts/mk/buildtools.mk
index d5638f50e..cdf7734d3 100644
--- a/scripts/mk/buildtools.mk
+++ b/scripts/mk/buildtools.mk
@@ -1,5 +1,6 @@
 # This Makefile snippet defines the following variables for host tools:
 #
+# AS: assembler
 # CPP: C preprocessor
 # CC: C compiler
 # CXX: C++ compiler
@@ -9,6 +10,12 @@
 # F77: Fortran 77 compiler
 # FC: Fortran 9x compiler
 # LD: linker
+# STRIP: strip objects
+# OBJCOPY: copy objects
+# OBJDUMP: dump objects
+# NM: names lister
+# AR: archiver
+# RANLIB: archive index generator
 # PKG_CONFIG: pkg-config tool
 #
 # All the above variables have a counterpart variable for the build tool,
@@ -25,6 +32,7 @@ include $(dpkg_datadir)/architecture.mk
 # not defined or contain the make built-in defaults. On native builds if
 # TOOL is defined and TOOL_FOR_BUILD is not, we fallback to use TOOL.
 define dpkg_buildtool_setvar
+ifeq (,$(findstring $(3),$(DEB_BUILD_OPTIONS)))
 ifeq ($(origin $(1)),default)
 $(1) = $(DEB_HOST_GNU_TYPE)-$(2)
 endif
@@ -37,6 +45,10 @@ $(1)_FOR_BUILD ?= $$($(1))
 endif
 endif
 $(1)_FOR_BUILD ?= $(DEB_BUILD_GNU_TYPE)-$(2)
+else
+$(1) = :
+$(1)_FOR_BUILD = :
+endif
 
 ifdef DPKG_EXPORT_BUILDTOOLS
 export $(1)
@@ -44,6 +56,7 @@ export $(1)_FOR_BUILD
 endif
 endef
 
+$(eval $(call dpkg_buildtool_setvar,AS,as))
 $(eval $(call dpkg_buildtool_setvar,CPP,gcc -E))
 $(eval $(call dpkg_buildtool_setvar,CC,gcc))
 $(eval $(call dpkg_buildtool_setvar,CXX,g++))
@@ -53,4 +66,10 @@ $(eval $(call dpkg_buildtool_setvar,GCJ,gcj))
 $(eval $(call dpkg_buildtool_setvar,F77,f77))
 $(eval $(call dpkg_buildtool_setvar,FC,f77))
 $(eval $(call dpkg_buildtool_setvar,LD,ld))
+$(eval $(call dpkg_buildtool_setvar,STRIP,strip,nostrip))
+$(eval $(call dpkg_buildtool_setvar,OBJCOPY,objcopy))
+$(eval $(call dpkg_buildtool_setvar,OBJDUMP,objdump))
+$(eval $(call dpkg_buildtool_setvar,NM,nm))
+$(eval $(call dpkg_buildtool_setvar,AR,ar))
+$(eval $(call dpkg_buildtool_setvar,RANLIB,ranlib))
 $(eval $(call dpkg_buildtool_setvar,PKG_CONFIG,pkg-config))
diff --git a/scripts/mk/vendor.mk b/scripts/mk/vendor.mk
index aa75cd6fc..f3b1565bb 100644
--- a/scripts/mk/vendor.mk
+++ b/scripts/mk/vendor.mk
@@ -3,16 +3,40 @@
 # DEB_VENDOR: output of dpkg-vendor --query Vendor
 # DEB_PARENT_VENDOR: output of dpkg-vendor --query Parent (can be empty)
 #
-# The snippet also defines a macro "dpkg_vendor_derives_from" that you can
-# use to verify if the current vendor derives from another vendor with a
-# simple test like this one:
-# ifeq ($(call dpkg_vendor_derives_from ubuntu),yes)
-#   ...
-# endif
+# This Makefile snippet also defines a set "dpkg_vendor_derives_from"
+# macros that can be used to verify if the current vendor derives from
+# another vendor. The unversioned variant defaults to the v0 version if
+# undefined, which can be defined explicitly to one of the versions or the
+# versioned macros can be used directly. The following are example usages:
+#
+# - dpkg_vendor_derives_from (since dpkg 1.16.1)
+#
+#   ifeq ($(shell $(call dpkg_vendor_derives_from,ubuntu)),yes)
+#     ...
+#   endif
+#
+# - dpkg_vendor_derives_from_v0 (since dpkg 1.19.3)
+#
+#   ifeq ($(shell $(call dpkg_vendor_derives_from_v0,ubuntu)),yes)
+#     ...
+#   endif
+#
+# - dpkg_vendor_derives_from_v1 (since dpkg 1.19.3)
+#
+#   dpkg_vendor_derives_from = $(dpkg_vendor_derives_from_v1)
+#   ifeq ($(call dpkg_vendor_derives_from,ubuntu),yes)
+#     ...
+#   endif
+#   ifeq ($(call dpkg_vendor_derives_from_v1,ubuntu),yes)
+#     ...
+#   endif
 
 dpkg_late_eval ?= $(or $(value DPKG_CACHE_$(1)),$(eval DPKG_CACHE_$(1) := $(shell $(2)))$(value DPKG_CACHE_$(1)))
 
 DEB_VENDOR = $(call dpkg_late_eval,DEB_VENDOR,dpkg-vendor --query Vendor)
 DEB_PARENT_VENDOR = $(call dpkg_late_eval,DEB_PARENT_VENDOR,dpkg-vendor --query Parent)
 
-dpkg_vendor_derives_from = dpkg-vendor --derives-from $(1) && echo yes || echo no
+dpkg_vendor_derives_from_v0 = dpkg-vendor --derives-from $(1) && echo yes || echo no
+dpkg_vendor_derives_from_v1 = $(shell $(dpkg_vendor_derives_from_v0))
+
+dpkg_vendor_derives_from ?= $(dpkg_vendor_derives_from_v0)
diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in
index dea8cde0e..a486b593d 100644
--- a/scripts/po/POTFILES.in
+++ b/scripts/po/POTFILES.in
@@ -46,6 +46,12 @@ scripts/Dpkg/Control/Tests.pm
 scripts/Dpkg/Control/Tests/Entry.pm
 scripts/Dpkg/Control/Types.pm
 scripts/Dpkg/Deps.pm
+scripts/Dpkg/Deps/AND.pm
+scripts/Dpkg/Deps/KnownFacts.pm
+scripts/Dpkg/Deps/Multiple.pm
+scripts/Dpkg/Deps/OR.pm
+scripts/Dpkg/Deps/Simple.pm
+scripts/Dpkg/Deps/Union.pm
 scripts/Dpkg/Dist/Files.pm
 scripts/Dpkg/ErrorHandling.pm
 scripts/Dpkg/Exit.pm
@@ -66,6 +72,7 @@ scripts/Dpkg/Shlibs/Symbol.pm
 scripts/Dpkg/Shlibs/SymbolFile.pm
 scripts/Dpkg/Source/Archive.pm
 scripts/Dpkg/Source/Functions.pm
+scripts/Dpkg/Source/BinaryFiles.pm
 scripts/Dpkg/Source/Package.pm
 scripts/Dpkg/Source/Package/V1.pm
 scripts/Dpkg/Source/Package/V2.pm
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 57918dd91..d7308988b 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -2,14 +2,14 @@
 # Copyright © 2006, 2010 Software in the Public Interest, Inc.
 # This file is distributed under the same license as the dpkg package.
 # Jordi Mallach <jordi@debian.org>, 2006, 2010.
-# Guillem Jover <guillem@debian.org>, 2010, 2014-2015, 2017
+# Guillem Jover <guillem@debian.org>, 2010-2011, 2014-2015, 2017, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg-dev 1.17.23\n"
+"Project-Id-Version: dpkg-dev 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2017-05-07 16:26+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
+"PO-Revision-Date: 2019-05-09 05:38+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
 "Language: ca\n"
@@ -179,28 +179,6 @@ msgid "Usage: %s [<command>]"
 msgstr "Format d'ús: %s [<ordre>]"
 
 #: scripts/dpkg-buildflags.pl
-#, fuzzy
-#| msgid ""
-#| "Commands:\n"
-#| "  --get <flag>       output the requested flag to stdout.\n"
-#| "  --origin <flag>    output the origin of the flag to stdout:\n"
-#| "                     value is one of vendor, system, user, env.\n"
-#| "  --query-features <area>\n"
-#| "                     output the status of features for the given area.\n"
-#| "  --list             output a list of the flags supported by the current "
-#| "vendor.\n"
-#| "  --export=(sh|make|cmdline|configure)\n"
-#| "                     output something convenient to import the "
-#| "compilation\n"
-#| "                     flags in a shell script, in make, or in a command "
-#| "line.\n"
-#| "  --dump             output all compilation flags with their values\n"
-#| "  --status           print a synopsis with all parameters affecting the\n"
-#| "                     behaviour of dpkg-buildflags and the resulting "
-#| "flags\n"
-#| "                     and their origin.\n"
-#| "  --help             show this help message.\n"
-#| "  --version          show the version.\n"
 msgid ""
 "Commands:\n"
 "  --get <flag>       output the requested flag to stdout.\n"
@@ -227,6 +205,11 @@ msgstr ""
 "  --origin <senyalador>\n"
 "                     mostra l'origen del senyalador a stdout, el valor és:\n"
 "                       vendor, system, user, env.\n"
+"  --status           mostra una sinopsis amb tots els paràmetres que "
+"afecten\n"
+"                       el comportament de dpkg-buildflags, els senyaladors\n"
+"                       resultants i els seus orígens.\n"
+"  --query            com --status, però en format deb822.\n"
 "  --query-features <àrea>\n"
 "                     mostra l'estat de les característiques de l'àrea "
 "donada.\n"
@@ -238,10 +221,6 @@ msgstr ""
 "                       a un guió d'ordres, a make o a la línia d'ordres.\n"
 "  --dump             mostra tots els senyaladors de compilació amb els seus\n"
 "                       valors.\n"
-"  --status           mostra una sinopsis amb tots els paràmetres que "
-"afecten\n"
-"                       el comportament de dpkg-buildflags, els senyaladors\n"
-"                       resultants i els seus orígens.\n"
 "  --help             mostra aquest missatge d'ajuda.\n"
 "  --version          mostra la versió.\n"
 
@@ -268,27 +247,29 @@ msgid ""
 "      --build=<type>[,...]    specify the build <type>: full, source, "
 "binary,\n"
 "                                any, all (default is 'full').\n"
-"  -F                          normal full build (source and binary; "
+"  -F, --build=full            normal full build (source and binary; "
 "default).\n"
-"  -g                          source and arch-indep build.\n"
-"  -G                          source and arch-specific build.\n"
-"  -b                          binary-only, no source files.\n"
-"  -B                          binary-only, only arch-specific files.\n"
-"  -A                          binary-only, only arch-indep files.\n"
-"  -S                          source-only, no binary files.\n"
+"  -g, --build=source,all      source and arch-indep build.\n"
+"  -G, --build=source,any      source and arch-specific build.\n"
+"  -b, --build=binary          binary-only, no source files.\n"
+"  -B, --build=any             binary-only, only arch-specific files.\n"
+"  -A, --build=all             binary-only, only arch-indep files.\n"
+"  -S, --build=source          source-only, no binary files.\n"
 "  -nc, --no-pre-clean         do not pre clean source tree (implies -b).\n"
-"       --pre-clean            pre clean source tree (default).\n"
-"  -tc, --post-clean           clean source tree when finished.\n"
-"  -D                          check build dependencies and conflicts "
+"      --pre-clean             pre clean source tree (default).\n"
+"      --no-post-clean         do not post clean source tree (default).\n"
+"  -tc, --post-clean           post clean source tree.\n"
+"  -D, --check-builddeps       check build dependencies and conflicts "
 "(default).\n"
-"  -d                          do not check build dependencies and "
+"  -d, --no-check-builddeps    do not check build dependencies and "
 "conflicts.\n"
-"      --[no-]check-builddeps  ditto.\n"
 "      --ignore-builtin-builddeps\n"
 "                              do not check builtin build dependencies.\n"
 "  -P, --build-profiles=<profiles>\n"
-"                              assume comma-separated build profiles as "
+"                              assume comma-separated build <profiles> as "
 "active.\n"
+"      --rules-requires-root   assume legacy Rules-Requires-Root field "
+"value.\n"
 "  -R, --rules-file=<rules>    rules file to execute (default is debian/"
 "rules).\n"
 "  -T, --rules-target=<target> call debian/rules <target>.\n"
@@ -346,16 +327,15 @@ msgstr ""
 "  -nc, --no-pre-clean         no preneteja l'arbre font (implica -b).\n"
 "       --pre-clean            preneteja l'arbre font (predeterminat)\n"
 "  -tc, --post-clean           neteja l'arbre font al finalitzar.\n"
-"  -D                          verifica dependències i conflictes de\n"
+"  -D, --check-builddeps       verifica dependències i conflictes de\n"
 "                                construcció (predeterminat).\n"
-"  -d                          no verifica dependències ni conflictes de\n"
+"  -d, --no-check-builddeps    no verifica dependències ni conflictes de\n"
 "                                construcció.\n"
-"      --[no-]check-builddeps  ídem.\n"
 "      --ignore-builtin-builddeps\n"
 "                              no verifica dependències de construcció\n"
 "                                incorporades.\n"
 "  -P, --build-profiles=<perfils>\n"
-"                              assumeix els perfils de construcció com "
+"                              assumeix els <perfils> de construcció com "
 "actius\n"
 "                                (llista de valors separats per comes).\n"
 "  -R, --rules-file=<regles>   regles a executar (predeterminat a debian/"
@@ -493,26 +473,9 @@ msgid "unknown option or argument %s"
 msgstr "l'opció o argument %s és desconeguda"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "using a gain-root-command while being root"
-msgstr "s'està emprant una ordre-assolir-superusuari mentre s'és superusuari"
-
-#: scripts/dpkg-buildpackage.pl
-msgid ""
-"fakeroot not found, either install the fakeroot\n"
-"package, specify a command with the -r option, or run this as root"
-msgstr ""
-"no s'ha trobat fakeroot, instal·leu el paquet fakeroot,\n"
-"especifiqueu una ordre amb l'opció -r, o executeu-ho com superusuari"
-
-#: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid "gain-root-command '%s' not found"
-msgstr "no s'ha trobat l'ordre-assolir-superusuari «%s»"
-
-#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "option %s is only meaningful with option %s"
-msgstr ""
+msgstr "l'opció %s només te sentit juntament amb l'opció %s"
 
 #: scripts/dpkg-buildpackage.pl
 #, perl-format
@@ -592,36 +555,70 @@ msgid "unable to determine %s"
 msgstr "no es pot determinar %s"
 
 #: scripts/dpkg-buildpackage.pl
+msgid "using a gain-root-command while being root"
+msgstr "s'està emprant una ordre-assolir-superusuari mentre s'és superusuari"
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"fakeroot not found, either install the fakeroot\n"
+"package, specify a command with the -r option, or run this as root"
+msgstr ""
+"no s'ha trobat fakeroot, instal·leu el paquet fakeroot,\n"
+"especifiqueu una ordre amb l'opció -r, o executeu-ho com superusuari"
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid "gain-root-command '%s' not found"
+msgstr "no s'ha trobat l'ordre-assolir-superusuari «%s»"
+
+#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "disallowed target in %s field keyword %s"
-msgstr ""
+msgstr "no s'accepta l'objectiu en el camp %s amb la paraula clau %s"
 
 #: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "unknown %s field keyword %s in dpkg namespace"
-msgstr ""
+msgstr "paraula clau %s desconeguda en el camp %s a l'espai de noms de dpkg"
 
 #: scripts/dpkg-buildpackage.pl
-#, fuzzy, perl-format
-#| msgid "unknown build type %s"
+#, perl-format
 msgid "unknown %s field keyword %s"
-msgstr "tipus de construcció «%s» desconegut"
+msgstr "paraula clau %s desconeguda en el camp %s"
 
 #: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "field %s contains duplicate keyword %s"
-msgstr ""
+msgstr "el camp %s conté la paraula clau duplicada «%s»"
 
 #: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "%s field contains both global and implementation specific keywords"
-msgstr ""
+msgstr "el camp %s conté paraules clau globals i especifiques d'implementació"
 
 #: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "la substitució %% és desconeguda en el lligam: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"short OpenPGP key IDs are broken; please use key fingerprints in %s or %s "
+"instead"
+msgstr ""
+"els identificador de clau OpenPGP curts estan trencats; empreu empremtes de "
+"clau a %s o %s"
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"in %s or %s instead"
+msgstr ""
+"els identificadors de clau OpenPGP llargs estan descoratjats; empreu "
+"empremtes de clau a %s o %s"
+
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
 #: scripts/dpkg-genbuildinfo.pl scripts/dpkg-name.pl scripts/Dpkg/Arch.pm
 #: scripts/Dpkg/IPC.pm scripts/Dpkg/OpenPGP.pm scripts/Dpkg/Shlibs.pm
@@ -766,8 +763,9 @@ msgstr ""
 #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl
 #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm
-#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm
+#: scripts/Dpkg/Source/Quilt.pm
 #, perl-format
 msgid "cannot write %s"
 msgstr "no es pot escriure %s"
@@ -778,22 +776,6 @@ msgid "install new files list file"
 msgstr "no es pot instal·lar la nova llista de fitxers"
 
 #: scripts/dpkg-genbuildinfo.pl
-#, fuzzy
-#| msgid ""
-#| "Options:\n"
-#| "  --build=<type>[,...]     specify the build <type>: full, source, "
-#| "binary,\n"
-#| "                             any, all (default is 'full').\n"
-#| "  -c<control-file>         get control info from this file.\n"
-#| "  -l<changelog-file>       get per-version info from this file.\n"
-#| "  -f<files-list-file>      get .deb files list from this file.\n"
-#| "  -F<changelog-format>     force changelog format.\n"
-#| "  -O[<buildinfo-file>]     write to stdout (or <buildinfo-file>).\n"
-#| "  -u<upload-files-dir>     directory with files (default is '..').\n"
-#| "  --always-include-path    always include Build-Path.\n"
-#| "  --admindir=<directory>   change the administrative directory.\n"
-#| "  -?, --help               show this help message.\n"
-#| "      --version            show the version.\n"
 msgid ""
 "Options:\n"
 "  --build=<type>[,...]     specify the build <type>: full, source, binary,\n"
@@ -820,6 +802,7 @@ msgstr ""
 "  -O[<fitxer-buildinfo>]   escriu a stdout (o <fitxer-buildinfo>).\n"
 "  -u<dir-publicació>       directori amb fitxers a publicar (predeterminat a "
 "«..»).\n"
+"  --always-include-kernel  inclou sempre el camp Build-Kernel-Version.\n"
 "  --always-include-path    inclou sempre el camp Build-Path.\n"
 "  --admindir=<directori>   canvia el directori administratiu.\n"
 "  -?, --help               mostra aquest missatge d'ajuda.\n"
@@ -902,7 +885,7 @@ msgstr ""
 "                             debian/substvars.\n"
 "  -D<camp>=<valor>         afegeix o sobreescriu un camp i valor.\n"
 "  -U<camp>                 suprimeix un camp.\n"
-"  -O[<ftxer>]              escriu les variables a stdout (predeterminat)\n"
+"  -O[<fitxer>]             escriu les variables a stdout (predeterminat)\n"
 "                             o al <fitxer>.\n"
 "  -?, --help               mostra aquest missatge d'ajuda.\n"
 "      --version            mostra la versió.\n"
@@ -920,7 +903,7 @@ msgstr "manca el camp Section pels fitxers font"
 msgid "missing Priority for source files"
 msgstr "manca el camp Priority pels fitxers font"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm
+#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm
 #, perl-format
 msgid "%s is empty"
 msgstr "%s és buit"
@@ -968,14 +951,6 @@ msgstr ""
 msgid "package %s in control file but not in files list"
 msgstr "el paquet %s és al fitxer de control però no a la llista de fitxers"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm
-#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm
-#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Quilt.pm
-#, perl-format
-msgid "cannot read %s"
-msgstr "no es pot llegir %s"
-
 #: scripts/dpkg-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1140,6 +1115,8 @@ msgstr "no s'ha pogut instal·lar el fitxer de control de sortida «%s»"
 #: scripts/dpkg-gensymbols.pl
 msgid ""
 "Options:\n"
+"  -l<library-path>         add directory to private shared library search "
+"list.\n"
 "  -p<package>              generate symbols file for package.\n"
 "  -P<package-build-dir>    temporary build directory instead of debian/tmp.\n"
 "  -e<library>              explicitly list libraries to scan.\n"
@@ -1173,6 +1150,8 @@ msgid ""
 "      --version            show the version.\n"
 msgstr ""
 "Opcions:\n"
+"  -l<directori>            afegeix el directori a la llista de cerca de\n"
+"                             biblioteques compartides privades.\n"
 "  -p<paquet>               genera el fitxer de símbols per a <paquet>.\n"
 "  -P<dir-construcció>      directori temporal de construcció, i no debian/"
 "tmp.\n"
@@ -1427,6 +1406,7 @@ msgid ""
 "Parser options:\n"
 "      --format <output-format>\n"
 "                           set output format (defaults to 'dpkg').\n"
+"      --reverse            include all changes in reverse order.\n"
 "      --all                include all changes.\n"
 "  -s, --since <version>    include all changes later than <version>.\n"
 "  -v <version>             ditto.\n"
@@ -1442,22 +1422,23 @@ msgid ""
 "                             the top (or tail if <number> is lower than 0).\n"
 msgstr ""
 "Opcions de l'analitzador:\n"
-"     --format <format-sortida>\n"
+"      --format <format-sortida>\n"
 "                           vegeu la pàgina de manual per la llista de "
 "formats\n"
 "                             de sortida disponibles, el valor predeterminat\n"
 "                             és «dpkg».\n"
-"     --all                 inclou tots els canvis.\n"
-" -s, --since <versió>      inclou tots els canvis posteriors a <versió>.\n"
-" -v <versió>               ídem.\n"
-" -u, --until <versió>      inclou tots els canvis anteriors a <versió>.\n"
-" -f, --from <versió>       inclou tots els canvis iguals o posteriors a\n"
+"      --reverse            inclou tots els canvis en ordre invertit.\n"
+"      --all                inclou tots els canvis.\n"
+"  -s, --since <versió>     inclou tots els canvis posteriors a <versió>.\n"
+"  -v <versió>              ídem.\n"
+"  -u, --until <versió>     inclou tots els canvis anteriors a <versió>.\n"
+"  -f, --from <versió>      inclou tots els canvis iguals o posteriors a\n"
 "                             <versió>.\n"
-" -t, --to <versió>         inclou tots els canvis fins o iguals a <versió>.\n"
-" -c, --count <número>      inclou el <número> d'entrades des del principi,\n"
+"  -t, --to <versió>        inclou tots els canvis fins o iguals a <versió>.\n"
+"  -c, --count <número>     inclou el <número> d'entrades des del principi,\n"
 "                             o des del final si <número> és inferior a 0.\n"
-" -n <número>               ídem.\n"
-" -o, --offset <número>     canvia el punt d'inici per a --count, contant\n"
+"  -n <número>              ídem.\n"
+"  -o, --offset <número>    canvia el punt d'inici per a --count, contant\n"
 "                             des del principi, o des del final si <número>\n"
 "                             és inferior a 0.\n"
 
@@ -1592,6 +1573,11 @@ msgid "couldn't close stdout"
 msgstr "no s'ha pogut tancar la sortida estàndard"
 
 #: scripts/dpkg-scanpackages.pl
+msgid "Packages with multiple instances but no --multiversion specified:"
+msgstr ""
+"Paquets amb múltiples instancies però no s'ha especificat --multiversion:"
+
+#: scripts/dpkg-scanpackages.pl
 msgid "Packages in override file with incorrect old maintainer value:"
 msgstr ""
 "Paquets en el fitxer de substitució amb valor antic de mantenidor incorrecte:"
@@ -1894,7 +1880,8 @@ msgstr ""
 "fitxer d'informació «%.255s» de la biblioteca dinàmica, línia %d dolenta: "
 "«%s»"
 
-#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm
+#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm
+#: scripts/Dpkg/Checksums.pm
 #, perl-format
 msgid "cannot open file %s"
 msgstr "no es pot obrir el fitxer %s"
@@ -1943,7 +1930,7 @@ msgstr "no es pot fer «stat» sobre el fitxer %s"
 msgid "directory argument %s is not a directory"
 msgstr "l'argument directori %s no és un directori"
 
-#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm
 #, perl-format
 msgid "unable to chdir to '%s'"
@@ -1971,6 +1958,11 @@ msgstr "es requereix una opció d'acció"
 
 #: scripts/dpkg-source.pl
 #, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr "no s'ha especificat el format del font a %s, vegeu dpkg-source(1)"
+
+#: scripts/dpkg-source.pl
+#, perl-format
 msgid "%s doesn't contain any information about the source package"
 msgstr "%s no conté cap informació del paquet font"
 
@@ -2005,11 +1997,6 @@ msgstr "s'està construint el font per a un llançament només binari"
 
 #: scripts/dpkg-source.pl
 #, perl-format
-msgid "no source format specified in %s, see dpkg-source(1)"
-msgstr "no s'ha especificat el format del font a %s, vegeu dpkg-source(1)"
-
-#: scripts/dpkg-source.pl
-#, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "no es pot construir amb format de font «%s»: %s"
 
@@ -2185,7 +2172,7 @@ msgstr ""
 "vàlida.\n"
 "  --require-strong-checksums\n"
 "                           interromp si el paquet no té sumes de "
-"comprovació\n"
+"verificació\n"
 "                             fortes.\n"
 "  --ignore-bad-version     permet versions de font no vàlides."
 
@@ -2262,6 +2249,14 @@ msgstr ""
 msgid "'%s' is not a legal architecture in list '%s'"
 msgstr "«%s» no és una cadena d'arquitectura vàlida a la llista «%s»"
 
+#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm
+#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm
+#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm
+#, perl-format
+msgid "cannot read %s"
+msgstr "no es pot llegir %s"
+
 #: scripts/Dpkg/BuildFlags.pm
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
@@ -2329,8 +2324,8 @@ msgstr "només es pot especificar «to» o «until», s'emprarà «until»"
 
 #: scripts/Dpkg/Changelog.pm
 #, perl-format
-msgid "'%s' option specifies non-existing version"
-msgstr "l'opció «%s» especifica una versió inexistent"
+msgid "'%s' option specifies non-existing version '%s'"
+msgstr "l'opció «%s» especifica una versió «%s» inexistent"
 
 #: scripts/Dpkg/Changelog.pm
 msgid "use newest entry that is earlier than the one specified"
@@ -2346,16 +2341,18 @@ msgstr "empra l'entrada més antiga que és posterior a l'especificada"
 
 #: scripts/Dpkg/Changelog.pm
 #, perl-format
-msgid "no such entry found, ignoring '%s' parameter"
-msgstr "no s'ha trobat l'entrada, s'ignorarà el paràmetre «%s»"
+msgid "no such entry found, ignoring '%s' parameter '%s'"
+msgstr "no s'ha trobat l'entrada, s'ignorarà el paràmetre «%s» = «%s»"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'since' option specifies most recent version, ignoring"
-msgstr "l'opció «since» especifica la versió més recent, s'ignorarà"
+#, perl-format
+msgid "'since' option specifies most recent version '%s', ignoring"
+msgstr "l'opció «since» especifica la versió «%s» més recent, s'ignorarà"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'until' option specifies oldest version, ignoring"
-msgstr "l'opció «until» especifica la versió més antiga, s'ignorarà"
+#, perl-format
+msgid "'until' option specifies oldest version '%s', ignoring"
+msgstr "l'opció «until» especifica la versió «%s» més antiga, s'ignorarà"
 
 #: scripts/Dpkg/Changelog/Debian.pm
 msgid "first heading"
@@ -2461,7 +2458,7 @@ msgstr "el nom del mes abreviat «%s» no es vàlid"
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
 #, perl-format
-msgid "cannot parse non-comformant date '%s'"
+msgid "cannot parse non-conformant date '%s'"
 msgstr "no es pot analitzar la data no conforme «%s»"
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -2470,13 +2467,8 @@ msgstr "el final no coincideix amb la regex esperada"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "cannot create pipe for %s"
-msgstr "no es pot crear el conducte per a %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "tail of %s"
-msgstr "cua de %s"
+msgid "cannot seek into file %s"
+msgstr "no es pot reposicionar al fitxer «%s»"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
@@ -2667,10 +2659,9 @@ msgid "block lacks the '%s' field"
 msgstr "el bloc no conté el camp «%s»"
 
 #: scripts/Dpkg/Control/Tests/Entry.pm
-#, fuzzy, perl-format
-#| msgid "block lacks the '%s' field"
+#, perl-format
 msgid "block lacks either %s or %s fields"
-msgstr "el bloc no conté el camp «%s»"
+msgstr "el bloc no conté els camps «%s» o «%s»"
 
 #: scripts/Dpkg/Deps.pm
 #, perl-format
@@ -2723,21 +2714,19 @@ msgid "error"
 msgstr "error"
 
 #: scripts/Dpkg/ErrorHandling.pm
-#, fuzzy, perl-format
-#| msgid "%s gave error exit status %s"
+#, perl-format
 msgid "%s subprocess returned exit status %d"
-msgstr "%s ha fallat amb el codi d'eixida d'error %s"
+msgstr "el subprocés «%s» ha retornat codi d'eixida %d"
 
 #: scripts/Dpkg/ErrorHandling.pm
 #, perl-format
 msgid "%s subprocess was killed by signal %d"
-msgstr ""
+msgstr "el subprocés «%s» ha estat finalitzat pel senyal %d"
 
 #: scripts/Dpkg/ErrorHandling.pm
-#, fuzzy, perl-format
-#| msgid "%s failed with unknown exit code %d"
+#, perl-format
 msgid "%s subprocess failed with unknown status code %d"
-msgstr "%s ha fallat amb el codi d'eixida d'error desconegut %d"
+msgstr "el subprocés «%s» ha fallat amb el codi d'estat desconegut %d"
 
 #: scripts/Dpkg/ErrorHandling.pm
 msgid "Use --help for program usage information."
@@ -2793,29 +2782,27 @@ msgstr "no s'ha pogut obtenir el blocatge d'escriptura per a %s"
 
 #: scripts/Dpkg/OpenPGP.pm
 msgid "signature file is already OpenPGP ASCII armor, copying"
-msgstr ""
+msgstr "el fitxer de signatura ja és armat en OpenPGP ASCII, s'esta copiant"
 
 #: scripts/Dpkg/OpenPGP.pm
 msgid "cannot OpenPGP ASCII armor signature file due to missing gpg"
 msgstr ""
+"no es pot armar el fitxer de signatura en OpenPGP ASCII ja que manca gpg"
 
 #: scripts/Dpkg/OpenPGP.pm
-#, fuzzy, perl-format
-#| msgid "cannot create pipe for %s"
+#, perl-format
 msgid "cannot create signature file %s"
-msgstr "no es pot crear el conducte per a %s"
+msgstr "no es pot crear el fitxer de signatura %s"
 
 #: scripts/Dpkg/OpenPGP.pm
-#, fuzzy, perl-format
-#| msgid "cannot write %s"
+#, perl-format
 msgid "cannot execute %s program"
-msgstr "no es pot escriure %s"
+msgstr "no es pot executar el programa %s"
 
 #: scripts/Dpkg/OpenPGP.pm
-#, fuzzy, perl-format
-#| msgid "cannot stat file %s"
+#, perl-format
 msgid "cannot write signature file %s"
-msgstr "no es pot fer «stat» al fitxer «%s»"
+msgstr "no es pot escriure el fitxer de signatura «%s»"
 
 #: scripts/Dpkg/Package.pm
 msgid "may not be empty string"
@@ -2830,6 +2817,14 @@ msgstr "el caràcter «%s» no és permès"
 msgid "must start with an alphanumeric character"
 msgstr "ha de començar amb un caràcter alfanumèric"
 
+#: scripts/Dpkg/Shlibs.pm
+msgid ""
+"deprecated use of LD_LIBRARY_PATH with private library directory which "
+"interferes with cross-building, please use -l option instead"
+msgstr ""
+"ús obsolet de LD_LIBRARY_PATH amb directori de biblioteques privades que "
+"interfereix amb la compilació creuada, empreu l'opció -l en el seu lloc"
+
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "unknown executable format in file '%s'"
@@ -2932,6 +2927,36 @@ msgstr "no es pot canviar la marca horària per a %s"
 msgid "cannot read timestamp from %s"
 msgstr "no es pot llegir la marca horària de %s"
 
+#: scripts/Dpkg/Source/Functions.pm
+#, perl-format
+msgid "cannot open file %s for binary detection"
+msgstr "no es pot obrir el fitxer %s per a detecció binaria"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "adding %s to %s"
+msgstr "s'està afegint %s a %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "unwanted binary file: %s"
+msgstr "fitxer binari no desitjat: %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid ""
+"detected %d unwanted binary file (add it in debian/source/include-binaries "
+"to allow its inclusion)."
+msgid_plural ""
+"detected %d unwanted binary files (add them in debian/source/include-"
+"binaries to allow their inclusion)."
+msgstr[0] ""
+"s'ha detectat %d fitxer binari no desitjat (afegiu-lo a debian/source/"
+"include-binaries per permetre la seva inclusió)."
+msgstr[1] ""
+"s'han detectat %d fitxers binaries no desitjats (afegiu-los a debian/source/"
+"include-binaries per permetre la seva inclusió)."
+
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
 msgid "%s is not the name of a file"
@@ -2948,15 +2973,6 @@ msgid "source package format '%s' is not supported: %s"
 msgstr "no s'admet el format del paquet font «%s»: %s"
 
 #: scripts/Dpkg/Source/Package.pm
-msgid "format variant must be in lowercase"
-msgstr "la variant de format ha de ser en minúscules"
-
-#: scripts/Dpkg/Source/Package.pm
-#, perl-format
-msgid "invalid Format field '%s'"
-msgstr "el camp Format no és vàlid «%s»"
-
-#: scripts/Dpkg/Source/Package.pm
 msgid "source package uses only weak checksums"
 msgstr "el paquet font només empra sumes de comprovació dèbils"
 
@@ -3379,26 +3395,6 @@ msgstr "s'han trobat canvis locals, els fitxers modificats són:"
 msgid "-b takes only one parameter with format '%s'"
 msgstr "l'opció -b només admet un paràmetre amb el format «%s»"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "unwanted binary file: %s"
-msgstr "fitxer binari no desitjat: %s"
-
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid ""
-"detected %d unwanted binary file (add it in debian/source/include-binaries "
-"to allow its inclusion)."
-msgid_plural ""
-"detected %d unwanted binary files (add them in debian/source/include-"
-"binaries to allow their inclusion)."
-msgstr[0] ""
-"s'ha detectat %d fitxer binari no desitjat (afegiu-lo a debian/source/"
-"include-binaries per permetre la seva inclusió)."
-msgstr[1] ""
-"s'han detectat %d fitxers binaries no desitjats (afegiu-los a debian/source/"
-"include-binaries per permetre la seva inclusió)."
-
 #: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "cannot represent change to %s: %s"
@@ -3471,11 +3467,6 @@ msgstr "no s'ha donat cap nom de pedaç; no es pot continuar"
 msgid "cannot find an editor"
 msgstr "no s'ha trobat un editor"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "adding %s to %s"
-msgstr "s'està afegint %s a %s"
-
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 msgid "cannot unpack bzr-format source package because bzr is not in the PATH"
 msgstr ""
@@ -3515,8 +3506,8 @@ msgid "uncommitted, not-ignored changes in working directory: %s"
 msgstr "hi ha canvis sense publicar no ignorats en el directori de treball: %s"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
-msgid "format v3.0 uses only one source file"
-msgstr "el format v3.0 només empra un sol fitxer font"
+msgid "format v3.0 (bzr) uses only one source file"
+msgstr "el format v3.0 (bzr) només empra un sol fitxer font"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 #, perl-format
@@ -3640,6 +3631,11 @@ msgstr "no es pot crear l'enllaç simbòlic %s"
 
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
 #, perl-format
+msgid "using patch list from %s"
+msgstr "s'esta emprant la llista de pedaços de %s"
+
+#: scripts/Dpkg/Source/Package/V3/Quilt.pm
+#, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "versió no admesa de les metadades quilt: %s"
 
@@ -3683,6 +3679,11 @@ msgstr "tipus de fitxer desconegut"
 
 #: scripts/Dpkg/Source/Patch.pm
 #, perl-format
+msgid "ignoring deletion of file %s"
+msgstr "s'omet la supressió del fitxer %s"
+
+#: scripts/Dpkg/Source/Patch.pm
+#, perl-format
 msgid "ignoring deletion of file %s, use --include-removal to override"
 msgstr ""
 "s'omet la supressió del fitxer %s, empreu --include-removal per forçar-ho"
@@ -3923,13 +3924,13 @@ msgstr "la variable de substitució ${%s} és obsoleta"
 
 #: scripts/Dpkg/Substvars.pm
 #, perl-format
-msgid "unknown substitution variable ${%s}"
-msgstr "la variable de substitució ${%s} és desconeguda"
+msgid "substitution variable ${%s} used, but is not defined"
+msgstr "la variable de substitució ${%s} s'utilitza, però no s'ha definit"
 
 #: scripts/Dpkg/Substvars.pm
 #, perl-format
-msgid "unused substitution variable ${%s}"
-msgstr "la variable de substitució ${%s} no s'utilitza"
+msgid "substitution variable ${%s} unused, but is defined"
+msgstr "la variable de substitució ${%s} no s'utilitza, però s'ha definit"
 
 #: scripts/Dpkg/Vars.pm
 #, perl-format
@@ -3997,6 +3998,21 @@ msgstr "el número de versió conté un caràcter il·legal ‘%s‘"
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "l'època en la versió no és un número: «%s»"
 
+#~ msgid "format variant must be in lowercase"
+#~ msgstr "la variant de format ha de ser en minúscules"
+
+#~ msgid "invalid Format field '%s'"
+#~ msgstr "el camp Format no és vàlid «%s»"
+
+#~ msgid "cannot create pipe for %s"
+#~ msgstr "no es pot crear el conducte per a %s"
+
+#~ msgid "tail of %s"
+#~ msgstr "cua de %s"
+
+#~ msgid "unknown substitution variable ${%s}"
+#~ msgstr "la variable de substitució ${%s} és desconeguda"
+
 #~ msgid "%s died from signal %s"
 #~ msgstr "%s ha mort d'una senyal %s"
 
diff --git a/scripts/po/de.po b/scripts/po/de.po
index 841792f4d..5125cb9c8 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -1,13 +1,13 @@
 # German translation of the scripts in the dpkg package
 # This file is distributed under the same license as the dpkg package.
-# (C) Helge Kreutzmann <debian@helgefjell.de>, 2007-2017.
+# (C) Helge Kreutzmann <debian@helgefjell.de>, 2007-2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg-dev 1.18.8\n"
+"Project-Id-Version: dpkg-dev 1.20.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
-"PO-Revision-Date: 2017-10-17 21:29+0200\n"
+"POT-Creation-Date: 2019-11-01 05:32+0100\n"
+"PO-Revision-Date: 2019-11-01 06:12+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -238,27 +238,29 @@ msgid ""
 "      --build=<type>[,...]    specify the build <type>: full, source, "
 "binary,\n"
 "                                any, all (default is 'full').\n"
-"  -F                          normal full build (source and binary; "
+"  -F, --build=full            normal full build (source and binary; "
 "default).\n"
-"  -g                          source and arch-indep build.\n"
-"  -G                          source and arch-specific build.\n"
-"  -b                          binary-only, no source files.\n"
-"  -B                          binary-only, only arch-specific files.\n"
-"  -A                          binary-only, only arch-indep files.\n"
-"  -S                          source-only, no binary files.\n"
+"  -g, --build=source,all      source and arch-indep build.\n"
+"  -G, --build=source,any      source and arch-specific build.\n"
+"  -b, --build=binary          binary-only, no source files.\n"
+"  -B, --build=any             binary-only, only arch-specific files.\n"
+"  -A, --build=all             binary-only, only arch-indep files.\n"
+"  -S, --build=source          source-only, no binary files.\n"
 "  -nc, --no-pre-clean         do not pre clean source tree (implies -b).\n"
-"       --pre-clean            pre clean source tree (default).\n"
-"  -tc, --post-clean           clean source tree when finished.\n"
-"  -D                          check build dependencies and conflicts "
+"      --pre-clean             pre clean source tree (default).\n"
+"      --no-post-clean         do not post clean source tree (default).\n"
+"  -tc, --post-clean           post clean source tree.\n"
+"  -D, --check-builddeps       check build dependencies and conflicts "
 "(default).\n"
-"  -d                          do not check build dependencies and "
+"  -d, --no-check-builddeps    do not check build dependencies and "
 "conflicts.\n"
-"      --[no-]check-builddeps  ditto.\n"
 "      --ignore-builtin-builddeps\n"
 "                              do not check builtin build dependencies.\n"
 "  -P, --build-profiles=<profiles>\n"
-"                              assume comma-separated build profiles as "
+"                              assume comma-separated build <profiles> as "
 "active.\n"
+"      --rules-requires-root   assume legacy Rules-Requires-Root field "
+"value.\n"
 "  -R, --rules-file=<rules>    rules file to execute (default is debian/"
 "rules).\n"
 "  -T, --rules-target=<target> call debian/rules <target>.\n"
@@ -285,7 +287,7 @@ msgid ""
 "                              pass option <opt> to dpkg-genbuildinfo.\n"
 "  -p, --sign-command=<command>\n"
 "                              command to sign .dsc and/or .changes files\n"
-"                                (default is gpg2 or gpg).\n"
+"                                (default is gpg).\n"
 "  -k, --sign-key=<keyid>      the key to use for signing.\n"
 "  -ap, --sign-pause           add pause before starting signature process.\n"
 "  -us, --unsigned-source      unsigned source package.\n"
@@ -299,27 +301,30 @@ msgid ""
 msgstr ""
 "Optionen:\n"
 "  --build=<Typ>[,…]   legt den Bau-<Typ> fest: full, source, binary, any,\n"
-"                        all (Vorgabe ist »full«)\n"
-"  -F                  normaler kompletter Bau (Quellen und Binärdateien,\n"
-"                        Standard)\n"
-"  -g                  Quell- und Architektur-unabhängiger Bau\n"
-"  -G                  Quell- und Architektur-abhängiger Bau\n"
-"  -b                  nur binär, keine Quelldateien\n"
-"  -B                  nur binär, nur Architektur-spezifische-Dateien\n"
-"  -A                  nur binär, nur Architektur-indep-Dateien\n"
-"  -S                  nur Quelle, keine Binärdateien\n"
+"                      all (Vorgabe ist »full«)\n"
+"  -F, --build=full    normaler kompletter Bau (Quellen und Binärdateien,\n"
+"                      Standard)\n"
+"  -g, --build=source,all  Quell- und Architektur-unabhängiger Bau\n"
+"  -G, --build=source,any  Quell- und Architektur-abhängiger Bau\n"
+"  -b, --build=binary      nur binär, keine Quelldateien\n"
+"  -B, --build=any         nur binär, nur Architektur-spezifische-Dateien\n"
+"  -A, --build=all         nur binär, nur Architektur-indep-Dateien\n"
+"  -S, --build=source      nur Quelle, keine Binärdateien\n"
 "  -nc, --no-pre-clean Quellbaum vorab nicht säubern (impliziert -b)\n"
 "       --pre-clean    Quellbaum vorab säubern (Standard)\n"
-"  -tc, --post-clean   nach Abschluss Quellbaum säubern\n"
-"  -D                  Bauabhängigkeiten und -konflikte prüfen, Standard\n"
-"  -d                  Bauabhängigkeiten und -konflikte nicht prüfen\n"
-"      --[no-]check-builddeps\n"
-"                      dito.\n"
+"      --no-post-clean Quellbaum nicht abschließend säubern (Standard).\n"
+"  -tc, --post-clean   Quellbaum abschließend säubern.\n"
+"  -D, --check-builddeps\n"
+"                      Bauabhängigkeiten und -konflikte prüfen (Standard)\n"
+"  -d, --no-check-builddeps Bauabhängigkeiten und -konflikte nicht prüfen\n"
 "      --ignore-builtin-builddeps\n"
 "                      eingebaute Bauabhängigkeiten nicht prüfen\n"
 "  -P, --build-profiles=<Profile>\n"
-"                      Kommata-getrennte übergebene Bauprofile als aktiv\n"
-"                        annehmen  -R, --rules-file=<rules>\n"
+"                      Kommata-getrennte übergebene Bau-<Profile> als aktiv\n"
+"                        annehmen\n"
+"  --rules-requires-root\n"
+"                      alten Feldwert »Rules-Requires-Root« annehmen\n"
+"  -R, --rules-file=<rules>\n"
 "                      auszuführende rules-Datei (Vorgabe: debian/rules)\n"
 "  -T, --rules-target=<Ziel>\n"
 "                      debian/rules <Ziel> mit der korrekten Umgebung "
@@ -350,7 +355,7 @@ msgstr ""
 "  -p, --sign-command=<Befehl>\n"
 "                      Befehl, um .dsc- und/oder .changes-Dateien zu "
 "signieren\n"
-"                        (standardmäßig gpg2 oder gpg)\n"
+"                        (standardmäßig gpg)\n"
 "  -k, --sign-key=<Schlüssel-ID>\n"
 "                      Für die Signierung zu verwendender Schlüssel\n"
 "  -ap, --sign-pause   Pause vor Beginn des Signaturprozesses einfügen\n"
@@ -455,23 +460,6 @@ msgid "unknown option or argument %s"
 msgstr "unbekannte Option oder Argument %s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "using a gain-root-command while being root"
-msgstr "Verwendung eines root-werde-Befehls, obwohl bereits root"
-
-#: scripts/dpkg-buildpackage.pl
-msgid ""
-"fakeroot not found, either install the fakeroot\n"
-"package, specify a command with the -r option, or run this as root"
-msgstr ""
-"Fakeroot nicht gefunden; installieren Sie entweder das Fakeroot-Paket,\n"
-"geben Sie einen Befehl mit der Option -r an oder führen Sie dies als root aus"
-
-#: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid "gain-root-command '%s' not found"
-msgstr "root-werde-Befehl »%s« nicht gefunden"
-
-#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "option %s is only meaningful with option %s"
 msgstr "Option %s hat nur zusammen mit der Option %s eine Bedeutung"
@@ -554,6 +542,23 @@ msgid "unable to determine %s"
 msgstr "%s kann nicht bestimmt werden"
 
 #: scripts/dpkg-buildpackage.pl
+msgid "using a gain-root-command while being root"
+msgstr "Verwendung eines root-werde-Befehls, obwohl bereits root"
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"fakeroot not found, either install the fakeroot\n"
+"package, specify a command with the -r option, or run this as root"
+msgstr ""
+"Fakeroot nicht gefunden; installieren Sie entweder das Fakeroot-Paket,\n"
+"geben Sie einen Befehl mit der Option -r an oder führen Sie dies als root aus"
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid "gain-root-command '%s' not found"
+msgstr "root-werde-Befehl »%s« nicht gefunden"
+
+#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "disallowed target in %s field keyword %s"
 msgstr "nicht erlaubtes Ziel im %s-Feld-Schlüsselwort %s"
@@ -585,6 +590,24 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "unbekannte %% Substitution in Hook: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"short OpenPGP key IDs are broken; please use key fingerprints in %s or %s "
+"instead"
+msgstr ""
+"kurze OpenGPG-Schlüsselkennungen sind defekt; bitte verwenden Sie "
+"stattdessen Fingerabdrücke in %s oder %s"
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"in %s or %s instead"
+msgstr ""
+"von langen OpenPGP-Schlüsselkennungen wird klar abgeraten; bitte verwenden "
+"Sie stattdessen Fingerabdrücke in %s oder %s"
+
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
 #: scripts/dpkg-genbuildinfo.pl scripts/dpkg-name.pl scripts/Dpkg/Arch.pm
 #: scripts/Dpkg/IPC.pm scripts/Dpkg/OpenPGP.pm scripts/Dpkg/Shlibs.pm
@@ -601,6 +624,11 @@ msgid "cannot close %s"
 msgstr "%s kann nicht geschlossen werden"
 
 #: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid "cannot move %s to %s"
+msgstr "%s kann nicht in %s verschoben werden"
+
+#: scripts/dpkg-buildpackage.pl
 msgid "source-only upload: Debian-native package"
 msgstr "Nur Quelle hochzuladen: Debian-native-Paket"
 
@@ -728,8 +756,9 @@ msgstr ""
 #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl
 #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm
-#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm
+#: scripts/Dpkg/Source/Quilt.pm
 #, perl-format
 msgid "cannot write %s"
 msgstr "%s kann nicht geschrieben werden"
@@ -865,7 +894,7 @@ msgstr "fehlende Sektion für Quelldateien"
 msgid "missing Priority for source files"
 msgstr "fehlende Priorität für Quelldateien"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm
+#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm
 #, perl-format
 msgid "%s is empty"
 msgstr "%s ist leer"
@@ -911,14 +940,6 @@ msgstr "binärer Bau ohne binäre Produkte gefunden; kann nicht verteilt werden"
 msgid "package %s in control file but not in files list"
 msgstr "Paket %s in Steuerdatei, aber nicht in Dateiliste"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm
-#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm
-#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Quilt.pm
-#, perl-format
-msgid "cannot read %s"
-msgstr "%s kann nicht gelesen werden"
-
 #: scripts/dpkg-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1073,6 +1094,8 @@ msgstr "Ausgabe-Steurdatei »%s« kann nicht installiert werden"
 #: scripts/dpkg-gensymbols.pl
 msgid ""
 "Options:\n"
+"  -l<library-path>         add directory to private shared library search "
+"list.\n"
 "  -p<package>              generate symbols file for package.\n"
 "  -P<package-build-dir>    temporary build directory instead of debian/tmp.\n"
 "  -e<library>              explicitly list libraries to scan.\n"
@@ -1106,6 +1129,8 @@ msgid ""
 "      --version            show the version.\n"
 msgstr ""
 "Optionen:\n"
+"  -l<library-path>         Verzeichnis zur privaten Suchliste für gemeinsam\n"
+"                           benutzte Bibliotheken hinzufügen\n"
 "  -p<Paket>                Symboldatei für Paket erstellen\n"
 "  -P<Paketbauverz>         temporäres Bauverzeichnis (statt debian/tmp)\n"
 "  -e<Bibliothek>           explizite Liste von zu durchsuchenden Dateien\n"
@@ -1356,6 +1381,7 @@ msgid ""
 "Parser options:\n"
 "      --format <output-format>\n"
 "                           set output format (defaults to 'dpkg').\n"
+"      --reverse            include all changes in reverse order.\n"
 "      --all                include all changes.\n"
 "  -s, --since <version>    include all changes later than <version>.\n"
 "  -v <version>             ditto.\n"
@@ -1373,6 +1399,8 @@ msgstr ""
 "Auswerteroptionen:\n"
 "      --format <Ausgabeformat>\n"
 "                           setzt das Ausgabeformat (Vorgabe: »dpkg«)\n"
+"      --reverse            fügt alle Änderungen in umgekehrter Reihenfolge "
+"ein\n"
 "      --all                fügt alle Änderungen hinzu\n"
 "  -s, --since <Version>    fügt alle Änderungen jünger als <Version> hinzu\n"
 "  -v <Version>             ebnso\n"
@@ -1519,6 +1547,10 @@ msgid "couldn't close stdout"
 msgstr "Stdout konnte nicht geschlossen werden"
 
 #: scripts/dpkg-scanpackages.pl
+msgid "Packages with multiple instances but no --multiversion specified:"
+msgstr "Pakete mit mehreren Instanzen aber kein --multiversion angegeben:"
+
+#: scripts/dpkg-scanpackages.pl
 msgid "Packages in override file with incorrect old maintainer value:"
 msgstr "Pakete in Override-Datei mit ungültigem alten Betreuer-Wert:"
 
@@ -1823,7 +1855,8 @@ msgid "shared libs info file '%s' line %d: bad line '%s'"
 msgstr ""
 "Informationsdatei »%s« der Laufzeitbibliothek, Zeile %d: ungültige Zeile »%s«"
 
-#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm
+#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm
+#: scripts/Dpkg/Checksums.pm
 #, perl-format
 msgid "cannot open file %s"
 msgstr "Datei %s kann nicht geöffnet werden"
@@ -1872,7 +1905,7 @@ msgstr "Verzeichnis %s kann nicht mit stat abgefragt werden"
 msgid "directory argument %s is not a directory"
 msgstr "Verzeichnis-Argument %s ist kein Verzeichnis"
 
-#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm
 #, perl-format
 msgid "unable to chdir to '%s'"
@@ -1900,6 +1933,11 @@ msgstr "eine Aktions-Option wird benötigt"
 
 #: scripts/dpkg-source.pl
 #, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr "kein Quellformat in %s angegeben, lesen Sie dpkg-source(1)"
+
+#: scripts/dpkg-source.pl
+#, perl-format
 msgid "%s doesn't contain any information about the source package"
 msgstr "%s enthält keine Informationen über das Quellpaket"
 
@@ -1932,11 +1970,6 @@ msgstr "Quelle für eine rein-binäre Veröffentlichung wird gebaut"
 
 #: scripts/dpkg-source.pl
 #, perl-format
-msgid "no source format specified in %s, see dpkg-source(1)"
-msgstr "kein Quellformat in %s angegeben, lesen Sie dpkg-source(1)"
-
-#: scripts/dpkg-source.pl
-#, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "unmöglich, mit Quellformat »%s« zu bauen: %s"
 
@@ -2197,6 +2230,14 @@ msgstr ""
 msgid "'%s' is not a legal architecture in list '%s'"
 msgstr "»%s« ist keine gültige Architektur in der Liste »%s«"
 
+#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm
+#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm
+#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm
+#, perl-format
+msgid "cannot read %s"
+msgstr "%s kann nicht gelesen werden"
+
 #: scripts/Dpkg/BuildFlags.pm
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
@@ -2268,8 +2309,8 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog.pm
 #, perl-format
-msgid "'%s' option specifies non-existing version"
-msgstr "Option »%s« gibt nicht existierende Version an"
+msgid "'%s' option specifies non-existing version '%s'"
+msgstr "Option »%s« gibt nicht existierende Version »%s« an"
 
 #: scripts/Dpkg/Changelog.pm
 msgid "use newest entry that is earlier than the one specified"
@@ -2285,16 +2326,18 @@ msgstr "ältester Eintrag wird verwendet, der neuer als der angegebene ist"
 
 #: scripts/Dpkg/Changelog.pm
 #, perl-format
-msgid "no such entry found, ignoring '%s' parameter"
-msgstr "kein solcher Eintrag gefunden, Parameter »%s« wird ignoriert"
+msgid "no such entry found, ignoring '%s' parameter '%s'"
+msgstr "kein solcher Eintrag gefunden, »%s«-Parameter »%s« wird ignoriert"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'since' option specifies most recent version, ignoring"
-msgstr "Option »since« gibt die neuste Version an, wird ignoriert"
+#, perl-format
+msgid "'since' option specifies most recent version '%s', ignoring"
+msgstr "Option »since« gibt die neuste Version »%s« an, wird ignoriert"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'until' option specifies oldest version, ignoring"
-msgstr "Option »until« gibt die älteste Version an, wird ignoriert"
+#, perl-format
+msgid "'until' option specifies oldest version '%s', ignoring"
+msgstr "Option »until« gibt die älteste Version »%s« an, wird ignoriert"
 
 #: scripts/Dpkg/Changelog/Debian.pm
 msgid "first heading"
@@ -2400,7 +2443,7 @@ msgstr "ungültig abgekürzter Monatsname »%s«"
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
 #, perl-format
-msgid "cannot parse non-comformant date '%s'"
+msgid "cannot parse non-conformant date '%s'"
 msgstr "nicht konformes Datum kann nicht ausgewertet werden: »%s«"
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -2409,13 +2452,8 @@ msgstr "der Abspann passte nicht auf den erwarteten regulären Ausdruck"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "cannot create pipe for %s"
-msgstr "Pipe für %s kann nicht angelegt werden"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "tail of %s"
-msgstr "Ende von %s"
+msgid "cannot seek into file %s"
+msgstr "auf die Datei %s kann nicht mit seek zugegriffen werden"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
@@ -2750,6 +2788,28 @@ msgstr "Programm %s kann nicht ausgeführt werden"
 msgid "cannot write signature file %s"
 msgstr "Signaturdatei %s kann nicht geschrieben werden"
 
+#: scripts/Dpkg/OpenPGP.pm
+#, perl-format
+msgid "cannot import key in %s since GnuPG is not installed"
+msgstr ""
+"Schlüssel kann nicht in %s importiert werden, da GnuPG nicht installiert ist"
+
+#: scripts/Dpkg/OpenPGP.pm
+#, perl-format
+msgid "failed to import key in %s"
+msgstr "Fehlschlag beim Import des Schlüssels in %s"
+
+#: scripts/Dpkg/OpenPGP.pm
+#, perl-format
+msgid "cannot verify signature on %s since GnuPG is not installed"
+msgstr ""
+"Signatur von %s kann nicht überprüft werden, da GnuPG nicht installiert ist"
+
+#: scripts/Dpkg/OpenPGP.pm
+#, perl-format
+msgid "failed to verify signature on %s"
+msgstr "Fehler beim Überprüfen der Signatur von %s"
+
 #: scripts/Dpkg/Package.pm
 msgid "may not be empty string"
 msgstr "darf keine leere Zeichenkette sein"
@@ -2763,6 +2823,14 @@ msgstr "Zeichen »%s« ist nicht erlaubt"
 msgid "must start with an alphanumeric character"
 msgstr "muss mit einem alphanumerischen Zeichen beginnen"
 
+#: scripts/Dpkg/Shlibs.pm
+msgid ""
+"deprecated use of LD_LIBRARY_PATH with private library directory which "
+"interferes with cross-building, please use -l option instead"
+msgstr ""
+"veraltete Verwendung von LD_LIBRARY_PATH mit privaten Bibliotheksverzeichnis "
+"stört Cross-Bau, bitte verwenden Sie stattdessen die Option »-l«"
+
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "unknown executable format in file '%s'"
@@ -2868,6 +2936,36 @@ msgstr "Zeitstempel für %s kann nicht geändert werden"
 msgid "cannot read timestamp from %s"
 msgstr "Zeitstempel für %s kann nicht gelesen werden"
 
+#: scripts/Dpkg/Source/Functions.pm
+#, perl-format
+msgid "cannot open file %s for binary detection"
+msgstr "kann Datei %s nicht zur Binärerkennung öffnen"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "adding %s to %s"
+msgstr "%s wird zu %s hinzugefügt"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "unwanted binary file: %s"
+msgstr "unerwünschte Binärdatei: %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid ""
+"detected %d unwanted binary file (add it in debian/source/include-binaries "
+"to allow its inclusion)."
+msgid_plural ""
+"detected %d unwanted binary files (add them in debian/source/include-"
+"binaries to allow their inclusion)."
+msgstr[0] ""
+"erkannte %d unerwünschte Binärdatei (fügen Sie sie zu debian/source/include-"
+"binaries hinzu, um ihre Aufnahme zu erlauben)."
+msgstr[1] ""
+"erkannte %d unerwünschte Binärdateien (fügen Sie sie zu debian/source/"
+"include-binaries hinzu, um ihre Aufnahme zu erlauben)."
+
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
 msgid "%s is not the name of a file"
@@ -2884,15 +2982,6 @@ msgid "source package format '%s' is not supported: %s"
 msgstr "Quellpaketformat »%s« wird nicht unterstützt: %s"
 
 #: scripts/Dpkg/Source/Package.pm
-msgid "format variant must be in lowercase"
-msgstr "Formatvariante muss Kleinbuchstaben verwenden"
-
-#: scripts/Dpkg/Source/Package.pm
-#, perl-format
-msgid "invalid Format field '%s'"
-msgstr "ungültiges Formatfeld »%s«"
-
-#: scripts/Dpkg/Source/Package.pm
 msgid "source package uses only weak checksums"
 msgstr "Quellpaket verwendet nur schwache Prüfsummen"
 
@@ -2904,15 +2993,10 @@ msgstr ""
 "ermitteln"
 
 #: scripts/Dpkg/Source/Package.pm
-#, perl-format
-msgid "failed to verify signature on %s"
-msgstr "Fehler beim Überprüfen der Signatur von %s"
-
-#: scripts/Dpkg/Source/Package.pm
-#, perl-format
-msgid "cannot verify signature on %s since GnuPG is not installed"
+msgid "upstream tarball signatures but no upstream signing key"
 msgstr ""
-"Signatur von %s kann nicht überprüft werden, da GnuPG nicht installiert ist"
+"Tarball-Signatur der Originalautoren aber kein Signaturschlüssel der "
+"Originalautoren"
 
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
@@ -2921,6 +3005,11 @@ msgstr "%s ist keine gültige Option für %s."
 
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
+msgid "cannot copy %s to %s"
+msgstr "%s kann nicht nach %s kopiert werden"
+
+#: scripts/Dpkg/Source/Package.pm
+#, perl-format
 msgid "%s does not exist"
 msgstr "%s existiert nicht."
 
@@ -3316,26 +3405,6 @@ msgstr "lokale Änderungen erkannt, die veränderten Dateien sind:"
 msgid "-b takes only one parameter with format '%s'"
 msgstr "-b akzeptiert nur einen Parameter mit dem Format »%s«"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "unwanted binary file: %s"
-msgstr "unerwünschte Binärdatei: %s"
-
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid ""
-"detected %d unwanted binary file (add it in debian/source/include-binaries "
-"to allow its inclusion)."
-msgid_plural ""
-"detected %d unwanted binary files (add them in debian/source/include-"
-"binaries to allow their inclusion)."
-msgstr[0] ""
-"erkannte %d unerwünschte Binärdatei (fügen Sie sie zu debian/source/include-"
-"binaries hinzu, um ihre Aufnahme zu erlauben)."
-msgstr[1] ""
-"erkannte %d unerwünschte Binärdateien (fügen Sie sie zu debian/source/"
-"include-binaries hinzu, um ihre Aufnahme zu erlauben)."
-
 #: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "cannot represent change to %s: %s"
@@ -3408,11 +3477,6 @@ msgstr "Kein Patch-Name angegeben; es kann nicht fortgefahren werden"
 msgid "cannot find an editor"
 msgstr "Es kann kein Editor gefunden werden"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "adding %s to %s"
-msgstr "%s wird zu %s hinzugefügt"
-
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 msgid "cannot unpack bzr-format source package because bzr is not in the PATH"
 msgstr ""
@@ -3453,8 +3517,8 @@ msgstr ""
 "noch nicht übergebene, nicht ignorierte Änderungen im Arbeitsverzeichnis: %s"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
-msgid "format v3.0 uses only one source file"
-msgstr "Format v3.0 verwendet nur eine Quelldatei"
+msgid "format v3.0 (bzr) uses only one source file"
+msgstr "Format v3.0 (bzr) verwendet nur eine Quelldatei"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 #, perl-format
@@ -3579,6 +3643,11 @@ msgstr "Symlink %s kann nicht angelegt werden"
 
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
 #, perl-format
+msgid "using patch list from %s"
+msgstr "Patchliste aus %s wird verwendet"
+
+#: scripts/Dpkg/Source/Package/V3/Quilt.pm
+#, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "nicht unterstützte Version der Quilt-Metadaten: %s"
 
@@ -3623,6 +3692,11 @@ msgstr "unbekannter Dateityp"
 
 #: scripts/Dpkg/Source/Patch.pm
 #, perl-format
+msgid "ignoring deletion of file %s"
+msgstr "Löschen der Datei %s wird ignoriert"
+
+#: scripts/Dpkg/Source/Patch.pm
+#, perl-format
 msgid "ignoring deletion of file %s, use --include-removal to override"
 msgstr ""
 "Löschen der Datei %s wird ignoriert, verwenden Sie --include-removal zum "
@@ -3863,13 +3937,13 @@ msgstr "veraltete Substitutionsvariable ${%s}"
 
 #: scripts/Dpkg/Substvars.pm
 #, perl-format
-msgid "unknown substitution variable ${%s}"
-msgstr "unbekannte Substitutionsvariable ${%s}"
+msgid "substitution variable ${%s} used, but is not defined"
+msgstr "unbenutzte Variable ${%s} verwandt, aber nicht definiert"
 
 #: scripts/Dpkg/Substvars.pm
 #, perl-format
-msgid "unused substitution variable ${%s}"
-msgstr "unbenutzte Substitutionsvariable ${%s}"
+msgid "substitution variable ${%s} unused, but is defined"
+msgstr "Substitutionsvariable ${%s} unbenutzt, aber definiert"
 
 #: scripts/Dpkg/Vars.pm
 #, perl-format
@@ -3937,6 +4011,21 @@ msgstr "Versionsnummer enthält ungültiges Zeichen »%s«"
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: »%s«"
 
+#~ msgid "format variant must be in lowercase"
+#~ msgstr "Formatvariante muss Kleinbuchstaben verwenden"
+
+#~ msgid "invalid Format field '%s'"
+#~ msgstr "ungültiges Formatfeld »%s«"
+
+#~ msgid "unknown substitution variable ${%s}"
+#~ msgstr "unbekannte Substitutionsvariable ${%s}"
+
+#~ msgid "cannot create pipe for %s"
+#~ msgstr "Pipe für %s kann nicht angelegt werden"
+
+#~ msgid "tail of %s"
+#~ msgstr "Ende von %s"
+
 #~ msgid "%s died from signal %s"
 #~ msgstr "%s wurde durch Signal %s getötet"
 
@@ -4480,9 +4569,6 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: »%s«"
 #~ msgid "1 to 3 args expected\n"
 #~ msgstr "1 bis 3 Argumente erwartet\n"
 
-#~ msgid "cannot rename %s to %s"
-#~ msgstr "%s kann nicht in %s umbenannt werden"
-
 #~ msgid "no orig.tar file found"
 #~ msgstr "keine orig.tar-Datei gefunden"
 
@@ -4772,9 +4858,6 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: »%s«"
 #~ msgid "diff `%s' is missing trailing newline"
 #~ msgstr "Diff »%s« fehlt ein abschließender Zeilenumbruch"
 
-#~ msgid "cannot open upload file %s for reading"
-#~ msgstr "kann hochzuladene Datei %s nicht zum Lesen öffnen"
-
 #~ msgid "cannot fstat upload file %s"
 #~ msgstr "kann keinen »fstat« auf hochzuladene Datei %s durchführen"
 
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 31a0a9275..b08bc755e 100644
--- a/scripts/po/dpkg-dev.pot
+++ b/scripts/po/dpkg-dev.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.0\n"
+"Project-Id-Version: dpkg 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -178,27 +178,29 @@ msgid ""
 "      --build=<type>[,...]    specify the build <type>: full, source, "
 "binary,\n"
 "                                any, all (default is 'full').\n"
-"  -F                          normal full build (source and binary; "
+"  -F, --build=full            normal full build (source and binary; "
 "default).\n"
-"  -g                          source and arch-indep build.\n"
-"  -G                          source and arch-specific build.\n"
-"  -b                          binary-only, no source files.\n"
-"  -B                          binary-only, only arch-specific files.\n"
-"  -A                          binary-only, only arch-indep files.\n"
-"  -S                          source-only, no binary files.\n"
+"  -g, --build=source,all      source and arch-indep build.\n"
+"  -G, --build=source,any      source and arch-specific build.\n"
+"  -b, --build=binary          binary-only, no source files.\n"
+"  -B, --build=any             binary-only, only arch-specific files.\n"
+"  -A, --build=all             binary-only, only arch-indep files.\n"
+"  -S, --build=source          source-only, no binary files.\n"
 "  -nc, --no-pre-clean         do not pre clean source tree (implies -b).\n"
-"       --pre-clean            pre clean source tree (default).\n"
-"  -tc, --post-clean           clean source tree when finished.\n"
-"  -D                          check build dependencies and conflicts "
+"      --pre-clean             pre clean source tree (default).\n"
+"      --no-post-clean         do not post clean source tree (default).\n"
+"  -tc, --post-clean           post clean source tree.\n"
+"  -D, --check-builddeps       check build dependencies and conflicts "
 "(default).\n"
-"  -d                          do not check build dependencies and "
+"  -d, --no-check-builddeps    do not check build dependencies and "
 "conflicts.\n"
-"      --[no-]check-builddeps  ditto.\n"
 "      --ignore-builtin-builddeps\n"
 "                              do not check builtin build dependencies.\n"
 "  -P, --build-profiles=<profiles>\n"
-"                              assume comma-separated build profiles as "
+"                              assume comma-separated build <profiles> as "
 "active.\n"
+"      --rules-requires-root   assume legacy Rules-Requires-Root field "
+"value.\n"
 "  -R, --rules-file=<rules>    rules file to execute (default is debian/"
 "rules).\n"
 "  -T, --rules-target=<target> call debian/rules <target>.\n"
@@ -302,21 +304,6 @@ msgid "unknown option or argument %s"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl
-msgid "using a gain-root-command while being root"
-msgstr ""
-
-#: scripts/dpkg-buildpackage.pl
-msgid ""
-"fakeroot not found, either install the fakeroot\n"
-"package, specify a command with the -r option, or run this as root"
-msgstr ""
-
-#: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid "gain-root-command '%s' not found"
-msgstr ""
-
-#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "option %s is only meaningful with option %s"
 msgstr ""
@@ -396,6 +383,21 @@ msgid "unable to determine %s"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl
+msgid "using a gain-root-command while being root"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"fakeroot not found, either install the fakeroot\n"
+"package, specify a command with the -r option, or run this as root"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid "gain-root-command '%s' not found"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "disallowed target in %s field keyword %s"
 msgstr ""
@@ -425,6 +427,20 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr ""
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"short OpenPGP key IDs are broken; please use key fingerprints in %s or %s "
+"instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"in %s or %s instead"
+msgstr ""
+
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
 #: scripts/dpkg-genbuildinfo.pl scripts/dpkg-name.pl scripts/Dpkg/Arch.pm
 #: scripts/Dpkg/IPC.pm scripts/Dpkg/OpenPGP.pm scripts/Dpkg/Shlibs.pm
@@ -542,8 +558,9 @@ msgstr ""
 #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl
 #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm
-#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm
+#: scripts/Dpkg/Source/Quilt.pm
 #, perl-format
 msgid "cannot write %s"
 msgstr ""
@@ -626,7 +643,7 @@ msgstr ""
 msgid "missing Priority for source files"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm
+#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm
 #, perl-format
 msgid "%s is empty"
 msgstr ""
@@ -668,14 +685,6 @@ msgstr ""
 msgid "package %s in control file but not in files list"
 msgstr ""
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm
-#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm
-#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Quilt.pm
-#, perl-format
-msgid "cannot read %s"
-msgstr ""
-
 #: scripts/dpkg-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -806,6 +815,8 @@ msgstr ""
 #: scripts/dpkg-gensymbols.pl
 msgid ""
 "Options:\n"
+"  -l<library-path>         add directory to private shared library search "
+"list.\n"
 "  -p<package>              generate symbols file for package.\n"
 "  -P<package-build-dir>    temporary build directory instead of debian/tmp.\n"
 "  -e<library>              explicitly list libraries to scan.\n"
@@ -1027,6 +1038,7 @@ msgid ""
 "Parser options:\n"
 "      --format <output-format>\n"
 "                           set output format (defaults to 'dpkg').\n"
+"      --reverse            include all changes in reverse order.\n"
 "      --all                include all changes.\n"
 "  -s, --since <version>    include all changes later than <version>.\n"
 "  -v <version>             ditto.\n"
@@ -1154,6 +1166,10 @@ msgid "couldn't close stdout"
 msgstr ""
 
 #: scripts/dpkg-scanpackages.pl
+msgid "Packages with multiple instances but no --multiversion specified:"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl
 msgid "Packages in override file with incorrect old maintainer value:"
 msgstr ""
 
@@ -1382,7 +1398,8 @@ msgstr ""
 msgid "shared libs info file '%s' line %d: bad line '%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm
+#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm
+#: scripts/Dpkg/Checksums.pm
 #, perl-format
 msgid "cannot open file %s"
 msgstr ""
@@ -1428,7 +1445,7 @@ msgstr ""
 msgid "directory argument %s is not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm
 #, perl-format
 msgid "unable to chdir to '%s'"
@@ -1456,6 +1473,11 @@ msgstr ""
 
 #: scripts/dpkg-source.pl
 #, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr ""
+
+#: scripts/dpkg-source.pl
+#, perl-format
 msgid "%s doesn't contain any information about the source package"
 msgstr ""
 
@@ -1486,11 +1508,6 @@ msgstr ""
 
 #: scripts/dpkg-source.pl
 #, perl-format
-msgid "no source format specified in %s, see dpkg-source(1)"
-msgstr ""
-
-#: scripts/dpkg-source.pl
-#, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr ""
 
@@ -1673,6 +1690,14 @@ msgstr ""
 msgid "'%s' is not a legal architecture in list '%s'"
 msgstr ""
 
+#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm
+#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm
+#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm
+#, perl-format
+msgid "cannot read %s"
+msgstr ""
+
 #: scripts/Dpkg/BuildFlags.pm
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
@@ -1738,7 +1763,7 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog.pm
 #, perl-format
-msgid "'%s' option specifies non-existing version"
+msgid "'%s' option specifies non-existing version '%s'"
 msgstr ""
 
 #: scripts/Dpkg/Changelog.pm
@@ -1755,15 +1780,17 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog.pm
 #, perl-format
-msgid "no such entry found, ignoring '%s' parameter"
+msgid "no such entry found, ignoring '%s' parameter '%s'"
 msgstr ""
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'since' option specifies most recent version, ignoring"
+#, perl-format
+msgid "'since' option specifies most recent version '%s', ignoring"
 msgstr ""
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'until' option specifies oldest version, ignoring"
+#, perl-format
+msgid "'until' option specifies oldest version '%s', ignoring"
 msgstr ""
 
 #: scripts/Dpkg/Changelog/Debian.pm
@@ -1870,7 +1897,7 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
 #, perl-format
-msgid "cannot parse non-comformant date '%s'"
+msgid "cannot parse non-conformant date '%s'"
 msgstr ""
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -1879,12 +1906,7 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "cannot create pipe for %s"
-msgstr ""
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "tail of %s"
+msgid "cannot seek into file %s"
 msgstr ""
 
 #: scripts/Dpkg/Changelog/Parse.pm
@@ -2228,6 +2250,12 @@ msgstr ""
 msgid "must start with an alphanumeric character"
 msgstr ""
 
+#: scripts/Dpkg/Shlibs.pm
+msgid ""
+"deprecated use of LD_LIBRARY_PATH with private library directory which "
+"interferes with cross-building, please use -l option instead"
+msgstr ""
+
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "unknown executable format in file '%s'"
@@ -2326,28 +2354,45 @@ msgstr ""
 msgid "cannot read timestamp from %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/Functions.pm
 #, perl-format
-msgid "%s is not the name of a file"
+msgid "cannot open file %s for binary detection"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm
 #, perl-format
-msgid "missing critical source control field %s"
+msgid "adding %s to %s"
 msgstr ""
 
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "unwanted binary file: %s"
+msgstr ""
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid ""
+"detected %d unwanted binary file (add it in debian/source/include-binaries "
+"to allow its inclusion)."
+msgid_plural ""
+"detected %d unwanted binary files (add them in debian/source/include-"
+"binaries to allow their inclusion)."
+msgstr[0] ""
+msgstr[1] ""
+
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
-msgid "source package format '%s' is not supported: %s"
+msgid "%s is not the name of a file"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package.pm
-msgid "format variant must be in lowercase"
+#, perl-format
+msgid "missing critical source control field %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
-msgid "invalid Format field '%s'"
+msgid "source package format '%s' is not supported: %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package.pm
@@ -2749,22 +2794,6 @@ msgstr ""
 msgid "-b takes only one parameter with format '%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "unwanted binary file: %s"
-msgstr ""
-
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid ""
-"detected %d unwanted binary file (add it in debian/source/include-binaries "
-"to allow its inclusion)."
-msgid_plural ""
-"detected %d unwanted binary files (add them in debian/source/include-"
-"binaries to allow their inclusion)."
-msgstr[0] ""
-msgstr[1] ""
-
 #: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "cannot represent change to %s: %s"
@@ -2833,11 +2862,6 @@ msgstr ""
 msgid "cannot find an editor"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "adding %s to %s"
-msgstr ""
-
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 msgid "cannot unpack bzr-format source package because bzr is not in the PATH"
 msgstr ""
@@ -2873,7 +2897,7 @@ msgid "uncommitted, not-ignored changes in working directory: %s"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
-msgid "format v3.0 uses only one source file"
+msgid "format v3.0 (bzr) uses only one source file"
 msgstr ""
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
@@ -2994,6 +3018,11 @@ msgstr ""
 
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
 #, perl-format
+msgid "using patch list from %s"
+msgstr ""
+
+#: scripts/Dpkg/Source/Package/V3/Quilt.pm
+#, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr ""
 
@@ -3036,6 +3065,11 @@ msgstr ""
 
 #: scripts/Dpkg/Source/Patch.pm
 #, perl-format
+msgid "ignoring deletion of file %s"
+msgstr ""
+
+#: scripts/Dpkg/Source/Patch.pm
+#, perl-format
 msgid "ignoring deletion of file %s, use --include-removal to override"
 msgstr ""
 
@@ -3267,12 +3301,12 @@ msgstr ""
 
 #: scripts/Dpkg/Substvars.pm
 #, perl-format
-msgid "unknown substitution variable ${%s}"
+msgid "substitution variable ${%s} used, but is not defined"
 msgstr ""
 
 #: scripts/Dpkg/Substvars.pm
 #, perl-format
-msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} unused, but is defined"
 msgstr ""
 
 #: scripts/Dpkg/Vars.pm
diff --git a/scripts/po/es.po b/scripts/po/es.po
index 7b79cb143..c01c9bde8 100644
--- a/scripts/po/es.po
+++ b/scripts/po/es.po
@@ -31,7 +31,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2014-12-02 20:24+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -338,27 +338,29 @@ msgid ""
 "      --build=<type>[,...]    specify the build <type>: full, source, "
 "binary,\n"
 "                                any, all (default is 'full').\n"
-"  -F                          normal full build (source and binary; "
+"  -F, --build=full            normal full build (source and binary; "
 "default).\n"
-"  -g                          source and arch-indep build.\n"
-"  -G                          source and arch-specific build.\n"
-"  -b                          binary-only, no source files.\n"
-"  -B                          binary-only, only arch-specific files.\n"
-"  -A                          binary-only, only arch-indep files.\n"
-"  -S                          source-only, no binary files.\n"
+"  -g, --build=source,all      source and arch-indep build.\n"
+"  -G, --build=source,any      source and arch-specific build.\n"
+"  -b, --build=binary          binary-only, no source files.\n"
+"  -B, --build=any             binary-only, only arch-specific files.\n"
+"  -A, --build=all             binary-only, only arch-indep files.\n"
+"  -S, --build=source          source-only, no binary files.\n"
 "  -nc, --no-pre-clean         do not pre clean source tree (implies -b).\n"
-"       --pre-clean            pre clean source tree (default).\n"
-"  -tc, --post-clean           clean source tree when finished.\n"
-"  -D                          check build dependencies and conflicts "
+"      --pre-clean             pre clean source tree (default).\n"
+"      --no-post-clean         do not post clean source tree (default).\n"
+"  -tc, --post-clean           post clean source tree.\n"
+"  -D, --check-builddeps       check build dependencies and conflicts "
 "(default).\n"
-"  -d                          do not check build dependencies and "
+"  -d, --no-check-builddeps    do not check build dependencies and "
 "conflicts.\n"
-"      --[no-]check-builddeps  ditto.\n"
 "      --ignore-builtin-builddeps\n"
 "                              do not check builtin build dependencies.\n"
 "  -P, --build-profiles=<profiles>\n"
-"                              assume comma-separated build profiles as "
+"                              assume comma-separated build <profiles> as "
 "active.\n"
+"      --rules-requires-root   assume legacy Rules-Requires-Root field "
+"value.\n"
 "  -R, --rules-file=<rules>    rules file to execute (default is debian/"
 "rules).\n"
 "  -T, --rules-target=<target> call debian/rules <target>.\n"
@@ -569,25 +571,6 @@ msgid "unknown option or argument %s"
 msgstr "el argumento u opción «%s» es desconocido"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "using a gain-root-command while being root"
-msgstr ""
-"está usando una orden para convertirse en administrador («gain-root-"
-"command»), a pesar de que ya es el administrador"
-
-#: scripts/dpkg-buildpackage.pl
-msgid ""
-"fakeroot not found, either install the fakeroot\n"
-"package, specify a command with the -r option, or run this as root"
-msgstr ""
-"no se ha encontrado fakeroot; puede instalar el paquete fakeroot,\n"
-"definir una orden con la opción «-r», o ejecutar esto como administrador"
-
-#: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid "gain-root-command '%s' not found"
-msgstr "no se ha encontrado la orden «%s» para convertirse en administrador"
-
-#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "option %s is only meaningful with option %s"
 msgstr ""
@@ -676,6 +659,25 @@ msgid "unable to determine %s"
 msgstr "no se pudo determinar «%s»"
 
 #: scripts/dpkg-buildpackage.pl
+msgid "using a gain-root-command while being root"
+msgstr ""
+"está usando una orden para convertirse en administrador («gain-root-"
+"command»), a pesar de que ya es el administrador"
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"fakeroot not found, either install the fakeroot\n"
+"package, specify a command with the -r option, or run this as root"
+msgstr ""
+"no se ha encontrado fakeroot; puede instalar el paquete fakeroot,\n"
+"definir una orden con la opción «-r», o ejecutar esto como administrador"
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid "gain-root-command '%s' not found"
+msgstr "no se ha encontrado la orden «%s» para convertirse en administrador"
+
+#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "disallowed target in %s field keyword %s"
 msgstr ""
@@ -706,6 +708,20 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "variable de sustitución %% desconocida en gancho: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"short OpenPGP key IDs are broken; please use key fingerprints in %s or %s "
+"instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"in %s or %s instead"
+msgstr ""
+
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
 #: scripts/dpkg-genbuildinfo.pl scripts/dpkg-name.pl scripts/Dpkg/Arch.pm
 #: scripts/Dpkg/IPC.pm scripts/Dpkg/OpenPGP.pm scripts/Dpkg/Shlibs.pm
@@ -873,8 +889,9 @@ msgstr ""
 #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl
 #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm
-#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm
+#: scripts/Dpkg/Source/Quilt.pm
 #, perl-format
 msgid "cannot write %s"
 msgstr "no se pudo escribir «%s»"
@@ -1027,7 +1044,7 @@ msgstr "falta el campo «Section» para los ficheros de fuentes"
 msgid "missing Priority for source files"
 msgstr "falta el campo «Priority» para los ficheros de fuentes"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm
+#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm
 #, perl-format
 msgid "%s is empty"
 msgstr "%s está vacío"
@@ -1083,14 +1100,6 @@ msgstr ""
 "el paquete %s está presente en el fichero «control» pero no en la lista de "
 "ficheros"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm
-#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm
-#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Quilt.pm
-#, perl-format
-msgid "cannot read %s"
-msgstr "no se puede leer %s"
-
 #: scripts/dpkg-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1312,6 +1321,8 @@ msgstr "no se ha podido instalar el fichero de control de salida «%s»"
 #| "      --version            show the version.\n"
 msgid ""
 "Options:\n"
+"  -l<library-path>         add directory to private shared library search "
+"list.\n"
 "  -p<package>              generate symbols file for package.\n"
 "  -P<package-build-dir>    temporary build directory instead of debian/tmp.\n"
 "  -e<library>              explicitly list libraries to scan.\n"
@@ -1653,6 +1664,7 @@ msgid ""
 "Parser options:\n"
 "      --format <output-format>\n"
 "                           set output format (defaults to 'dpkg').\n"
+"      --reverse            include all changes in reverse order.\n"
 "      --all                include all changes.\n"
 "  -s, --since <version>    include all changes later than <version>.\n"
 "  -v <version>             ditto.\n"
@@ -1844,6 +1856,10 @@ msgid "couldn't close stdout"
 msgstr "No se ha podido cerrar la salida estándar"
 
 #: scripts/dpkg-scanpackages.pl
+msgid "Packages with multiple instances but no --multiversion specified:"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl
 msgid "Packages in override file with incorrect old maintainer value:"
 msgstr ""
 "Paquetes en el fichero de sustituciones «override» con un valor incorrecto "
@@ -2189,7 +2205,8 @@ msgstr ""
 "fichero de información de bibliotecas compartidas «%s», línea %d: línea "
 "incorrecta «%s»"
 
-#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm
+#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm
+#: scripts/Dpkg/Checksums.pm
 #, perl-format
 msgid "cannot open file %s"
 msgstr "no se ha podido abrir el fichero «%s»"
@@ -2239,7 +2256,7 @@ msgstr "no se pudo obtener el estado («stat») del directorio «%s»"
 msgid "directory argument %s is not a directory"
 msgstr "el argumento de directorio «%s» no es un directorio"
 
-#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm
 #, perl-format
 msgid "unable to chdir to '%s'"
@@ -2267,6 +2284,12 @@ msgstr "es necesaria una opción de acción"
 
 #: scripts/dpkg-source.pl
 #, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr ""
+"no se ha definido un formato de fuentes en «%s», consulte dpkg-source(1)"
+
+#: scripts/dpkg-source.pl
+#, perl-format
 msgid "%s doesn't contain any information about the source package"
 msgstr "%s no contiene información sobre el paquete fuente"
 
@@ -2301,12 +2324,6 @@ msgstr "generando fuentes para una publicación solo binaria"
 
 #: scripts/dpkg-source.pl
 #, perl-format
-msgid "no source format specified in %s, see dpkg-source(1)"
-msgstr ""
-"no se ha definido un formato de fuentes en «%s», consulte dpkg-source(1)"
-
-#: scripts/dpkg-source.pl
-#, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "no se puede construir con el formato de fuente «%s»: %s"
 
@@ -2600,6 +2617,14 @@ msgstr ""
 msgid "'%s' is not a legal architecture in list '%s'"
 msgstr "«%s» no es una cadena de arquitectura legal"
 
+#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm
+#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm
+#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm
+#, perl-format
+msgid "cannot read %s"
+msgstr "no se puede leer %s"
+
 #: scripts/Dpkg/BuildFlags.pm
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
@@ -2668,8 +2693,9 @@ msgid "you can only specify one of 'to' and 'until', using 'until'"
 msgstr "sólo puede definir o bien «to» o «until», usando «until»"
 
 #: scripts/Dpkg/Changelog.pm
-#, perl-format
-msgid "'%s' option specifies non-existing version"
+#, fuzzy, perl-format
+#| msgid "'%s' option specifies non-existing version"
+msgid "'%s' option specifies non-existing version '%s'"
 msgstr "la opción «%s» define un versión que no existe"
 
 #: scripts/Dpkg/Changelog.pm
@@ -2685,16 +2711,21 @@ msgid "use oldest entry that is later than the one specified"
 msgstr "usar la entrada más antigua que es posterior a la que se ha definido"
 
 #: scripts/Dpkg/Changelog.pm
-#, perl-format
-msgid "no such entry found, ignoring '%s' parameter"
+#, fuzzy, perl-format
+#| msgid "no such entry found, ignoring '%s' parameter"
+msgid "no such entry found, ignoring '%s' parameter '%s'"
 msgstr "no se ha encontrado esa entrada, ignorando el parámetro «%s»"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'since' option specifies most recent version, ignoring"
+#, fuzzy, perl-format
+#| msgid "'since' option specifies most recent version, ignoring"
+msgid "'since' option specifies most recent version '%s', ignoring"
 msgstr "la opción «since» define la versión más reciente, omitiendo"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'until' option specifies oldest version, ignoring"
+#, fuzzy, perl-format
+#| msgid "'until' option specifies oldest version, ignoring"
+msgid "'until' option specifies oldest version '%s', ignoring"
 msgstr "la opción «until» define la versión más antigua, omitiendo"
 
 #: scripts/Dpkg/Changelog/Debian.pm
@@ -2809,7 +2840,7 @@ msgstr "se ha detectado una opción inválida en %s: %s"
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
 #, fuzzy, perl-format
 #| msgid "cannot exec format parser: %s"
-msgid "cannot parse non-comformant date '%s'"
+msgid "cannot parse non-conformant date '%s'"
 msgstr "no se puede ejecutar el analizador de formato: %s"
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -2820,14 +2851,9 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
-#| msgid "cannot create directory %s"
-msgid "cannot create pipe for %s"
-msgstr "no se puede crear el directorio «%s»"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "tail of %s"
-msgstr "final de «%s»"
+#| msgid "cannot stat file %s"
+msgid "cannot seek into file %s"
+msgstr "no se puede obtener el estado (stat) del fichero «%s»"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
@@ -3215,6 +3241,12 @@ msgstr "no se permite el carácter «%s»"
 msgid "must start with an alphanumeric character"
 msgstr "debe empezar con un carácter alfanumérico"
 
+#: scripts/Dpkg/Shlibs.pm
+msgid ""
+"deprecated use of LD_LIBRARY_PATH with private library directory which "
+"interferes with cross-building, please use -l option instead"
+msgstr ""
+
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, fuzzy, perl-format
 #| msgid "cannot exec format parser: %s"
@@ -3328,6 +3360,37 @@ msgstr "no se puede cambiar la marca de tiempo de «%s»"
 msgid "cannot read timestamp from %s"
 msgstr "no se puede leer la marca de tiempo desde «%s»"
 
+#: scripts/Dpkg/Source/Functions.pm
+#, fuzzy, perl-format
+#| msgid "cannot open file %s"
+msgid "cannot open file %s for binary detection"
+msgstr "no se ha podido abrir el fichero «%s»"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "adding %s to %s"
+msgstr "añadiendo «%s» a «%s»"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "unwanted binary file: %s"
+msgstr "fichero binario no deseado: %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid ""
+"detected %d unwanted binary file (add it in debian/source/include-binaries "
+"to allow its inclusion)."
+msgid_plural ""
+"detected %d unwanted binary files (add them in debian/source/include-"
+"binaries to allow their inclusion)."
+msgstr[0] ""
+"se ha detectado %d fichero binario (añada este en «debian/source/include-"
+"binaries» para permitir su inclusión)."
+msgstr[1] ""
+"se han detectado %d ficheros binarios (añada estos en «debian/source/include-"
+"binaries» para permitir su inclusión)."
+
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
 msgid "%s is not the name of a file"
@@ -3344,15 +3407,6 @@ msgid "source package format '%s' is not supported: %s"
 msgstr "no se permite el formato de paquete fuente «%s»: %s"
 
 #: scripts/Dpkg/Source/Package.pm
-msgid "format variant must be in lowercase"
-msgstr "la variante de formato debe estar en minúsculas"
-
-#: scripts/Dpkg/Source/Package.pm
-#, perl-format
-msgid "invalid Format field '%s'"
-msgstr "se ha detectado un campo «Format» inválido «%s»"
-
-#: scripts/Dpkg/Source/Package.pm
 msgid "source package uses only weak checksums"
 msgstr ""
 
@@ -3810,26 +3864,6 @@ msgstr "se han detecta cambios locales, los ficheros modificados son:"
 msgid "-b takes only one parameter with format '%s'"
 msgstr "-b sólo toma un parámetro con formato «%s»"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "unwanted binary file: %s"
-msgstr "fichero binario no deseado: %s"
-
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid ""
-"detected %d unwanted binary file (add it in debian/source/include-binaries "
-"to allow its inclusion)."
-msgid_plural ""
-"detected %d unwanted binary files (add them in debian/source/include-"
-"binaries to allow their inclusion)."
-msgstr[0] ""
-"se ha detectado %d fichero binario (añada este en «debian/source/include-"
-"binaries» para permitir su inclusión)."
-msgstr[1] ""
-"se han detectado %d ficheros binarios (añada estos en «debian/source/include-"
-"binaries» para permitir su inclusión)."
-
 #: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "cannot represent change to %s: %s"
@@ -3902,11 +3936,6 @@ msgstr ""
 msgid "cannot find an editor"
 msgstr "no se puede encontrar «%s»"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "adding %s to %s"
-msgstr "añadiendo «%s» a «%s»"
-
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 msgid "cannot unpack bzr-format source package because bzr is not in the PATH"
 msgstr ""
@@ -3948,7 +3977,9 @@ msgstr ""
 "directorio actual: %s"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
-msgid "format v3.0 uses only one source file"
+#, fuzzy
+#| msgid "format v3.0 uses only one source file"
+msgid "format v3.0 (bzr) uses only one source file"
 msgstr "el formato v3.0 sólo usa un fichero de fuente"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
@@ -4078,6 +4109,12 @@ msgid "can't create symlink %s"
 msgstr "no se puede crear el enlace simbólico «%s»"
 
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
+#, fuzzy, perl-format
+#| msgid "using options from %s: %s"
+msgid "using patch list from %s"
+msgstr "usando opciones de %s: %s"
+
+#: scripts/Dpkg/Source/Package/V3/Quilt.pm
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "la versión de los metadatos de quilt es incompatible: %s"
@@ -4123,6 +4160,12 @@ msgstr "el tipo de fichero es desconocido"
 
 #: scripts/Dpkg/Source/Patch.pm
 #, fuzzy, perl-format
+#| msgid "ignoring deletion of directory %s"
+msgid "ignoring deletion of file %s"
+msgstr "ignorando la eliminación del directorio «%s»"
+
+#: scripts/Dpkg/Source/Patch.pm
+#, fuzzy, perl-format
 #| msgid "ignoring deletion of file %s"
 msgid "ignoring deletion of file %s, use --include-removal to override"
 msgstr "ignorando la eliminación del fichero «%s»"
@@ -4372,13 +4415,15 @@ msgid "obsolete substitution variable ${%s}"
 msgstr "la variable de sustitución ${%s} no está en uso"
 
 #: scripts/Dpkg/Substvars.pm
-#, perl-format
-msgid "unknown substitution variable ${%s}"
-msgstr "la variable de sustitución ${%s} es desconocida"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} used, but is not defined"
+msgstr "la variable de sustitución ${%s} no está en uso"
 
 #: scripts/Dpkg/Substvars.pm
-#, perl-format
-msgid "unused substitution variable ${%s}"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} unused, but is defined"
 msgstr "la variable de sustitución ${%s} no está en uso"
 
 #: scripts/Dpkg/Vars.pm
@@ -4453,6 +4498,23 @@ msgstr "el número de versión contiene el carácter ilegal «%s»"
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "la sección «epoch» del número de versión no es un número: «%s»"
 
+#~ msgid "format variant must be in lowercase"
+#~ msgstr "la variante de formato debe estar en minúsculas"
+
+#~ msgid "invalid Format field '%s'"
+#~ msgstr "se ha detectado un campo «Format» inválido «%s»"
+
+#, fuzzy
+#~| msgid "cannot create directory %s"
+#~ msgid "cannot create pipe for %s"
+#~ msgstr "no se puede crear el directorio «%s»"
+
+#~ msgid "tail of %s"
+#~ msgstr "final de «%s»"
+
+#~ msgid "unknown substitution variable ${%s}"
+#~ msgstr "la variable de sustitución ${%s} es desconocida"
+
 #~ msgid "%s died from signal %s"
 #~ msgstr "%s murió con la señal %s"
 
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index 37958f9db..a6630bbfa 100644
--- a/scripts/po/fr.po
+++ b/scripts/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.17.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-09-08 15:39+0200\n"
 "Last-Translator: Sébastien Poher <sbphr@volted.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -321,27 +321,29 @@ msgid ""
 "      --build=<type>[,...]    specify the build <type>: full, source, "
 "binary,\n"
 "                                any, all (default is 'full').\n"
-"  -F                          normal full build (source and binary; "
+"  -F, --build=full            normal full build (source and binary; "
 "default).\n"
-"  -g                          source and arch-indep build.\n"
-"  -G                          source and arch-specific build.\n"
-"  -b                          binary-only, no source files.\n"
-"  -B                          binary-only, only arch-specific files.\n"
-"  -A                          binary-only, only arch-indep files.\n"
-"  -S                          source-only, no binary files.\n"
+"  -g, --build=source,all      source and arch-indep build.\n"
+"  -G, --build=source,any      source and arch-specific build.\n"
+"  -b, --build=binary          binary-only, no source files.\n"
+"  -B, --build=any             binary-only, only arch-specific files.\n"
+"  -A, --build=all             binary-only, only arch-indep files.\n"
+"  -S, --build=source          source-only, no binary files.\n"
 "  -nc, --no-pre-clean         do not pre clean source tree (implies -b).\n"
-"       --pre-clean            pre clean source tree (default).\n"
-"  -tc, --post-clean           clean source tree when finished.\n"
-"  -D                          check build dependencies and conflicts "
+"      --pre-clean             pre clean source tree (default).\n"
+"      --no-post-clean         do not post clean source tree (default).\n"
+"  -tc, --post-clean           post clean source tree.\n"
+"  -D, --check-builddeps       check build dependencies and conflicts "
 "(default).\n"
-"  -d                          do not check build dependencies and "
+"  -d, --no-check-builddeps    do not check build dependencies and "
 "conflicts.\n"
-"      --[no-]check-builddeps  ditto.\n"
 "      --ignore-builtin-builddeps\n"
 "                              do not check builtin build dependencies.\n"
 "  -P, --build-profiles=<profiles>\n"
-"                              assume comma-separated build profiles as "
+"                              assume comma-separated build <profiles> as "
 "active.\n"
+"      --rules-requires-root   assume legacy Rules-Requires-Root field "
+"value.\n"
 "  -R, --rules-file=<rules>    rules file to execute (default is debian/"
 "rules).\n"
 "  -T, --rules-target=<target> call debian/rules <target>.\n"
@@ -558,26 +560,6 @@ msgid "unknown option or argument %s"
 msgstr "option ou paramètre inconnu %s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "using a gain-root-command while being root"
-msgstr ""
-"utilisation d'une commande pour obtenir les privilèges administrateur en "
-"tant qu'administrateur"
-
-#: scripts/dpkg-buildpackage.pl
-msgid ""
-"fakeroot not found, either install the fakeroot\n"
-"package, specify a command with the -r option, or run this as root"
-msgstr ""
-"fakeroot non trouvé, veuillez soit installer le paquet fakeroot,\n"
-"soit indiquer une commande avec l'option -r ou exécuter cette\n"
-"commande en tant qu'administrateur"
-
-#: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid "gain-root-command '%s' not found"
-msgstr "commande pour obtenir les privilèges administrateur « %s » non trouvée"
-
-#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "option %s is only meaningful with option %s"
 msgstr ""
@@ -662,6 +644,26 @@ msgid "unable to determine %s"
 msgstr "impossible de déterminer %s"
 
 #: scripts/dpkg-buildpackage.pl
+msgid "using a gain-root-command while being root"
+msgstr ""
+"utilisation d'une commande pour obtenir les privilèges administrateur en "
+"tant qu'administrateur"
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"fakeroot not found, either install the fakeroot\n"
+"package, specify a command with the -r option, or run this as root"
+msgstr ""
+"fakeroot non trouvé, veuillez soit installer le paquet fakeroot,\n"
+"soit indiquer une commande avec l'option -r ou exécuter cette\n"
+"commande en tant qu'administrateur"
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid "gain-root-command '%s' not found"
+msgstr "commande pour obtenir les privilèges administrateur « %s » non trouvée"
+
+#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "disallowed target in %s field keyword %s"
 msgstr ""
@@ -693,6 +695,20 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "substitution %% inconnue dans le point d'ancrage: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"short OpenPGP key IDs are broken; please use key fingerprints in %s or %s "
+"instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"in %s or %s instead"
+msgstr ""
+
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
 #: scripts/dpkg-genbuildinfo.pl scripts/dpkg-name.pl scripts/Dpkg/Arch.pm
 #: scripts/Dpkg/IPC.pm scripts/Dpkg/OpenPGP.pm scripts/Dpkg/Shlibs.pm
@@ -845,8 +861,9 @@ msgstr "fichier, section et priorité ne peuvent contenir d'espace"
 #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl
 #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm
-#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm
+#: scripts/Dpkg/Source/Quilt.pm
 #, perl-format
 msgid "cannot write %s"
 msgstr "impossible d'écrire %s"
@@ -1002,7 +1019,7 @@ msgstr "il manque la section des fichiers source"
 msgid "missing Priority for source files"
 msgstr "il manque la priorité des fichiers source"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm
+#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm
 #, perl-format
 msgid "%s is empty"
 msgstr "%s est vide"
@@ -1050,14 +1067,6 @@ msgstr ""
 "paquet %s dans le fichier de contrôle mais pas dans le fichier de liste des "
 "fichiers"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm
-#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm
-#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Quilt.pm
-#, perl-format
-msgid "cannot read %s"
-msgstr "impossible de lire %s"
-
 #: scripts/dpkg-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1224,8 +1233,45 @@ msgid "cannot install output control file '%s'"
 msgstr "impossible d'installer le nouveau fichier de contrôle en sortie %s"
 
 #: scripts/dpkg-gensymbols.pl
+#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| "  -p<package>              generate symbols file for package.\n"
+#| "  -P<package-build-dir>    temporary build directory instead of debian/"
+#| "tmp.\n"
+#| "  -e<library>              explicitly list libraries to scan.\n"
+#| "  -v<version>              version of the packages (defaults to\n"
+#| "                           version extracted from debian/changelog).\n"
+#| "  -c<level>                compare generated symbols file with the "
+#| "reference\n"
+#| "                           template in the debian directory and fail if\n"
+#| "                           difference is too important; level goes from 0 "
+#| "for\n"
+#| "                           no check, to 4 for all checks (default level "
+#| "is 1).\n"
+#| "  -q                       keep quiet and never emit any warnings or\n"
+#| "                           generate a diff between generated symbols\n"
+#| "                           file and the reference template.\n"
+#| "  -I<file>                 force usage of <file> as reference symbols\n"
+#| "                           file instead of the default file.\n"
+#| "  -O[<file>]               write to stdout (or <file>), not .../DEBIAN/"
+#| "symbols.\n"
+#| "  -t                       write in template mode (tags are not\n"
+#| "                           processed and included in output).\n"
+#| "  -V                       verbose output; write deprecated symbols and "
+#| "pattern\n"
+#| "                           matching symbols as comments (in template mode "
+#| "only).\n"
+#| "  -a<arch>                 assume <arch> as host architecture when "
+#| "processing\n"
+#| "                           symbol files.\n"
+#| "  -d                       display debug information during work.\n"
+#| "  -?, --help               show this help message.\n"
+#| "      --version            show the version.\n"
 msgid ""
 "Options:\n"
+"  -l<library-path>         add directory to private shared library search "
+"list.\n"
 "  -p<package>              generate symbols file for package.\n"
 "  -P<package-build-dir>    temporary build directory instead of debian/tmp.\n"
 "  -e<library>              explicitly list libraries to scan.\n"
@@ -1535,10 +1581,32 @@ msgstr ""
 "      --version            afficher la version."
 
 #: scripts/dpkg-parsechangelog.pl
+#, fuzzy
+#| msgid ""
+#| "Parser options:\n"
+#| "      --format <output-format>\n"
+#| "                           set output format (defaults to 'dpkg').\n"
+#| "      --all                include all changes.\n"
+#| "  -s, --since <version>    include all changes later than <version>.\n"
+#| "  -v <version>             ditto.\n"
+#| "  -u, --until <version>    include all changes earlier than <version>.\n"
+#| "  -f, --from <version>     include all changes equal or later than "
+#| "<version>.\n"
+#| "  -t, --to <version>       include all changes up to or equal than "
+#| "<version>.\n"
+#| "  -c, --count <number>     include <number> entries from the top (or "
+#| "tail\n"
+#| "                             if <number> is lower than 0).\n"
+#| "  -n <number>              ditto.\n"
+#| "  -o, --offset <number>    change starting point for --count, counted "
+#| "from\n"
+#| "                             the top (or tail if <number> is lower than "
+#| "0).\n"
 msgid ""
 "Parser options:\n"
 "      --format <output-format>\n"
 "                           set output format (defaults to 'dpkg').\n"
+"      --reverse            include all changes in reverse order.\n"
 "      --all                include all changes.\n"
 "  -s, --since <version>    include all changes later than <version>.\n"
 "  -v <version>             ditto.\n"
@@ -1713,6 +1781,10 @@ msgid "couldn't close stdout"
 msgstr "impossible de fermer la sortie standard"
 
 #: scripts/dpkg-scanpackages.pl
+msgid "Packages with multiple instances but no --multiversion specified:"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl
 msgid "Packages in override file with incorrect old maintainer value:"
 msgstr ""
 "Paquets dans le fichier d'override avec valeur incorrecte pour l'ancien "
@@ -2045,7 +2117,8 @@ msgstr ""
 "fichier info sur les bibliothèques partagées « %s », ligne %d : ligne mal "
 "formée « %s »"
 
-#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm
+#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm
+#: scripts/Dpkg/Checksums.pm
 #, perl-format
 msgid "cannot open file %s"
 msgstr "impossible d'ouvrir le fichier %s"
@@ -2094,7 +2167,7 @@ msgstr "« stat » du répertoire %s impossible"
 msgid "directory argument %s is not a directory"
 msgstr "paramètre répertoire %s n'est pas un répertoire"
 
-#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm
 #, perl-format
 msgid "unable to chdir to '%s'"
@@ -2122,6 +2195,11 @@ msgstr "option d'action indispensable"
 
 #: scripts/dpkg-source.pl
 #, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr "aucun format source indiqué dans %s, voir dpkg-source(1)"
+
+#: scripts/dpkg-source.pl
+#, perl-format
 msgid "%s doesn't contain any information about the source package"
 msgstr "%s ne contient pas d'information sur le paquet source"
 
@@ -2156,11 +2234,6 @@ msgstr "construction des sources pour une publication binaire seule"
 
 #: scripts/dpkg-source.pl
 #, perl-format
-msgid "no source format specified in %s, see dpkg-source(1)"
-msgstr "aucun format source indiqué dans %s, voir dpkg-source(1)"
-
-#: scripts/dpkg-source.pl
-#, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "impossible de construire avec le format source « %s » : %s"
 
@@ -2458,6 +2531,14 @@ msgstr ""
 msgid "'%s' is not a legal architecture in list '%s'"
 msgstr "« %s » n'est pas une architecture autorisée"
 
+#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm
+#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm
+#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm
+#, perl-format
+msgid "cannot read %s"
+msgstr "impossible de lire %s"
+
 #: scripts/Dpkg/BuildFlags.pm
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
@@ -2531,8 +2612,9 @@ msgstr ""
 "utilisé"
 
 #: scripts/Dpkg/Changelog.pm
-#, perl-format
-msgid "'%s' option specifies non-existing version"
+#, fuzzy, perl-format
+#| msgid "'%s' option specifies non-existing version"
+msgid "'%s' option specifies non-existing version '%s'"
 msgstr "l'option « %s » indique une version inexistante"
 
 #: scripts/Dpkg/Changelog.pm
@@ -2548,16 +2630,21 @@ msgid "use oldest entry that is later than the one specified"
 msgstr "utiliser l'entrée la plus ancienne qui est supérieure à celle indiquée"
 
 #: scripts/Dpkg/Changelog.pm
-#, perl-format
-msgid "no such entry found, ignoring '%s' parameter"
+#, fuzzy, perl-format
+#| msgid "no such entry found, ignoring '%s' parameter"
+msgid "no such entry found, ignoring '%s' parameter '%s'"
 msgstr "aucune telle entrée n'a été trouvée, paramètre « %s » ignoré"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'since' option specifies most recent version, ignoring"
+#, fuzzy, perl-format
+#| msgid "'since' option specifies most recent version, ignoring"
+msgid "'since' option specifies most recent version '%s', ignoring"
 msgstr "l'option « since » indique la version la plus récente et est ignorée"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'until' option specifies oldest version, ignoring"
+#, fuzzy, perl-format
+#| msgid "'until' option specifies oldest version, ignoring"
+msgid "'until' option specifies oldest version '%s', ignoring"
 msgstr "l'option « until » indique la version la plus ancienne et est ignorée"
 
 #: scripts/Dpkg/Changelog/Debian.pm
@@ -2666,7 +2753,7 @@ msgstr "nom de fichier %s non valable"
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
 #, fuzzy, perl-format
 #| msgid "cannot execute format parser: %s"
-msgid "cannot parse non-comformant date '%s'"
+msgid "cannot parse non-conformant date '%s'"
 msgstr "impossible d'exécuter l'analyseur de format : %s"
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -2676,14 +2763,10 @@ msgstr ""
 "attendue"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "cannot create pipe for %s"
-msgstr "impossible de créer le tube pour %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "tail of %s"
-msgstr "fin de %s"
+#, fuzzy, perl-format
+#| msgid "cannot stat file %s"
+msgid "cannot seek into file %s"
+msgstr "stat impossible pour le fichier %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
@@ -3049,6 +3132,12 @@ msgstr "caractère « %s » non autorisé"
 msgid "must start with an alphanumeric character"
 msgstr "doit commencer par un caractère alphanumérique"
 
+#: scripts/Dpkg/Shlibs.pm
+msgid ""
+"deprecated use of LD_LIBRARY_PATH with private library directory which "
+"interferes with cross-building, please use -l option instead"
+msgstr ""
+
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, fuzzy, perl-format
 #| msgid "cannot execute format parser: %s"
@@ -3153,6 +3242,38 @@ msgstr "impossible de modifier la date de %s"
 msgid "cannot read timestamp from %s"
 msgstr "impossible de lire la date de %s"
 
+#: scripts/Dpkg/Source/Functions.pm
+#, fuzzy, perl-format
+#| msgid "cannot open file %s"
+msgid "cannot open file %s for binary detection"
+msgstr "impossible d'ouvrir le fichier %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "adding %s to %s"
+msgstr "ajout de %s à %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "unwanted binary file: %s"
+msgstr "fichier binaire non souhaité : %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid ""
+"detected %d unwanted binary file (add it in debian/source/include-binaries "
+"to allow its inclusion)."
+msgid_plural ""
+"detected %d unwanted binary files (add them in debian/source/include-"
+"binaries to allow their inclusion)."
+msgstr[0] ""
+"%d fichier binaire non souhaité a été détecté (il est nécessaire de "
+"l'ajouter dans debian/source/include-binaries pour autoriser son inclusion)."
+msgstr[1] ""
+"%d fichiers binaires non souhaités ont été détectés (il est nécessaire de "
+"les ajouter dans debian/source/include-binaries pour autoriser leur "
+"inclusion)."
+
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
 msgid "%s is not the name of a file"
@@ -3169,15 +3290,6 @@ msgid "source package format '%s' is not supported: %s"
 msgstr "le format de paquet source « %s » n'est pas géré : %s"
 
 #: scripts/Dpkg/Source/Package.pm
-msgid "format variant must be in lowercase"
-msgstr "la variante de ce format doit être écrite en minuscules"
-
-#: scripts/Dpkg/Source/Package.pm
-#, perl-format
-msgid "invalid Format field '%s'"
-msgstr "champ Format « %s » erroné"
-
-#: scripts/Dpkg/Source/Package.pm
 msgid "source package uses only weak checksums"
 msgstr ""
 
@@ -3623,27 +3735,6 @@ msgstr "modifications locales détectées, les fichiers modifiés sont :"
 msgid "-b takes only one parameter with format '%s'"
 msgstr "-b n'utilise qu'un paramètre avec le format « %s »"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "unwanted binary file: %s"
-msgstr "fichier binaire non souhaité : %s"
-
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid ""
-"detected %d unwanted binary file (add it in debian/source/include-binaries "
-"to allow its inclusion)."
-msgid_plural ""
-"detected %d unwanted binary files (add them in debian/source/include-"
-"binaries to allow their inclusion)."
-msgstr[0] ""
-"%d fichier binaire non souhaité a été détecté (il est nécessaire de "
-"l'ajouter dans debian/source/include-binaries pour autoriser son inclusion)."
-msgstr[1] ""
-"%d fichiers binaires non souhaités ont été détectés (il est nécessaire de "
-"les ajouter dans debian/source/include-binaries pour autoriser leur "
-"inclusion)."
-
 #: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "cannot represent change to %s: %s"
@@ -3717,11 +3808,6 @@ msgstr ""
 msgid "cannot find an editor"
 msgstr "impossible de trouver un éditeur"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "adding %s to %s"
-msgstr "ajout de %s à %s"
-
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 msgid "cannot unpack bzr-format source package because bzr is not in the PATH"
 msgstr ""
@@ -3763,7 +3849,9 @@ msgstr ""
 "travail : %s"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
-msgid "format v3.0 uses only one source file"
+#, fuzzy
+#| msgid "format v3.0 uses only one source file"
+msgid "format v3.0 (bzr) uses only one source file"
 msgstr "le format v3.0 n'utilise qu'un fichier source"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
@@ -3896,6 +3984,12 @@ msgid "can't create symlink %s"
 msgstr "impossible de lire le lien symbolique %s"
 
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
+#, fuzzy, perl-format
+#| msgid "using options from %s: %s"
+msgid "using patch list from %s"
+msgstr "utilisation des options depuis %s : %s"
+
+#: scripts/Dpkg/Source/Package/V3/Quilt.pm
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "version inconnue des métadonnées de quilt : %s"
@@ -3940,6 +4034,12 @@ msgid "unknown file type"
 msgstr "type de fichier inconnu"
 
 #: scripts/Dpkg/Source/Patch.pm
+#, fuzzy, perl-format
+#| msgid "ignoring deletion of directory %s"
+msgid "ignoring deletion of file %s"
+msgstr "suppression du répertoire %s ignorée"
+
+#: scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "ignoring deletion of file %s, use --include-removal to override"
 msgstr ""
@@ -4195,13 +4295,15 @@ msgid "obsolete substitution variable ${%s}"
 msgstr "variable de substitution inutilisée ${%s}"
 
 #: scripts/Dpkg/Substvars.pm
-#, perl-format
-msgid "unknown substitution variable ${%s}"
-msgstr "variable de substitution inconnue ${%s}"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} used, but is not defined"
+msgstr "variable de substitution inutilisée ${%s}"
 
 #: scripts/Dpkg/Substvars.pm
-#, perl-format
-msgid "unused substitution variable ${%s}"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} unused, but is defined"
 msgstr "variable de substitution inutilisée ${%s}"
 
 #: scripts/Dpkg/Vars.pm
@@ -4278,6 +4380,21 @@ msgid "epoch part of the version number is not a number: '%s'"
 msgstr ""
 "la partie d'ère (« epoch ») du numéro de version n'est pas un nombre : « %s »"
 
+#~ msgid "format variant must be in lowercase"
+#~ msgstr "la variante de ce format doit être écrite en minuscules"
+
+#~ msgid "invalid Format field '%s'"
+#~ msgstr "champ Format « %s » erroné"
+
+#~ msgid "cannot create pipe for %s"
+#~ msgstr "impossible de créer le tube pour %s"
+
+#~ msgid "tail of %s"
+#~ msgstr "fin de %s"
+
+#~ msgid "unknown substitution variable ${%s}"
+#~ msgstr "variable de substitution inconnue ${%s}"
+
 #~ msgid "%s died from signal %s"
 #~ msgstr "%s tué par le signal %s"
 
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index ed869e906..2a23a842b 100644
--- a/scripts/po/pl.po
+++ b/scripts/po/pl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 07:05+0200\n"
 "Last-Translator: Łukasz Dulny <BartekChom@poczta.onet.pl>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -306,27 +306,29 @@ msgid ""
 "      --build=<type>[,...]    specify the build <type>: full, source, "
 "binary,\n"
 "                                any, all (default is 'full').\n"
-"  -F                          normal full build (source and binary; "
+"  -F, --build=full            normal full build (source and binary; "
 "default).\n"
-"  -g                          source and arch-indep build.\n"
-"  -G                          source and arch-specific build.\n"
-"  -b                          binary-only, no source files.\n"
-"  -B                          binary-only, only arch-specific files.\n"
-"  -A                          binary-only, only arch-indep files.\n"
-"  -S                          source-only, no binary files.\n"
+"  -g, --build=source,all      source and arch-indep build.\n"
+"  -G, --build=source,any      source and arch-specific build.\n"
+"  -b, --build=binary          binary-only, no source files.\n"
+"  -B, --build=any             binary-only, only arch-specific files.\n"
+"  -A, --build=all             binary-only, only arch-indep files.\n"
+"  -S, --build=source          source-only, no binary files.\n"
 "  -nc, --no-pre-clean         do not pre clean source tree (implies -b).\n"
-"       --pre-clean            pre clean source tree (default).\n"
-"  -tc, --post-clean           clean source tree when finished.\n"
-"  -D                          check build dependencies and conflicts "
+"      --pre-clean             pre clean source tree (default).\n"
+"      --no-post-clean         do not post clean source tree (default).\n"
+"  -tc, --post-clean           post clean source tree.\n"
+"  -D, --check-builddeps       check build dependencies and conflicts "
 "(default).\n"
-"  -d                          do not check build dependencies and "
+"  -d, --no-check-builddeps    do not check build dependencies and "
 "conflicts.\n"
-"      --[no-]check-builddeps  ditto.\n"
 "      --ignore-builtin-builddeps\n"
 "                              do not check builtin build dependencies.\n"
 "  -P, --build-profiles=<profiles>\n"
-"                              assume comma-separated build profiles as "
+"                              assume comma-separated build <profiles> as "
 "active.\n"
+"      --rules-requires-root   assume legacy Rules-Requires-Root field "
+"value.\n"
 "  -R, --rules-file=<rules>    rules file to execute (default is debian/"
 "rules).\n"
 "  -T, --rules-target=<target> call debian/rules <target>.\n"
@@ -527,23 +529,6 @@ msgid "unknown option or argument %s"
 msgstr "niepoprawna opcja lub argument %s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "using a gain-root-command while being root"
-msgstr "używanie polecenia-uzysk-praw-admin podczas bycia administratorem"
-
-#: scripts/dpkg-buildpackage.pl
-msgid ""
-"fakeroot not found, either install the fakeroot\n"
-"package, specify a command with the -r option, or run this as root"
-msgstr ""
-"nie znaleziono fakeroot, proszę zainstalować pakiet fakeroot lub\n"
-"podać polecenie w opcji -r, lub uruchomić ten program jako root"
-
-#: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid "gain-root-command '%s' not found"
-msgstr "nie znaleziono polecenia-uzysk-praw-admin \"%s\""
-
-#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "option %s is only meaningful with option %s"
 msgstr ""
@@ -628,6 +613,23 @@ msgid "unable to determine %s"
 msgstr "nie można określić %s"
 
 #: scripts/dpkg-buildpackage.pl
+msgid "using a gain-root-command while being root"
+msgstr "używanie polecenia-uzysk-praw-admin podczas bycia administratorem"
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"fakeroot not found, either install the fakeroot\n"
+"package, specify a command with the -r option, or run this as root"
+msgstr ""
+"nie znaleziono fakeroot, proszę zainstalować pakiet fakeroot lub\n"
+"podać polecenie w opcji -r, lub uruchomić ten program jako root"
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid "gain-root-command '%s' not found"
+msgstr "nie znaleziono polecenia-uzysk-praw-admin \"%s\""
+
+#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "disallowed target in %s field keyword %s"
 msgstr ""
@@ -659,6 +661,20 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "nieznane podstawienie %% w hooku: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"short OpenPGP key IDs are broken; please use key fingerprints in %s or %s "
+"instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"in %s or %s instead"
+msgstr ""
+
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
 #: scripts/dpkg-genbuildinfo.pl scripts/dpkg-name.pl scripts/Dpkg/Arch.pm
 #: scripts/Dpkg/IPC.pm scripts/Dpkg/OpenPGP.pm scripts/Dpkg/Shlibs.pm
@@ -817,8 +833,9 @@ msgstr "nazwa pliku, sekcja i priorytet nie mogą zawierać białych znaków"
 #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl
 #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm
-#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm
+#: scripts/Dpkg/Source/Quilt.pm
 #, perl-format
 msgid "cannot write %s"
 msgstr "nie można zapisać %s"
@@ -963,7 +980,7 @@ msgstr "brak pola Section plików źródłowych"
 msgid "missing Priority for source files"
 msgstr "brak pola Priority plików źródłowych"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm
+#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm
 #, perl-format
 msgid "%s is empty"
 msgstr "%s jest puste"
@@ -1010,14 +1027,6 @@ msgstr ""
 msgid "package %s in control file but not in files list"
 msgstr "pakiet %s w pliku kontrolnym, ale nie w liście plików"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm
-#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm
-#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Quilt.pm
-#, perl-format
-msgid "cannot read %s"
-msgstr "nie można odczytać %s"
-
 #: scripts/dpkg-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1230,6 +1239,8 @@ msgstr "nie można zainstalować wyjściowego pliku kontrolnego \"%s\""
 #| "      --version            show the version.\n"
 msgid ""
 "Options:\n"
+"  -l<library-path>         add directory to private shared library search "
+"list.\n"
 "  -p<package>              generate symbols file for package.\n"
 "  -P<package-build-dir>    temporary build directory instead of debian/tmp.\n"
 "  -e<library>              explicitly list libraries to scan.\n"
@@ -1559,6 +1570,7 @@ msgid ""
 "Parser options:\n"
 "      --format <output-format>\n"
 "                           set output format (defaults to 'dpkg').\n"
+"      --reverse            include all changes in reverse order.\n"
 "      --all                include all changes.\n"
 "  -s, --since <version>    include all changes later than <version>.\n"
 "  -v <version>             ditto.\n"
@@ -1732,6 +1744,10 @@ msgid "couldn't close stdout"
 msgstr "nie można zamknąć stdout"
 
 #: scripts/dpkg-scanpackages.pl
+msgid "Packages with multiple instances but no --multiversion specified:"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl
 msgid "Packages in override file with incorrect old maintainer value:"
 msgstr ""
 "Pakiety w pliku nadpisań z niepoprawną wartością poprzedniego opiekuna:"
@@ -2060,7 +2076,8 @@ msgstr ""
 msgid "shared libs info file '%s' line %d: bad line '%s'"
 msgstr "plik bibliotek współdzielonych %s, linia %d: niepoprawna linia \"%s\""
 
-#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm
+#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm
+#: scripts/Dpkg/Checksums.pm
 #, perl-format
 msgid "cannot open file %s"
 msgstr "nie można otworzyć pliku %s"
@@ -2109,7 +2126,7 @@ msgstr "nie można ustalić stanu katalogu %s"
 msgid "directory argument %s is not a directory"
 msgstr "argument %s nie jest katalogiem"
 
-#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm
 #, perl-format
 msgid "unable to chdir to '%s'"
@@ -2137,6 +2154,11 @@ msgstr "potrzebna opcja akcji"
 
 #: scripts/dpkg-source.pl
 #, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr "w %s nie podano formatu źródeł, patrz dpkg-source(1)"
+
+#: scripts/dpkg-source.pl
+#, perl-format
 msgid "%s doesn't contain any information about the source package"
 msgstr "%s nie zawiera żadnej informacji o pakiecie źródłowym"
 
@@ -2169,11 +2191,6 @@ msgstr "budowanie źródeł do wydania wyłącznie binarnego"
 
 #: scripts/dpkg-source.pl
 #, perl-format
-msgid "no source format specified in %s, see dpkg-source(1)"
-msgstr "w %s nie podano formatu źródeł, patrz dpkg-source(1)"
-
-#: scripts/dpkg-source.pl
-#, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "nie można zbudować z formatem źródeł \"%s\": %s"
 
@@ -2457,6 +2474,14 @@ msgstr "nieznany typ systemu gcc %s, użycie domyślnego (kompilacja natywna)"
 msgid "'%s' is not a legal architecture in list '%s'"
 msgstr "\"%s\" nie jest poprawną specyfikacją architektury"
 
+#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm
+#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm
+#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm
+#, perl-format
+msgid "cannot read %s"
+msgstr "nie można odczytać %s"
+
 #: scripts/Dpkg/BuildFlags.pm
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
@@ -2525,8 +2550,9 @@ msgid "you can only specify one of 'to' and 'until', using 'until'"
 msgstr "można podać tylko jedno z \"to\" i \"until\", użycie \"until\""
 
 #: scripts/Dpkg/Changelog.pm
-#, perl-format
-msgid "'%s' option specifies non-existing version"
+#, fuzzy, perl-format
+#| msgid "'%s' option specifies non-existing version"
+msgid "'%s' option specifies non-existing version '%s'"
 msgstr "opcja \"%s\" określa nieistniejącą wersję"
 
 #: scripts/Dpkg/Changelog.pm
@@ -2542,16 +2568,21 @@ msgid "use oldest entry that is later than the one specified"
 msgstr "użycie najstarszego wpisu, który jest późniejszy niż określony"
 
 #: scripts/Dpkg/Changelog.pm
-#, perl-format
-msgid "no such entry found, ignoring '%s' parameter"
+#, fuzzy, perl-format
+#| msgid "no such entry found, ignoring '%s' parameter"
+msgid "no such entry found, ignoring '%s' parameter '%s'"
 msgstr "nie znaleziono takiego wpisu, ignorowanie parametru \"%s\""
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'since' option specifies most recent version, ignoring"
+#, fuzzy, perl-format
+#| msgid "'since' option specifies most recent version, ignoring"
+msgid "'since' option specifies most recent version '%s', ignoring"
 msgstr "opcja \"since\" określa już najnowszą wersję, ignorowanie"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'until' option specifies oldest version, ignoring"
+#, fuzzy, perl-format
+#| msgid "'until' option specifies oldest version, ignoring"
+msgid "'until' option specifies oldest version '%s', ignoring"
 msgstr "opcja \"until\" określa już najstarszą wersję, ignorowanie"
 
 #: scripts/Dpkg/Changelog/Debian.pm
@@ -2663,7 +2694,7 @@ msgstr "niepoprawna flaga w %s: %s"
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
 #, fuzzy, perl-format
 #| msgid "cannot exec format parser: %s"
-msgid "cannot parse non-comformant date '%s'"
+msgid "cannot parse non-conformant date '%s'"
 msgstr "nie można uruchomić parsera formatu: %s"
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -2671,14 +2702,10 @@ msgid "the trailer doesn't match the expected regex"
 msgstr "trailer nie pasuje do oczekiwanego wyrażenia regularnego"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "cannot create pipe for %s"
-msgstr "nie można utworzyć potoku dla %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "tail of %s"
-msgstr "tail na %s"
+#, fuzzy, perl-format
+#| msgid "cannot stat file %s"
+msgid "cannot seek into file %s"
+msgstr "nie można ustalić stanu pliku %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
@@ -3044,6 +3071,12 @@ msgstr "znak \"%s\" nie jest dozwolony"
 msgid "must start with an alphanumeric character"
 msgstr "musi zaczynać się literą lub cyfrą"
 
+#: scripts/Dpkg/Shlibs.pm
+msgid ""
+"deprecated use of LD_LIBRARY_PATH with private library directory which "
+"interferes with cross-building, please use -l option instead"
+msgstr ""
+
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, fuzzy, perl-format
 #| msgid "cannot exec format parser: %s"
@@ -3146,6 +3179,40 @@ msgstr "nie można zmienić czasu modyfikacji dla %s"
 msgid "cannot read timestamp from %s"
 msgstr "nie można odczytać czasu modyfikacji z %s"
 
+#: scripts/Dpkg/Source/Functions.pm
+#, fuzzy, perl-format
+#| msgid "cannot open file %s"
+msgid "cannot open file %s for binary detection"
+msgstr "nie można otworzyć pliku %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "adding %s to %s"
+msgstr "dodawanie %s do %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "unwanted binary file: %s"
+msgstr "niechciany plik binarny: %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid ""
+"detected %d unwanted binary file (add it in debian/source/include-binaries "
+"to allow its inclusion)."
+msgid_plural ""
+"detected %d unwanted binary files (add them in debian/source/include-"
+"binaries to allow their inclusion)."
+msgstr[0] ""
+"wykryto %d niechciany plik binarny (należy go wymienić w debian/source/"
+"include-binaries, aby umożliwić jego włączenie)."
+msgstr[1] ""
+"wykryto %d niechciane pliki binarne (należy je wymienić w debian/source/"
+"include-binaries, aby umożliwić ich włączenie)."
+msgstr[2] ""
+"wykryto %d niechcianych plików binarnych (należy je wymienić w debian/source/"
+"include-binaries, aby umożliwić ich włączenie)."
+
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
 msgid "%s is not the name of a file"
@@ -3162,15 +3229,6 @@ msgid "source package format '%s' is not supported: %s"
 msgstr "format \"%s\" pakietu źródłowego nie jest obsługiwany: %s"
 
 #: scripts/Dpkg/Source/Package.pm
-msgid "format variant must be in lowercase"
-msgstr "wariant formatu musi być zapisany małymi literami"
-
-#: scripts/Dpkg/Source/Package.pm
-#, perl-format
-msgid "invalid Format field '%s'"
-msgstr "niepoprawne pole Format \"%s\""
-
-#: scripts/Dpkg/Source/Package.pm
 msgid "source package uses only weak checksums"
 msgstr ""
 
@@ -3612,29 +3670,6 @@ msgstr "wykryto lokalne zmiany, zmodyfikowane pliki to:"
 msgid "-b takes only one parameter with format '%s'"
 msgstr "-b przyjmuje tylko jeden parametr w formacie \"%s\""
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "unwanted binary file: %s"
-msgstr "niechciany plik binarny: %s"
-
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid ""
-"detected %d unwanted binary file (add it in debian/source/include-binaries "
-"to allow its inclusion)."
-msgid_plural ""
-"detected %d unwanted binary files (add them in debian/source/include-"
-"binaries to allow their inclusion)."
-msgstr[0] ""
-"wykryto %d niechciany plik binarny (należy go wymienić w debian/source/"
-"include-binaries, aby umożliwić jego włączenie)."
-msgstr[1] ""
-"wykryto %d niechciane pliki binarne (należy je wymienić w debian/source/"
-"include-binaries, aby umożliwić ich włączenie)."
-msgstr[2] ""
-"wykryto %d niechcianych plików binarnych (należy je wymienić w debian/source/"
-"include-binaries, aby umożliwić ich włączenie)."
-
 #: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "cannot represent change to %s: %s"
@@ -3705,11 +3740,6 @@ msgstr ""
 msgid "cannot find an editor"
 msgstr "nie można odnaleźć edytora"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "adding %s to %s"
-msgstr "dodawanie %s do %s"
-
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 msgid "cannot unpack bzr-format source package because bzr is not in the PATH"
 msgstr ""
@@ -3749,7 +3779,9 @@ msgid "uncommitted, not-ignored changes in working directory: %s"
 msgstr "niezatwierdzone, nie ignorowane zmiany w katalogu roboczym: %s"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
-msgid "format v3.0 uses only one source file"
+#, fuzzy
+#| msgid "format v3.0 uses only one source file"
+msgid "format v3.0 (bzr) uses only one source file"
 msgstr "format 3.0 używa tylko jednego pliku źródłowego"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
@@ -3878,6 +3910,12 @@ msgid "can't create symlink %s"
 msgstr "nie można utworzyć linku symbolicznego \"%s\""
 
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
+#, fuzzy, perl-format
+#| msgid "using options from %s: %s"
+msgid "using patch list from %s"
+msgstr "użycie opcji z %s: %s"
+
+#: scripts/Dpkg/Source/Package/V3/Quilt.pm
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "nieobsługiwana wersja metadanych quilt: %s"
@@ -3922,6 +3960,12 @@ msgid "unknown file type"
 msgstr "nieznany typ pliku"
 
 #: scripts/Dpkg/Source/Patch.pm
+#, fuzzy, perl-format
+#| msgid "ignoring deletion of directory %s"
+msgid "ignoring deletion of file %s"
+msgstr "zignorowano usunięcie katalogu %s"
+
+#: scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "ignoring deletion of file %s, use --include-removal to override"
 msgstr "zignorowano usunięcie pliku %s, użyj --include-removal, aby nadpisać"
@@ -4167,13 +4211,15 @@ msgid "obsolete substitution variable ${%s}"
 msgstr "nieużywana zmienna podstawiania ${%s}"
 
 #: scripts/Dpkg/Substvars.pm
-#, perl-format
-msgid "unknown substitution variable ${%s}"
-msgstr "nieznana zmienna podstawiania ${%s}"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} used, but is not defined"
+msgstr "nieużywana zmienna podstawiania ${%s}"
 
 #: scripts/Dpkg/Substvars.pm
-#, perl-format
-msgid "unused substitution variable ${%s}"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} unused, but is defined"
 msgstr "nieużywana zmienna podstawiania ${%s}"
 
 #: scripts/Dpkg/Vars.pm
@@ -4247,6 +4293,21 @@ msgstr "numer wersji zawiera niepoprawny znak \"%s\""
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "częśc epoki w numerze wersji nie jest liczbą: \"%s\""
 
+#~ msgid "format variant must be in lowercase"
+#~ msgstr "wariant formatu musi być zapisany małymi literami"
+
+#~ msgid "invalid Format field '%s'"
+#~ msgstr "niepoprawne pole Format \"%s\""
+
+#~ msgid "cannot create pipe for %s"
+#~ msgstr "nie można utworzyć potoku dla %s"
+
+#~ msgid "tail of %s"
+#~ msgstr "tail na %s"
+
+#~ msgid "unknown substitution variable ${%s}"
+#~ msgstr "nieznana zmienna podstawiania ${%s}"
+
 #~ msgid "%s died from signal %s"
 #~ msgstr "%s zakończony z powodu sygnału %s"
 
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index 396e37dd6..fc9b2eaf4 100644
--- a/scripts/po/ru.po
+++ b/scripts/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.17.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2015-04-07 07:02+0200\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -307,27 +307,29 @@ msgid ""
 "      --build=<type>[,...]    specify the build <type>: full, source, "
 "binary,\n"
 "                                any, all (default is 'full').\n"
-"  -F                          normal full build (source and binary; "
+"  -F, --build=full            normal full build (source and binary; "
 "default).\n"
-"  -g                          source and arch-indep build.\n"
-"  -G                          source and arch-specific build.\n"
-"  -b                          binary-only, no source files.\n"
-"  -B                          binary-only, only arch-specific files.\n"
-"  -A                          binary-only, only arch-indep files.\n"
-"  -S                          source-only, no binary files.\n"
+"  -g, --build=source,all      source and arch-indep build.\n"
+"  -G, --build=source,any      source and arch-specific build.\n"
+"  -b, --build=binary          binary-only, no source files.\n"
+"  -B, --build=any             binary-only, only arch-specific files.\n"
+"  -A, --build=all             binary-only, only arch-indep files.\n"
+"  -S, --build=source          source-only, no binary files.\n"
 "  -nc, --no-pre-clean         do not pre clean source tree (implies -b).\n"
-"       --pre-clean            pre clean source tree (default).\n"
-"  -tc, --post-clean           clean source tree when finished.\n"
-"  -D                          check build dependencies and conflicts "
+"      --pre-clean             pre clean source tree (default).\n"
+"      --no-post-clean         do not post clean source tree (default).\n"
+"  -tc, --post-clean           post clean source tree.\n"
+"  -D, --check-builddeps       check build dependencies and conflicts "
 "(default).\n"
-"  -d                          do not check build dependencies and "
+"  -d, --no-check-builddeps    do not check build dependencies and "
 "conflicts.\n"
-"      --[no-]check-builddeps  ditto.\n"
 "      --ignore-builtin-builddeps\n"
 "                              do not check builtin build dependencies.\n"
 "  -P, --build-profiles=<profiles>\n"
-"                              assume comma-separated build profiles as "
+"                              assume comma-separated build <profiles> as "
 "active.\n"
+"      --rules-requires-root   assume legacy Rules-Requires-Root field "
+"value.\n"
 "  -R, --rules-file=<rules>    rules file to execute (default is debian/"
 "rules).\n"
 "  -T, --rules-target=<target> call debian/rules <target>.\n"
@@ -532,23 +534,6 @@ msgid "unknown option or argument %s"
 msgstr "неизвестный параметр или аргумент %s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "using a gain-root-command while being root"
-msgstr "используется команда получения прав root, но уже есть права root"
-
-#: scripts/dpkg-buildpackage.pl
-msgid ""
-"fakeroot not found, either install the fakeroot\n"
-"package, specify a command with the -r option, or run this as root"
-msgstr ""
-"fakeroot не найдена, установите пакет fakeroot и\n"
-"запускайте команду с параметром -r, или запускайте её от root"
-
-#: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid "gain-root-command '%s' not found"
-msgstr "команда-получения-root «%s» не найдена"
-
-#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "option %s is only meaningful with option %s"
 msgstr ""
@@ -634,6 +619,23 @@ msgid "unable to determine %s"
 msgstr "невозможно определить %s"
 
 #: scripts/dpkg-buildpackage.pl
+msgid "using a gain-root-command while being root"
+msgstr "используется команда получения прав root, но уже есть права root"
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"fakeroot not found, either install the fakeroot\n"
+"package, specify a command with the -r option, or run this as root"
+msgstr ""
+"fakeroot не найдена, установите пакет fakeroot и\n"
+"запускайте команду с параметром -r, или запускайте её от root"
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid "gain-root-command '%s' not found"
+msgstr "команда-получения-root «%s» не найдена"
+
+#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "disallowed target in %s field keyword %s"
 msgstr ""
@@ -664,6 +666,20 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "неизвестная подстановка %% в ловушке: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"short OpenPGP key IDs are broken; please use key fingerprints in %s or %s "
+"instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"in %s or %s instead"
+msgstr ""
+
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
 #: scripts/dpkg-genbuildinfo.pl scripts/dpkg-name.pl scripts/Dpkg/Arch.pm
 #: scripts/Dpkg/IPC.pm scripts/Dpkg/OpenPGP.pm scripts/Dpkg/Shlibs.pm
@@ -827,8 +843,9 @@ msgstr "имя файла, секция и приоритет не могут с
 #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl
 #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm
-#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm
+#: scripts/Dpkg/Source/Quilt.pm
 #, perl-format
 msgid "cannot write %s"
 msgstr "не удалось записать %s"
@@ -978,7 +995,7 @@ msgstr "отсутствует Section для файлов с исходным �
 msgid "missing Priority for source files"
 msgstr "отсутствует Priority для файлов с исходным кодом"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm
+#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm
 #, perl-format
 msgid "%s is empty"
 msgstr "%s пуст"
@@ -1025,14 +1042,6 @@ msgstr ""
 msgid "package %s in control file but not in files list"
 msgstr "пакет %s в управляющем файле, но его нет в файле со списком файлов"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm
-#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm
-#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Quilt.pm
-#, perl-format
-msgid "cannot read %s"
-msgstr "не удалось прочитать %s"
-
 #: scripts/dpkg-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1242,6 +1251,8 @@ msgstr "не удалось установить новый выходной у�
 #| "      --version            show the version.\n"
 msgid ""
 "Options:\n"
+"  -l<library-path>         add directory to private shared library search "
+"list.\n"
 "  -p<package>              generate symbols file for package.\n"
 "  -P<package-build-dir>    temporary build directory instead of debian/tmp.\n"
 "  -e<library>              explicitly list libraries to scan.\n"
@@ -1572,6 +1583,7 @@ msgid ""
 "Parser options:\n"
 "      --format <output-format>\n"
 "                           set output format (defaults to 'dpkg').\n"
+"      --reverse            include all changes in reverse order.\n"
 "      --all                include all changes.\n"
 "  -s, --since <version>    include all changes later than <version>.\n"
 "  -v <version>             ditto.\n"
@@ -1741,6 +1753,10 @@ msgid "couldn't close stdout"
 msgstr "не удалось закрыть стандартный вывод"
 
 #: scripts/dpkg-scanpackages.pl
+msgid "Packages with multiple instances but no --multiversion specified:"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl
 msgid "Packages in override file with incorrect old maintainer value:"
 msgstr ""
 "Пакеты в файле переназначений с неправильным старым значением "
@@ -2073,7 +2089,8 @@ msgstr ""
 "информационный файл разделяемой библиотеки «%s» строка %d: неправильная "
 "строка «%s»"
 
-#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm
+#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm
+#: scripts/Dpkg/Checksums.pm
 #, perl-format
 msgid "cannot open file %s"
 msgstr "не удалось открыть файл %s"
@@ -2121,7 +2138,7 @@ msgstr "не удалось выполнить функцию stat для кат
 msgid "directory argument %s is not a directory"
 msgstr "значение параметра каталога %s не является каталогом"
 
-#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm
 #, perl-format
 msgid "unable to chdir to '%s'"
@@ -2149,6 +2166,11 @@ msgstr "необходим параметр действия"
 
 #: scripts/dpkg-source.pl
 #, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr "не задан формат исходников в %s, см. dpkg-source(1)"
+
+#: scripts/dpkg-source.pl
+#, perl-format
 msgid "%s doesn't contain any information about the source package"
 msgstr "%s не содержит информации о пакете с исходным кодом"
 
@@ -2183,11 +2205,6 @@ msgstr "сборка пакета с исходным кодом только д
 
 #: scripts/dpkg-source.pl
 #, perl-format
-msgid "no source format specified in %s, see dpkg-source(1)"
-msgstr "не задан формат исходников в %s, см. dpkg-source(1)"
-
-#: scripts/dpkg-source.pl
-#, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "невозможно собрать с форматом исходника «%s»: %s"
 
@@ -2478,6 +2495,14 @@ msgstr ""
 msgid "'%s' is not a legal architecture in list '%s'"
 msgstr "«%s» не является разрешённой строкой архитектуры"
 
+#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm
+#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm
+#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm
+#, perl-format
+msgid "cannot read %s"
+msgstr "не удалось прочитать %s"
+
 #: scripts/Dpkg/BuildFlags.pm
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
@@ -2547,8 +2572,9 @@ msgid "you can only specify one of 'to' and 'until', using 'until'"
 msgstr "можно указать только одно «to» и «until», используется «until»"
 
 #: scripts/Dpkg/Changelog.pm
-#, perl-format
-msgid "'%s' option specifies non-existing version"
+#, fuzzy, perl-format
+#| msgid "'%s' option specifies non-existing version"
+msgid "'%s' option specifies non-existing version '%s'"
 msgstr "в параметре «%s» указана несуществующая версия"
 
 #: scripts/Dpkg/Changelog.pm
@@ -2564,16 +2590,21 @@ msgid "use oldest entry that is later than the one specified"
 msgstr "используемый самый старый элемент больше чем указанный"
 
 #: scripts/Dpkg/Changelog.pm
-#, perl-format
-msgid "no such entry found, ignoring '%s' parameter"
+#, fuzzy, perl-format
+#| msgid "no such entry found, ignoring '%s' parameter"
+msgid "no such entry found, ignoring '%s' parameter '%s'"
 msgstr "элемент не найден, параметр «%s» игнорируется"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'since' option specifies most recent version, ignoring"
+#, fuzzy, perl-format
+#| msgid "'since' option specifies most recent version, ignoring"
+msgid "'since' option specifies most recent version '%s', ignoring"
 msgstr "в параметре «since» задана более новая версия, игнорируется"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'until' option specifies oldest version, ignoring"
+#, fuzzy, perl-format
+#| msgid "'until' option specifies oldest version, ignoring"
+msgid "'until' option specifies oldest version '%s', ignoring"
 msgstr "в параметре «until» задана более новая версия, игнорируется"
 
 #: scripts/Dpkg/Changelog/Debian.pm
@@ -2685,7 +2716,7 @@ msgstr "неправильный флаг в %s: %s"
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
 #, fuzzy, perl-format
 #| msgid "cannot exec format parser: %s"
-msgid "cannot parse non-comformant date '%s'"
+msgid "cannot parse non-conformant date '%s'"
 msgstr "не удалось запустить анализатор формата: %s"
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -2693,14 +2724,10 @@ msgid "the trailer doesn't match the expected regex"
 msgstr "концевик не подходит под ожидаемое регулярное выражение"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "cannot create pipe for %s"
-msgstr "невозможно создать канал для %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "tail of %s"
-msgstr "конец %s"
+#, fuzzy, perl-format
+#| msgid "cannot stat file %s"
+msgid "cannot seek into file %s"
+msgstr "не удалось выполнить функцию stat для файла %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
@@ -3070,6 +3097,12 @@ msgstr "символ «%s» запрещён"
 msgid "must start with an alphanumeric character"
 msgstr "должно начинаться с латинской буквы или цифры"
 
+#: scripts/Dpkg/Shlibs.pm
+msgid ""
+"deprecated use of LD_LIBRARY_PATH with private library directory which "
+"interferes with cross-building, please use -l option instead"
+msgstr ""
+
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, fuzzy, perl-format
 #| msgid "cannot exec format parser: %s"
@@ -3173,6 +3206,40 @@ msgstr "не удалось изменить метку времени для %s
 msgid "cannot read timestamp from %s"
 msgstr "не удалось изменить метку времени из %s"
 
+#: scripts/Dpkg/Source/Functions.pm
+#, fuzzy, perl-format
+#| msgid "cannot open file %s"
+msgid "cannot open file %s for binary detection"
+msgstr "не удалось открыть файл %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "adding %s to %s"
+msgstr "добавляется %s в %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "unwanted binary file: %s"
+msgstr "нежелательный двоичный файл: %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid ""
+"detected %d unwanted binary file (add it in debian/source/include-binaries "
+"to allow its inclusion)."
+msgid_plural ""
+"detected %d unwanted binary files (add them in debian/source/include-"
+"binaries to allow their inclusion)."
+msgstr[0] ""
+"обнаружен %d нежелательный двоичный файл (чтобы разрешить включение, "
+"добавьте его в debian/source/include-binaries)."
+msgstr[1] ""
+"обнаружено %d нежелательных двоичных файла (чтобы разрешить включение, "
+"добавьте их в debian/source/include-binaries)."
+msgstr[2] ""
+"обнаружено %d нежелательных двоичных файлов (чтобы разрешить включение, "
+"добавьте их в debian/source/include-binaries)."
+
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
 msgid "%s is not the name of a file"
@@ -3189,15 +3256,6 @@ msgid "source package format '%s' is not supported: %s"
 msgstr "формат пакета с исходным кодом «%s» не поддерживается: %s"
 
 #: scripts/Dpkg/Source/Package.pm
-msgid "format variant must be in lowercase"
-msgstr "символы варианта формата должны быть строчными"
-
-#: scripts/Dpkg/Source/Package.pm
-#, perl-format
-msgid "invalid Format field '%s'"
-msgstr "неправильное поле Format «%s»"
-
-#: scripts/Dpkg/Source/Package.pm
 msgid "source package uses only weak checksums"
 msgstr ""
 
@@ -3644,29 +3702,6 @@ msgstr "обнаружены локальные изменения, изменё
 msgid "-b takes only one parameter with format '%s'"
 msgstr "значением параметра -b является только один аргумент в формате «%s»"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "unwanted binary file: %s"
-msgstr "нежелательный двоичный файл: %s"
-
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid ""
-"detected %d unwanted binary file (add it in debian/source/include-binaries "
-"to allow its inclusion)."
-msgid_plural ""
-"detected %d unwanted binary files (add them in debian/source/include-"
-"binaries to allow their inclusion)."
-msgstr[0] ""
-"обнаружен %d нежелательный двоичный файл (чтобы разрешить включение, "
-"добавьте его в debian/source/include-binaries)."
-msgstr[1] ""
-"обнаружено %d нежелательных двоичных файла (чтобы разрешить включение, "
-"добавьте их в debian/source/include-binaries)."
-msgstr[2] ""
-"обнаружено %d нежелательных двоичных файлов (чтобы разрешить включение, "
-"добавьте их в debian/source/include-binaries)."
-
 #: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "cannot represent change to %s: %s"
@@ -3739,11 +3774,6 @@ msgstr ""
 msgid "cannot find an editor"
 msgstr "не удалось найти редактор"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "adding %s to %s"
-msgstr "добавляется %s в %s"
-
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 msgid "cannot unpack bzr-format source package because bzr is not in the PATH"
 msgstr ""
@@ -3785,7 +3815,9 @@ msgstr ""
 "каталоге: %s"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
-msgid "format v3.0 uses only one source file"
+#, fuzzy
+#| msgid "format v3.0 uses only one source file"
+msgid "format v3.0 (bzr) uses only one source file"
 msgstr "формат v3.0 используется только в файле исходнике"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
@@ -3916,6 +3948,12 @@ msgid "can't create symlink %s"
 msgstr "не удалось создать символьную ссылку %s"
 
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
+#, fuzzy, perl-format
+#| msgid "using options from %s: %s"
+msgid "using patch list from %s"
+msgstr "используются параметры из %s: %s"
+
+#: scripts/Dpkg/Source/Package/V3/Quilt.pm
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "неподдерживаемая версия метаданных quilt: %s"
@@ -3960,6 +3998,12 @@ msgid "unknown file type"
 msgstr "неизвестный тип файла"
 
 #: scripts/Dpkg/Source/Patch.pm
+#, fuzzy, perl-format
+#| msgid "ignoring deletion of directory %s"
+msgid "ignoring deletion of file %s"
+msgstr "игнорируется удаление каталога %s"
+
+#: scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "ignoring deletion of file %s, use --include-removal to override"
 msgstr ""
@@ -4203,13 +4247,15 @@ msgid "obsolete substitution variable ${%s}"
 msgstr "неиспользуемая подстановочная переменная ${%s}"
 
 #: scripts/Dpkg/Substvars.pm
-#, perl-format
-msgid "unknown substitution variable ${%s}"
-msgstr "неизвестная подстановочная переменная ${%s}"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} used, but is not defined"
+msgstr "неиспользуемая подстановочная переменная ${%s}"
 
 #: scripts/Dpkg/Substvars.pm
-#, perl-format
-msgid "unused substitution variable ${%s}"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} unused, but is defined"
 msgstr "неиспользуемая подстановочная переменная ${%s}"
 
 #: scripts/Dpkg/Vars.pm
@@ -4284,6 +4330,21 @@ msgstr "номер версии содержит недопустимый сим
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "часть эпохи в номере версии не является числом: «%s»"
 
+#~ msgid "format variant must be in lowercase"
+#~ msgstr "символы варианта формата должны быть строчными"
+
+#~ msgid "invalid Format field '%s'"
+#~ msgstr "неправильное поле Format «%s»"
+
+#~ msgid "cannot create pipe for %s"
+#~ msgstr "невозможно создать канал для %s"
+
+#~ msgid "tail of %s"
+#~ msgstr "конец %s"
+
+#~ msgid "unknown substitution variable ${%s}"
+#~ msgstr "неизвестная подстановочная переменная ${%s}"
+
 #~ msgid "%s died from signal %s"
 #~ msgstr "%s завершился по сигналу %s"
 
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index 816c3b18e..05f6d8eb0 100644
--- a/scripts/po/sv.po
+++ b/scripts/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.17.22\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2016-12-09 11:32+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\n"
@@ -297,27 +297,29 @@ msgid ""
 "      --build=<type>[,...]    specify the build <type>: full, source, "
 "binary,\n"
 "                                any, all (default is 'full').\n"
-"  -F                          normal full build (source and binary; "
+"  -F, --build=full            normal full build (source and binary; "
 "default).\n"
-"  -g                          source and arch-indep build.\n"
-"  -G                          source and arch-specific build.\n"
-"  -b                          binary-only, no source files.\n"
-"  -B                          binary-only, only arch-specific files.\n"
-"  -A                          binary-only, only arch-indep files.\n"
-"  -S                          source-only, no binary files.\n"
+"  -g, --build=source,all      source and arch-indep build.\n"
+"  -G, --build=source,any      source and arch-specific build.\n"
+"  -b, --build=binary          binary-only, no source files.\n"
+"  -B, --build=any             binary-only, only arch-specific files.\n"
+"  -A, --build=all             binary-only, only arch-indep files.\n"
+"  -S, --build=source          source-only, no binary files.\n"
 "  -nc, --no-pre-clean         do not pre clean source tree (implies -b).\n"
-"       --pre-clean            pre clean source tree (default).\n"
-"  -tc, --post-clean           clean source tree when finished.\n"
-"  -D                          check build dependencies and conflicts "
+"      --pre-clean             pre clean source tree (default).\n"
+"      --no-post-clean         do not post clean source tree (default).\n"
+"  -tc, --post-clean           post clean source tree.\n"
+"  -D, --check-builddeps       check build dependencies and conflicts "
 "(default).\n"
-"  -d                          do not check build dependencies and "
+"  -d, --no-check-builddeps    do not check build dependencies and "
 "conflicts.\n"
-"      --[no-]check-builddeps  ditto.\n"
 "      --ignore-builtin-builddeps\n"
 "                              do not check builtin build dependencies.\n"
 "  -P, --build-profiles=<profiles>\n"
-"                              assume comma-separated build profiles as "
+"                              assume comma-separated build <profiles> as "
 "active.\n"
+"      --rules-requires-root   assume legacy Rules-Requires-Root field "
+"value.\n"
 "  -R, --rules-file=<rules>    rules file to execute (default is debian/"
 "rules).\n"
 "  -T, --rules-target=<target> call debian/rules <target>.\n"
@@ -518,23 +520,6 @@ msgid "unknown option or argument %s"
 msgstr "okänd flagga eller argument %s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "using a gain-root-command while being root"
-msgstr "använder ett gain-root-command fast jag redan är root"
-
-#: scripts/dpkg-buildpackage.pl
-msgid ""
-"fakeroot not found, either install the fakeroot\n"
-"package, specify a command with the -r option, or run this as root"
-msgstr ""
-"fakeroot hittades inte, du kan installera paketet fakeroot,\n"
-"ange ett kommando med flaggan -r, eller köra som root"
-
-#: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid "gain-root-command '%s' not found"
-msgstr "få-root-kommandot \"%s\" hittades inte"
-
-#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "option %s is only meaningful with option %s"
 msgstr ""
@@ -620,6 +605,23 @@ msgid "unable to determine %s"
 msgstr "kan inte bestämma %s"
 
 #: scripts/dpkg-buildpackage.pl
+msgid "using a gain-root-command while being root"
+msgstr "använder ett gain-root-command fast jag redan är root"
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"fakeroot not found, either install the fakeroot\n"
+"package, specify a command with the -r option, or run this as root"
+msgstr ""
+"fakeroot hittades inte, du kan installera paketet fakeroot,\n"
+"ange ett kommando med flaggan -r, eller köra som root"
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid "gain-root-command '%s' not found"
+msgstr "få-root-kommandot \"%s\" hittades inte"
+
+#: scripts/dpkg-buildpackage.pl
 #, perl-format
 msgid "disallowed target in %s field keyword %s"
 msgstr ""
@@ -651,6 +653,20 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "okänd %%-substituering i krok: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"short OpenPGP key IDs are broken; please use key fingerprints in %s or %s "
+"instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"in %s or %s instead"
+msgstr ""
+
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
 #: scripts/dpkg-genbuildinfo.pl scripts/dpkg-name.pl scripts/Dpkg/Arch.pm
 #: scripts/Dpkg/IPC.pm scripts/Dpkg/OpenPGP.pm scripts/Dpkg/Shlibs.pm
@@ -808,8 +824,9 @@ msgstr "filnamn, sektion och prioritet kan inte innehålla blanktecken"
 #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl
 #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm
-#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm
+#: scripts/Dpkg/Source/Quilt.pm
 #, perl-format
 msgid "cannot write %s"
 msgstr "kan inte skriva %s"
@@ -951,7 +968,7 @@ msgstr "\"Section\" saknas för källfiler"
 msgid "missing Priority for source files"
 msgstr "\"Priority\" saknas för källfiler"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm
+#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm
 #, perl-format
 msgid "%s is empty"
 msgstr "%s är tom"
@@ -997,14 +1014,6 @@ msgstr "binärbygge utan binära artifakter upptäckt; kan inte distribuera"
 msgid "package %s in control file but not in files list"
 msgstr "paketet %s i styrinfofilen men inte i fillistfilen"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm
-#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm
-#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Quilt.pm
-#, perl-format
-msgid "cannot read %s"
-msgstr "kan inte läsa %s"
-
 #: scripts/dpkg-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1212,6 +1221,8 @@ msgstr "kan inte installera utdatastyrfil \"%s\""
 #| "      --version            show the version.\n"
 msgid ""
 "Options:\n"
+"  -l<library-path>         add directory to private shared library search "
+"list.\n"
 "  -p<package>              generate symbols file for package.\n"
 "  -P<package-build-dir>    temporary build directory instead of debian/tmp.\n"
 "  -e<library>              explicitly list libraries to scan.\n"
@@ -1538,6 +1549,7 @@ msgid ""
 "Parser options:\n"
 "      --format <output-format>\n"
 "                           set output format (defaults to 'dpkg').\n"
+"      --reverse            include all changes in reverse order.\n"
 "      --all                include all changes.\n"
 "  -s, --since <version>    include all changes later than <version>.\n"
 "  -v <version>             ditto.\n"
@@ -1707,6 +1719,10 @@ msgid "couldn't close stdout"
 msgstr "kunde inte stänga standard ut"
 
 #: scripts/dpkg-scanpackages.pl
+msgid "Packages with multiple instances but no --multiversion specified:"
+msgstr ""
+
+#: scripts/dpkg-scanpackages.pl
 msgid "Packages in override file with incorrect old maintainer value:"
 msgstr "Paket i överstyrningsfilen med felaktigt värde på gammal ansvarig:"
 
@@ -2028,7 +2044,8 @@ msgid "shared libs info file '%s' line %d: bad line '%s'"
 msgstr ""
 "informationsfilen för delade bibliotek \"%s\" rad %d: felaktig rad \"%s\""
 
-#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm
+#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm
+#: scripts/Dpkg/Checksums.pm
 #, perl-format
 msgid "cannot open file %s"
 msgstr "kan inte öppna filen %s"
@@ -2077,7 +2094,7 @@ msgstr "kan inte ta status på katalogen %s"
 msgid "directory argument %s is not a directory"
 msgstr "katalogargumentet %s är inte en katalog"
 
-#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm
 #, perl-format
 msgid "unable to chdir to '%s'"
@@ -2105,6 +2122,11 @@ msgstr "åtgärd krävs"
 
 #: scripts/dpkg-source.pl
 #, perl-format
+msgid "no source format specified in %s, see dpkg-source(1)"
+msgstr "källkodsformat ej angivet i %s, se dpkg-source(1)"
+
+#: scripts/dpkg-source.pl
+#, perl-format
 msgid "%s doesn't contain any information about the source package"
 msgstr "%s innehåller inte någon information om källkodspaketet"
 
@@ -2136,11 +2158,6 @@ msgstr "bygger källkod för utgåva med endast binär"
 
 #: scripts/dpkg-source.pl
 #, perl-format
-msgid "no source format specified in %s, see dpkg-source(1)"
-msgstr "källkodsformat ej angivet i %s, se dpkg-source(1)"
-
-#: scripts/dpkg-source.pl
-#, perl-format
 msgid "can't build with source format '%s': %s"
 msgstr "kan inte bygga med källkodsformatet \"%s\": %s"
 
@@ -2425,6 +2442,14 @@ msgstr ""
 msgid "'%s' is not a legal architecture in list '%s'"
 msgstr "\"%s\" är inte en giltig arkitektursträng"
 
+#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm
+#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm
+#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm
+#, perl-format
+msgid "cannot read %s"
+msgstr "kan inte läsa %s"
+
 #: scripts/Dpkg/BuildFlags.pm
 #, perl-format
 msgid "line %d of %s mentions unknown flag %s"
@@ -2493,8 +2518,9 @@ msgid "you can only specify one of 'to' and 'until', using 'until'"
 msgstr "du kan bara ange en av \"to\" och \"until\", använder \"until\""
 
 #: scripts/Dpkg/Changelog.pm
-#, perl-format
-msgid "'%s' option specifies non-existing version"
+#, fuzzy, perl-format
+#| msgid "'%s' option specifies non-existing version"
+msgid "'%s' option specifies non-existing version '%s'"
 msgstr "\"%s\"-flaggan anger en icke-existerande version"
 
 #: scripts/Dpkg/Changelog.pm
@@ -2510,16 +2536,21 @@ msgid "use oldest entry that is later than the one specified"
 msgstr "använd den äldsta posten som är senare än den angivna"
 
 #: scripts/Dpkg/Changelog.pm
-#, perl-format
-msgid "no such entry found, ignoring '%s' parameter"
+#, fuzzy, perl-format
+#| msgid "no such entry found, ignoring '%s' parameter"
+msgid "no such entry found, ignoring '%s' parameter '%s'"
 msgstr "hittade ingen sådan post, ignorerar parametern \"%s\""
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'since' option specifies most recent version, ignoring"
+#, fuzzy, perl-format
+#| msgid "'since' option specifies most recent version, ignoring"
+msgid "'since' option specifies most recent version '%s', ignoring"
 msgstr "\"since\"-flaggan anger den senaste versionen, ignorerar"
 
 #: scripts/Dpkg/Changelog.pm
-msgid "'until' option specifies oldest version, ignoring"
+#, fuzzy, perl-format
+#| msgid "'until' option specifies oldest version, ignoring"
+msgid "'until' option specifies oldest version '%s', ignoring"
 msgstr "\"until\"-flaggan anger den äldsta versionen, ignorerar"
 
 #: scripts/Dpkg/Changelog/Debian.pm
@@ -2631,7 +2662,7 @@ msgstr "felaktig flagga i %s: %s"
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
 #, fuzzy, perl-format
 #| msgid "cannot exec format parser: %s"
-msgid "cannot parse non-comformant date '%s'"
+msgid "cannot parse non-conformant date '%s'"
 msgstr "kan inte exekvera formattolk: %s"
 
 #: scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -2639,14 +2670,10 @@ msgid "the trailer doesn't match the expected regex"
 msgstr "filslutet motsvarar inte det förväntat reguljärt uttryck"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "cannot create pipe for %s"
-msgstr "kan inte skapa rör för %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "tail of %s"
-msgstr "tail för %s"
+#, fuzzy, perl-format
+#| msgid "cannot stat file %s"
+msgid "cannot seek into file %s"
+msgstr "kan inte ta status på filen %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
@@ -3010,6 +3037,12 @@ msgstr "tecknet \"%s\" är inte tillåtet"
 msgid "must start with an alphanumeric character"
 msgstr "måste börja med ett alfanumeriskt tecken"
 
+#: scripts/Dpkg/Shlibs.pm
+msgid ""
+"deprecated use of LD_LIBRARY_PATH with private library directory which "
+"interferes with cross-building, please use -l option instead"
+msgstr ""
+
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, fuzzy, perl-format
 #| msgid "cannot exec format parser: %s"
@@ -3112,6 +3145,37 @@ msgstr "kan inte ändra tidsstämpel på %s"
 msgid "cannot read timestamp from %s"
 msgstr "kan inte läsa tidsstämpel från %s"
 
+#: scripts/Dpkg/Source/Functions.pm
+#, fuzzy, perl-format
+#| msgid "cannot open file %s"
+msgid "cannot open file %s for binary detection"
+msgstr "kan inte öppna filen %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "adding %s to %s"
+msgstr "lägger %s till %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid "unwanted binary file: %s"
+msgstr "oönskad binärfil: %s"
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+msgid ""
+"detected %d unwanted binary file (add it in debian/source/include-binaries "
+"to allow its inclusion)."
+msgid_plural ""
+"detected %d unwanted binary files (add them in debian/source/include-"
+"binaries to allow their inclusion)."
+msgstr[0] ""
+"upptäckte %d oönskad binärfil (lägg till den i debian/source/include-"
+"binaries för att tillåta att den tas med)"
+msgstr[1] ""
+"upptäckte %d oönskade binärfiler (lägg till dem i debian/source/include-"
+"binaries för att tillåta att de tas med)"
+
 #: scripts/Dpkg/Source/Package.pm
 #, perl-format
 msgid "%s is not the name of a file"
@@ -3128,15 +3192,6 @@ msgid "source package format '%s' is not supported: %s"
 msgstr "källkodsformatet \"%s\" stöds inte: %s"
 
 #: scripts/Dpkg/Source/Package.pm
-msgid "format variant must be in lowercase"
-msgstr "formatvarianten måste skrivas med små bokstäver"
-
-#: scripts/Dpkg/Source/Package.pm
-#, perl-format
-msgid "invalid Format field '%s'"
-msgstr "ogiltigt Format-fält \"%s\""
-
-#: scripts/Dpkg/Source/Package.pm
 msgid "source package uses only weak checksums"
 msgstr ""
 
@@ -3573,26 +3628,6 @@ msgstr "lokala ändringar upptäcktes, de ändrade filerna är:"
 msgid "-b takes only one parameter with format '%s'"
 msgstr "-b tar bara en parameter för formatet \"%s\""
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "unwanted binary file: %s"
-msgstr "oönskad binärfil: %s"
-
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid ""
-"detected %d unwanted binary file (add it in debian/source/include-binaries "
-"to allow its inclusion)."
-msgid_plural ""
-"detected %d unwanted binary files (add them in debian/source/include-"
-"binaries to allow their inclusion)."
-msgstr[0] ""
-"upptäckte %d oönskad binärfil (lägg till den i debian/source/include-"
-"binaries för att tillåta att den tas med)"
-msgstr[1] ""
-"upptäckte %d oönskade binärfiler (lägg till dem i debian/source/include-"
-"binaries för att tillåta att de tas med)"
-
 #: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "cannot represent change to %s: %s"
@@ -3663,11 +3698,6 @@ msgstr ""
 msgid "cannot find an editor"
 msgstr "kan inte hitta något textredigeringsprogram"
 
-#: scripts/Dpkg/Source/Package/V2.pm
-#, perl-format
-msgid "adding %s to %s"
-msgstr "lägger %s till %s"
-
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 msgid "cannot unpack bzr-format source package because bzr is not in the PATH"
 msgstr "kan inte packa upp källkodspaket i bzr-format då bzr inte finns i PATH"
@@ -3705,7 +3735,9 @@ msgid "uncommitted, not-ignored changes in working directory: %s"
 msgstr "ej incheckade, ej ignorerade ändringar i arbetskatalogen: %s"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
-msgid "format v3.0 uses only one source file"
+#, fuzzy
+#| msgid "format v3.0 uses only one source file"
+msgid "format v3.0 (bzr) uses only one source file"
 msgstr "formatet v3.0 innehåller endast en källkodsfil"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
@@ -3831,6 +3863,12 @@ msgid "can't create symlink %s"
 msgstr "kan inte skapa den symboliska länken %s"
 
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
+#, fuzzy, perl-format
+#| msgid "using options from %s: %s"
+msgid "using patch list from %s"
+msgstr "använder flaggor från %s: %s"
+
+#: scripts/Dpkg/Source/Package/V3/Quilt.pm
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
 msgstr "versionen av quilt-metadata stöds inte: %s"
@@ -3875,6 +3913,12 @@ msgid "unknown file type"
 msgstr "okänd filtyp"
 
 #: scripts/Dpkg/Source/Patch.pm
+#, fuzzy, perl-format
+#| msgid "ignoring deletion of directory %s"
+msgid "ignoring deletion of file %s"
+msgstr "ignorerar borttagning av katalogen %s"
+
+#: scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "ignoring deletion of file %s, use --include-removal to override"
 msgstr ""
@@ -4116,13 +4160,15 @@ msgid "obsolete substitution variable ${%s}"
 msgstr "oanvänd substitueringsvariabel ${%s}"
 
 #: scripts/Dpkg/Substvars.pm
-#, perl-format
-msgid "unknown substitution variable ${%s}"
-msgstr "okänd substitueringsvariabel ${%s}"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} used, but is not defined"
+msgstr "oanvänd substitueringsvariabel ${%s}"
 
 #: scripts/Dpkg/Substvars.pm
-#, perl-format
-msgid "unused substitution variable ${%s}"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} unused, but is defined"
 msgstr "oanvänd substitueringsvariabel ${%s}"
 
 #: scripts/Dpkg/Vars.pm
@@ -4197,6 +4243,21 @@ msgstr "versionsnummer innehåller ogiltigt tecken \"%s\""
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "epokdelen av versionsnumret är inte ett tal: \"%s\""
 
+#~ msgid "format variant must be in lowercase"
+#~ msgstr "formatvarianten måste skrivas med små bokstäver"
+
+#~ msgid "invalid Format field '%s'"
+#~ msgstr "ogiltigt Format-fält \"%s\""
+
+#~ msgid "cannot create pipe for %s"
+#~ msgstr "kan inte skapa rör för %s"
+
+#~ msgid "tail of %s"
+#~ msgstr "tail för %s"
+
+#~ msgid "unknown substitution variable ${%s}"
+#~ msgstr "okänd substitueringsvariabel ${%s}"
+
 #~ msgid "%s died from signal %s"
 #~ msgstr "%s dog av signal %s"
 
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
index 525817085..a3a9e6fee 100644
--- a/scripts/t/Dpkg_Arch.t
+++ b/scripts/t/Dpkg_Arch.t
@@ -16,12 +16,12 @@
 use strict;
 use warnings;
 
-use Test::More tests => 16367;
+use Test::More tests => 16836;
 
 use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch
                         debarch_eq debarch_is debarch_is_wildcard
                         debarch_is_illegal
-                        debarch_to_abiattrs
+                        debarch_to_abiattrs debarch_to_cpubits
                         debarch_list_parse
                         debtuple_to_debarch gnutriplet_to_debarch
                         get_host_gnu_type
@@ -148,11 +148,23 @@ my @arch_ref;
 @arch_new = debarch_list_parse('amd64  !arm64   linux-i386 !kfreebsd-any');
 is_deeply(\@arch_new, \@arch_ref, 'parse valid arch list');
 
+@arch_ref = qw(amd64 arm64 linux-i386 kfreebsd-any);
+@arch_new = debarch_list_parse('amd64  arm64   linux-i386 kfreebsd-any', positive => 1);
+is_deeply(\@arch_new, \@arch_ref, 'parse valid positive arch list');
+
 eval { @arch_new = debarch_list_parse('!amd64!arm64') };
 ok($@, 'parse concatenated arches failed');
 
+eval { @arch_new = debarch_list_parse('amd64 !arm64 !mips', positive => 1) };
+ok($@, 'parse disallowed negated arches failed');
+
 is(debarch_to_abiattrs(undef), undef, 'undef ABI attrs');
 is_deeply([ debarch_to_abiattrs('amd64') ], [ qw(64 little) ], 'amd64 ABI attrs');
+is_deeply([ debarch_to_abiattrs('x32') ], [ qw(32 little) ], 'x32 ABI attrs');
+
+is(debarch_to_cpubits(undef), undef, 'undef CPU bits');
+is(debarch_to_cpubits('i386'), 32, 'i386 CPU bits');
+is(debarch_to_cpubits('amd64'), 64, 'amd64 CPU bits');
 
 is(debtuple_to_debarch(undef, undef, undef, undef), undef, 'undef debtuple');
 is(debtuple_to_debarch('base', 'gnu', 'linux', 'amd64'), 'amd64', 'known debtuple');
@@ -162,7 +174,7 @@ is(gnutriplet_to_debarch(undef), undef, 'undef gnutriplet');
 is(gnutriplet_to_debarch('unknown-unknown-unknown'), undef, 'unknown gnutriplet');
 is(gnutriplet_to_debarch('x86_64-linux-gnu'), 'amd64', 'known gnutriplet');
 
-is(scalar get_valid_arches(), 524, 'expected amount of known architectures');
+is(scalar get_valid_arches(), 539, 'expected amount of known architectures');
 
 {
     local $ENV{CC} = 'false';
diff --git a/scripts/t/Dpkg_BuildFlags.t b/scripts/t/Dpkg_BuildFlags.t
index 0ebf878b8..b087e0ab2 100644
--- a/scripts/t/Dpkg_BuildFlags.t
+++ b/scripts/t/Dpkg_BuildFlags.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 15;
+use Test::More tests => 26;
 
 BEGIN {
     use_ok('Dpkg::BuildFlags');
@@ -47,6 +47,47 @@ is($bf->get('DPKGFLAGS'), '-Idir -Wflag -fsome -Wl,other', 'get prepended flag')
 is($bf->get_origin('DPKGFLAGS'), 'env', 'flag has an env origin');
 ok($bf->is_maintainer_modified('DPKGFLAGS'), 'prepend marked flag as maint modified');
 
+my %known_features = (
+    future => [ qw(
+        lfs
+    ) ],
+    hardening => [ qw(
+        bindnow
+        format
+        fortify
+        pie
+        relro
+        stackprotector
+        stackprotectorstrong
+    ) ],
+    qa => [ qw(
+        bug
+        canary
+    ) ],
+    reproducible => [ qw(
+        fixdebugpath
+        fixfilepath
+        timeless
+    ) ],
+    sanitize => [ qw(
+        address
+        leak
+        thread
+        undefined
+    ) ],
+);
+
+is_deeply([ sort $bf->get_feature_areas() ], [ sort keys %known_features ],
+          'supported feature areas');
+
+foreach my $area (sort keys %known_features) {
+    ok($bf->has_features($area), "has feature area $area");
+    my %features = $bf->get_features($area);
+    is_deeply([ sort keys %features ],
+              $known_features{$area},
+              "supported features for area $area");
+}
+
 # TODO: Add more test cases.
 
 1;
diff --git a/scripts/t/Dpkg_BuildFlags_Ubuntu.t b/scripts/t/Dpkg_BuildFlags_Ubuntu.t
new file mode 100644
index 000000000..3cfdb268f
--- /dev/null
+++ b/scripts/t/Dpkg_BuildFlags_Ubuntu.t
@@ -0,0 +1,57 @@
+#!/usr/bin/perl
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+use strict;
+use warnings;
+
+use Test::More tests => 16;
+
+BEGIN {
+    use_ok('Dpkg::BuildFlags');
+}
+
+sub test_optflag
+{
+    my ($bf, $optflag) = @_;
+
+    foreach my $flag (qw(CFLAGS CXXFLAGS OBJCFLAGS OBJCXXFLAGS GCJFLAGS
+                         FFLAGS FCFLAGS)) {
+        my $value = $bf->get($flag);
+        ok($value =~ m/$optflag/, "$flag contains $optflag: $value");
+    }
+}
+
+my $bf;
+
+# Force loading the Dpkg::Vendor::Ubuntu module.
+$ENV{DEB_VENDOR} = 'Ubuntu';
+
+# Test the optimization flag inherited from the Dpkg::Vendor::Debian module.
+$ENV{DEB_HOST_ARCH} = 'amd64';
+$bf = Dpkg::BuildFlags->new();
+
+test_optflag($bf, '-O2');
+
+# Test the overlaid Ubuntu-specific linker flag.
+ok($bf->get('LDFLAGS') =~ m/-Wl,-Bsymbolic-functions/,
+   'LDFLAGS contains -Bsymbolic-functions');
+
+# Test the optimization flag override only for ppc64el.
+$ENV{DEB_HOST_ARCH} = 'ppc64el';
+$bf = Dpkg::BuildFlags->new();
+
+test_optflag($bf, '-O3');
+
+1;
diff --git a/scripts/t/Dpkg_Build_Types.t b/scripts/t/Dpkg_Build_Types.t
index 7fa70ccf9..03c7055b3 100644
--- a/scripts/t/Dpkg_Build_Types.t
+++ b/scripts/t/Dpkg_Build_Types.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 26;
+use Test::More tests => 39;
 
 BEGIN {
     use_ok('Dpkg::Build::Types');
@@ -52,6 +52,29 @@ ok(!build_has_all(BUILD_SOURCE | BUILD_ARCH_DEP),
    'build source,all not has_all source,any');
 ok(!build_has_all(BUILD_FULL), 'build source,all has_all full');
 
+set_build_type_from_targets('build-arch,build-indep',
+                            '--targets=build-arch,build-indep', nocheck => 1);
+is(get_build_options_from_type(), 'binary',
+                                  'build is binary from build-arch,build-indep');
+ok(build_is(BUILD_BINARY), 'build is binary from build-arch,build-indep');
+
+set_build_type_from_targets('binary', '--targets=binary', nocheck => 1);
+is(get_build_options_from_type(), 'binary', 'build is binary from binary');
+ok(build_is(BUILD_BINARY), 'build is binary from binary');
+
+set_build_type_from_targets('clean,binary-indep',
+                            '--targets=clean,binary-indep', nocheck => 1);
+ok(build_is(BUILD_SOURCE | BUILD_ARCH_INDEP), 'build source,all is source,all');
+ok(!build_is(BUILD_SOURCE | BUILD_ARCH_DEP), 'build source,all is not source,any');
+ok(build_has_any(BUILD_SOURCE), 'build source,all has_any source');
+ok(build_has_any(BUILD_ARCH_INDEP), 'build source,all has_any any');
+ok(build_has_none(BUILD_DEFAULT), 'build source,all has_none default');
+ok(build_has_none(BUILD_ARCH_DEP), 'build source,all has_none any');
+ok(!build_has_all(BUILD_BINARY), 'build source,all not has_all binary');
+ok(!build_has_all(BUILD_SOURCE | BUILD_ARCH_DEP),
+   'build source,all not has_all source,any');
+ok(!build_has_all(BUILD_FULL), 'build source,all has_all full');
+
 set_build_type(BUILD_BINARY, '--build=binary', nocheck => 1);
 ok(build_is(BUILD_BINARY), 'build binary is binary');
 ok(build_has_any(BUILD_ARCH_DEP), 'build binary has_any any');
diff --git a/scripts/t/Dpkg_Changelog.t b/scripts/t/Dpkg_Changelog.t
index 1ca238acd..4d046fec1 100644
--- a/scripts/t/Dpkg_Changelog.t
+++ b/scripts/t/Dpkg_Changelog.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 94;
+use Test::More tests => 102;
 use Test::Dpkg qw(:paths);
 
 use File::Basename;
@@ -29,21 +29,19 @@ BEGIN {
     use_ok('Dpkg::Vendor', qw(get_current_vendor));
 };
 
-my $datadir = test_get_data_path('t/Dpkg_Changelog');
+my $datadir = test_get_data_path();
 
 my $vendor = get_current_vendor();
 
 #########################
 
 foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields",
-    "$datadir/regressions", "$datadir/date-format") {
+    "$datadir/regressions", "$datadir/date-format", "$datadir/stop-modeline") {
 
     my $changes = Dpkg::Changelog::Debian->new(verbose => 0);
     $changes->load($file);
 
-    open(my $clog_fh, '<', "$file") or die "can't open $file\n";
-    my $content = file_slurp($clog_fh);
-    close($clog_fh);
+    my $content = file_slurp($file);
     cmp_ok($content, 'eq', "$changes", "string output of Dpkg::Changelog on $file");
 
     my $errors = $changes->get_parse_errors();
@@ -81,6 +79,10 @@ foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields",
                       count => 3,
                       versions => [ '2:2.0-1', '1:2.0~rc2-3', '1:2.0~rc2-2' ],
                       name => 'positive count');
+        check_options(%ref, range => { count => 3, reverse => 1 },
+                      count => 3,
+                      versions => [ '1:2.0~rc2-2', '1:2.0~rc2-3', '2:2.0-1' ],
+                      name => 'positive reverse count');
         check_options(%ref, range => { count => -3 },
                       count => 3,
                       versions => [
@@ -342,6 +344,10 @@ Xb-Userfield2: foobar
         is($data[2]->get_timestamp(), 'Mon, 01 Jan 2000 00:00:00 +0000',
            'get date w/ DoW, and zero timezone offset');
     }
+    if ($file eq "$datadir/stop-modeline") {
+        is($changes->get_unparsed_tail(), "vim: et\n",
+           'get unparsed modeline at EOF');
+    }
     if ($file eq "$datadir/regressions") {
 	my $f = ($changes->format_range('dpkg'))[0];
 	is("$f->{Version}", '0', 'version 0 correctly parsed');
diff --git a/scripts/t/Dpkg_Changelog/shadow b/scripts/t/Dpkg_Changelog/shadow
index f9b2236f5..ca1f1934a 100644
--- a/scripts/t/Dpkg_Changelog/shadow
+++ b/scripts/t/Dpkg_Changelog/shadow
@@ -204,7 +204,7 @@ shadow (1:4.0.3-35) unstable; urgency=low
       Closes: #311588
     - 131_tl: Tagalog updated by Eric Pareja
       Closes: #310386
-    - 132_vi: Correct file used for Vietnamese tanslation
+    - 132_vi: Correct file used for Vietnamese translation
       Closes: #306614, #307251, #307262, #308479
 
  -- Christian Perrier <bubulle@debian.org>  Fri,  3 Jun 2005 07:32:07 +0200
@@ -896,7 +896,7 @@ shadow (1:4.0.3-12) unstable; urgency=low
 shadow (1:4.0.3-11) unstable; urgency=low
 
   * update Japanese debconf translation. closes: #210382
-  * update Brazilian Portugese debconf translation. closes: #208122
+  * update Brazilian Portuguese debconf translation. closes: #208122
   * run pam cleanup code as root. closes: #195048
 
  -- Karl Ramm <kcr@debian.org>  Sat, 13 Sep 2003 17:49:29 -0400
@@ -1108,7 +1108,7 @@ shadow (20000902-7) unstable; urgency=low
   * Cancel login timeout after authentication so that patient people
     timing out on network directory services can log in with local
     accounts.  Closes: #107148
-  * Add Brazillian Portugese debconf template translation for passwd.
+  * Add Brazillian Portuguese debconf template translation for passwd.
     Closes: #105292, #93223
   * Pull /usr/share/doc/$package/README.shadow-paper.gz.  Closes: #98058
   * Use getent instead of group to verify existence of shadow group
@@ -1382,7 +1382,7 @@ shadow (19990827-9) unstable; urgency=low
 
 shadow (19990827-8) unstable; urgency=low
 
-  * src/login.c: fixed loggin of username on successful login (was using
+  * src/login.c: fixed login of username on successful login (was using
     the normal username, when it should have used pam_user),
     closes: #47819
   * src/login.c: check for hushed login and pass PAM_SILENT if true,
@@ -1586,7 +1586,7 @@ shadow (19990827-1) unstable; urgency=low
     also call pam_fail_delay() with FAIL_DELAY as the arg before authentication.
   * etc/login.defs.pam.linux: new file, reflects options that PAM takesover
   * etc/login.defs.pam.hurd: new file, same for Hurd
-  * debian/passwd.mk: make sure that login.defs.5 get's installed for Hurd
+  * debian/passwd.mk: make sure that login.defs.5 gets installed for Hurd
   * pam.d/: Modified defaults for each service to reflect the old style and also
     added commented options on how to enable obsoleted options from login.defs
     in the PAM Way(tm).
diff --git a/scripts/t/Dpkg_Changelog/stop-modeline b/scripts/t/Dpkg_Changelog/stop-modeline
new file mode 100644
index 000000000..5b8a7b438
--- /dev/null
+++ b/scripts/t/Dpkg_Changelog/stop-modeline
@@ -0,0 +1,13 @@
+modeline (2.0-1) unstable; urgency=low
+
+  * Upload.
+
+ -- Dpkg Developers <debian-dpkg@lists.debian.org>  Tue,  4 Oct 2005 01:49:05 +0200
+
+modeline (1.0-1) unstable; urgency=low
+
+  * Upload.
+
+ -- Dpkg Developers <debian-dpkg@lists.debian.org>  Tue,  4 Oct 2005 01:48:05 +0200
+
+vim: et
diff --git a/scripts/t/Dpkg_Checksums.t b/scripts/t/Dpkg_Checksums.t
index e549e640e..33e2587e1 100644
--- a/scripts/t/Dpkg_Checksums.t
+++ b/scripts/t/Dpkg_Checksums.t
@@ -16,14 +16,14 @@
 use strict;
 use warnings;
 
-use Test::More tests => 44;
+use Test::More tests => 59;
 use Test::Dpkg qw(:paths);
 
 BEGIN {
     use_ok('Dpkg::Checksums');
 }
 
-my $datadir = test_get_data_path('t/Dpkg_Checksums');
+my $datadir = test_get_data_path();
 
 my @data = (
     {
@@ -120,4 +120,32 @@ foreach my $alg (keys %str_checksum) {
 
 test_checksums($ck);
 
+# Check remove_file()
+
+ok($ck->has_file('data-2'), 'To be removed file is present');
+$ck->remove_file('data-2');
+ok(!$ck->has_file('data-2'), 'Remove file is not present');
+
+# Check add_from_control()
+my $ctrl;
+foreach my $f (@data) {
+    next if $f->{file} ne 'data-2';
+    foreach my $alg (keys %{$f->{sums}}) {
+        $ctrl->{"Checksums-$alg"} = "\n$f->{sums}->{$alg} $f->{size} $f->{file}";
+    }
+}
+$ck->add_from_control($ctrl);
+
+test_checksums($ck);
+
+# Check export_to_control()
+
+my $ctrl_export = {};
+$ck->export_to_control($ctrl_export);
+
+foreach my $alg (keys %str_checksum) {
+    is($ctrl_export->{"Checksums-$alg"}, $str_checksum{$alg},
+       "Export checksum $alg to a control object");
+}
+
 1;
diff --git a/scripts/t/Dpkg_Compression.t b/scripts/t/Dpkg_Compression.t
index 3a2be1107..3babe5fca 100644
--- a/scripts/t/Dpkg_Compression.t
+++ b/scripts/t/Dpkg_Compression.t
@@ -17,12 +17,12 @@ use strict;
 use warnings;
 
 use Test::More tests => 13;
+use Test::Dpkg qw(:paths);
 
 use_ok('Dpkg::Compression');
 use_ok('Dpkg::Compression::FileHandle');
 
-my $tmpdir = 't.tmp/Dpkg_Compression';
-mkdir $tmpdir;
+my $tmpdir = test_get_temp_path();
 my @lines = ("One\n", "Two\n", "Three\n");
 my $fh;
 
diff --git a/scripts/t/Dpkg_Conf.t b/scripts/t/Dpkg_Conf.t
index 2e55e3d59..940d18dd7 100644
--- a/scripts/t/Dpkg_Conf.t
+++ b/scripts/t/Dpkg_Conf.t
@@ -23,7 +23,7 @@ BEGIN {
     use_ok('Dpkg::Conf');
 }
 
-my $datadir = test_get_data_path('t/Dpkg_Conf');
+my $datadir = test_get_data_path();
 
 my ($conf, $count, @opts);
 
diff --git a/scripts/t/Dpkg_Control.t b/scripts/t/Dpkg_Control.t
index 0f808fbdc..057cb21b6 100644
--- a/scripts/t/Dpkg_Control.t
+++ b/scripts/t/Dpkg_Control.t
@@ -26,7 +26,7 @@ BEGIN {
     use_ok('Dpkg::Control::Info');
 }
 
-my $datadir = test_get_data_path('t/Dpkg_Control');
+my $datadir = test_get_data_path();
 
 sub parse_dsc {
     my $path = shift;
diff --git a/scripts/t/Dpkg_Control_Fields.t b/scripts/t/Dpkg_Control_Fields.t
index 7a6582287..8e0bd721b 100644
--- a/scripts/t/Dpkg_Control_Fields.t
+++ b/scripts/t/Dpkg_Control_Fields.t
@@ -20,22 +20,25 @@ use Test::More;
 use Test::Dpkg qw(:paths);
 
 BEGIN {
-    plan tests => 2416;
+    plan tests => 2438;
 
     use_ok('Dpkg::Control::Types');
     use_ok('Dpkg::Control::FieldsCore');
 }
 
-#my $datadir = test_get_data_path('t/Dpkg_Control_Fields');
+#my $datadir = test_get_data_path();
 
 my @src_dep_fields = qw(
     Build-Depends Build-Depends-Arch Build-Depends-Indep
     Build-Conflicts Build-Conflicts-Arch Build-Conflicts-Indep
 );
-my @bin_dep_fields = qw(
+my @bin_dep_normal_fields = qw(
     Pre-Depends Depends Recommends Suggests Enhances
+);
+my @bin_dep_union_fields = qw(
     Conflicts Breaks Replaces Provides Built-Using
 );
+my @bin_dep_fields = (@bin_dep_normal_fields, @bin_dep_union_fields);
 my @src_checksums = qw(
     Checksums-Md5 Checksums-Sha1 Checksums-Sha256
 );
@@ -164,7 +167,8 @@ my %fields = (
             qw(Format Source Binary Architecture Version Binary-Only-Changes),
             @src_checksums,
             qw(Build-Origin Build-Architecture Build-Kernel-Version
-               Build-Date Build-Path Installed-Build-Depends Environment)
+               Build-Date Build-Path Build-Tainted-By
+               Installed-Build-Depends Environment)
         ],
     },
     CTRL_FILE_CHANGES() => {
diff --git a/scripts/t/Dpkg_Control_Tests.t b/scripts/t/Dpkg_Control_Tests.t
index 9c14a2e4e..27042dcfc 100644
--- a/scripts/t/Dpkg_Control_Tests.t
+++ b/scripts/t/Dpkg_Control_Tests.t
@@ -23,7 +23,7 @@ BEGIN {
     use_ok('Dpkg::Control::Tests');
 }
 
-my $datadir = test_get_data_path('t/Dpkg_Control_Tests');
+my $datadir = test_get_data_path();
 
 sub parse_tests {
     my $path = shift;
diff --git a/scripts/t/Dpkg_Deps.t b/scripts/t/Dpkg_Deps.t
index 71a3cf16a..14fe4e014 100644
--- a/scripts/t/Dpkg_Deps.t
+++ b/scripts/t/Dpkg_Deps.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 70;
+use Test::More tests => 82;
 
 use Dpkg::Arch qw(get_host_arch);
 use Dpkg::Version;
@@ -160,6 +160,8 @@ $facts->add_installed_package('pkg-ma-foreign2', '1.3.4-1', get_host_arch(), 'fo
 $facts->add_installed_package('pkg-ma-allowed', '1.3.4-1', 'somearch', 'allowed');
 $facts->add_installed_package('pkg-ma-allowed2', '1.3.4-1', 'somearch', 'allowed');
 $facts->add_installed_package('pkg-ma-allowed3', '1.3.4-1', get_host_arch(), 'allowed');
+$facts->add_installed_package('pkg-indep-normal', '1.3.4-1', 'all', 'no');
+$facts->add_installed_package('pkg-indep-foreign', '1.3.4-1', 'all', 'foreign');
 $facts->add_provided_package('myvirtual', undef, undef, 'mypackage');
 $facts->add_provided_package('myvirtual2', REL_EQ, '1.0-1', 'mypackage');
 $facts->add_provided_package('myvirtual3', REL_GE, '2.0-1', 'mypackage');
@@ -169,7 +171,51 @@ my $field_duplicate = 'libc6 (>= 2.3), libc6 (>= 2.6-1), mypackage (>=
 pkg-ma-foreign2, pkg-ma-allowed:any, pkg-ma-allowed2, pkg-ma-allowed3';
 my $dep_dup = deps_parse($field_duplicate);
 $dep_dup->simplify_deps($facts, $dep_opposite);
-is($dep_dup->output(), 'libc6 (>= 2.6-1), mypackage2, pkg-ma-allowed2', 'Simplify deps');
+is($dep_dup->output(), 'libc6 (>= 2.6-1), mypackage2, pkg-ma-allowed2',
+    'Simplify deps');
+
+my $dep_ma_all_normal_implicit_native = deps_parse('pkg-indep-normal', build_dep => 1);
+my $dep_ma_all_normal_explicit_native = deps_parse('pkg-indep-normal:native', build_dep => 1);
+my $dep_ma_all_foreign_implicit_native = deps_parse('pkg-indep-foreign', build_dep => 1);
+my $dep_ma_all_foreign_explicit_native = deps_parse('pkg-indep-foreign:native', build_dep => 1);
+$dep_ma_all_normal_implicit_native->simplify_deps($facts);
+is($dep_ma_all_normal_implicit_native->output(), '',
+    'Simplify arch:all m-a:no w/ implicit :native (satisfied)');
+$dep_ma_all_normal_explicit_native->simplify_deps($facts);
+is($dep_ma_all_normal_explicit_native->output(), '',
+    'Simplify arch:all m-a:no w/ explicit :native (satisfied)');
+$dep_ma_all_foreign_implicit_native->simplify_deps($facts);
+is($dep_ma_all_foreign_implicit_native->output(), '',
+    'Simplify arch:all m-a:foreign w/ implicit :native (satisfied)');
+$dep_ma_all_foreign_explicit_native->simplify_deps($facts);
+is($dep_ma_all_foreign_explicit_native->output(), 'pkg-indep-foreign:native',
+    'Simplify arch:all m-a:foreign w/ explicit :native (unsatisfied)');
+
+TODO: {
+
+local $TODO = 'not yet implemented';
+
+my $dep_or_eq = deps_parse('pkg-a | pkg-b | pkg-a');
+$dep_or_eq->simplify_deps($facts);
+is($dep_or_eq->output(), 'pkg-a | pkg-b',
+    'Simplify duped ORed, equal names');
+
+$dep_or_eq = deps_parse('pkg-a (= 10) | pkg-b | pkg-a (= 10)');
+$dep_or_eq->simplify_deps($facts);
+is($dep_or_eq->output(), 'pkg-a (= 10) | pkg-b',
+    'Simplify duped ORed, matching version');
+
+my $dep_or_subset = deps_parse('pkg-a (>= 10) | pkg-b | pkg-a (= 10)');
+$dep_or_eq->simplify_deps($facts);
+is($dep_or_eq->output(), 'pkg-a (= 10) | pkg-b',
+    'Simplify duped ORed, subset version');
+
+$dep_or_subset = deps_parse('pkg-a (>= 10) <profile> | pkg-b | pkg-a (= 10) <profile>');
+$dep_or_eq->simplify_deps($facts);
+is($dep_or_eq->output(), 'pkg-a (= 10) <profile> | pkg-b',
+    'Simplify duped ORed, subset version');
+
+} # TODO
 
 my $field_virtual = 'myvirtual | other';
 my $dep_virtual = deps_parse($field_virtual);
@@ -221,11 +267,16 @@ $dep_profiles->simplify_deps($facts);
 is($dep_profiles->output(), 'dupe <stage1 cross>',
    'Simplification respects duplicated profiles');
 
+TODO: {
+
+local $TODO = 'not yet implemented';
+
 $dep_profiles = deps_parse('tool <!cross>, tool <stage1 cross>');
 $dep_profiles->simplify_deps($facts);
-# XXX: Ideally this would get simplified to "tool <!cross> <stage1 cross>".
-is($dep_profiles->output(), 'tool <!cross>, tool <stage1 cross>',
-   'Simplification respects profiles');
+is($dep_profiles->output(), 'tool <!cross> <stage1 cross>',
+   'Simplify restriction formulas');
+
+} # TODO
 
 $dep_profiles = deps_parse('libfoo-dev:native <!stage1>, libfoo-dev <!stage1 cross>', build_dep => 1);
 $dep_profiles->simplify_deps($facts);
@@ -233,6 +284,26 @@ is($dep_profiles->output(),
    'libfoo-dev:native <!stage1>, libfoo-dev <!stage1 cross>',
    'Simplification respects archqualifiers and profiles');
 
+my $dep_archqual = deps_parse('pkg, pkg:any');
+$dep_archqual->simplify_deps($facts);
+is($dep_archqual->output(), 'pkg, pkg:any',
+    'Simplify respect arch-qualified ANDed dependencies 1/2');
+
+$dep_archqual = deps_parse('pkg:amd64, pkg:any, pkg:i386');
+$dep_archqual->simplify_deps($facts);
+is($dep_archqual->output(), 'pkg:amd64, pkg:any, pkg:i386',
+    'Simplify respects arch-qualified ANDed dependencies 2/2');
+
+$dep_archqual = deps_parse('pkg | pkg:any');
+$dep_archqual->simplify_deps($facts);
+is($dep_archqual->output(), 'pkg | pkg:any',
+    'Simplify respect arch-qualified ORed dependencies 1/2');
+
+$dep_archqual = deps_parse('pkg:amd64 | pkg:i386 | pkg:any');
+$dep_archqual->simplify_deps($facts);
+is($dep_archqual->output(), 'pkg:amd64 | pkg:i386 | pkg:any',
+    'Simplify respect arch-qualified ORed dependencies 2/2');
+
 my $dep_version = deps_parse('pkg, pkg (= 1.0)');
 $dep_version->simplify_deps($facts);
 is($dep_version->output(), 'pkg (= 1.0)', 'Simplification merges versions');
diff --git a/scripts/t/Dpkg_Dist_Files.t b/scripts/t/Dpkg_Dist_Files.t
index b29973d38..e7d6a5da6 100644
--- a/scripts/t/Dpkg_Dist_Files.t
+++ b/scripts/t/Dpkg_Dist_Files.t
@@ -21,7 +21,7 @@ use Test::Dpkg qw(:paths);
 
 use_ok('Dpkg::Dist::Files');
 
-my $datadir = test_get_data_path('t/Dpkg_Dist_Files');
+my $datadir = test_get_data_path();
 
 my $expected;
 my %expected = (
@@ -29,11 +29,13 @@ my %expected = (
         filename => 'pkg-src_4:2.0+1A~rc1-1.dsc',
         section => 'source',
         priority => 'extra',
+        attrs => {},
     },
     'pkg-src_4:2.0+1A~rc1-1.tar.xz' => {
         filename => 'pkg-src_4:2.0+1A~rc1-1.tar.xz',
         section => 'source',
         priority => 'extra',
+        attrs => {},
     },
     'pkg-templ_1.2.3_arch.type' => {
         filename => 'pkg-templ_1.2.3_arch.type',
@@ -43,6 +45,7 @@ my %expected = (
         arch => 'arch',
         section => 'section',
         priority => 'priority',
+        attrs => {},
     },
     'pkg-arch_2.0.0_amd64.deb' => {
         filename => 'pkg-arch_2.0.0_amd64.deb',
@@ -52,6 +55,7 @@ my %expected = (
         arch => 'amd64',
         section => 'admin',
         priority => 'required',
+        attrs => {},
     },
     'pkg-indep_0.0.1-2_all.deb' => {
         filename => 'pkg-indep_0.0.1-2_all.deb',
@@ -61,26 +65,35 @@ my %expected = (
         arch => 'all',
         section => 'net',
         priority => 'standard',
+        attrs => {},
     },
     'other_0.txt' => {
         filename => 'other_0.txt',
         section => 'text',
         priority => 'optional',
+        attrs => {
+            'mime-type' => 'text/plain',
+        },
     },
     'BY-HAND-file' => {
         filename => 'BY-HAND-file',
         section => 'webdocs',
         priority => 'optional',
+        attrs => {
+            'by-hand' => 'true'
+        },
     },
     'another:filename' => {
         filename => 'another:filename',
         section => 'by-hand',
         priority => 'extra',
+        attrs => {},
     },
     'added-on-the-fly' => {
         filename => 'added-on-the-fly',
         section => 'void',
         priority => 'wish',
+        attrs => {},
     },
 );
 
@@ -88,8 +101,8 @@ my $dist = Dpkg::Dist::Files->new();
 $dist->load("$datadir/files-byhand") or error('cannot parse file');
 
 $expected = <<'FILES';
-BY-HAND-file webdocs optional
-other_0.txt text optional
+BY-HAND-file webdocs optional by-hand=true
+other_0.txt text optional mime-type=text/plain
 pkg-arch_2.0.0_amd64.deb admin required
 pkg-indep_0.0.1-2_all.deb net standard
 pkg-templ_1.2.3_arch.type section priority
@@ -110,9 +123,9 @@ foreach my $f ($dist->get_files()) {
 is($dist->parse_filename('file%invalid'), undef, 'invalid filename');
 
 $expected = <<'FILES';
-BY-HAND-file webdocs optional
+BY-HAND-file webdocs optional by-hand=true
 added-on-the-fly void wish
-other_0.txt text optional
+other_0.txt text optional mime-type=text/plain
 pkg-arch_2.0.0_amd64.deb void imperative
 pkg-templ_1.2.3_arch.type section priority
 FILES
@@ -156,8 +169,8 @@ is_deeply($dist->get_file('another:filename'),
 is($dist->output, $expected, 'Added source files');
 
 $expected = <<'FILES';
-BY-HAND-file webdocs optional
-other_0.txt text optional
+BY-HAND-file webdocs optional by-hand=true
+other_0.txt text optional mime-type=text/plain
 pkg-arch_2.0.0_amd64.deb admin required
 pkg-frag-a_0.0_arch.type section priority
 pkg-frag-b_0.0_arch.type section priority
@@ -181,8 +194,8 @@ $dist->filter(remove => sub { $_[0]->{priority} eq 'optional' });
 is($dist->output(), $expected, 'Filter remove priority optional');
 
 $expected = <<'FILES';
-BY-HAND-file webdocs optional
-other_0.txt text optional
+BY-HAND-file webdocs optional by-hand=true
+other_0.txt text optional mime-type=text/plain
 FILES
 
 $dist->reset();
@@ -191,7 +204,7 @@ $dist->filter(keep => sub { $_[0]->{priority} eq 'optional' });
 is($dist->output(), $expected, 'Filter keep priority optional');
 
 $expected = <<'FILES';
-BY-HAND-file webdocs optional
+BY-HAND-file webdocs optional by-hand=true
 FILES
 
 $dist->reset();
diff --git a/scripts/t/Dpkg_Dist_Files/files-byhand b/scripts/t/Dpkg_Dist_Files/files-byhand
index ac45d4610..416b14fb8 100644
--- a/scripts/t/Dpkg_Dist_Files/files-byhand
+++ b/scripts/t/Dpkg_Dist_Files/files-byhand
@@ -1,5 +1,5 @@
 pkg-templ_1.2.3_arch.type section priority
 pkg-arch_2.0.0_amd64.deb admin required
 pkg-indep_0.0.1-2_all.deb net standard
-other_0.txt text optional
-BY-HAND-file webdocs optional
+other_0.txt text optional mime-type=text/plain
+BY-HAND-file webdocs optional by-hand=true
diff --git a/scripts/t/Dpkg_OpenPGP.t b/scripts/t/Dpkg_OpenPGP.t
index 84b8401f3..164395117 100644
--- a/scripts/t/Dpkg_OpenPGP.t
+++ b/scripts/t/Dpkg_OpenPGP.t
@@ -25,32 +25,35 @@ use Dpkg::ErrorHandling;
 
 test_needs_command('gpg');
 
-plan tests => 3;
+plan tests => 6;
 
 use_ok('Dpkg::OpenPGP');
 
 report_options(quiet_warnings => 1);
 
-my $datadir = test_get_data_path('t/Dpkg_OpenPGP');
-my $tmpdir = 't.tmp/Dpkg_OpenPGP';
+my $datadir = test_get_data_path();
+my $tmpdir = test_get_temp_path();
+my $ascfile;
 
-mkdir $tmpdir;
+$ascfile = "$tmpdir/package_1.0.orig.tar.enoent";
+is(openpgp_sig_to_asc("$datadir/nonexistent", $ascfile),
+   undef, 'no conversion of inexistent file');
 
-openpgp_sig_to_asc("$datadir/package_1.0.orig.tar.sig",
-                   "$tmpdir/package_1.0.orig.tar.sig2asc");
+$ascfile = "$tmpdir/package_1.0.orig.tar.sig2asc";
+is(openpgp_sig_to_asc("$datadir/package_1.0.orig.tar.sig", $ascfile),
+   $ascfile, 'conversion from binary sig to armored asc');
 
-ok(compare("$tmpdir/package_1.0.orig.tar.sig2asc",
-           "$datadir/package_1.0.orig.tar.asc") == 0,
+ok(compare($ascfile, "$datadir/package_1.0.orig.tar.asc") == 0,
    'binary signature converted to OpenPGP ASCII Armor');
 
 # Grab the output messages.
 eval {
-    openpgp_sig_to_asc("$datadir/package_1.0.orig.tar.asc",
-                       "$tmpdir/package_1.0.orig.tar.asc2asc");
+    $ascfile = "$tmpdir/package_1.0.orig.tar.asc2asc";
+    is(openpgp_sig_to_asc("$datadir/package_1.0.orig.tar.asc", $ascfile),
+       $ascfile, 'copy instead of converting already armored input');
 };
 
-ok(compare("$tmpdir/package_1.0.orig.tar.asc2asc",
-           "$datadir/package_1.0.orig.tar.asc") == 0,
+ok(compare($ascfile, "$datadir/package_1.0.orig.tar.asc") == 0,
    'OpenPGP ASCII Armor copied to destination');
 
 # TODO: Add actual test cases.
diff --git a/scripts/t/Dpkg_Path.t b/scripts/t/Dpkg_Path.t
index deb63bab7..fbf883d64 100644
--- a/scripts/t/Dpkg_Path.t
+++ b/scripts/t/Dpkg_Path.t
@@ -17,14 +17,14 @@ use strict;
 use warnings;
 
 use Test::More tests => 16;
+use Test::Dpkg qw(:paths);
 
 use_ok('Dpkg::Path', 'canonpath', 'resolve_symlink',
        'check_files_are_the_same', 'get_pkg_root_dir',
        'guess_pkg_root_dir', 'relative_to_pkg_root');
 
-my $tmpdir = 't.tmp/Dpkg_Path';
+my $tmpdir = test_get_temp_path();
 
-mkdir $tmpdir;
 mkdir "$tmpdir/a";
 mkdir "$tmpdir/a/b";
 mkdir "$tmpdir/a/b/c";
diff --git a/scripts/t/Dpkg_Shlibs.t b/scripts/t/Dpkg_Shlibs.t
index 39163d75b..a2b892d74 100644
--- a/scripts/t/Dpkg_Shlibs.t
+++ b/scripts/t/Dpkg_Shlibs.t
@@ -21,7 +21,7 @@ use Test::Dpkg qw(:needs :paths);
 
 use Cwd;
 
-plan tests => 148;
+plan tests => 150;
 
 use Dpkg::Path qw(find_command);
 
@@ -31,7 +31,7 @@ my $tmp;
 my @tmp;
 my %tmp;
 
-my $datadir = test_get_data_path('t/Dpkg_Shlibs');
+my $datadir = test_get_data_path();
 
 my @librarypaths;
 
@@ -54,7 +54,7 @@ Dpkg::Shlibs::blank_library_paths();
 # We want relative paths inside the ld.so.conf fragments to work, and $srcdir
 # is usually a relative path, so let's temporarily switch directory.
 # XXX: An alternative would be to make parse_ldso_conf relative path aware.
-my $cwd = cwd();
+my $cwd = getcwd();
 test_needs_srcdir_switch();
 Dpkg::Shlibs::parse_ldso_conf('t/Dpkg_Shlibs/ld.so.conf');
 chdir($cwd);
@@ -104,7 +104,7 @@ $obj->parse_objdump_output($objdump);
 close $objdump;
 
 ok($obj->is_public_library(), 'libc6 is a public library');
-ok(!$obj->is_executable(), 'libc6 is not an executable');
+ok($obj->is_executable(), 'libc6 is an executable');
 
 is($obj->{SONAME}, 'libc.so.6', 'SONAME');
 is($obj->{HASH}, '0x13d99c', 'HASH');
@@ -350,6 +350,8 @@ open $objdump, '<', "$datadir/objdump.glib-ia64"
   or die "$datadir/objdump.glib-ia64: $!";
 $obj->parse_objdump_output($objdump);
 close $objdump;
+ok($obj->is_public_library(), 'glib-ia64 is a public library');
+ok(!$obj->is_executable(), 'glib-ia64 is not an executable');
 
 $sym = $obj->get_symbol('IA__g_free');
 is_deeply( $sym, { name => 'IA__g_free', version => '',
@@ -380,7 +382,8 @@ sub check_spacesym {
                       debug => '', type => 'F', weak => '',
                       local => '', global => 1, visibility => $visibility,
                       hidden => '', defined => 1 }, $name);
-    ok(defined $obj->{dynrelocs}{$name}, "dynreloc found for $name");
+    ok(defined $obj->{dynrelocs}{$name . "@@" . $version},
+       "dynreloc found for $name");
 }
 
 check_spacesym('symdefaultvernospacedefault', 'Base');
diff --git a/scripts/t/Dpkg_Shlibs/objdump.basictags-amd64 b/scripts/t/Dpkg_Shlibs/objdump.basictags-amd64
index 93d7ea467..aa533761b 100644
--- a/scripts/t/Dpkg_Shlibs/objdump.basictags-amd64
+++ b/scripts/t/Dpkg_Shlibs/objdump.basictags-amd64
@@ -2,46 +2,45 @@
 ./t/Dpkg_Shlibs/libobjdump.basictags-amd64.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
-start address 0x00000480
+start address 0x00000450
 
 Program Header:
     LOAD off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**12
-         filesz 0x00000724 memsz 0x00000724 flags r-x
-    LOAD off    0x00000724 vaddr 0x00001724 paddr 0x00001724 align 2**12
-         filesz 0x00000120 memsz 0x00000124 flags rw-
- DYNAMIC off    0x00000730 vaddr 0x00001730 paddr 0x00001730 align 2**2
-         filesz 0x000000e8 memsz 0x000000e8 flags rw-
-    NOTE off    0x000000f4 vaddr 0x000000f4 paddr 0x000000f4 align 2**2
+         filesz 0x000006d0 memsz 0x000006d0 flags r-x
+    LOAD off    0x00000f18 vaddr 0x00001f18 paddr 0x00001f18 align 2**12
+         filesz 0x000000f8 memsz 0x000000fc flags rw-
+ DYNAMIC off    0x00000f20 vaddr 0x00001f20 paddr 0x00001f20 align 2**2
+         filesz 0x000000d0 memsz 0x000000d0 flags rw-
+    NOTE off    0x00000114 vaddr 0x00000114 paddr 0x00000114 align 2**2
          filesz 0x00000024 memsz 0x00000024 flags r--
-EH_FRAME off    0x00000628 vaddr 0x00000628 paddr 0x00000628 align 2**2
-         filesz 0x00000044 memsz 0x00000044 flags r--
+EH_FRAME off    0x000005b8 vaddr 0x000005b8 paddr 0x000005b8 align 2**2
+         filesz 0x0000004c memsz 0x0000004c flags r--
    STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**4
          filesz 0x00000000 memsz 0x00000000 flags rw-
+   RELRO off    0x00000f18 vaddr 0x00001f18 paddr 0x00001f18 align 2**0
+         filesz 0x000000e8 memsz 0x000000e8 flags r--
 
 Dynamic Section:
   NEEDED               libc.so.6
   SONAME               libbasictags.so.1
-  INIT                 0x00000424
-  FINI                 0x00000614
-  INIT_ARRAY           0x00001724
+  INIT                 0x00000404
+  FINI                 0x000005a4
+  INIT_ARRAY           0x00001f18
   INIT_ARRAYSZ         0x00000004
-  FINI_ARRAY           0x00001728
+  FINI_ARRAY           0x00001f1c
   FINI_ARRAYSZ         0x00000004
-  GNU_HASH             0x00000118
-  STRTAB               0x00000278
-  SYMTAB               0x00000168
-  STRSZ                0x00000117
+  GNU_HASH             0x00000138
+  STRTAB               0x00000288
+  SYMTAB               0x00000188
+  STRSZ                0x00000103
   SYMENT               0x00000010
-  PLTGOT               0x0000182c
-  PLTRELSZ             0x00000010
-  PLTREL               0x00000011
-  JMPREL               0x00000414
-  REL                  0x000003d4
-  RELSZ                0x00000040
+  PLTGOT               0x00002000
+  REL                  0x000003cc
+  RELSZ                0x00000038
   RELENT               0x00000008
-  VERNEED              0x000003b4
+  VERNEED              0x000003ac
   VERNEEDNUM           0x00000001
-  VERSYM               0x00000390
+  VERSYM               0x0000038c
   RELCOUNT             0x00000003
 
 Version References:
@@ -52,32 +51,28 @@ DYNAMIC SYMBOL TABLE:
 00000000  w   D  *UND*	00000000              _ITM_deregisterTMCloneTable
 00000000  w   DF *UND*	00000000  GLIBC_2.1.3 __cxa_finalize
 00000000  w   D  *UND*	00000000              __gmon_start__
-00000000  w   D  *UND*	00000000              _Jv_RegisterClasses
 00000000  w   D  *UND*	00000000              _ITM_registerTMCloneTable
-00001844 g    D  .data	00000000  Base        _edata
-000005f0 g    DF .text	00000002  Base        symbol26_little
-00001848 g    D  .bss	00000000  Base        _end
-000005d0 g    DF .text	00000002  Base        symbol21_amd64
-00001844 g    D  .bss	00000000  Base        __bss_start
-000005e0 g    DF .text	00000002  Base        symbol25_64
-00000424 g    DF .init	00000000  Base        _init
-00000600 g    DF .text	00000002  Base        symbol31_randomtag
-00000614 g    DF .fini	00000000  Base        _fini
-00000610 g    DF .text	00000002  Base        symbol51_untagged
-000005c0 g    DF .text	00000002  Base        symbol11_optional
+00002010 g    D  .data	00000000  Base        _edata
+00000580 g    DF .text	00000002  Base        symbol26_little
+00002014 g    D  .bss	00000000  Base        _end
+00000560 g    DF .text	00000002  Base        symbol21_amd64
+00002010 g    D  .bss	00000000  Base        __bss_start
+00000570 g    DF .text	00000002  Base        symbol25_64
+00000404 g    DF .init	00000000  Base        _init
+00000590 g    DF .text	00000002  Base        symbol31_randomtag
+000005a4 g    DF .fini	00000000  Base        _fini
+000005a0 g    DF .text	00000002  Base        symbol51_untagged
+00000550 g    DF .text	00000002  Base        symbol11_optional
 
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-00001724 R_386_RELATIVE    *ABS*
-00001728 R_386_RELATIVE    *ABS*
-00001840 R_386_RELATIVE    *ABS*
-00001818 R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
-0000181c R_386_GLOB_DAT    __cxa_finalize
-00001820 R_386_GLOB_DAT    __gmon_start__
-00001824 R_386_GLOB_DAT    _Jv_RegisterClasses
-00001828 R_386_GLOB_DAT    _ITM_registerTMCloneTable
-00001838 R_386_JUMP_SLOT   __cxa_finalize
-0000183c R_386_JUMP_SLOT   __gmon_start__
+00001f18 R_386_RELATIVE    *ABS*
+00001f1c R_386_RELATIVE    *ABS*
+0000200c R_386_RELATIVE    *ABS*
+00001ff0 R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
+00001ff4 R_386_GLOB_DAT    __cxa_finalize@GLIBC_2.1.3
+00001ff8 R_386_GLOB_DAT    __gmon_start__
+00001ffc R_386_GLOB_DAT    _ITM_registerTMCloneTable
 
 
diff --git a/scripts/t/Dpkg_Shlibs/objdump.basictags-i386 b/scripts/t/Dpkg_Shlibs/objdump.basictags-i386
index 4138a8945..af0f707d1 100644
--- a/scripts/t/Dpkg_Shlibs/objdump.basictags-i386
+++ b/scripts/t/Dpkg_Shlibs/objdump.basictags-i386
@@ -2,46 +2,45 @@
 ./t/Dpkg_Shlibs/libobjdump.basictags-i386.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
-start address 0x000004e0
+start address 0x000004b0
 
 Program Header:
     LOAD off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**12
-         filesz 0x000007dc memsz 0x000007dc flags r-x
-    LOAD off    0x000007dc vaddr 0x000017dc paddr 0x000017dc align 2**12
-         filesz 0x00000120 memsz 0x00000124 flags rw-
- DYNAMIC off    0x000007e8 vaddr 0x000017e8 paddr 0x000017e8 align 2**2
-         filesz 0x000000e8 memsz 0x000000e8 flags rw-
-    NOTE off    0x000000f4 vaddr 0x000000f4 paddr 0x000000f4 align 2**2
+         filesz 0x00000788 memsz 0x00000788 flags r-x
+    LOAD off    0x00000f18 vaddr 0x00001f18 paddr 0x00001f18 align 2**12
+         filesz 0x000000f8 memsz 0x000000fc flags rw-
+ DYNAMIC off    0x00000f20 vaddr 0x00001f20 paddr 0x00001f20 align 2**2
+         filesz 0x000000d0 memsz 0x000000d0 flags rw-
+    NOTE off    0x00000114 vaddr 0x00000114 paddr 0x00000114 align 2**2
          filesz 0x00000024 memsz 0x00000024 flags r--
-EH_FRAME off    0x000006a8 vaddr 0x000006a8 paddr 0x000006a8 align 2**2
-         filesz 0x00000054 memsz 0x00000054 flags r--
+EH_FRAME off    0x00000638 vaddr 0x00000638 paddr 0x00000638 align 2**2
+         filesz 0x0000005c memsz 0x0000005c flags r--
    STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**4
          filesz 0x00000000 memsz 0x00000000 flags rw-
+   RELRO off    0x00000f18 vaddr 0x00001f18 paddr 0x00001f18 align 2**0
+         filesz 0x000000e8 memsz 0x000000e8 flags r--
 
 Dynamic Section:
   NEEDED               libc.so.6
   SONAME               libbasictags.so.1
-  INIT                 0x00000484
-  FINI                 0x00000694
-  INIT_ARRAY           0x000017dc
+  INIT                 0x00000464
+  FINI                 0x00000624
+  INIT_ARRAY           0x00001f18
   INIT_ARRAYSZ         0x00000004
-  FINI_ARRAY           0x000017e0
+  FINI_ARRAY           0x00001f1c
   FINI_ARRAYSZ         0x00000004
-  GNU_HASH             0x00000118
-  STRTAB               0x000002a8
-  SYMTAB               0x00000178
-  STRSZ                0x00000144
+  GNU_HASH             0x00000138
+  STRTAB               0x000002b8
+  SYMTAB               0x00000198
+  STRSZ                0x00000130
   SYMENT               0x00000010
-  PLTGOT               0x000018e4
-  PLTRELSZ             0x00000010
-  PLTREL               0x00000011
-  JMPREL               0x00000474
-  REL                  0x00000434
-  RELSZ                0x00000040
+  PLTGOT               0x00002000
+  REL                  0x0000042c
+  RELSZ                0x00000038
   RELENT               0x00000008
-  VERNEED              0x00000414
+  VERNEED              0x0000040c
   VERNEEDNUM           0x00000001
-  VERSYM               0x000003ec
+  VERSYM               0x000003e8
   RELCOUNT             0x00000003
 
 Version References:
@@ -52,34 +51,30 @@ DYNAMIC SYMBOL TABLE:
 00000000  w   D  *UND*	00000000              _ITM_deregisterTMCloneTable
 00000000  w   DF *UND*	00000000  GLIBC_2.1.3 __cxa_finalize
 00000000  w   D  *UND*	00000000              __gmon_start__
-00000000  w   D  *UND*	00000000              _Jv_RegisterClasses
 00000000  w   D  *UND*	00000000              _ITM_registerTMCloneTable
-000018fc g    D  .data	00000000  Base        _edata
-00000650 g    DF .text	00000002  Base        symbol26_little
-00001900 g    D  .bss	00000000  Base        _end
-00000680 g    DF .text	00000002  Base        symbol41_i386_and_optional
-00000630 g    DF .text	00000002  Base        symbol22_i386
-00000660 g    DF .text	00000002  Base        symbol28_little_32
-000018fc g    D  .bss	00000000  Base        __bss_start
-00000484 g    DF .init	00000000  Base        _init
-00000670 g    DF .text	00000002  Base        symbol31_randomtag
-00000640 g    DF .text	00000002  Base        symbol24_32
-00000694 g    DF .fini	00000000  Base        _fini
-00000690 g    DF .text	00000002  Base        symbol51_untagged
-00000620 g    DF .text	00000002  Base        symbol11_optional
+00002010 g    D  .data	00000000  Base        _edata
+000005e0 g    DF .text	00000002  Base        symbol26_little
+00002014 g    D  .bss	00000000  Base        _end
+00000610 g    DF .text	00000002  Base        symbol41_i386_and_optional
+000005c0 g    DF .text	00000002  Base        symbol22_i386
+000005f0 g    DF .text	00000002  Base        symbol28_little_32
+00002010 g    D  .bss	00000000  Base        __bss_start
+00000464 g    DF .init	00000000  Base        _init
+00000600 g    DF .text	00000002  Base        symbol31_randomtag
+000005d0 g    DF .text	00000002  Base        symbol24_32
+00000624 g    DF .fini	00000000  Base        _fini
+00000620 g    DF .text	00000002  Base        symbol51_untagged
+000005b0 g    DF .text	00000002  Base        symbol11_optional
 
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-000017dc R_386_RELATIVE    *ABS*
-000017e0 R_386_RELATIVE    *ABS*
-000018f8 R_386_RELATIVE    *ABS*
-000018d0 R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
-000018d4 R_386_GLOB_DAT    __cxa_finalize
-000018d8 R_386_GLOB_DAT    __gmon_start__
-000018dc R_386_GLOB_DAT    _Jv_RegisterClasses
-000018e0 R_386_GLOB_DAT    _ITM_registerTMCloneTable
-000018f0 R_386_JUMP_SLOT   __cxa_finalize
-000018f4 R_386_JUMP_SLOT   __gmon_start__
+00001f18 R_386_RELATIVE    *ABS*
+00001f1c R_386_RELATIVE    *ABS*
+0000200c R_386_RELATIVE    *ABS*
+00001ff0 R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
+00001ff4 R_386_GLOB_DAT    __cxa_finalize@GLIBC_2.1.3
+00001ff8 R_386_GLOB_DAT    __gmon_start__
+00001ffc R_386_GLOB_DAT    _ITM_registerTMCloneTable
 
 
diff --git a/scripts/t/Dpkg_Shlibs/objdump.basictags-mips b/scripts/t/Dpkg_Shlibs/objdump.basictags-mips
index 620b821cc..27795c49b 100644
--- a/scripts/t/Dpkg_Shlibs/objdump.basictags-mips
+++ b/scripts/t/Dpkg_Shlibs/objdump.basictags-mips
@@ -2,46 +2,45 @@
 ./t/Dpkg_Shlibs/libobjdump.basictags-mips.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
-start address 0x000004b0
+start address 0x00000480
 
 Program Header:
     LOAD off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**12
-         filesz 0x00000780 memsz 0x00000780 flags r-x
-    LOAD off    0x00000780 vaddr 0x00001780 paddr 0x00001780 align 2**12
-         filesz 0x00000120 memsz 0x00000124 flags rw-
- DYNAMIC off    0x0000078c vaddr 0x0000178c paddr 0x0000178c align 2**2
-         filesz 0x000000e8 memsz 0x000000e8 flags rw-
-    NOTE off    0x000000f4 vaddr 0x000000f4 paddr 0x000000f4 align 2**2
+         filesz 0x0000072c memsz 0x0000072c flags r-x
+    LOAD off    0x00000f18 vaddr 0x00001f18 paddr 0x00001f18 align 2**12
+         filesz 0x000000f8 memsz 0x000000fc flags rw-
+ DYNAMIC off    0x00000f20 vaddr 0x00001f20 paddr 0x00001f20 align 2**2
+         filesz 0x000000d0 memsz 0x000000d0 flags rw-
+    NOTE off    0x00000114 vaddr 0x00000114 paddr 0x00000114 align 2**2
          filesz 0x00000024 memsz 0x00000024 flags r--
-EH_FRAME off    0x00000668 vaddr 0x00000668 paddr 0x00000668 align 2**2
-         filesz 0x0000004c memsz 0x0000004c flags r--
+EH_FRAME off    0x000005f8 vaddr 0x000005f8 paddr 0x000005f8 align 2**2
+         filesz 0x00000054 memsz 0x00000054 flags r--
    STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**4
          filesz 0x00000000 memsz 0x00000000 flags rw-
+   RELRO off    0x00000f18 vaddr 0x00001f18 paddr 0x00001f18 align 2**0
+         filesz 0x000000e8 memsz 0x000000e8 flags r--
 
 Dynamic Section:
   NEEDED               libc.so.6
   SONAME               libbasictags.so.1
-  INIT                 0x00000458
-  FINI                 0x00000654
-  INIT_ARRAY           0x00001780
+  INIT                 0x00000438
+  FINI                 0x000005e4
+  INIT_ARRAY           0x00001f18
   INIT_ARRAYSZ         0x00000004
-  FINI_ARRAY           0x00001784
+  FINI_ARRAY           0x00001f1c
   FINI_ARRAYSZ         0x00000004
-  GNU_HASH             0x00000118
-  STRTAB               0x00000294
-  SYMTAB               0x00000174
-  STRSZ                0x0000012e
+  GNU_HASH             0x00000138
+  STRTAB               0x000002a4
+  SYMTAB               0x00000194
+  STRSZ                0x0000011a
   SYMENT               0x00000010
-  PLTGOT               0x00001888
-  PLTRELSZ             0x00000010
-  PLTREL               0x00000011
-  JMPREL               0x00000448
-  REL                  0x00000408
-  RELSZ                0x00000040
+  PLTGOT               0x00002000
+  REL                  0x00000400
+  RELSZ                0x00000038
   RELENT               0x00000008
-  VERNEED              0x000003e8
+  VERNEED              0x000003e0
   VERNEEDNUM           0x00000001
-  VERSYM               0x000003c2
+  VERSYM               0x000003be
   RELCOUNT             0x00000003
 
 Version References:
@@ -52,33 +51,29 @@ DYNAMIC SYMBOL TABLE:
 00000000  w   D  *UND*	00000000              _ITM_deregisterTMCloneTable
 00000000  w   DF *UND*	00000000  GLIBC_2.1.3 __cxa_finalize
 00000000  w   D  *UND*	00000000              __gmon_start__
-00000000  w   D  *UND*	00000000              _Jv_RegisterClasses
 00000000  w   D  *UND*	00000000              _ITM_registerTMCloneTable
-000018a0 g    D  .data	00000000  Base        _edata
-000018a4 g    D  .bss	00000000  Base        _end
-00000640 g    DF .text	00000002  Base        symbol42_mips_and_optional
-000018a0 g    D  .bss	00000000  Base        __bss_start
-00000458 g    DF .init	00000000  Base        _init
-00000630 g    DF .text	00000002  Base        symbol31_randomtag
-00000610 g    DF .text	00000002  Base        symbol24_32
-00000654 g    DF .fini	00000000  Base        _fini
-00000650 g    DF .text	00000002  Base        symbol51_untagged
-000005f0 g    DF .text	00000002  Base        symbol11_optional
-00000600 g    DF .text	00000002  Base        symbol23_mips
-00000620 g    DF .text	00000002  Base        symbol27_big
+00002010 g    D  .data	00000000  Base        _edata
+00002014 g    D  .bss	00000000  Base        _end
+000005d0 g    DF .text	00000002  Base        symbol42_mips_and_optional
+00002010 g    D  .bss	00000000  Base        __bss_start
+00000438 g    DF .init	00000000  Base        _init
+000005c0 g    DF .text	00000002  Base        symbol31_randomtag
+000005a0 g    DF .text	00000002  Base        symbol24_32
+000005e4 g    DF .fini	00000000  Base        _fini
+000005e0 g    DF .text	00000002  Base        symbol51_untagged
+00000580 g    DF .text	00000002  Base        symbol11_optional
+00000590 g    DF .text	00000002  Base        symbol23_mips
+000005b0 g    DF .text	00000002  Base        symbol27_big
 
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-00001780 R_386_RELATIVE    *ABS*
-00001784 R_386_RELATIVE    *ABS*
-0000189c R_386_RELATIVE    *ABS*
-00001874 R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
-00001878 R_386_GLOB_DAT    __cxa_finalize
-0000187c R_386_GLOB_DAT    __gmon_start__
-00001880 R_386_GLOB_DAT    _Jv_RegisterClasses
-00001884 R_386_GLOB_DAT    _ITM_registerTMCloneTable
-00001894 R_386_JUMP_SLOT   __cxa_finalize
-00001898 R_386_JUMP_SLOT   __gmon_start__
+00001f18 R_386_RELATIVE    *ABS*
+00001f1c R_386_RELATIVE    *ABS*
+0000200c R_386_RELATIVE    *ABS*
+00001ff0 R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
+00001ff4 R_386_GLOB_DAT    __cxa_finalize@GLIBC_2.1.3
+00001ff8 R_386_GLOB_DAT    __gmon_start__
+00001ffc R_386_GLOB_DAT    _ITM_registerTMCloneTable
 
 
diff --git a/scripts/t/Dpkg_Shlibs/objdump.ls b/scripts/t/Dpkg_Shlibs/objdump.ls
index f679242c3..30ae8beb0 100644
--- a/scripts/t/Dpkg_Shlibs/objdump.ls
+++ b/scripts/t/Dpkg_Shlibs/objdump.ls
@@ -1,277 +1,536 @@
 
 /bin/ls:     file format elf32-i386
-architecture: i386, flags 0x00000112:
-EXEC_P, HAS_SYMS, D_PAGED
-start address 0x08049b50
+architecture: i386, flags 0x00000150:
+HAS_SYMS, DYNAMIC, D_PAGED
+start address 0x00003e16
 
 Program Header:
-    PHDR off    0x00000034 vaddr 0x08048034 paddr 0x08048034 align 2**2
-         filesz 0x00000100 memsz 0x00000100 flags r-x
-  INTERP off    0x00000134 vaddr 0x08048134 paddr 0x08048134 align 2**0
+    PHDR off    0x00000034 vaddr 0x00000034 paddr 0x00000034 align 2**2
+         filesz 0x00000120 memsz 0x00000120 flags r-x
+  INTERP off    0x00000154 vaddr 0x00000154 paddr 0x00000154 align 2**0
          filesz 0x00000013 memsz 0x00000013 flags r--
-    LOAD off    0x00000000 vaddr 0x08048000 paddr 0x08048000 align 2**12
-         filesz 0x00012478 memsz 0x00012478 flags r-x
-    LOAD off    0x00012478 vaddr 0x0805b478 paddr 0x0805b478 align 2**12
-         filesz 0x000003b4 memsz 0x00000818 flags rw-
- DYNAMIC off    0x0001248c vaddr 0x0805b48c paddr 0x0805b48c align 2**2
-         filesz 0x000000e8 memsz 0x000000e8 flags rw-
-    NOTE off    0x00000148 vaddr 0x08048148 paddr 0x08048148 align 2**2
-         filesz 0x00000020 memsz 0x00000020 flags r--
-EH_FRAME off    0x000123b0 vaddr 0x0805a3b0 paddr 0x0805a3b0 align 2**2
-         filesz 0x0000002c memsz 0x0000002c flags r--
-   STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**2
+    LOAD off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**12
+         filesz 0x00021f10 memsz 0x00021f10 flags r-x
+    LOAD off    0x000229b8 vaddr 0x000239b8 paddr 0x000239b8 align 2**12
+         filesz 0x0000098c memsz 0x00001b1c flags rw-
+ DYNAMIC off    0x00022eac vaddr 0x00023eac paddr 0x00023eac align 2**2
+         filesz 0x000000f8 memsz 0x000000f8 flags rw-
+    NOTE off    0x00000168 vaddr 0x00000168 paddr 0x00000168 align 2**2
+         filesz 0x00000044 memsz 0x00000044 flags r--
+EH_FRAME off    0x0001b5b8 vaddr 0x0001b5b8 paddr 0x0001b5b8 align 2**2
+         filesz 0x000008cc memsz 0x000008cc flags r--
+   STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**4
          filesz 0x00000000 memsz 0x00000000 flags rw-
+   RELRO off    0x000229b8 vaddr 0x000239b8 paddr 0x000239b8 align 2**0
+         filesz 0x00000648 memsz 0x00000648 flags r--
 
 Dynamic Section:
-  NEEDED      librt.so.1
-  NEEDED      libacl.so.1
-  NEEDED      libselinux.so.1
-  NEEDED      libc.so.6
-  INIT        0x8049510
-  FINI        0x8056768
-  HASH        0x8048168
-  GNU_HASH    0x80484a4
-  STRTAB      0x8048bc0
-  SYMTAB      0x8048500
-  STRSZ       0x4a0
-  SYMENT      0x10
-  DEBUG       0x0
-  PLTGOT      0x805b57c
-  PLTRELSZ    0x300
-  PLTREL      0x11
-  JMPREL      0x8049210
-  REL         0x80491e8
-  RELSZ       0x28
-  RELENT      0x8
-  VERNEED     0x8049138
-  VERNEEDNUM  0x3
-  VERSYM      0x8049060
+  NEEDED               libselinux.so.1
+  NEEDED               libc.so.6
+  INIT                 0x00001ce8
+  FINI                 0x00016524
+  INIT_ARRAY           0x000239b8
+  INIT_ARRAYSZ         0x00000004
+  FINI_ARRAY           0x000239bc
+  FINI_ARRAYSZ         0x00000004
+  GNU_HASH             0x000001ac
+  STRTAB               0x00000adc
+  SYMTAB               0x0000020c
+  STRSZ                0x00000638
+  SYMENT               0x00000010
+  DEBUG                0x00000000
+  PLTGOT               0x00024000
+  PLTRELSZ             0x00000388
+  PLTREL               0x00000011
+  JMPREL               0x00001960
+  REL                  0x000012d0
+  RELSZ                0x00000690
+  RELENT               0x00000008
+  FLAGS_1              0x08000000
+  VERNEED              0x00001230
+  VERNEEDNUM           0x00000001
+  VERSYM               0x00001114
+  RELCOUNT             0x000000c6
 
 Version References:
-  required from librt.so.1:
-    0x0d696912 0x00 08 GLIBC_2.2
-  required from libacl.so.1:
-    0x05822450 0x00 06 ACL_1.0
   required from libc.so.6:
-    0x09691a73 0x00 09 GLIBC_2.2.3
-    0x0d696913 0x00 07 GLIBC_2.3
+    0x0d696912 0x00 10 GLIBC_2.2
+    0x09691f73 0x00 09 GLIBC_2.1.3
+    0x09691a73 0x00 08 GLIBC_2.2.3
+    0x0d696914 0x00 07 GLIBC_2.4
+    0x06969197 0x00 06 GLIBC_2.17
     0x0d696911 0x00 05 GLIBC_2.1
-    0x09691f73 0x00 04 GLIBC_2.1.3
-    0x0d696912 0x00 03 GLIBC_2.2
-    0x0d696910 0x00 02 GLIBC_2.0
+    0x09691974 0x00 04 GLIBC_2.3.4
+    0x0d696910 0x00 03 GLIBC_2.0
+    0x0d696913 0x00 02 GLIBC_2.3
 
 DYNAMIC SYMBOL TABLE:
-00000000      DF *UND*	0000026e  GLIBC_2.0   abort
-00000000      DF *UND*	0000001d  GLIBC_2.0   __errno_location
-00000000      DF *UND*	0000004d  GLIBC_2.0   sigemptyset
-00000000      DF *UND*	00000034  GLIBC_2.0   sprintf
-00000000      DF *UND*	000001a2  GLIBC_2.2   localeconv
-00000000      DF *UND*	0000000a  GLIBC_2.0   dirfd
-00000000      DF *UND*	00000057  GLIBC_2.1.3 __cxa_atexit
-00000000      DF *UND*	00000037  GLIBC_2.0   strcoll
-00000000      DF *UND*	00000150  GLIBC_2.0   qsort
-00000000      DF *UND*	00000094  GLIBC_2.1   fputs_unlocked
-00000000      DF *UND*	0000001e  GLIBC_2.0   __ctype_get_mb_cur_max
-00000000      DF *UND*	000000d9  GLIBC_2.0   signal
-00000000      DF *UND*	0000006e  GLIBC_2.0   sigismember
+00000000      DF *UND*	00000000  GLIBC_2.3   __ctype_toupper_loc
+00000000      DF *UND*	00000000  GLIBC_2.0   unsetenv
+00000000      DF *UND*	00000000  GLIBC_2.0   getpwnam
+00000000      DF *UND*	00000000  GLIBC_2.0   raise
+00000000      DF *UND*	00000000  GLIBC_2.3.4 __snprintf_chk
+00000000      DO *UND*	00000000  GLIBC_2.0   __progname
+00000000      DF *UND*	00000000  GLIBC_2.0   strcmp
+00000000      DF *UND*	00000000  GLIBC_2.1   open64
+00000000  w   D  *UND*	00000000              _ITM_deregisterTMCloneTable
+00000000      DF *UND*	00000000  GLIBC_2.0   getpwuid
+00000000      DF *UND*	00000000  GLIBC_2.0   fflush
+00000000      DO *UND*	00000000  GLIBC_2.0   stderr
+00000000      DF *UND*	00000000  GLIBC_2.0   _exit
+00000000      DF *UND*	00000000  GLIBC_2.0   sigprocmask
+00000000      DF *UND*	00000000  GLIBC_2.0   dirfd
+00000000      DF *UND*	00000000  GLIBC_2.0   wcwidth
+00000000      DF *UND*	00000000  GLIBC_2.0   memmove
+00000000      DF *UND*	00000000  GLIBC_2.0   _setjmp
+00000000      DF *UND*	00000000  GLIBC_2.0   free
+00000000      DF *UND*	00000000  GLIBC_2.0   memcpy
+00000000      DF *UND*	00000000  GLIBC_2.0   mbsinit
+00000000      DF *UND*	00000000  GLIBC_2.17  clock_gettime
+00000000      DF *UND*	00000000  GLIBC_2.0   __strtoull_internal
+00000000      DF *UND*	00000000  GLIBC_2.1   fclose
+00000000      DF *UND*	00000000  GLIBC_2.1   fseeko64
+00000000      DF *UND*	00000000  GLIBC_2.0   signal
+00000000      DF *UND*	00000000  GLIBC_2.0   memcmp
+00000000      DF *UND*	00000000  GLIBC_2.0   gettimeofday
+00000000      DO *UND*	00000000  GLIBC_2.0   __progname_full
+00000000      DO *UND*	00000000  GLIBC_2.0   optind
+00000000      DF *UND*	00000000  GLIBC_2.0   dcgettext
+00000000      DF *UND*	00000000  GLIBC_2.0   mktime
+00000000      DF *UND*	00000000  GLIBC_2.4   __stack_chk_fail
+00000000      DF *UND*	00000000  GLIBC_2.0   localtime_r
+00000000      DF *UND*	00000000  GLIBC_2.0   sigismember
+00000000      DF *UND*	00000000              fgetfilecon
+00000000      DF *UND*	00000000  GLIBC_2.0   fflush_unlocked
+00000000      DF *UND*	00000000  GLIBC_2.0   iswcntrl
+00000000      DF *UND*	00000000  GLIBC_2.0   textdomain
+00000000      DF *UND*	00000000  GLIBC_2.0   readlink
+00000000      DF *UND*	00000000  GLIBC_2.2.3 fnmatch
+00000000      DF *UND*	00000000  GLIBC_2.0   iswprint
+00000000      DF *UND*	00000000  GLIBC_2.0   ioctl
+00000000  w   DF *UND*	00000000  GLIBC_2.1.3 __cxa_finalize
+00000000      DF *UND*	00000000  GLIBC_2.0   fwrite
+00000000      DF *UND*	00000000  GLIBC_2.2   __fxstat64
+00000000      DF *UND*	00000000  GLIBC_2.0   tzset
+00000000      DF *UND*	00000000  GLIBC_2.0   __ctype_get_mb_cur_max
+00000000      DF *UND*	00000000  GLIBC_2.0   strcpy
+00000000      DF *UND*	00000000  GLIBC_2.2   __fpending
+00000000      DF *UND*	00000000  GLIBC_2.0   wcstombs
+00000000      DF *UND*	00000000  GLIBC_2.0   mbrtowc
+00000000      DF *UND*	00000000  GLIBC_2.0   gethostname
+00000000      DF *UND*	00000000  GLIBC_2.1.3 __cxa_atexit
+00000000      DF *UND*	00000000  GLIBC_2.0   error
+00000000      DF *UND*	00000000  GLIBC_2.0   strcoll
+00000000      DF *UND*	00000000  GLIBC_2.0   getenv
+00000000      DF *UND*	00000000  GLIBC_2.0   realloc
+00000000      DF *UND*	00000000              lgetfilecon
+00000000      DF *UND*	00000000  GLIBC_2.0   malloc
+00000000      DF *UND*	00000000  GLIBC_2.0   timegm
+00000000      DF *UND*	00000000  GLIBC_2.2   __freading
+00000000      DF *UND*	00000000  GLIBC_2.3.4 __memcpy_chk
 00000000  w   D  *UND*	00000000              __gmon_start__
-00000000  w   D  *UND*	00000000              _Jv_RegisterClasses
-00000000      DF *UND*	00000490  GLIBC_2.0   realloc
-00000000      DF *UND*	0000003f  GLIBC_2.2   __xstat64
-00000000      DF *UND*	00000035  GLIBC_2.0   localtime
-00000000      DF *UND*	00000132  GLIBC_2.0   getgrnam
-00000000      DF *UND*	00000167  GLIBC_2.0   strchr
-00000000      DF *UND*	000000dc  GLIBC_2.0   getenv
-00000000      DF *UND*	00000304  GLIBC_2.0   calloc
-00000000      DF *UND*	000000c6  GLIBC_2.0   strncpy
-00000000      DF *UND*	00000023              freecon
-00000000      DF *UND*	00000058  GLIBC_2.0   memset
-00000000      DF *UND*	000001b2  GLIBC_2.0   __libc_start_main
-00000000      DF *UND*	00000044  GLIBC_2.1   mempcpy
-00000000      DF *UND*	000000c9  GLIBC_2.0   _obstack_begin
-00000000      DF *UND*	000001b9  GLIBC_2.0   strrchr
-00000000      DF *UND*	00000038  GLIBC_2.0   chmod
-00000000      DF *UND*	00000150  GLIBC_2.0   __assert_fail
-00000000      DF *UND*	00000015  GLIBC_2.0   bindtextdomain
-00000000      DF *UND*	00000215  GLIBC_2.0   mbrtowc
-00000000      DF *UND*	00000046  ACL_1.0     acl_delete_def_file
-00000000      DF *UND*	00000038  GLIBC_2.0   gettimeofday
-00000000      DF *UND*	0000003c  GLIBC_2.3   __ctype_toupper_loc
-00000000      DF *UND*	0000003f  GLIBC_2.2   __lxstat64
-00000000      DF *UND*	00000195  GLIBC_2.0   _obstack_newchunk
-00000000      DF *UND*	00000066  GLIBC_2.0   __overflow
-00000000      DF *UND*	00000049  GLIBC_2.0   dcgettext
-00000000      DF *UND*	00000160  GLIBC_2.0   sigaction
-00000000      DF *UND*	00000127  GLIBC_2.1   strverscmp
-00000000      DF *UND*	00000092  GLIBC_2.0   opendir
-00000000      DF *UND*	00000047  GLIBC_2.0   getopt_long
-00000000      DF *UND*	0000003a  GLIBC_2.0   ioctl
-00000000      DF *UND*	0000003c  GLIBC_2.3   __ctype_b_loc
-00000000      DF *UND*	000000c9  GLIBC_2.0   iswcntrl
-00000000      DF *UND*	00000032  GLIBC_2.0   isatty
-00000000      DF *UND*	000001e8  GLIBC_2.1   fclose
-00000000      DF *UND*	00000019  GLIBC_2.0   mbsinit
-00000000      DF *UND*	00000036  GLIBC_2.0   _setjmp
-00000000      DF *UND*	00000038  GLIBC_2.0   tcgetpgrp
-00000000      DF *UND*	0000003c  GLIBC_2.0   mktime
-00000000      DF *UND*	000000af  GLIBC_2.2   readdir64
-00000000      DF *UND*	00000046  GLIBC_2.0   memcpy
-00000000      DF *UND*	000000af  GLIBC_2.0   strlen
-00000000      DF *UND*	00000132  GLIBC_2.0   getpwuid
-00000000      DF *UND*	00000094  ACL_1.0     acl_extended_file
-00000000      DF *UND*	00000195  ACL_1.0     acl_get_file
-00000000      DF *UND*	000006b5  GLIBC_2.0   setlocale
-00000000      DF *UND*	0000002a  ACL_1.0     acl_entries
-00000000      DF *UND*	00000024  GLIBC_2.0   strcpy
-00000000      DF *UND*	00000039  GLIBC_2.0   printf
-00000000      DF *UND*	0000008c  GLIBC_2.0   raise
-00000000      DF *UND*	000000a2  GLIBC_2.1   fwrite_unlocked
-00000000      DF *UND*	00000115  GLIBC_2.2   clock_gettime
-00000000      DF *UND*	00000075              getfilecon
-00000000      DF *UND*	00000055  GLIBC_2.0   closedir
-00000000      DF *UND*	00000024  GLIBC_2.0   fprintf
-00000000      DF *UND*	00000114  ACL_1.0     acl_set_file
-00000000      DF *UND*	0000009e  GLIBC_2.0   sigprocmask
-00000000      DF *UND*	0000002a  GLIBC_2.2   __fpending
-00000000      DF *UND*	00000075              lgetfilecon
-00000000      DF *UND*	000000d7  GLIBC_2.0   error
-00000000      DF *UND*	00000132  GLIBC_2.0   getgrgid
-00000000      DF *UND*	00000045  GLIBC_2.0   __strtoull_internal
-00000000      DF *UND*	0000006a  GLIBC_2.0   sigaddset
-00000000      DF *UND*	0000003a  GLIBC_2.0   readlink
-00000000      DF *UND*	0000008e  GLIBC_2.0   memmove
-00000000      DF *UND*	0000003c  GLIBC_2.3   __ctype_tolower_loc
-00000000      DF *UND*	00000045  GLIBC_2.0   __strtoul_internal
-00000000      DF *UND*	0000011d  GLIBC_2.0   textdomain
-00000000      DF *UND*	0000003f  GLIBC_2.2   __fxstat64
-00000000      DF *UND*	000002d9  GLIBC_2.2.3 fnmatch
-00000000      DF *UND*	000000f3  GLIBC_2.0   strncmp
-00000000      DF *UND*	00004373  GLIBC_2.0   vfprintf
-00000000      DF *UND*	0000006e  ACL_1.0     acl_free
-00000000      DF *UND*	00000042  GLIBC_2.0   fflush_unlocked
-00000000      DF *UND*	00000045  GLIBC_2.0   strftime
-00000000      DF *UND*	00000078  GLIBC_2.0   wcwidth
-00000000      DF *UND*	000000cb  GLIBC_2.0   iswprint
-00000000      DF *UND*	00000132  GLIBC_2.0   getpwnam
-00000000      DF *UND*	00000054  GLIBC_2.0   strcmp
-00000000      DF *UND*	000000fa  GLIBC_2.0   exit
-00000000      DF *UND*	000004bc  ACL_1.0     acl_from_text
-0805bc90 g    D  *ABS*	00000000  Base        _end
-0805b860 g    DO .bss	00000004  GLIBC_2.0   stdout
-0805b82c g    D  *ABS*	00000000  Base        _edata
-080567a4 g    DO .rodata	00000004  Base        _IO_stdin_used
-08049780      DF *UND*	000001e5  GLIBC_2.0   free
-0805b844 g    DO .bss	00000004  GLIBC_2.0   stderr
-0805b82c g    D  *ABS*	00000000  Base        __bss_start
-080499a0      DF *UND*	00000178  GLIBC_2.0   malloc
-08049510 g    DF .init	00000000  Base        _init
-08056768 g    DF .fini	00000000  Base        _fini
-0805b840 g    DO .bss	00000004  GLIBC_2.0   optind
-0805b864 g    DO .bss	00000004  GLIBC_2.0   optarg
+00000000      DF *UND*	00000000  GLIBC_2.0   exit
+00000000      DF *UND*	00000000  GLIBC_2.1   fdopen
+00000000      DF *UND*	00000000  GLIBC_2.1   fputs_unlocked
+00000000      DF *UND*	00000000  GLIBC_2.0   strftime
+00000000      DF *UND*	00000000  GLIBC_2.0   getopt_long
+00000000      DF *UND*	00000000              getfilecon
+00000000      DF *UND*	00000000  GLIBC_2.0   strtoul
+00000000      DF *UND*	00000000  GLIBC_2.0   strchr
+00000000      DF *UND*	00000000  GLIBC_2.0   getcwd
+00000000      DF *UND*	00000000  GLIBC_2.0   fscanf
+00000000      DF *UND*	00000000  GLIBC_2.0   strlen
+00000000      DF *UND*	00000000  GLIBC_2.0   setenv
+00000000      DF *UND*	00000000  GLIBC_2.0   __libc_start_main
+00000000      DF *UND*	00000000  GLIBC_2.0   sigaddset
+00000000      DF *UND*	00000000  GLIBC_2.0   memset
+00000000      DF *UND*	00000000  GLIBC_2.0   ungetc
+00000000      DF *UND*	00000000  GLIBC_2.0   snprintf
+00000000      DF *UND*	00000000  GLIBC_2.0   __errno_location
+00000000      DF *UND*	00000000  GLIBC_2.0   tcgetpgrp
+00000000      DF *UND*	00000000  GLIBC_2.0   fileno
+00000000      DF *UND*	00000000  GLIBC_2.0   stpncpy
+00000000      DO *UND*	00000000  GLIBC_2.0   stdout
+00000000      DF *UND*	00000000  GLIBC_2.1   fwrite_unlocked
+00000000      DF *UND*	00000000  GLIBC_2.3.4 __printf_chk
+00000000      DF *UND*	00000000  GLIBC_2.1   mempcpy
+00000000      DF *UND*	00000000  GLIBC_2.0   wcswidth
+00000000      DF *UND*	00000000  GLIBC_2.0   sigemptyset
+00000000      DF *UND*	00000000  GLIBC_2.0   __uflow
+00000000      DO *UND*	00000000  GLIBC_2.0   program_invocation_name
+00000000      DF *UND*	00000000  GLIBC_2.1   __rawmemchr
+00000000      DF *UND*	00000000  GLIBC_2.0   nl_langinfo
+00000000      DF *UND*	00000000  GLIBC_2.0   setlocale
+00000000      DF *UND*	00000000  GLIBC_2.0   strrchr
+00000000      DF *UND*	00000000  GLIBC_2.0   __overflow
+00000000      DF *UND*	00000000  GLIBC_2.0   mbstowcs
+00000000      DF *UND*	00000000  GLIBC_2.0   gmtime_r
+00000000      DF *UND*	00000000  GLIBC_2.2   localeconv
+00000000      DF *UND*	00000000  GLIBC_2.3   getxattr
+00000000      DF *UND*	00000000              freecon
+00000000      DF *UND*	00000000  GLIBC_2.1   lseek64
+00000000      DF *UND*	00000000  GLIBC_2.2   readdir64
+00000000      DO *UND*	00000000  GLIBC_2.0   program_invocation_short_name
+00000000      DF *UND*	00000000  GLIBC_2.3.4 __fprintf_chk
+00000000      DF *UND*	00000000  GLIBC_2.0   sigaction
+00000000      DF *UND*	00000000  GLIBC_2.0   bindtextdomain
+00000000  w   D  *UND*	00000000              _ITM_registerTMCloneTable
+00000000      DF *UND*	00000000  GLIBC_2.0   strncmp
+00000000      DF *UND*	00000000  GLIBC_2.0   isatty
+00000000      DF *UND*	00000000  GLIBC_2.0   abort
+00000000      DF *UND*	00000000  GLIBC_2.2   __xstat64
+00000000      DO *UND*	00000000  GLIBC_2.0   optarg
+00000000      DF *UND*	00000000  GLIBC_2.2   __lxstat64
+00000000      DF *UND*	00000000  GLIBC_2.0   getgrnam
+00000000      DF *UND*	00000000  GLIBC_2.0   close
+00000000      DF *UND*	00000000  GLIBC_2.0   closedir
+00000000      DF *UND*	00000000  GLIBC_2.0   strspn
+00000000      DF *UND*	00000000  GLIBC_2.0   opendir
+00000000      DF *UND*	00000000  GLIBC_2.0   getgrgid
+00000000      DF *UND*	00000000  GLIBC_2.3   __ctype_tolower_loc
+00000000      DF *UND*	00000000  GLIBC_2.0   __assert_fail
+00000000      DF *UND*	00000000  GLIBC_2.3   __ctype_b_loc
+00000000      DF *UND*	00000000  GLIBC_2.0   calloc
+00000000      DF *UND*	00000000  GLIBC_2.3.4 __sprintf_chk
+00024340 g    DO .data	00000004  Base        obstack_alloc_failed_handler
+00014ed0 g    DF .text	000000fb  Base        _obstack_newchunk
+00024344 g    D  .data	00000000  Base        _edata
+00014ea0 g    DF .text	0000002a  Base        _obstack_begin_1
+00014fd0 g    DF .text	00000030  Base        _obstack_allocated_p
+000254d4 g    D  .bss	00000000  Base        _end
+00014e70 g    DF .text	00000023  Base        _obstack_begin
+00016544 g    DO .rodata	00000004  Base        _IO_stdin_used
+00015080 g    DF .text	00000022  Base        _obstack_memory_used
+00024344 g    D  .bss	00000000  Base        __bss_start
+00001ce8 g    DF .init	00000000  Base        _init
+00016524 g    DF .fini	00000000  Base        _fini
+00015000 g    DF .text	00000071  Base        _obstack_free
 
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-0805b5d4 R_386_GLOB_DAT    __gmon_start__
-0805b8a0 R_386_COPY        optind
-0805b8a4 R_386_COPY        stderr
-0805b8c0 R_386_COPY        stdout
-0805b8c4 R_386_COPY        optarg
-0805b5e8 R_386_JUMP_SLOT   abort
-0805b5ec R_386_JUMP_SLOT   __errno_location
-0805b5f0 R_386_JUMP_SLOT   sigemptyset
-0805b5f4 R_386_JUMP_SLOT   sprintf
-0805b5f8 R_386_JUMP_SLOT   localeconv
-0805b5fc R_386_JUMP_SLOT   dirfd
-0805b600 R_386_JUMP_SLOT   __cxa_atexit
-0805b604 R_386_JUMP_SLOT   strcoll
-0805b608 R_386_JUMP_SLOT   qsort
-0805b60c R_386_JUMP_SLOT   fputs_unlocked
-0805b610 R_386_JUMP_SLOT   __ctype_get_mb_cur_max
-0805b614 R_386_JUMP_SLOT   signal
-0805b618 R_386_JUMP_SLOT   sigismember
-0805b61c R_386_JUMP_SLOT   __gmon_start__
-0805b620 R_386_JUMP_SLOT   realloc
-0805b624 R_386_JUMP_SLOT   __xstat64
-0805b628 R_386_JUMP_SLOT   localtime
-0805b62c R_386_JUMP_SLOT   getgrnam
-0805b630 R_386_JUMP_SLOT   strchr
-0805b634 R_386_JUMP_SLOT   getenv
-0805b638 R_386_JUMP_SLOT   calloc
-0805b63c R_386_JUMP_SLOT   strncpy
-0805b640 R_386_JUMP_SLOT   freecon
-0805b644 R_386_JUMP_SLOT   memset
-0805b648 R_386_JUMP_SLOT   __libc_start_main
-0805b64c R_386_JUMP_SLOT   mempcpy
-0805b650 R_386_JUMP_SLOT   _obstack_begin
-0805b654 R_386_JUMP_SLOT   strrchr
-0805b658 R_386_JUMP_SLOT   chmod
-0805b65c R_386_JUMP_SLOT   __assert_fail
-0805b660 R_386_JUMP_SLOT   bindtextdomain
-0805b664 R_386_JUMP_SLOT   mbrtowc
-0805b668 R_386_JUMP_SLOT   acl_delete_def_file
-0805b66c R_386_JUMP_SLOT   gettimeofday
-0805b670 R_386_JUMP_SLOT   __ctype_toupper_loc
-0805b674 R_386_JUMP_SLOT   free
-0805b678 R_386_JUMP_SLOT   __lxstat64
-0805b67c R_386_JUMP_SLOT   _obstack_newchunk
-0805b680 R_386_JUMP_SLOT   __overflow
-0805b684 R_386_JUMP_SLOT   dcgettext
-0805b688 R_386_JUMP_SLOT   sigaction
-0805b68c R_386_JUMP_SLOT   strverscmp
-0805b690 R_386_JUMP_SLOT   opendir
-0805b694 R_386_JUMP_SLOT   getopt_long
-0805b698 R_386_JUMP_SLOT   ioctl
-0805b69c R_386_JUMP_SLOT   __ctype_b_loc
-0805b6a0 R_386_JUMP_SLOT   iswcntrl
-0805b6a4 R_386_JUMP_SLOT   isatty
-0805b6a8 R_386_JUMP_SLOT   fclose
-0805b6ac R_386_JUMP_SLOT   mbsinit
-0805b6b0 R_386_JUMP_SLOT   _setjmp
-0805b6b4 R_386_JUMP_SLOT   tcgetpgrp
-0805b6b8 R_386_JUMP_SLOT   mktime
-0805b6bc R_386_JUMP_SLOT   readdir64
-0805b6c0 R_386_JUMP_SLOT   memcpy
-0805b6c4 R_386_JUMP_SLOT   strtoul
-0805b6c8 R_386_JUMP_SLOT   strlen
-0805b6cc R_386_JUMP_SLOT   getpwuid
-0805b6d0 R_386_JUMP_SLOT   acl_extended_file
-0805b6d4 R_386_JUMP_SLOT   acl_get_file
-0805b6d8 R_386_JUMP_SLOT   setlocale
-0805b6dc R_386_JUMP_SLOT   acl_entries
-0805b6e0 R_386_JUMP_SLOT   strcpy
-0805b6e4 R_386_JUMP_SLOT   printf
-0805b6e8 R_386_JUMP_SLOT   raise
-0805b6ec R_386_JUMP_SLOT   fwrite_unlocked
-0805b6f0 R_386_JUMP_SLOT   clock_gettime
-0805b6f4 R_386_JUMP_SLOT   getfilecon
-0805b6f8 R_386_JUMP_SLOT   closedir
-0805b6fc R_386_JUMP_SLOT   fprintf
-0805b700 R_386_JUMP_SLOT   malloc
-0805b704 R_386_JUMP_SLOT   acl_set_file
-0805b708 R_386_JUMP_SLOT   sigprocmask
-0805b70c R_386_JUMP_SLOT   __fpending
-0805b710 R_386_JUMP_SLOT   lgetfilecon
-0805b714 R_386_JUMP_SLOT   error
-0805b718 R_386_JUMP_SLOT   getgrgid
-0805b71c R_386_JUMP_SLOT   __strtoull_internal
-0805b720 R_386_JUMP_SLOT   sigaddset
-0805b724 R_386_JUMP_SLOT   readlink
-0805b728 R_386_JUMP_SLOT   memmove
-0805b72c R_386_JUMP_SLOT   __ctype_tolower_loc
-0805b730 R_386_JUMP_SLOT   textdomain
-0805b734 R_386_JUMP_SLOT   __fxstat64
-0805b738 R_386_JUMP_SLOT   fnmatch
-0805b73c R_386_JUMP_SLOT   strncmp
-0805b740 R_386_JUMP_SLOT   vfprintf
-0805b744 R_386_JUMP_SLOT   acl_free
-0805b748 R_386_JUMP_SLOT   fflush_unlocked
-0805b74c R_386_JUMP_SLOT   strftime
-0805b750 R_386_JUMP_SLOT   wcwidth
-0805b754 R_386_JUMP_SLOT   iswprint
-0805b758 R_386_JUMP_SLOT   getpwnam
-0805b75c R_386_JUMP_SLOT   strcmp
-0805b760 R_386_JUMP_SLOT   exit
-0805b764 R_386_JUMP_SLOT   acl_from_text
+000239b8 R_386_RELATIVE    *ABS*
+000239bc R_386_RELATIVE    *ABS*
+000239c0 R_386_RELATIVE    *ABS*
+000239c4 R_386_RELATIVE    *ABS*
+000239c8 R_386_RELATIVE    *ABS*
+000239cc R_386_RELATIVE    *ABS*
+000239d0 R_386_RELATIVE    *ABS*
+000239d4 R_386_RELATIVE    *ABS*
+000239d8 R_386_RELATIVE    *ABS*
+000239dc R_386_RELATIVE    *ABS*
+000239e0 R_386_RELATIVE    *ABS*
+000239e4 R_386_RELATIVE    *ABS*
+000239e8 R_386_RELATIVE    *ABS*
+000239ec R_386_RELATIVE    *ABS*
+000239f0 R_386_RELATIVE    *ABS*
+000239f4 R_386_RELATIVE    *ABS*
+000239f8 R_386_RELATIVE    *ABS*
+000239fc R_386_RELATIVE    *ABS*
+00023a00 R_386_RELATIVE    *ABS*
+00023a04 R_386_RELATIVE    *ABS*
+00023a08 R_386_RELATIVE    *ABS*
+00023a0c R_386_RELATIVE    *ABS*
+00023a10 R_386_RELATIVE    *ABS*
+00023a14 R_386_RELATIVE    *ABS*
+00023a18 R_386_RELATIVE    *ABS*
+00023a1c R_386_RELATIVE    *ABS*
+00023a20 R_386_RELATIVE    *ABS*
+00023a24 R_386_RELATIVE    *ABS*
+00023a28 R_386_RELATIVE    *ABS*
+00023a2c R_386_RELATIVE    *ABS*
+00023a40 R_386_RELATIVE    *ABS*
+00023a44 R_386_RELATIVE    *ABS*
+00023a48 R_386_RELATIVE    *ABS*
+00023a4c R_386_RELATIVE    *ABS*
+00023a50 R_386_RELATIVE    *ABS*
+00023a54 R_386_RELATIVE    *ABS*
+00023a58 R_386_RELATIVE    *ABS*
+00023a5c R_386_RELATIVE    *ABS*
+00023a60 R_386_RELATIVE    *ABS*
+00023a64 R_386_RELATIVE    *ABS*
+00023a68 R_386_RELATIVE    *ABS*
+00023a6c R_386_RELATIVE    *ABS*
+00023a70 R_386_RELATIVE    *ABS*
+00023a74 R_386_RELATIVE    *ABS*
+00023a78 R_386_RELATIVE    *ABS*
+00023a7c R_386_RELATIVE    *ABS*
+00023a80 R_386_RELATIVE    *ABS*
+00023a84 R_386_RELATIVE    *ABS*
+00023a88 R_386_RELATIVE    *ABS*
+00023a8c R_386_RELATIVE    *ABS*
+00023a90 R_386_RELATIVE    *ABS*
+00023a94 R_386_RELATIVE    *ABS*
+00023a98 R_386_RELATIVE    *ABS*
+00023a9c R_386_RELATIVE    *ABS*
+00023aa0 R_386_RELATIVE    *ABS*
+00023aa4 R_386_RELATIVE    *ABS*
+00023aa8 R_386_RELATIVE    *ABS*
+00023aac R_386_RELATIVE    *ABS*
+00023ab0 R_386_RELATIVE    *ABS*
+00023ab4 R_386_RELATIVE    *ABS*
+00023ab8 R_386_RELATIVE    *ABS*
+00023abc R_386_RELATIVE    *ABS*
+00023ac0 R_386_RELATIVE    *ABS*
+00023ac8 R_386_RELATIVE    *ABS*
+00023acc R_386_RELATIVE    *ABS*
+00023ad0 R_386_RELATIVE    *ABS*
+00023ad4 R_386_RELATIVE    *ABS*
+00023ad8 R_386_RELATIVE    *ABS*
+00023ae0 R_386_RELATIVE    *ABS*
+00023ae4 R_386_RELATIVE    *ABS*
+00023ae8 R_386_RELATIVE    *ABS*
+00023aec R_386_RELATIVE    *ABS*
+00023af0 R_386_RELATIVE    *ABS*
+00023b00 R_386_RELATIVE    *ABS*
+00023b04 R_386_RELATIVE    *ABS*
+00023b08 R_386_RELATIVE    *ABS*
+00023b0c R_386_RELATIVE    *ABS*
+00023b10 R_386_RELATIVE    *ABS*
+00023b14 R_386_RELATIVE    *ABS*
+00023b18 R_386_RELATIVE    *ABS*
+00023b20 R_386_RELATIVE    *ABS*
+00023b30 R_386_RELATIVE    *ABS*
+00023b40 R_386_RELATIVE    *ABS*
+00023b50 R_386_RELATIVE    *ABS*
+00023b60 R_386_RELATIVE    *ABS*
+00023b70 R_386_RELATIVE    *ABS*
+00023b80 R_386_RELATIVE    *ABS*
+00023b90 R_386_RELATIVE    *ABS*
+00023ba0 R_386_RELATIVE    *ABS*
+00023bb0 R_386_RELATIVE    *ABS*
+00023bc0 R_386_RELATIVE    *ABS*
+00023bd0 R_386_RELATIVE    *ABS*
+00023be0 R_386_RELATIVE    *ABS*
+00023bf0 R_386_RELATIVE    *ABS*
+00023c00 R_386_RELATIVE    *ABS*
+00023c10 R_386_RELATIVE    *ABS*
+00023c20 R_386_RELATIVE    *ABS*
+00023c30 R_386_RELATIVE    *ABS*
+00023c40 R_386_RELATIVE    *ABS*
+00023c50 R_386_RELATIVE    *ABS*
+00023c60 R_386_RELATIVE    *ABS*
+00023c70 R_386_RELATIVE    *ABS*
+00023c80 R_386_RELATIVE    *ABS*
+00023c90 R_386_RELATIVE    *ABS*
+00023ca0 R_386_RELATIVE    *ABS*
+00023cb0 R_386_RELATIVE    *ABS*
+00023cc0 R_386_RELATIVE    *ABS*
+00023cd0 R_386_RELATIVE    *ABS*
+00023ce0 R_386_RELATIVE    *ABS*
+00023cf0 R_386_RELATIVE    *ABS*
+00023d00 R_386_RELATIVE    *ABS*
+00023d10 R_386_RELATIVE    *ABS*
+00023d20 R_386_RELATIVE    *ABS*
+00023d30 R_386_RELATIVE    *ABS*
+00023d40 R_386_RELATIVE    *ABS*
+00023d50 R_386_RELATIVE    *ABS*
+00023d60 R_386_RELATIVE    *ABS*
+00023d70 R_386_RELATIVE    *ABS*
+00023d80 R_386_RELATIVE    *ABS*
+00023d90 R_386_RELATIVE    *ABS*
+00023da0 R_386_RELATIVE    *ABS*
+00023db0 R_386_RELATIVE    *ABS*
+00023dc0 R_386_RELATIVE    *ABS*
+00023de0 R_386_RELATIVE    *ABS*
+00023de4 R_386_RELATIVE    *ABS*
+00023de8 R_386_RELATIVE    *ABS*
+00023dec R_386_RELATIVE    *ABS*
+00023df0 R_386_RELATIVE    *ABS*
+00023df4 R_386_RELATIVE    *ABS*
+00023df8 R_386_RELATIVE    *ABS*
+00023dfc R_386_RELATIVE    *ABS*
+00023e00 R_386_RELATIVE    *ABS*
+00023e04 R_386_RELATIVE    *ABS*
+00023e08 R_386_RELATIVE    *ABS*
+00023e0c R_386_RELATIVE    *ABS*
+00023e10 R_386_RELATIVE    *ABS*
+00023e14 R_386_RELATIVE    *ABS*
+00023e18 R_386_RELATIVE    *ABS*
+00023e1c R_386_RELATIVE    *ABS*
+00023e20 R_386_RELATIVE    *ABS*
+00023e24 R_386_RELATIVE    *ABS*
+00023e28 R_386_RELATIVE    *ABS*
+00023e2c R_386_RELATIVE    *ABS*
+00023e30 R_386_RELATIVE    *ABS*
+00023e34 R_386_RELATIVE    *ABS*
+00023e38 R_386_RELATIVE    *ABS*
+00023e3c R_386_RELATIVE    *ABS*
+00023e44 R_386_RELATIVE    *ABS*
+00023e48 R_386_RELATIVE    *ABS*
+00023e4c R_386_RELATIVE    *ABS*
+00023e50 R_386_RELATIVE    *ABS*
+00023e58 R_386_RELATIVE    *ABS*
+00023e5c R_386_RELATIVE    *ABS*
+00023e60 R_386_RELATIVE    *ABS*
+00023e64 R_386_RELATIVE    *ABS*
+00023e6c R_386_RELATIVE    *ABS*
+00023e70 R_386_RELATIVE    *ABS*
+00023e80 R_386_RELATIVE    *ABS*
+00023e84 R_386_RELATIVE    *ABS*
+00023e88 R_386_RELATIVE    *ABS*
+00023e8c R_386_RELATIVE    *ABS*
+00023e90 R_386_RELATIVE    *ABS*
+00023e94 R_386_RELATIVE    *ABS*
+00023e98 R_386_RELATIVE    *ABS*
+00023e9c R_386_RELATIVE    *ABS*
+00023ea0 R_386_RELATIVE    *ABS*
+00023ea4 R_386_RELATIVE    *ABS*
+00023fb8 R_386_RELATIVE    *ABS*
+00023fc0 R_386_RELATIVE    *ABS*
+00023fc8 R_386_RELATIVE    *ABS*
+00023fd0 R_386_RELATIVE    *ABS*
+00023fd8 R_386_RELATIVE    *ABS*
+000241e4 R_386_RELATIVE    *ABS*
+00024200 R_386_RELATIVE    *ABS*
+00024204 R_386_RELATIVE    *ABS*
+00024224 R_386_RELATIVE    *ABS*
+0002422c R_386_RELATIVE    *ABS*
+0002423c R_386_RELATIVE    *ABS*
+00024254 R_386_RELATIVE    *ABS*
+0002425c R_386_RELATIVE    *ABS*
+00024264 R_386_RELATIVE    *ABS*
+0002426c R_386_RELATIVE    *ABS*
+00024274 R_386_RELATIVE    *ABS*
+0002427c R_386_RELATIVE    *ABS*
+00024294 R_386_RELATIVE    *ABS*
+0002429c R_386_RELATIVE    *ABS*
+000242a4 R_386_RELATIVE    *ABS*
+000242ac R_386_RELATIVE    *ABS*
+000242b4 R_386_RELATIVE    *ABS*
+000242bc R_386_RELATIVE    *ABS*
+000242c4 R_386_RELATIVE    *ABS*
+000242cc R_386_RELATIVE    *ABS*
+000242dc R_386_RELATIVE    *ABS*
+000242e4 R_386_RELATIVE    *ABS*
+000242e8 R_386_RELATIVE    *ABS*
+00024334 R_386_RELATIVE    *ABS*
+0002433c R_386_RELATIVE    *ABS*
+00024340 R_386_RELATIVE    *ABS*
+00023fa4 R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
+00023fa8 R_386_GLOB_DAT    stderr@GLIBC_2.0
+00023fac R_386_GLOB_DAT    free@GLIBC_2.0
+00023fb0 R_386_GLOB_DAT    optind@GLIBC_2.0
+00023fb4 R_386_GLOB_DAT    __cxa_finalize@GLIBC_2.1.3
+00023fbc R_386_GLOB_DAT    malloc@GLIBC_2.0
+00023fc4 R_386_GLOB_DAT    __gmon_start__
+00023fcc R_386_GLOB_DAT    stdout@GLIBC_2.0
+00023fd4 R_386_GLOB_DAT    program_invocation_name@GLIBC_2.0
+00023fdc R_386_GLOB_DAT    program_invocation_short_name@GLIBC_2.0
+00023fe0 R_386_GLOB_DAT    _ITM_registerTMCloneTable
+00023fe4 R_386_GLOB_DAT    optarg@GLIBC_2.0
+0002400c R_386_JUMP_SLOT   __ctype_toupper_loc@GLIBC_2.3
+00024010 R_386_JUMP_SLOT   unsetenv@GLIBC_2.0
+00024014 R_386_JUMP_SLOT   getpwnam@GLIBC_2.0
+00024018 R_386_JUMP_SLOT   raise@GLIBC_2.0
+0002401c R_386_JUMP_SLOT   __snprintf_chk@GLIBC_2.3.4
+00024020 R_386_JUMP_SLOT   strcmp@GLIBC_2.0
+00024024 R_386_JUMP_SLOT   open64@GLIBC_2.1
+00024028 R_386_JUMP_SLOT   getpwuid@GLIBC_2.0
+0002402c R_386_JUMP_SLOT   fflush@GLIBC_2.0
+00024030 R_386_JUMP_SLOT   _exit@GLIBC_2.0
+00024034 R_386_JUMP_SLOT   sigprocmask@GLIBC_2.0
+00024038 R_386_JUMP_SLOT   dirfd@GLIBC_2.0
+0002403c R_386_JUMP_SLOT   wcwidth@GLIBC_2.0
+00024040 R_386_JUMP_SLOT   memmove@GLIBC_2.0
+00024044 R_386_JUMP_SLOT   _setjmp@GLIBC_2.0
+00024048 R_386_JUMP_SLOT   memcpy@GLIBC_2.0
+0002404c R_386_JUMP_SLOT   mbsinit@GLIBC_2.0
+00024050 R_386_JUMP_SLOT   clock_gettime@GLIBC_2.17
+00024054 R_386_JUMP_SLOT   __strtoull_internal@GLIBC_2.0
+00024058 R_386_JUMP_SLOT   fclose@GLIBC_2.1
+0002405c R_386_JUMP_SLOT   fseeko64@GLIBC_2.1
+00024060 R_386_JUMP_SLOT   signal@GLIBC_2.0
+00024064 R_386_JUMP_SLOT   memcmp@GLIBC_2.0
+00024068 R_386_JUMP_SLOT   gettimeofday@GLIBC_2.0
+0002406c R_386_JUMP_SLOT   dcgettext@GLIBC_2.0
+00024070 R_386_JUMP_SLOT   mktime@GLIBC_2.0
+00024074 R_386_JUMP_SLOT   __stack_chk_fail@GLIBC_2.4
+00024078 R_386_JUMP_SLOT   localtime_r@GLIBC_2.0
+0002407c R_386_JUMP_SLOT   sigismember@GLIBC_2.0
+00024080 R_386_JUMP_SLOT   fgetfilecon
+00024084 R_386_JUMP_SLOT   fflush_unlocked@GLIBC_2.0
+00024088 R_386_JUMP_SLOT   iswcntrl@GLIBC_2.0
+0002408c R_386_JUMP_SLOT   textdomain@GLIBC_2.0
+00024090 R_386_JUMP_SLOT   readlink@GLIBC_2.0
+00024094 R_386_JUMP_SLOT   fnmatch@GLIBC_2.2.3
+00024098 R_386_JUMP_SLOT   iswprint@GLIBC_2.0
+0002409c R_386_JUMP_SLOT   ioctl@GLIBC_2.0
+000240a0 R_386_JUMP_SLOT   fwrite@GLIBC_2.0
+000240a4 R_386_JUMP_SLOT   __fxstat64@GLIBC_2.2
+000240a8 R_386_JUMP_SLOT   tzset@GLIBC_2.0
+000240ac R_386_JUMP_SLOT   __ctype_get_mb_cur_max@GLIBC_2.0
+000240b0 R_386_JUMP_SLOT   strcpy@GLIBC_2.0
+000240b4 R_386_JUMP_SLOT   __fpending@GLIBC_2.2
+000240b8 R_386_JUMP_SLOT   wcstombs@GLIBC_2.0
+000240bc R_386_JUMP_SLOT   mbrtowc@GLIBC_2.0
+000240c0 R_386_JUMP_SLOT   gethostname@GLIBC_2.0
+000240c4 R_386_JUMP_SLOT   __cxa_atexit@GLIBC_2.1.3
+000240c8 R_386_JUMP_SLOT   error@GLIBC_2.0
+000240cc R_386_JUMP_SLOT   strcoll@GLIBC_2.0
+000240d0 R_386_JUMP_SLOT   getenv@GLIBC_2.0
+000240d4 R_386_JUMP_SLOT   realloc@GLIBC_2.0
+000240d8 R_386_JUMP_SLOT   lgetfilecon
+000240dc R_386_JUMP_SLOT   timegm@GLIBC_2.0
+000240e0 R_386_JUMP_SLOT   __freading@GLIBC_2.2
+000240e4 R_386_JUMP_SLOT   __memcpy_chk@GLIBC_2.3.4
+000240e8 R_386_JUMP_SLOT   exit@GLIBC_2.0
+000240ec R_386_JUMP_SLOT   fdopen@GLIBC_2.1
+000240f0 R_386_JUMP_SLOT   fputs_unlocked@GLIBC_2.1
+000240f4 R_386_JUMP_SLOT   strftime@GLIBC_2.0
+000240f8 R_386_JUMP_SLOT   getopt_long@GLIBC_2.0
+000240fc R_386_JUMP_SLOT   getfilecon
+00024100 R_386_JUMP_SLOT   strtoul@GLIBC_2.0
+00024104 R_386_JUMP_SLOT   strchr@GLIBC_2.0
+00024108 R_386_JUMP_SLOT   getcwd@GLIBC_2.0
+0002410c R_386_JUMP_SLOT   fscanf@GLIBC_2.0
+00024110 R_386_JUMP_SLOT   strlen@GLIBC_2.0
+00024114 R_386_JUMP_SLOT   setenv@GLIBC_2.0
+00024118 R_386_JUMP_SLOT   __libc_start_main@GLIBC_2.0
+0002411c R_386_JUMP_SLOT   sigaddset@GLIBC_2.0
+00024120 R_386_JUMP_SLOT   memset@GLIBC_2.0
+00024124 R_386_JUMP_SLOT   ungetc@GLIBC_2.0
+00024128 R_386_JUMP_SLOT   snprintf@GLIBC_2.0
+0002412c R_386_JUMP_SLOT   __errno_location@GLIBC_2.0
+00024130 R_386_JUMP_SLOT   tcgetpgrp@GLIBC_2.0
+00024134 R_386_JUMP_SLOT   fileno@GLIBC_2.0
+00024138 R_386_JUMP_SLOT   stpncpy@GLIBC_2.0
+0002413c R_386_JUMP_SLOT   fwrite_unlocked@GLIBC_2.1
+00024140 R_386_JUMP_SLOT   __printf_chk@GLIBC_2.3.4
+00024144 R_386_JUMP_SLOT   mempcpy@GLIBC_2.1
+00024148 R_386_JUMP_SLOT   wcswidth@GLIBC_2.0
+0002414c R_386_JUMP_SLOT   sigemptyset@GLIBC_2.0
+00024150 R_386_JUMP_SLOT   __uflow@GLIBC_2.0
+00024154 R_386_JUMP_SLOT   __rawmemchr@GLIBC_2.1
+00024158 R_386_JUMP_SLOT   nl_langinfo@GLIBC_2.0
+0002415c R_386_JUMP_SLOT   setlocale@GLIBC_2.0
+00024160 R_386_JUMP_SLOT   strrchr@GLIBC_2.0
+00024164 R_386_JUMP_SLOT   __overflow@GLIBC_2.0
+00024168 R_386_JUMP_SLOT   mbstowcs@GLIBC_2.0
+0002416c R_386_JUMP_SLOT   gmtime_r@GLIBC_2.0
+00024170 R_386_JUMP_SLOT   localeconv@GLIBC_2.2
+00024174 R_386_JUMP_SLOT   getxattr@GLIBC_2.3
+00024178 R_386_JUMP_SLOT   freecon
+0002417c R_386_JUMP_SLOT   lseek64@GLIBC_2.1
+00024180 R_386_JUMP_SLOT   readdir64@GLIBC_2.2
+00024184 R_386_JUMP_SLOT   __fprintf_chk@GLIBC_2.3.4
+00024188 R_386_JUMP_SLOT   sigaction@GLIBC_2.0
+0002418c R_386_JUMP_SLOT   bindtextdomain@GLIBC_2.0
+00024190 R_386_JUMP_SLOT   strncmp@GLIBC_2.0
+00024194 R_386_JUMP_SLOT   isatty@GLIBC_2.0
+00024198 R_386_JUMP_SLOT   abort@GLIBC_2.0
+0002419c R_386_JUMP_SLOT   __xstat64@GLIBC_2.2
+000241a0 R_386_JUMP_SLOT   __lxstat64@GLIBC_2.2
+000241a4 R_386_JUMP_SLOT   getgrnam@GLIBC_2.0
+000241a8 R_386_JUMP_SLOT   close@GLIBC_2.0
+000241ac R_386_JUMP_SLOT   closedir@GLIBC_2.0
+000241b0 R_386_JUMP_SLOT   strspn@GLIBC_2.0
+000241b4 R_386_JUMP_SLOT   opendir@GLIBC_2.0
+000241b8 R_386_JUMP_SLOT   getgrgid@GLIBC_2.0
+000241bc R_386_JUMP_SLOT   __ctype_tolower_loc@GLIBC_2.3
+000241c0 R_386_JUMP_SLOT   __assert_fail@GLIBC_2.0
+000241c4 R_386_JUMP_SLOT   __ctype_b_loc@GLIBC_2.3
+000241c8 R_386_JUMP_SLOT   calloc@GLIBC_2.0
+000241cc R_386_JUMP_SLOT   __sprintf_chk@GLIBC_2.3.4
 
 
diff --git a/scripts/t/Dpkg_Shlibs/objdump.patterns b/scripts/t/Dpkg_Shlibs/objdump.patterns
index a319cb95f..571ad4726 100644
--- a/scripts/t/Dpkg_Shlibs/objdump.patterns
+++ b/scripts/t/Dpkg_Shlibs/objdump.patterns
@@ -2,21 +2,23 @@
 ./t/Dpkg_Shlibs/libobjdump.patterns.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
-start address 0x00001880
+start address 0x00001650
 
 Program Header:
     LOAD off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**12
-         filesz 0x00002466 memsz 0x00002466 flags r-x
-    LOAD off    0x00002468 vaddr 0x00003468 paddr 0x00003468 align 2**12
-         filesz 0x000002a4 memsz 0x000002ac flags rw-
- DYNAMIC off    0x0000259c vaddr 0x0000359c paddr 0x0000359c align 2**2
-         filesz 0x000000f8 memsz 0x000000f8 flags rw-
-    NOTE off    0x000000f4 vaddr 0x000000f4 paddr 0x000000f4 align 2**2
+         filesz 0x0000212c memsz 0x0000212c flags r-x
+    LOAD off    0x00002dd8 vaddr 0x00003dd8 paddr 0x00003dd8 align 2**12
+         filesz 0x00000274 memsz 0x00000278 flags rw-
+ DYNAMIC off    0x00002ec8 vaddr 0x00003ec8 paddr 0x00003ec8 align 2**2
+         filesz 0x00000110 memsz 0x00000110 flags rw-
+    NOTE off    0x00000114 vaddr 0x00000114 paddr 0x00000114 align 2**2
          filesz 0x00000024 memsz 0x00000024 flags r--
-EH_FRAME off    0x00001f10 vaddr 0x00001f10 paddr 0x00001f10 align 2**2
-         filesz 0x0000014c memsz 0x0000014c flags r--
-   STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**2
+EH_FRAME off    0x00001ba0 vaddr 0x00001ba0 paddr 0x00001ba0 align 2**2
+         filesz 0x00000134 memsz 0x00000134 flags r--
+   STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**4
          filesz 0x00000000 memsz 0x00000000 flags rw-
+   RELRO off    0x00002dd8 vaddr 0x00003dd8 paddr 0x00003dd8 align 2**0
+         filesz 0x00000228 memsz 0x00000228 flags r--
 
 Dynamic Section:
   NEEDED               libstdc++.so.6
@@ -24,27 +26,30 @@ Dynamic Section:
   NEEDED               libgcc_s.so.1
   NEEDED               libc.so.6
   SONAME               libpatterns.so.1
-  INIT                 0x00001738
-  FINI                 0x00001e98
-  HASH                 0x00000118
-  GNU_HASH             0x0000038c
-  STRTAB               0x00000ba4
-  SYMTAB               0x00000624
-  STRSZ                0x000007de
+  INIT                 0x00001520
+  FINI                 0x00001b2c
+  INIT_ARRAY           0x00003dd8
+  INIT_ARRAYSZ         0x00000004
+  FINI_ARRAY           0x00003ddc
+  FINI_ARRAYSZ         0x00000004
+  GNU_HASH             0x00000138
+  STRTAB               0x00000960
+  SYMTAB               0x000003d0
+  STRSZ                0x00000802
   SYMENT               0x00000010
-  PLTGOT               0x000036b8
-  PLTRELSZ             0x00000080
+  PLTGOT               0x00004000
+  PLTRELSZ             0x00000070
   PLTREL               0x00000011
-  JMPREL               0x000016b8
-  REL                  0x000014f8
-  RELSZ                0x000001c0
+  JMPREL               0x000014b0
+  REL                  0x000012d8
+  RELSZ                0x000001d8
   RELENT               0x00000008
-  VERDEF               0x00001434
+  VERDEF               0x00001214
   VERDEFNUM            0x00000003
-  VERNEED              0x00001488
+  VERNEED              0x00001268
   VERNEEDNUM           0x00000003
-  VERSYM               0x00001382
-  RELCOUNT             0x00000001
+  VERSYM               0x00001162
+  RELCOUNT             0x00000003
 
 Version definitions:
 1 0x01 0x03e92331 libpatterns.so.1
@@ -52,177 +57,179 @@ Version definitions:
 3 0x00 0x0a4cbc82 SYMVEROPT_2
 
 Version References:
-  required from libc.so.6:
-    0x09691f73 0x00 07 GLIBC_2.1.3
   required from libgcc_s.so.1:
-    0x0b792650 0x00 06 GCC_3.0
+    0x0b792650 0x00 07 GCC_3.0
   required from libstdc++.so.6:
-    0x056bafd3 0x00 05 CXXABI_1.3
-    0x08922974 0x00 04 GLIBCXX_3.4
+    0x056bafd3 0x00 06 CXXABI_1.3
+    0x0bafd179 0x00 05 CXXABI_1.3.9
+  required from libc.so.6:
+    0x09691f73 0x00 04 GLIBC_2.1.3
 
 DYNAMIC SYMBOL TABLE:
-00000000  w   D  *UND*	00000000              __gmon_start__
-00000000  w   D  *UND*	00000000              _Jv_RegisterClasses
-00000000      DF *UND*	00000000  GLIBCXX_3.4 _ZdlPv
+00000000  w   DF *UND*	00000000  GLIBC_2.1.3 __cxa_finalize
+00000000      DF *UND*	00000000  CXXABI_1.3.9 _ZdlPvj
 00000000      DO *UND*	00000000  CXXABI_1.3  _ZTVN10__cxxabiv117__class_type_infoE
-00000000      DO *UND*	00000000  CXXABI_1.3  _ZTVN10__cxxabiv121__vmi_class_type_infoE
 00000000      DF *UND*	00000000  CXXABI_1.3  __gxx_personality_v0
+00000000      DO *UND*	00000000  CXXABI_1.3  _ZTVN10__cxxabiv121__vmi_class_type_infoE
+00000000  w   D  *UND*	00000000              _ITM_deregisterTMCloneTable
 00000000      DF *UND*	00000000  GCC_3.0     _Unwind_Resume
-00000000  w   DF *UND*	00000000  GLIBC_2.1.3 __cxa_finalize
-00001ef7  w   DO .rodata	00000008  Base        _ZTS6ClassC
-000019b0 g    DF .text	0000001b  Base        _ZN6ClassBD1Ev
-00001b70 g    DF .text	00000007  Base        _ZThn16_N3NSB6ClassDD0Ev
-00001af0 g    DF .text	00000036  Base        _ZN6ClassCD0Ev
-00001cd0 g    DF .text	0000001b  Base        _ZN3NSA6ClassA8InternalC2Ev
-00001e00 g    DF .text	00000002  SYMVER_1    _ZN3NSB6SymverC2Ev
-00001d10 g    DF .text	0000001b  Base        _ZN3NSA6ClassAC2Ev
-00001c50 g    DF .text	00000036  Base        _ZN3NSA6ClassA7PrivateD0Ev
-00001d70 g    DF .text	00000089  Base        _ZN3NSB6ClassDC2Ev
-00001cf0 g    DF .text	00000002  Base        _ZN3NSA6ClassA8Internal16internal_method1Ec
+00000000  w   D  *UND*	00000000              __gmon_start__
+00000000  w   D  *UND*	00000000              _ITM_registerTMCloneTable
+00001b88  w   DO .rodata	00000008  Base        _ZTS6ClassC
+00001790 g    DF .text	00000002  Base        _ZN6ClassBD1Ev
+00001940 g    DF .text	00000007  Base        _ZThn16_N3NSB6ClassDD0Ev
+000018e0 g    DF .text	0000002a  Base        _ZN6ClassCD0Ev
+00001a00 g    DF .text	0000001a  Base        _ZN3NSA6ClassAC2Ev
+00001af0 g    DF .text	00000002  SYMVER_1    _ZN3NSB6SymverC2Ev
+000019c0 g    DF .text	0000001a  Base        _ZN3NSA6ClassA8InternalC2Ev
+00001820 g    DF .text	0000002a  Base        _ZN3NSA6ClassA7PrivateD0Ev
+00001a60 g    DF .text	0000008c  Base        _ZN3NSB6ClassDC2Ev
+000019e0 g    DF .text	00000002  Base        _ZN3NSA6ClassA8Internal16internal_method1Ec
+00001970 g    DF .text	00000002  Base        _ZThn12_NK3NSB6ClassD11generate_vtEPKc
 00000000 g    DO *ABS*	00000000  SYMVER_1    SYMVER_1
-00001ad0 g    DF .text	00000007  Base        _ZThn12_NK3NSB6ClassD11generate_vtEPKc
-000034e8  w   DO .data.rel.ro	00000010  Base        _ZTVN3NSA6ClassA7PrivateE
-00001e10 g    DF .text	00000002  SYMVER_1    _ZN3NSB6SymverD1Ev
-00001e50 g    DF .text	00000002  SYMVEROPT_2 _ZN3NSB14SymverOptionalD2Ev
-00001d50 g    DF .text	0000001b  Base        _ZN6ClassCC2Ev
-00001980 g    DF .text	0000001b  Base        _ZN3NSA6ClassAD1Ev
-00001960 g    DF .text	0000001b  Base        _ZN3NSA6ClassA8InternalD1Ev
-00001a30 g    DF .text	00000088  Base        _ZN3NSB6ClassDD1Ev
-00001c90 g    DF .text	0000001b  Base        _ZN3NSA6ClassA7PrivateC2Ev
-000034f8  w   DO .data.rel.ro	00000010  Base        _ZTVN3NSA6ClassA8InternalE
-00001cb0 g    DF .text	00000002  Base        _ZN3NSA6ClassA7Private11privmethod1Ei
-000019b0 g    DF .text	0000001b  Base        _ZN6ClassBD2Ev
-00001a10 g    DF .text	00000007  Base        _ZThn16_N3NSB6ClassDD1Ev
-00001e98 g    DF .fini	00000000  Base        _fini
-00001b80 g    DF .text	00000007  Base        _ZThn12_N3NSB6ClassDD0Ev
-000019e0 g    DF .text	0000001b  Base        _ZN6ClassCD1Ev
-00001940 g    DF .text	0000001b  Base        _ZN3NSA6ClassA7PrivateD1Ev
-00003498  w   DO .data.rel.ro	00000008  Base        _ZTI6ClassB
-00001738 g    DF .init	00000000  Base        _init
-000034a0  w   DO .data.rel.ro	00000008  Base        _ZTI6ClassC
-00001d00 g    DF .text	00000002  Base        _ZN3NSA6ClassA8Internal16internal_method2Ec
-00001980 g    DF .text	0000001b  Base        _ZN3NSA6ClassAD2Ev
-00001960 g    DF .text	0000001b  Base        _ZN3NSA6ClassA8InternalD2Ev
-00001e10 g    DF .text	00000002  SYMVER_1    _ZN3NSB6SymverD2Ev
+00003e30  w   DO .data.rel.ro	00000010  Base        _ZTVN3NSA6ClassA7PrivateE
+00001770 g    DF .text	00000002  Base        _ZN3NSA6ClassAD1Ev
+00001760 g    DF .text	00000002  Base        _ZN3NSA6ClassA8InternalD1Ev
+00001b00 g    DF .text	00000002  SYMVER_1    _ZN3NSB6SymverD1Ev
+00001a40 g    DF .text	0000001a  Base        _ZN6ClassCC2Ev
+00001b00 g    DF .text	00000002  SYMVEROPT_2 _ZN3NSB14SymverOptionalD2Ev
+00003e40  w   DO .data.rel.ro	00000010  Base        _ZTVN3NSA6ClassA8InternalE
+00001980 g    DF .text	0000001a  Base        _ZN3NSA6ClassA7PrivateC2Ev
+000017b0 g    DF .text	0000004d  Base        _ZN3NSB6ClassDD1Ev
+000019a0 g    DF .text	00000002  Base        _ZN3NSA6ClassA7Private11privmethod1Ei
+00001790 g    DF .text	00000002  Base        _ZN6ClassBD2Ev
+00001810 g    DF .text	00000007  Base        _ZThn16_N3NSB6ClassDD1Ev
+00001b2c g    DF .fini	00000000  Base        _fini
+00001950 g    DF .text	00000007  Base        _ZThn12_N3NSB6ClassDD0Ev
+000017a0 g    DF .text	00000002  Base        _ZN6ClassCD1Ev
+00001750 g    DF .text	00000002  Base        _ZN3NSA6ClassA7PrivateD1Ev
+00001520 g    DF .init	00000000  Base        _init
+00003df8  w   DO .data.rel.ro	00000008  Base        _ZTI6ClassB
+000019f0 g    DF .text	00000002  Base        _ZN3NSA6ClassA8Internal16internal_method2Ec
+00003e00  w   DO .data.rel.ro	00000008  Base        _ZTI6ClassC
+00001b00 g    DF .text	00000002  SYMVER_1    _ZN3NSB6SymverD2Ev
+00001760 g    DF .text	00000002  Base        _ZN3NSA6ClassA8InternalD2Ev
 00000000 g    DO *ABS*	00000000  SYMVEROPT_2 SYMVEROPT_2
-00003560  w   DO .data.rel.ro	0000003c  Base        _ZTVN3NSB6ClassDE
-00003508  w   DO .data.rel.ro	00000014  Base        _ZTVN3NSA6ClassAE
-000019a0 g    DF .text	00000002  Base        _ZNK3NSA6ClassA11generate_vtEPKc
-00001cc0 g    DF .text	00000002  Base        _ZN3NSA6ClassA7Private11privmethod2Ei
-00001a30 g    DF .text	00000088  Base        _ZN3NSB6ClassDD2Ev
-00001ac0 g    DF .text	00000007  Base        _ZThn16_NK3NSB6ClassD11generate_vtEPKc
-00001a00 g    DF .text	00000002  Base        _ZNK6ClassC11generate_vtEPKc
-00001a20 g    DF .text	00000007  Base        _ZThn12_N3NSB6ClassDD1Ev
-000019e0 g    DF .text	0000001b  Base        _ZN6ClassCD2Ev
-00001e40 g    DF .text	00000002  SYMVEROPT_2 _ZN3NSB14SymverOptionalC1Ev
-00001e20 g    DF .text	00000002  SYMVER_1    _ZN3NSB6Symver14symver_method1Ev
-00001940 g    DF .text	0000001b  Base        _ZN3NSA6ClassA7PrivateD2Ev
-000019d0 g    DF .text	00000002  Base        _ZNK6ClassB11generate_vtEPKc
-00001d30 g    DF .text	0000001b  Base        _ZN6ClassBC1Ev
-00003520  w   DO .data.rel.ro	00000014  Base        _ZTV6ClassB
-00003538  w   DO .data.rel.ro	00000014  Base        _ZTV6ClassC
-00001eb4  w   DO .rodata	00000016  Base        _ZTSN3NSA6ClassA7PrivateE
-00001eff  w   DO .rodata	0000000e  Base        _ZTSN3NSB6ClassDE
-0000370c g    D  *ABS*	00000000  Base        _edata
-00001ee1  w   DO .rodata	0000000e  Base        _ZTSN3NSA6ClassAE
-00001b30 g    DF .text	00000036  Base        _ZN6ClassBD0Ev
-00003480  w   DO .data.rel.ro	00000008  Base        _ZTIN3NSA6ClassA7PrivateE
-00001d10 g    DF .text	0000001b  Base        _ZN3NSA6ClassAC1Ev
-00001e40 g    DF .text	00000002  SYMVEROPT_2 _ZN3NSB14SymverOptionalC2Ev
-00001cd0 g    DF .text	0000001b  Base        _ZN3NSA6ClassA8InternalC1Ev
-00003714 g    D  *ABS*	00000000  Base        _end
-00001e00 g    DF .text	00000002  SYMVER_1    _ZN3NSB6SymverC1Ev
-00001eca  w   DO .rodata	00000017  Base        _ZTSN3NSA6ClassA8InternalE
-00001e30 g    DF .text	00000002  SYMVER_1    _ZN3NSB6Symver14symver_method2Ev
-00001d70 g    DF .text	00000089  Base        _ZN3NSB6ClassDC1Ev
-00001d30 g    DF .text	0000001b  Base        _ZN6ClassBC2Ev
-00001ae0 g    DF .text	00000002  Base        _ZNK3NSB6ClassD11generate_vtEPKc
-00001bd0 g    DF .text	00000036  Base        _ZN3NSA6ClassAD0Ev
-00001d50 g    DF .text	0000001b  Base        _ZN6ClassCC1Ev
-00001c10 g    DF .text	00000036  Base        _ZN3NSA6ClassA8InternalD0Ev
-00001e50 g    DF .text	00000002  SYMVEROPT_2 _ZN3NSB14SymverOptionalD1Ev
-00003488  w   DO .data.rel.ro	00000008  Base        _ZTIN3NSA6ClassA8InternalE
-0000370c g    D  *ABS*	00000000  Base        __bss_start
-00001eef  w   DO .rodata	00000008  Base        _ZTS6ClassB
-000034c0  w   DO .data.rel.ro	00000028  Base        _ZTIN3NSB6ClassDE
-00001c90 g    DF .text	0000001b  Base        _ZN3NSA6ClassA7PrivateC1Ev
-00003490  w   DO .data.rel.ro	00000008  Base        _ZTIN3NSA6ClassAE
-00001b90 g    DF .text	00000036  Base        _ZN3NSB6ClassDD0Ev
+00001770 g    DF .text	00000002  Base        _ZN3NSA6ClassAD2Ev
+00003e8c  w   DO .data.rel.ro	0000003c  Base        _ZTVN3NSB6ClassDE
+00003e50  w   DO .data.rel.ro	00000014  Base        _ZTVN3NSA6ClassAE
+000019b0 g    DF .text	00000002  Base        _ZN3NSA6ClassA7Private11privmethod2Ei
+00001780 g    DF .text	00000002  Base        _ZNK3NSA6ClassA11generate_vtEPKc
+000017b0 g    DF .text	0000004d  Base        _ZN3NSB6ClassDD2Ev
+00001960 g    DF .text	00000002  Base        _ZThn16_NK3NSB6ClassD11generate_vtEPKc
+00001780 g    DF .text	00000002  Base        _ZNK6ClassC11generate_vtEPKc
+00001800 g    DF .text	00000007  Base        _ZThn12_N3NSB6ClassDD1Ev
+00001af0 g    DF .text	00000002  SYMVEROPT_2 _ZN3NSB14SymverOptionalC1Ev
+000017a0 g    DF .text	00000002  Base        _ZN6ClassCD2Ev
+00001b10 g    DF .text	00000002  SYMVER_1    _ZN3NSB6Symver14symver_method1Ev
+00001750 g    DF .text	00000002  Base        _ZN3NSA6ClassA7PrivateD2Ev
+00001780 g    DF .text	00000002  Base        _ZNK6ClassB11generate_vtEPKc
+00001a20 g    DF .text	0000001a  Base        _ZN6ClassBC1Ev
+00003e64  w   DO .data.rel.ro	00000014  Base        _ZTV6ClassB
+00003e78  w   DO .data.rel.ro	00000014  Base        _ZTV6ClassC
+00001b70  w   DO .rodata	0000000e  Base        _ZTSN3NSA6ClassAE
+0000404c g    D  .data	00000000  Base        _edata
+00001b40  w   DO .rodata	00000016  Base        _ZTSN3NSA6ClassA7PrivateE
+00001b90  w   DO .rodata	0000000e  Base        _ZTSN3NSB6ClassDE
+000018b0 g    DF .text	0000002a  Base        _ZN6ClassBD0Ev
+00003de0  w   DO .data.rel.ro	00000008  Base        _ZTIN3NSA6ClassA7PrivateE
+00001af0 g    DF .text	00000002  SYMVEROPT_2 _ZN3NSB14SymverOptionalC2Ev
+000019c0 g    DF .text	0000001a  Base        _ZN3NSA6ClassA8InternalC1Ev
+00001af0 g    DF .text	00000002  SYMVER_1    _ZN3NSB6SymverC1Ev
+00004050 g    D  .bss	00000000  Base        _end
+00001a00 g    DF .text	0000001a  Base        _ZN3NSA6ClassAC1Ev
+00001b20 g    DF .text	00000002  SYMVER_1    _ZN3NSB6Symver14symver_method2Ev
+00001a60 g    DF .text	0000008c  Base        _ZN3NSB6ClassDC1Ev
+00001b58  w   DO .rodata	00000017  Base        _ZTSN3NSA6ClassA8InternalE
+00001a20 g    DF .text	0000001a  Base        _ZN6ClassBC2Ev
+00001780 g    DF .text	00000002  Base        _ZNK3NSB6ClassD11generate_vtEPKc
+00001b00 g    DF .text	00000002  SYMVEROPT_2 _ZN3NSB14SymverOptionalD1Ev
+00001880 g    DF .text	0000002a  Base        _ZN3NSA6ClassAD0Ev
+00001a40 g    DF .text	0000001a  Base        _ZN6ClassCC1Ev
+00001850 g    DF .text	0000002a  Base        _ZN3NSA6ClassA8InternalD0Ev
+00003de8  w   DO .data.rel.ro	00000008  Base        _ZTIN3NSA6ClassA8InternalE
+0000404c g    D  .bss	00000000  Base        __bss_start
+00003e08  w   DO .data.rel.ro	00000028  Base        _ZTIN3NSB6ClassDE
+00003df0  w   DO .data.rel.ro	00000008  Base        _ZTIN3NSA6ClassAE
+00001910 g    DF .text	0000002a  Base        _ZN3NSB6ClassDD0Ev
+00001980 g    DF .text	0000001a  Base        _ZN3NSA6ClassA7PrivateC1Ev
+00001b80  w   DO .rodata	00000008  Base        _ZTS6ClassB
 
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-00003704 R_386_RELATIVE    *ABS*
-00003480 R_386_32          _ZTVN10__cxxabiv117__class_type_infoE
-00003488 R_386_32          _ZTVN10__cxxabiv117__class_type_infoE
-00003490 R_386_32          _ZTVN10__cxxabiv117__class_type_infoE
-00003498 R_386_32          _ZTVN10__cxxabiv117__class_type_infoE
-000034a0 R_386_32          _ZTVN10__cxxabiv117__class_type_infoE
-00003484 R_386_32          _ZTSN3NSA6ClassA7PrivateE
-0000348c R_386_32          _ZTSN3NSA6ClassA8InternalE
-00003494 R_386_32          _ZTSN3NSA6ClassAE
-0000349c R_386_32          _ZTS6ClassB
-000034a4 R_386_32          _ZTS6ClassC
-000034c0 R_386_32          _ZTVN10__cxxabiv121__vmi_class_type_infoE
-000034c4 R_386_32          _ZTSN3NSB6ClassDE
-000034d0 R_386_32          _ZTIN3NSA6ClassAE
-0000350c R_386_32          _ZTIN3NSA6ClassAE
-000034d8 R_386_32          _ZTI6ClassB
-00003524 R_386_32          _ZTI6ClassB
-000034e0 R_386_32          _ZTI6ClassC
-0000353c R_386_32          _ZTI6ClassC
-000034ec R_386_32          _ZTIN3NSA6ClassA7PrivateE
-000034f0 R_386_32          _ZN3NSA6ClassA7PrivateD1Ev
-000034f4 R_386_32          _ZN3NSA6ClassA7PrivateD0Ev
-000034fc R_386_32          _ZTIN3NSA6ClassA8InternalE
-00003500 R_386_32          _ZN3NSA6ClassA8InternalD1Ev
-00003504 R_386_32          _ZN3NSA6ClassA8InternalD0Ev
-00003510 R_386_32          _ZN3NSA6ClassAD1Ev
-00003514 R_386_32          _ZN3NSA6ClassAD0Ev
-00003518 R_386_32          _ZNK3NSA6ClassA11generate_vtEPKc
-00003528 R_386_32          _ZN6ClassBD1Ev
-0000352c R_386_32          _ZN6ClassBD0Ev
-00003530 R_386_32          _ZNK6ClassB11generate_vtEPKc
-00003540 R_386_32          _ZN6ClassCD1Ev
-00003544 R_386_32          _ZN6ClassCD0Ev
-00003548 R_386_32          _ZNK6ClassC11generate_vtEPKc
-00003564 R_386_32          _ZTIN3NSB6ClassDE
-00003578 R_386_32          _ZTIN3NSB6ClassDE
-0000358c R_386_32          _ZTIN3NSB6ClassDE
-00003568 R_386_32          _ZN3NSB6ClassDD1Ev
-0000356c R_386_32          _ZN3NSB6ClassDD0Ev
-00003570 R_386_32          _ZNK3NSB6ClassD11generate_vtEPKc
-0000357c R_386_32          _ZThn12_N3NSB6ClassDD1Ev
-00003580 R_386_32          _ZThn12_N3NSB6ClassDD0Ev
-00003584 R_386_32          _ZThn12_NK3NSB6ClassD11generate_vtEPKc
-00003590 R_386_32          _ZThn16_N3NSB6ClassDD1Ev
-00003594 R_386_32          _ZThn16_N3NSB6ClassDD0Ev
-00003598 R_386_32          _ZThn16_NK3NSB6ClassD11generate_vtEPKc
-00003694 R_386_GLOB_DAT    _ZTVN3NSB6ClassDE
-00003698 R_386_GLOB_DAT    __gmon_start__
-0000369c R_386_GLOB_DAT    _Jv_RegisterClasses
-000036a0 R_386_GLOB_DAT    _ZTV6ClassB
-000036a4 R_386_GLOB_DAT    _ZTVN3NSA6ClassA8InternalE
-000036a8 R_386_GLOB_DAT    _ZTVN3NSA6ClassA7PrivateE
-000036ac R_386_GLOB_DAT    _ZTVN3NSA6ClassAE
-000036b0 R_386_GLOB_DAT    __cxa_finalize
-000036b4 R_386_GLOB_DAT    _ZTV6ClassC
-00003708 R_386_32          __gxx_personality_v0
-000036c4 R_386_JUMP_SLOT   _ZN3NSA6ClassA7PrivateD1Ev
-000036c8 R_386_JUMP_SLOT   _ZN3NSB6ClassDD1Ev
-000036cc R_386_JUMP_SLOT   _ZN3NSA6ClassAD2Ev
-000036d0 R_386_JUMP_SLOT   __gmon_start__
-000036d4 R_386_JUMP_SLOT   _ZdlPv
-000036d8 R_386_JUMP_SLOT   _ZN6ClassCD2Ev
-000036dc R_386_JUMP_SLOT   _ZN6ClassBD2Ev
-000036e0 R_386_JUMP_SLOT   _ZN6ClassBD1Ev
-000036e4 R_386_JUMP_SLOT   _ZN6ClassCC2Ev
-000036e8 R_386_JUMP_SLOT   _ZN3NSA6ClassAD1Ev
-000036ec R_386_JUMP_SLOT   _ZN3NSA6ClassAC2Ev
-000036f0 R_386_JUMP_SLOT   _ZN6ClassBC2Ev
-000036f4 R_386_JUMP_SLOT   _ZN6ClassCD1Ev
-000036f8 R_386_JUMP_SLOT   _ZN3NSA6ClassA8InternalD1Ev
-000036fc R_386_JUMP_SLOT   _Unwind_Resume
-00003700 R_386_JUMP_SLOT   __cxa_finalize
+00003dd8 R_386_RELATIVE    *ABS*
+00003ddc R_386_RELATIVE    *ABS*
+00004044 R_386_RELATIVE    *ABS*
+00003de0 R_386_32          _ZTVN10__cxxabiv117__class_type_infoE@CXXABI_1.3
+00003de8 R_386_32          _ZTVN10__cxxabiv117__class_type_infoE@CXXABI_1.3
+00003df0 R_386_32          _ZTVN10__cxxabiv117__class_type_infoE@CXXABI_1.3
+00003df8 R_386_32          _ZTVN10__cxxabiv117__class_type_infoE@CXXABI_1.3
+00003e00 R_386_32          _ZTVN10__cxxabiv117__class_type_infoE@CXXABI_1.3
+00003de4 R_386_32          _ZTSN3NSA6ClassA7PrivateE@@Base
+00003dec R_386_32          _ZTSN3NSA6ClassA8InternalE@@Base
+00003df4 R_386_32          _ZTSN3NSA6ClassAE@@Base
+00003dfc R_386_32          _ZTS6ClassB@@Base
+00003e04 R_386_32          _ZTS6ClassC@@Base
+00003e08 R_386_32          _ZTVN10__cxxabiv121__vmi_class_type_infoE@CXXABI_1.3
+00003e0c R_386_32          _ZTSN3NSB6ClassDE@@Base
+00003e18 R_386_32          _ZTIN3NSA6ClassAE@@Base
+00003e54 R_386_32          _ZTIN3NSA6ClassAE@@Base
+00003e20 R_386_32          _ZTI6ClassB@@Base
+00003e68 R_386_32          _ZTI6ClassB@@Base
+00003e28 R_386_32          _ZTI6ClassC@@Base
+00003e7c R_386_32          _ZTI6ClassC@@Base
+00003e34 R_386_32          _ZTIN3NSA6ClassA7PrivateE@@Base
+00003e38 R_386_32          _ZN3NSA6ClassA7PrivateD1Ev@@Base
+00003e3c R_386_32          _ZN3NSA6ClassA7PrivateD0Ev@@Base
+00003e44 R_386_32          _ZTIN3NSA6ClassA8InternalE@@Base
+00003e48 R_386_32          _ZN3NSA6ClassA8InternalD1Ev@@Base
+00003e4c R_386_32          _ZN3NSA6ClassA8InternalD0Ev@@Base
+00003e58 R_386_32          _ZN3NSA6ClassAD1Ev@@Base
+00003e5c R_386_32          _ZN3NSA6ClassAD0Ev@@Base
+00003e60 R_386_32          _ZNK3NSA6ClassA11generate_vtEPKc@@Base
+00003e6c R_386_32          _ZN6ClassBD1Ev@@Base
+00003e70 R_386_32          _ZN6ClassBD0Ev@@Base
+00003e74 R_386_32          _ZNK6ClassB11generate_vtEPKc@@Base
+00003e80 R_386_32          _ZN6ClassCD1Ev@@Base
+00003e84 R_386_32          _ZN6ClassCD0Ev@@Base
+00003e88 R_386_32          _ZNK6ClassC11generate_vtEPKc@@Base
+00003e90 R_386_32          _ZTIN3NSB6ClassDE@@Base
+00003ea4 R_386_32          _ZTIN3NSB6ClassDE@@Base
+00003eb8 R_386_32          _ZTIN3NSB6ClassDE@@Base
+00003e94 R_386_32          _ZN3NSB6ClassDD1Ev@@Base
+00003e98 R_386_32          _ZN3NSB6ClassDD0Ev@@Base
+00003e9c R_386_32          _ZNK3NSB6ClassD11generate_vtEPKc@@Base
+00003ea8 R_386_32          _ZThn12_N3NSB6ClassDD1Ev@@Base
+00003eac R_386_32          _ZThn12_N3NSB6ClassDD0Ev@@Base
+00003eb0 R_386_32          _ZThn12_NK3NSB6ClassD11generate_vtEPKc@@Base
+00003ebc R_386_32          _ZThn16_N3NSB6ClassDD1Ev@@Base
+00003ec0 R_386_32          _ZThn16_N3NSB6ClassDD0Ev@@Base
+00003ec4 R_386_32          _ZThn16_NK3NSB6ClassD11generate_vtEPKc@@Base
+00003fd8 R_386_GLOB_DAT    __cxa_finalize@GLIBC_2.1.3
+00003fdc R_386_GLOB_DAT    _ZTVN3NSA6ClassA8InternalE@@Base
+00003fe0 R_386_GLOB_DAT    _ZTVN3NSB6ClassDE@@Base
+00003fe4 R_386_GLOB_DAT    _ZTVN3NSA6ClassAE@@Base
+00003fe8 R_386_GLOB_DAT    _ZTV6ClassC@@Base
+00003fec R_386_GLOB_DAT    _ZTV6ClassB@@Base
+00003ff0 R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
+00003ff4 R_386_GLOB_DAT    _ZTVN3NSA6ClassA7PrivateE@@Base
+00003ff8 R_386_GLOB_DAT    __gmon_start__
+00003ffc R_386_GLOB_DAT    _ITM_registerTMCloneTable
+00004048 R_386_32          __gxx_personality_v0@CXXABI_1.3
+0000400c R_386_JUMP_SLOT   _ZN6ClassBD1Ev@@Base
+00004010 R_386_JUMP_SLOT   _ZN6ClassBD2Ev@@Base
+00004014 R_386_JUMP_SLOT   _ZN3NSA6ClassA7PrivateD1Ev@@Base
+00004018 R_386_JUMP_SLOT   _ZN3NSA6ClassAD1Ev@@Base
+0000401c R_386_JUMP_SLOT   _ZN3NSA6ClassA8InternalD1Ev@@Base
+00004020 R_386_JUMP_SLOT   _ZdlPvj@CXXABI_1.3.9
+00004024 R_386_JUMP_SLOT   _ZN3NSB6ClassDD1Ev@@Base
+00004028 R_386_JUMP_SLOT   _ZN6ClassCD2Ev@@Base
+0000402c R_386_JUMP_SLOT   _ZN3NSA6ClassAC2Ev@@Base
+00004030 R_386_JUMP_SLOT   _ZN6ClassBC2Ev@@Base
+00004034 R_386_JUMP_SLOT   _ZN6ClassCC2Ev@@Base
+00004038 R_386_JUMP_SLOT   _Unwind_Resume@GCC_3.0
+0000403c R_386_JUMP_SLOT   _ZN3NSA6ClassAD2Ev@@Base
+00004040 R_386_JUMP_SLOT   _ZN6ClassCD1Ev@@Base
 
 
diff --git a/scripts/t/Dpkg_Shlibs/objdump.spacesyms b/scripts/t/Dpkg_Shlibs/objdump.spacesyms
index f307ee5a5..1b26af972 100644
--- a/scripts/t/Dpkg_Shlibs/objdump.spacesyms
+++ b/scripts/t/Dpkg_Shlibs/objdump.spacesyms
@@ -2,48 +2,47 @@
 ./t/Dpkg_Shlibs/libobjdump.spacesyms.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
-start address 0x000007a0
+start address 0x00000770
 
 Program Header:
     LOAD off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**12
-         filesz 0x00000d5c memsz 0x00000d5c flags r-x
-    LOAD off    0x00000d5c vaddr 0x00001d5c paddr 0x00001d5c align 2**12
-         filesz 0x00000204 memsz 0x00000208 flags rw-
- DYNAMIC off    0x00000d68 vaddr 0x00001d68 paddr 0x00001d68 align 2**2
-         filesz 0x000000f8 memsz 0x000000f8 flags rw-
-    NOTE off    0x000000f4 vaddr 0x000000f4 paddr 0x000000f4 align 2**2
+         filesz 0x00000d08 memsz 0x00000d08 flags r-x
+    LOAD off    0x00000f08 vaddr 0x00001f08 paddr 0x00001f08 align 2**12
+         filesz 0x00000198 memsz 0x0000019c flags rw-
+ DYNAMIC off    0x00000f10 vaddr 0x00001f10 paddr 0x00001f10 align 2**2
+         filesz 0x000000e0 memsz 0x000000e0 flags rw-
+    NOTE off    0x00000114 vaddr 0x00000114 paddr 0x00000114 align 2**2
          filesz 0x00000024 memsz 0x00000024 flags r--
-EH_FRAME off    0x00000a68 vaddr 0x00000a68 paddr 0x00000a68 align 2**2
-         filesz 0x000000d4 memsz 0x000000d4 flags r--
+EH_FRAME off    0x000009f8 vaddr 0x000009f8 paddr 0x000009f8 align 2**2
+         filesz 0x000000dc memsz 0x000000dc flags r--
    STACK off    0x00000000 vaddr 0x00000000 paddr 0x00000000 align 2**4
          filesz 0x00000000 memsz 0x00000000 flags rw-
+   RELRO off    0x00000f08 vaddr 0x00001f08 paddr 0x00001f08 align 2**0
+         filesz 0x000000f8 memsz 0x000000f8 flags r--
 
 Dynamic Section:
   NEEDED               libc.so.6
   SONAME               libspacesyms.so.1
-  INIT                 0x00000740
-  FINI                 0x00000a54
-  INIT_ARRAY           0x00001d5c
+  INIT                 0x00000724
+  FINI                 0x000009e4
+  INIT_ARRAY           0x00001f08
   INIT_ARRAYSZ         0x00000004
-  FINI_ARRAY           0x00001d60
+  FINI_ARRAY           0x00001f0c
   FINI_ARRAYSZ         0x00000004
-  GNU_HASH             0x00000118
-  STRTAB               0x0000036c
-  SYMTAB               0x000001cc
-  STRSZ                0x00000214
+  GNU_HASH             0x00000138
+  STRTAB               0x0000037c
+  SYMTAB               0x000001ec
+  STRSZ                0x00000200
   SYMENT               0x00000010
-  PLTGOT               0x00001e74
-  PLTRELSZ             0x00000010
-  PLTREL               0x00000011
-  JMPREL               0x00000730
-  REL                  0x00000630
-  RELSZ                0x00000100
+  PLTGOT               0x00002000
+  REL                  0x0000062c
+  RELSZ                0x000000f8
   RELENT               0x00000008
-  VERDEF               0x000005b4
+  VERDEF               0x000005b0
   VERDEFNUM            0x00000003
-  VERNEED              0x00000610
+  VERNEED              0x0000060c
   VERNEEDNUM           0x00000001
-  VERSYM               0x00000580
+  VERSYM               0x0000057c
   RELCOUNT             0x0000000f
 
 Version definitions:
@@ -60,65 +59,61 @@ DYNAMIC SYMBOL TABLE:
 00000000  w   D  *UND*	00000000              _ITM_deregisterTMCloneTable
 00000000  w   DF *UND*	00000000  GLIBC_2.1.3 __cxa_finalize
 00000000  w   D  *UND*	00000000              __gmon_start__
-00000000  w   D  *UND*	00000000              _Jv_RegisterClasses
 00000000  w   D  *UND*	00000000              _ITM_registerTMCloneTable
-00000920 g    DF .text	00000002  Base        symdefaultverSPA CEdefault
-00000a54 g    DF .fini	00000000  Base        _fini
-00001f00 g    DO .data	00000060  Base        funcs
-00000740 g    DF .init	00000000  Base        _init
-000009e0 g    DF .text	00000002  V1          symshortvernospacedefault
-00001f60 g    D  .bss	00000000  Base        __bss_start
-00000900 g    DF .text	00000002  Base        .protected symdefaultvernospaceprotected
-00001f64 g    D  .bss	00000000  Base        _end
-00000a20 g    DF .text	00000002  V1          symshortverSPA CEdefault
+000008c0 g    DF .text	00000002  Base        symdefaultverSPA CEdefault
+000009e4 g    DF .fini	00000000  Base        _fini
+00002040 g    DO .data	00000060  Base        funcs
+00000724 g    DF .init	00000000  Base        _init
+00000980 g    DF .text	00000002  V1          symshortvernospacedefault
+000020a0 g    D  .bss	00000000  Base        __bss_start
+00000890 g    DF .text	00000002  Base        .protected symdefaultvernospaceprotected
+000020a4 g    D  .bss	00000000  Base        _end
+000009c0 g    DF .text	00000002  V1          symshortverSPA CEdefault
 00000000 g    DO *ABS*	00000000  V1          V1
-00000a00 g    DF .text	00000002  V1          .protected symshortvernospaceprotected
-00000960 g    DF .text	00000002  VERY_LONG_VERSION_1 symlongvernospacedefault
+000009a0 g    DF .text	00000002  V1          .protected symshortvernospaceprotected
+00000900 g    DF .text	00000002  VERY_LONG_VERSION_1 symlongvernospacedefault
 00000000 g    DO *ABS*	00000000  VERY_LONG_VERSION_1 VERY_LONG_VERSION_1
-00001f60 g    D  .data	00000000  Base        _edata
-000008e0 g    DF .text	00000002  Base        symdefaultvernospacedefault
-000009c0 g    DF .text	00000002  VERY_LONG_VERSION_1 .protected symlongverSPA CEprotected
-00000940 g    DF .text	00000002  Base        .protected symdefaultverSPA CEprotected
-000009a0 g    DF .text	00000002  VERY_LONG_VERSION_1 symlongverSPA CEdefault
-00000a40 g    DF .text	00000002  V1          .protected symshortverSPA CEprotected
-00000980 g    DF .text	00000002  VERY_LONG_VERSION_1 .protected symlongvernospaceprotected
+000020a0 g    D  .data	00000000  Base        _edata
+00000870 g    DF .text	00000002  Base        symdefaultvernospacedefault
+00000960 g    DF .text	00000002  VERY_LONG_VERSION_1 .protected symlongverSPA CEprotected
+000008e0 g    DF .text	00000002  Base        .protected symdefaultverSPA CEprotected
+00000940 g    DF .text	00000002  VERY_LONG_VERSION_1 symlongverSPA CEdefault
+000009e0 g    DF .text	00000002  V1          .protected symshortverSPA CEprotected
+00000920 g    DF .text	00000002  VERY_LONG_VERSION_1 .protected symlongvernospaceprotected
 
 
 DYNAMIC RELOCATION RECORDS
 OFFSET   TYPE              VALUE 
-00001d5c R_386_RELATIVE    *ABS*
-00001d60 R_386_RELATIVE    *ABS*
-00001ec0 R_386_RELATIVE    *ABS*
-00001f04 R_386_RELATIVE    *ABS*
+00001f08 R_386_RELATIVE    *ABS*
 00001f0c R_386_RELATIVE    *ABS*
-00001f14 R_386_RELATIVE    *ABS*
-00001f1c R_386_RELATIVE    *ABS*
-00001f24 R_386_RELATIVE    *ABS*
-00001f2c R_386_RELATIVE    *ABS*
-00001f34 R_386_RELATIVE    *ABS*
-00001f3c R_386_RELATIVE    *ABS*
-00001f44 R_386_RELATIVE    *ABS*
-00001f4c R_386_RELATIVE    *ABS*
-00001f54 R_386_RELATIVE    *ABS*
-00001f5c R_386_RELATIVE    *ABS*
-00001e60 R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
-00001e64 R_386_GLOB_DAT    __cxa_finalize
-00001e68 R_386_GLOB_DAT    __gmon_start__
-00001e6c R_386_GLOB_DAT    _Jv_RegisterClasses
-00001e70 R_386_GLOB_DAT    _ITM_registerTMCloneTable
-00001f00 R_386_32          symdefaultvernospacedefault
-00001f08 R_386_32          symdefaultvernospaceprotected
-00001f10 R_386_32          symdefaultverSPA CEdefault
-00001f18 R_386_32          symdefaultverSPA CEprotected
-00001f20 R_386_32          symlongvernospacedefault
-00001f28 R_386_32          symlongvernospaceprotected
-00001f30 R_386_32          symlongverSPA CEdefault
-00001f38 R_386_32          symlongverSPA CEprotected
-00001f40 R_386_32          symshortvernospacedefault
-00001f48 R_386_32          symshortvernospaceprotected
-00001f50 R_386_32          symshortverSPA CEdefault
-00001f58 R_386_32          symshortverSPA CEprotected
-00001e80 R_386_JUMP_SLOT   __cxa_finalize
-00001e84 R_386_JUMP_SLOT   __gmon_start__
+00002020 R_386_RELATIVE    *ABS*
+00002044 R_386_RELATIVE    *ABS*
+0000204c R_386_RELATIVE    *ABS*
+00002054 R_386_RELATIVE    *ABS*
+0000205c R_386_RELATIVE    *ABS*
+00002064 R_386_RELATIVE    *ABS*
+0000206c R_386_RELATIVE    *ABS*
+00002074 R_386_RELATIVE    *ABS*
+0000207c R_386_RELATIVE    *ABS*
+00002084 R_386_RELATIVE    *ABS*
+0000208c R_386_RELATIVE    *ABS*
+00002094 R_386_RELATIVE    *ABS*
+0000209c R_386_RELATIVE    *ABS*
+00001ff0 R_386_GLOB_DAT    _ITM_deregisterTMCloneTable
+00001ff4 R_386_GLOB_DAT    __cxa_finalize@GLIBC_2.1.3
+00001ff8 R_386_GLOB_DAT    __gmon_start__
+00001ffc R_386_GLOB_DAT    _ITM_registerTMCloneTable
+00002040 R_386_32          symdefaultvernospacedefault@@Base
+00002048 R_386_32          symdefaultvernospaceprotected@@Base
+00002050 R_386_32          symdefaultverSPA CEdefault@@Base
+00002058 R_386_32          symdefaultverSPA CEprotected@@Base
+00002060 R_386_32          symlongvernospacedefault@@VERY_LONG_VERSION_1
+00002068 R_386_32          symlongvernospaceprotected@@VERY_LONG_VERSION_1
+00002070 R_386_32          symlongverSPA CEdefault@@VERY_LONG_VERSION_1
+00002078 R_386_32          symlongverSPA CEprotected@@VERY_LONG_VERSION_1
+00002080 R_386_32          symshortvernospacedefault@@V1
+00002088 R_386_32          symshortvernospaceprotected@@V1
+00002090 R_386_32          symshortverSPA CEdefault@@V1
+00002098 R_386_32          symshortverSPA CEprotected@@V1
 
 
diff --git a/scripts/t/Dpkg_Shlibs/patterns.cpp b/scripts/t/Dpkg_Shlibs/patterns.cpp
index 3beee43e0..8bfcb4dad 100644
--- a/scripts/t/Dpkg_Shlibs/patterns.cpp
+++ b/scripts/t/Dpkg_Shlibs/patterns.cpp
@@ -75,7 +75,7 @@ namespace NSB
 	public:
 	    ClassD();
 	    virtual ~ClassD();
-	    virtual void generate_vt(const char *) const;
+	    virtual void generate_vt(const char *) const override;
     };
 
     EXPORT(ClassD::ClassD());
diff --git a/scripts/t/Dpkg_Source_Format.t b/scripts/t/Dpkg_Source_Format.t
new file mode 100644
index 000000000..5a2785ea5
--- /dev/null
+++ b/scripts/t/Dpkg_Source_Format.t
@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+use strict;
+use warnings;
+
+use Test::More tests => 14;
+
+BEGIN {
+    use_ok('Dpkg::Source::Format');
+}
+
+my $format = Dpkg::Source::Format->new();
+my @format_parts;
+my $format_string;
+
+$format->set('4.3 (variant)');
+@format_parts = $format->get();
+is_deeply(\@format_parts, [ qw(4 3 variant) ], 'decomposition of format');
+$format_string = $format->get();
+ok($format_string eq '4.3 (variant)', 'function stringification of format');
+$format_string = "$format";
+ok($format_string eq '4.3 (variant)', 'operator stringification of format');
+
+$format->set('5.5');
+$format_string = $format->get();
+ok($format_string eq '5.5', 'missing variant');
+
+$format->set('6');
+$format_string = $format->get();
+ok($format_string eq '6.0', 'implied minor');
+
+my %format_bogus = (
+    'a' => 'require numerical major',
+    '7.a'=> 'require numerical minor',
+    '.5' => 'require non-empty major',
+    '7.' => 'require non-empty minor',
+    '7.0 ()' => 'require non-empty variant',
+    '7.0 (  )' => 'require non-space variant',
+    '7.0 (VARIANT)' => 'require lower-case variant',
+    '7.6.5' => 'excess version part',
+);
+
+foreach my $format_bogus (sort keys %format_bogus) {
+    eval {
+        $format->set($format_bogus);
+    };
+    ok($@, $format_bogus{$format_bogus});
+};
+
+# TODO: Add actual test cases.
+
+1;
diff --git a/scripts/t/Dpkg_Source_Patch.t b/scripts/t/Dpkg_Source_Patch.t
index d81a1a39d..f50f15be2 100644
--- a/scripts/t/Dpkg_Source_Patch.t
+++ b/scripts/t/Dpkg_Source_Patch.t
@@ -25,8 +25,8 @@ BEGIN {
     use_ok('Dpkg::Source::Patch');
 }
 
-my $datadir = test_get_data_path('t/Dpkg_Source_Patch');
-my $tmpdir = 't.tmp/Dpkg_Source_Patch';
+my $datadir = test_get_data_path();
+my $tmpdir = test_get_temp_path();
 
 sub test_patch_escape {
     my ($name, $symlink, $patchname, $desc) = @_;
diff --git a/scripts/t/Dpkg_Source_Quilt.t b/scripts/t/Dpkg_Source_Quilt.t
index af0071dea..96c3be04d 100644
--- a/scripts/t/Dpkg_Source_Quilt.t
+++ b/scripts/t/Dpkg_Source_Quilt.t
@@ -23,7 +23,7 @@ BEGIN {
     use_ok('Dpkg::Source::Quilt');
 }
 
-my $datadir = test_get_data_path('t/Dpkg_Source_Quilt');
+my $datadir = test_get_data_path();
 
 my $quilt;
 my (@series_got, @series_exp);
diff --git a/scripts/t/Dpkg_Substvars.t b/scripts/t/Dpkg_Substvars.t
index ded25ddc8..35ffd0ca5 100644
--- a/scripts/t/Dpkg_Substvars.t
+++ b/scripts/t/Dpkg_Substvars.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 37;
+use Test::More tests => 47;
 use Test::Dpkg qw(:paths);
 
 use Dpkg ();
@@ -24,7 +24,7 @@ use Dpkg::Arch qw(get_host_arch);
 
 use_ok('Dpkg::Substvars');
 
-my $datadir = test_get_data_path('t/Dpkg_Substvars');
+my $datadir = test_get_data_path();
 
 my $expected;
 
@@ -82,6 +82,23 @@ is($s->get('binary:Version'), '1:2.3.4~5-6.7.8~nmu9+b0', 'binary:Version');
 is($s->get('source:Version'), '1:2.3.4~5-6.7.8~nmu9', 'source:Version');
 is($s->get('source:Upstream-Version'), '1:2.3.4~5', 'source:Upstream-Version');
 
+is($s->get($_), undef, 'no ' . $_) foreach qw(source:Synopsis source:Extended-Description);
+$s->set_desc_substvars("short synopsis\nthis is the long\nextended text\n");
+is($s->get('source:Synopsis'), 'short synopsis', 'contents of source:Synopsis');
+is($s->get('source:Extended-Description'), "this is the long\nextended text\n",
+    'contents of source:Extended-Description');
+
+my %ctrl_fields = (
+    'Some-Field' => 'some-value',
+    'Other-Field' => 'other-value',
+    'Alter-Field' => 'alter-value',
+);
+is($s->get($_), undef, 'no ' . $_) foreach sort keys %ctrl_fields;
+$s->set_field_substvars(\%ctrl_fields, 'ctrl');
+is($s->get('ctrl:Some-Field'), 'some-value', 'contents of ctrl:Some-Field');
+is($s->get('ctrl:Other-Field'), 'other-value', 'contents of ctrl:Other-Field');
+is($s->get('ctrl:Alter-Field'), 'alter-value', 'contents of ctrl:Alter-Field');
+
 # Replace stuff
 is($s->substvars('This is a string ${var1} with variables ${binary:Version}'),
                  'This is a string New value with variables 1:2.3.4~5-6.7.8~nmu9+b0',
@@ -97,7 +114,7 @@ is($s->substvars('This is a string with unknown variable ${blubb}'),
                  'substvars missing');
 delete $SIG{__WARN__};
 is($output,
-   'Dpkg_Substvars.t: warning: test unknown substitution variable ${blubb}' . "\n",
+   'Dpkg_Substvars.t: warning: test substitution variable ${blubb} used, but is not defined' . "\n",
    'missing variables warning');
 
 # Recursive replace
@@ -117,7 +134,7 @@ $SIG{__WARN__} = sub { $output .= $_[0] };
 $s->warn_about_unused();
 delete $SIG{__WARN__};
 is($output,
-   'Dpkg_Substvars.t: warning: test unused substitution variable ${var2}' . "\n",
+   'Dpkg_Substvars.t: warning: test substitution variable ${var2} unused, but is defined' . "\n",
    'unused variables warnings');
 
 # Disable warnings for a certain variable
diff --git a/scripts/t/Dpkg_Version.t b/scripts/t/Dpkg_Version.t
index 78db7aead..69f0fecf0 100644
--- a/scripts/t/Dpkg_Version.t
+++ b/scripts/t/Dpkg_Version.t
@@ -20,6 +20,8 @@ use Test::More;
 
 use Dpkg::ErrorHandling;
 use Dpkg::IPC;
+use Dpkg::Path qw(find_command);
+use Dpkg::Version;
 
 report_options(quiet_warnings => 1);
 
@@ -30,7 +32,9 @@ my @ops = ('<', '<<', 'lt',
 	   '>=', 'ge',
 	   '>', '>>', 'gt');
 
-plan tests => scalar(@tests) * (3 * scalar(@ops) + 4) + 30;
+plan tests => scalar(@tests) * (3 * scalar(@ops) + 4) + 27;
+
+my $have_dpkg = find_command('dpkg');
 
 sub dpkg_vercmp {
      my ($a, $cmp, $b) = @_;
@@ -57,8 +61,6 @@ sub obj_vercmp {
      return $a gt $b if $cmp eq 'gt';
 }
 
-use_ok('Dpkg::Version');
-
 my $truth = {
     '-1' => {
 	'<<' => 1, 'lt' => 1,
@@ -128,12 +130,6 @@ ok(!$ver->is_native(), 'upstream version w/ revision is not native');
 $ver = Dpkg::Version->new('1.0-1.0-1');
 ok(!$ver->is_native(), 'upstream version w/ dash and revision is not native');
 
-# Other tests
-$ver = Dpkg::Version->new('1.2.3-4');
-is($ver || 'default', '1.2.3-4', 'bool eval returns string representation');
-$ver = Dpkg::Version->new('0');
-is($ver || 'default', 'default', 'bool eval of version 0 is still false...');
-
 # Comparisons
 foreach my $case (@tests) {
     my ($a, $b, $res) = split ' ', $case;
@@ -150,11 +146,21 @@ foreach my $case (@tests) {
 	if ($truth->{$res}{$op}) {
 	    ok(version_compare_relation($a, $norm_op, $b), "$a $op $b => true");
 	    ok(obj_vercmp($va, $op, $vb), "Dpkg::Version($a) $op Dpkg::Version($b) => true");
-	    ok(dpkg_vercmp($a, $op, $b), "dpkg --compare-versions -- $a $op $b => true");
+
+            SKIP: {
+                skip 'dpkg not available', 1 if not $have_dpkg;
+
+                ok(dpkg_vercmp($a, $op, $b), "dpkg --compare-versions -- $a $op $b => true");
+            }
 	} else {
 	    ok(!version_compare_relation($a, $norm_op, $b), "$a $op $b => false");
 	    ok(!obj_vercmp($va, $op, $vb), "Dpkg::Version($a) $op Dpkg::Version($b) => false");
-	    ok(!dpkg_vercmp($a, $op, $b), "dpkg --compare-versions -- $a $op $b => false");
+
+            SKIP: {
+                skip 'dpkg not available', 1 if not $have_dpkg;
+
+                ok(!dpkg_vercmp($a, $op, $b), "dpkg --compare-versions -- $a $op $b => false");
+            }
 	}
     }
 }
diff --git a/scripts/t/dpkg_buildpackage.t b/scripts/t/dpkg_buildpackage.t
index 2b4345539..dd4f67a6f 100644
--- a/scripts/t/dpkg_buildpackage.t
+++ b/scripts/t/dpkg_buildpackage.t
@@ -17,7 +17,7 @@ use strict;
 use warnings;
 
 use Test::More;
-use Test::Dpkg qw(:needs test_neutralize_checksums);
+use Test::Dpkg qw(:needs :paths test_neutralize_checksums);
 
 use File::Spec::Functions qw(rel2abs);
 use File::Compare;
@@ -34,7 +34,7 @@ plan tests => 12;
 
 my $srcdir = rel2abs($ENV{srcdir} || '.');
 my $datadir = "$srcdir/t/dpkg_buildpackage";
-my $tmpdir = 't.tmp/dpkg_buildpackage';
+my $tmpdir = test_get_temp_path();
 
 $ENV{$_} = rel2abs($ENV{$_}) foreach qw(DPKG_DATADIR DPKG_ORIGINS_DIR);
 
@@ -48,8 +48,6 @@ delete $ENV{SOURCE_DATE_EPOCH};
 # Delete other variables that can affect the tests.
 delete $ENV{$_} foreach grep { m/^DEB_/ } keys %ENV;
 
-make_path($tmpdir);
-
 chdir $tmpdir;
 
 my $tmpl_format = <<'TMPL_FORMAT';
diff --git a/scripts/t/dpkg_buildpackage/test-source_0_all.changes b/scripts/t/dpkg_buildpackage/test-source_0_all.changes
index ebe0890e2..c6c444f45 100644
--- a/scripts/t/dpkg_buildpackage/test-source_0_all.changes
+++ b/scripts/t/dpkg_buildpackage/test-source_0_all.changes
@@ -1,7 +1,7 @@
 Format: 1.8
 Date: Thu, 30 Jun 2016 20:15:12 +0200
 Source: test-source
-Binary: test-binary-all test-binary-any
+Binary: test-binary-all
 Architecture: all
 Version: 0
 Distribution: unstable
@@ -10,7 +10,6 @@ Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
 Changed-By: Dpkg Developers <debian-dpkg@lists.debian.org>
 Description:
  test-binary-all - architecture independent binary package
- test-binary-any - architecture dependent binary package
 Closes: 12345
 Changes:
  test-source (0) unstable; urgency=low
diff --git a/scripts/t/dpkg_buildpackage/test-source_0_any.changes b/scripts/t/dpkg_buildpackage/test-source_0_any.changes
index 098277f14..d67460cba 100644
--- a/scripts/t/dpkg_buildpackage/test-source_0_any.changes
+++ b/scripts/t/dpkg_buildpackage/test-source_0_any.changes
@@ -1,7 +1,7 @@
 Format: 1.8
 Date: Thu, 30 Jun 2016 20:15:12 +0200
 Source: test-source
-Binary: test-binary-all test-binary-any
+Binary: test-binary-any
 Architecture: amd64
 Version: 0
 Distribution: unstable
@@ -9,7 +9,6 @@ Urgency: low
 Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
 Changed-By: Dpkg Developers <debian-dpkg@lists.debian.org>
 Description:
- test-binary-all - architecture independent binary package
  test-binary-any - architecture dependent binary package
 Closes: 12345
 Changes:
diff --git a/scripts/t/dpkg_buildpackage/test-source_0_source.changes b/scripts/t/dpkg_buildpackage/test-source_0_source.changes
index 95ea1be6a..8c2f3d1e3 100644
--- a/scripts/t/dpkg_buildpackage/test-source_0_source.changes
+++ b/scripts/t/dpkg_buildpackage/test-source_0_source.changes
@@ -1,16 +1,12 @@
 Format: 1.8
 Date: Thu, 30 Jun 2016 20:15:12 +0200
 Source: test-source
-Binary: test-binary-all test-binary-any
 Architecture: source
 Version: 0
 Distribution: unstable
 Urgency: low
 Maintainer: Dpkg Developers <debian-dpkg@lists.debian.org>
 Changed-By: Dpkg Developers <debian-dpkg@lists.debian.org>
-Description:
- test-binary-all - architecture independent binary package
- test-binary-any - architecture dependent binary package
 Closes: 12345
 Changes:
  test-source (0) unstable; urgency=low
diff --git a/scripts/t/dpkg_source.t b/scripts/t/dpkg_source.t
index cdbedceb3..a0c343846 100644
--- a/scripts/t/dpkg_source.t
+++ b/scripts/t/dpkg_source.t
@@ -17,7 +17,7 @@ use strict;
 use warnings;
 
 use Test::More tests => 8;
-use Test::Dpkg qw(test_neutralize_checksums);
+use Test::Dpkg qw(:paths test_neutralize_checksums);
 
 use File::Spec::Functions qw(rel2abs);
 use File::Compare;
@@ -28,15 +28,13 @@ use Dpkg::Substvars;
 
 my $srcdir = rel2abs($ENV{srcdir} || '.');
 my $datadir = "$srcdir/t/dpkg_source";
-my $tmpdir = 't.tmp/dpkg_source';
+my $tmpdir = test_get_temp_path();
 
 $ENV{$_} = rel2abs($ENV{$_}) foreach qw(DPKG_DATADIR DPKG_ORIGINS_DIR);
 
 # Delete variables that can affect the tests.
 delete $ENV{SOURCE_DATE_EPOCH};
 
-make_path($tmpdir);
-
 chdir $tmpdir;
 
 my $tmpl_format = <<'TMPL_FORMAT';
diff --git a/scripts/t/merge_changelogs/ch-a b/scripts/t/merge_changelogs/ch-a
index 02dad9397..ff5419d8d 100644
--- a/scripts/t/merge_changelogs/ch-a
+++ b/scripts/t/merge_changelogs/ch-a
@@ -90,3 +90,5 @@ test (1.0-1) unstable; urgency=low
   * Initial release. (Closes: #XXXXXX)
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:37:46 +0200
+
+vim: et
diff --git a/scripts/t/merge_changelogs/ch-b b/scripts/t/merge_changelogs/ch-b
index 9eb78699b..a74145f82 100644
--- a/scripts/t/merge_changelogs/ch-b
+++ b/scripts/t/merge_changelogs/ch-b
@@ -85,3 +85,5 @@ test (1.0-1) unstable; urgency=low
   * Initial release. (Closes: #XXXXXX)
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:37:46 +0200
+
+vim: et
diff --git a/scripts/t/merge_changelogs/ch-merged b/scripts/t/merge_changelogs/ch-merged
index c995f1cf9..29a985d16 100644
--- a/scripts/t/merge_changelogs/ch-merged
+++ b/scripts/t/merge_changelogs/ch-merged
@@ -111,3 +111,5 @@ test (1.0-1) unstable; urgency=low
   * Initial release. (Closes: #XXXXXX)
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:37:46 +0200
+
+vim: et
diff --git a/scripts/t/merge_changelogs/ch-merged-basic b/scripts/t/merge_changelogs/ch-merged-basic
index 6b054c353..f89fe1123 100644
--- a/scripts/t/merge_changelogs/ch-merged-basic
+++ b/scripts/t/merge_changelogs/ch-merged-basic
@@ -134,3 +134,5 @@ test (1.0-1) unstable; urgency=low
   * Initial release. (Closes: #XXXXXX)
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:37:46 +0200
+
+vim: et
diff --git a/scripts/t/merge_changelogs/ch-merged-pr b/scripts/t/merge_changelogs/ch-merged-pr
index 467211c80..a58f09779 100644
--- a/scripts/t/merge_changelogs/ch-merged-pr
+++ b/scripts/t/merge_changelogs/ch-merged-pr
@@ -104,3 +104,5 @@ test (1.0-1) unstable; urgency=low
   * Initial release. (Closes: #XXXXXX)
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:37:46 +0200
+
+vim: et
diff --git a/scripts/t/merge_changelogs/ch-merged-pr-basic b/scripts/t/merge_changelogs/ch-merged-pr-basic
index 61f46cd69..773361253 100644
--- a/scripts/t/merge_changelogs/ch-merged-pr-basic
+++ b/scripts/t/merge_changelogs/ch-merged-pr-basic
@@ -136,3 +136,5 @@ test (1.0-1) unstable; urgency=low
   * Initial release. (Closes: #XXXXXX)
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:37:46 +0200
+
+vim: et
diff --git a/scripts/t/merge_changelogs/ch-old b/scripts/t/merge_changelogs/ch-old
index 12ee224c1..5ff7dd366 100644
--- a/scripts/t/merge_changelogs/ch-old
+++ b/scripts/t/merge_changelogs/ch-old
@@ -83,3 +83,5 @@ test (1.0-1) unstable; urgency=low
   * Initial release. (Closes: #XXXXXX)
 
  -- Raphaël Hertzog <hertzog@debian.org>  Sun, 18 Apr 2010 17:37:46 +0200
+
+vim: et
diff --git a/scripts/t/mk.t b/scripts/t/mk.t
index e711270c7..2e62cf5cf 100644
--- a/scripts/t/mk.t
+++ b/scripts/t/mk.t
@@ -16,7 +16,9 @@
 use strict;
 use warnings;
 
-use Test::More tests => 6;
+use Test::More tests => 9;
+use Test::Dpkg qw(:paths);
+
 use File::Spec::Functions qw(rel2abs);
 
 use Dpkg ();
@@ -25,7 +27,7 @@ use Dpkg::IPC;
 use Dpkg::Vendor;
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = "$srcdir/t/mk";
+my $datadir = test_get_data_path();
 
 # Turn these into absolute names so that we can safely switch to the test
 # directory with «make -C».
@@ -80,6 +82,7 @@ $ENV{"TEST_$_"} = $buildflag{$_} foreach keys %buildflag;
 test_makefile('buildflags.mk');
 
 my %buildtools = (
+    AS => 'as',
     CPP => 'gcc -E',
     CC => 'gcc',
     CXX => 'g++',
@@ -89,6 +92,12 @@ my %buildtools = (
     F77 => 'f77',
     FC => 'f77',
     LD => 'ld',
+    STRIP => 'strip',
+    OBJCOPY => 'objcopy',
+    OBJDUMP => 'objdump',
+    NM => 'nm',
+    AR => 'ar',
+    RANLIB => 'ranlib',
     PKG_CONFIG => 'pkg-config',
 );
 
@@ -100,6 +109,12 @@ foreach my $tool (keys %buildtools) {
 }
 test_makefile('buildtools.mk');
 
+$ENV{DEB_BUILD_OPTIONS} = 'nostrip';
+$ENV{TEST_STRIP} = ':';
+$ENV{TEST_STRIP_FOR_BUILD} = ':';
+test_makefile('buildtools.mk');
+delete $ENV{DEB_BUILD_OPTIONS};
+
 foreach my $tool (keys %buildtools) {
     delete $ENV{${tool}};
     delete $ENV{"${tool}_FOR_BUILD"};
@@ -108,5 +123,7 @@ foreach my $tool (keys %buildtools) {
 test_makefile('pkg-info.mk');
 
 test_makefile('vendor.mk');
+test_makefile('vendor-v0.mk');
+test_makefile('vendor-v1.mk');
 
 1;
diff --git a/scripts/t/mk/buildtools.mk b/scripts/t/mk/buildtools.mk
index 8bba96430..0077791b5 100644
--- a/scripts/t/mk/buildtools.mk
+++ b/scripts/t/mk/buildtools.mk
@@ -1,6 +1,8 @@
 include $(srcdir)/mk/buildtools.mk
 
 test:
+	test "$(AS)" = "$(TEST_AS)"
+	test "$(AS_FOR_BUILD)" = "$(TEST_AS_FOR_BUILD)"
 	test "$(CC)" = "$(TEST_CC)"
 	test "$(CC_FOR_BUILD)" = "$(TEST_CC_FOR_BUILD)"
 	test "$(CXX)" = "$(TEST_CXX)"
@@ -17,5 +19,17 @@ test:
 	test "$(FC_FOR_BUILD)" = "$(TEST_FC_FOR_BUILD)"
 	test "$(LD)" = "$(TEST_LD)"
 	test "$(LD_FOR_BUILD)" = "$(TEST_LD_FOR_BUILD)"
+	test "$(STRIP)" = "$(TEST_STRIP)"
+	test "$(STRIP_FOR_BUILD)" = "$(TEST_STRIP_FOR_BUILD)"
+	test "$(OBJCOPY)" = "$(TEST_OBJCOPY)"
+	test "$(OBJCOPY_FOR_BUILD)" = "$(TEST_OBJCOPY_FOR_BUILD)"
+	test "$(OBJDUMP)" = "$(TEST_OBJDUMP)"
+	test "$(OBJDUMP_FOR_BUILD)" = "$(TEST_OBJDUMP_FOR_BUILD)"
+	test "$(NM)" = "$(TEST_NM)"
+	test "$(NM_FOR_BUILD)" = "$(TEST_NM_FOR_BUILD)"
+	test "$(AR)" = "$(TEST_AR)"
+	test "$(AR_FOR_BUILD)" = "$(TEST_AR_FOR_BUILD)"
+	test "$(RANLIB)" = "$(TEST_RANLIB)"
+	test "$(RANLIB_FOR_BUILD)" = "$(TEST_RANLIB_FOR_BUILD)"
 	test "$(PKG_CONFIG)" = "$(TEST_PKG_CONFIG)"
 	test "$(PKG_CONFIG_FOR_BUILD)" = "$(TEST_PKG_CONFIG_FOR_BUILD)"
diff --git a/scripts/t/mk/vendor-v0.mk b/scripts/t/mk/vendor-v0.mk
new file mode 100644
index 000000000..602a8c63a
--- /dev/null
+++ b/scripts/t/mk/vendor-v0.mk
@@ -0,0 +1,6 @@
+dpkg_vendor_derives_from = $(dpkg_vendor_derives_from_v0)
+
+include $(srcdir)/mk/vendor.mk
+
+test:
+	test "$(shell $(call dpkg_vendor_derives_from,debian))" = "yes"
diff --git a/scripts/t/mk/vendor-v1.mk b/scripts/t/mk/vendor-v1.mk
new file mode 100644
index 000000000..11c1314ef
--- /dev/null
+++ b/scripts/t/mk/vendor-v1.mk
@@ -0,0 +1,6 @@
+include $(srcdir)/mk/vendor.mk
+
+dpkg_vendor_derives_from = $(dpkg_vendor_derives_from_v1)
+
+test:
+	test "$(call dpkg_vendor_derives_from,debian)" = "yes"
diff --git a/scripts/t/mk/vendor.mk b/scripts/t/mk/vendor.mk
index 371b39c87..4e0d9ff89 100644
--- a/scripts/t/mk/vendor.mk
+++ b/scripts/t/mk/vendor.mk
@@ -3,3 +3,4 @@ include $(srcdir)/mk/vendor.mk
 test:
 	test "$(DEB_VENDOR)" = "Debian"
 	test "$(DEB_PARENT_VENDOR)" = ""
+	test "$(shell $(call dpkg_vendor_derives_from,debian))" = "yes"
diff --git a/src/Makefile.am b/src/Makefile.am
index 2d776dd9a..b1003f428 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,10 +25,6 @@ bin_PROGRAMS = \
 	dpkg-statoverride \
 	dpkg-trigger
 
-noinst_HEADERS = \
-	filesdb.h \
-	infodb.h
-
 dpkg_SOURCES = \
 	archives.c archives.h \
 	cleanup.c \
@@ -36,18 +32,13 @@ dpkg_SOURCES = \
 	depcon.c \
 	enquiry.c \
 	errors.c \
-	filesdb.c \
-	filesdb-hash.c \
 	file-match.c file-match.h \
 	filters.c filters.h \
-	infodb-access.c \
-	infodb-format.c \
-	infodb-upgrade.c \
-	divertdb.c \
-	statdb.c \
+	force.c force.h \
 	help.c \
 	main.c main.h \
 	packages.c \
+	perpkgstate.c \
 	remove.c \
 	script.c \
 	select.c \
@@ -63,23 +54,14 @@ dpkg_LDADD = \
 	$(SELINUX_LIBS)
 
 dpkg_divert_SOURCES = \
-	filesdb.c \
-	infodb-format.c \
-	divertdb.c \
 	divertcmd.c
 
 dpkg_query_SOURCES = \
-	filesdb.c \
-	infodb-access.c \
-	infodb-format.c \
-	divertdb.c \
 	querycmd.c
 
 dpkg_statoverride_SOURCES = \
-	filesdb.c \
-	infodb-format.c \
+	force.c force.h \
 	selinux.c \
-	statdb.c \
 	statcmd.c
 
 dpkg_statoverride_LDADD = \
diff --git a/src/archives.c b/src/archives.c
index b82ee4f56..1f2c9df5d 100644
--- a/src/archives.c
+++ b/src/archives.c
@@ -29,7 +29,6 @@
 #include <sys/time.h>
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <time.h>
@@ -56,12 +55,12 @@
 #include <dpkg/tarfn.h>
 #include <dpkg/options.h>
 #include <dpkg/triglib.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
 #include "main.h"
 #include "archives.h"
 #include "filters.h"
-#include "infodb.h"
 
 static inline void
 fd_writeback_init(int fd)
@@ -114,11 +113,11 @@ tar_pool_release(void)
   }
 }
 
-struct fileinlist *
-tar_filenamenode_queue_push(struct filenamenode_queue *queue,
-                            struct filenamenode *namenode)
+struct fsys_namenode_list *
+tar_fsys_namenode_queue_push(struct fsys_namenode_queue *queue,
+                            struct fsys_namenode *namenode)
 {
-  struct fileinlist *node;
+  struct fsys_namenode_list *node;
 
   node = tar_pool_alloc(sizeof(*node));
   node->namenode = namenode;
@@ -131,9 +130,9 @@ tar_filenamenode_queue_push(struct filenamenode_queue *queue,
 }
 
 static void
-tar_filenamenode_queue_pop(struct filenamenode_queue *queue,
-                           struct fileinlist **tail_prev,
-                           struct fileinlist *node)
+tar_fsys_namenode_queue_pop(struct fsys_namenode_queue *queue,
+                           struct fsys_namenode_list **tail_prev,
+                           struct fsys_namenode_list *node)
 {
   tar_pool_free(node);
   queue->tail = tail_prev;
@@ -149,11 +148,11 @@ tar_filenamenode_queue_pop(struct filenamenode_queue *queue,
  * shared directories don't stop packages from disappearing).
  */
 bool
-filesavespackage(struct fileinlist *file,
+filesavespackage(struct fsys_namenode_list *file,
                  struct pkginfo *pkgtobesaved,
                  struct pkginfo *pkgbeinginstalled)
 {
-  struct filepackages_iterator *iter;
+  struct fsys_node_pkgs_iter *iter;
   struct pkgset *divpkgset;
   struct pkginfo *thirdpkg;
 
@@ -172,14 +171,14 @@ filesavespackage(struct fileinlist *file,
     }
   }
   /* Is the file in the package being installed? If so then it can't save. */
-  if (file->namenode->flags & fnnf_new_inarchive) {
+  if (file->namenode->flags & FNNF_NEW_INARCHIVE) {
     debug(dbg_eachfiledetail,"filesavespackage ... in new archive -- no save");
     return false;
   }
   /* Look for a 3rd package which can take over the file (in case
    * it's a directory which is shared by many packages. */
-  iter = filepackages_iter_new(file->namenode);
-  while ((thirdpkg = filepackages_iter_next(iter))) {
+  iter = fsys_node_pkgs_iter_new(file->namenode);
+  while ((thirdpkg = fsys_node_pkgs_iter_next(iter))) {
     debug(dbg_eachfiledetail, "filesavespackage ... also in %s",
           pkg_name(thirdpkg, pnaw_always));
 
@@ -199,17 +198,17 @@ filesavespackage(struct fileinlist *file,
      * we shouldn't try to make it take over this shared directory. */
     debug(dbg_eachfiledetail,"filesavespackage ...  is 3rd package");
 
-    if (!thirdpkg->clientdata->fileslistvalid) {
+    if (!thirdpkg->files_list_valid) {
       debug(dbg_eachfiledetail, "process_archive ... already disappeared!");
       continue;
     }
 
     /* We've found a package that can take this file. */
     debug(dbg_eachfiledetail, "filesavespackage ...  taken -- no save");
-    filepackages_iter_free(iter);
+    fsys_node_pkgs_iter_free(iter);
     return false;
   }
-  filepackages_iter_free(iter);
+  fsys_node_pkgs_iter_free(iter);
 
   debug(dbg_eachfiledetail, "filesavespackage ... not taken -- save !");
   return true;
@@ -217,7 +216,7 @@ filesavespackage(struct fileinlist *file,
 
 static void
 md5hash_prev_conffile(struct pkginfo *pkg, char *oldhash, const char *oldname,
-                      struct filenamenode *namenode)
+                      struct fsys_namenode *namenode)
 {
   struct pkginfo *otherpkg;
   struct conffile *conff;
@@ -265,8 +264,10 @@ void cu_pathname(int argc, void **argv) {
   path_remove_tree((char*)(argv[0]));
 }
 
-int tarfileread(void *ud, char *buf, int len) {
-  struct tarcontext *tc= (struct tarcontext*)ud;
+int
+tarfileread(struct tar_archive *tar, char *buf, int len)
+{
+  struct tarcontext *tc = (struct tarcontext *)tar->ctx;
   int r;
 
   r = fd_read(tc->backendpipe, buf, len);
@@ -322,12 +323,12 @@ does_replace(struct pkginfo *new_pkg, struct pkgbin *new_pkgbin,
   debug(dbg_depcon,"does_replace new=%s old=%s (%s)",
         pkgbin_name(new_pkg, new_pkgbin, pnaw_always),
         pkgbin_name(old_pkg, old_pkgbin, pnaw_always),
-        versiondescribe(&old_pkgbin->version, vdew_always));
+        versiondescribe_c(&old_pkgbin->version, vdew_always));
   for (dep = new_pkgbin->depends; dep; dep = dep->next) {
     if (dep->type != dep_replaces || dep->list->ed != old_pkg->set)
       continue;
     debug(dbg_depcondetail,"does_replace ... found old, version %s",
-          versiondescribe(&dep->list->version,vdew_always));
+          versiondescribe_c(&dep->list->version,vdew_always));
     if (!versionsatisfied(old_pkgbin, dep->list))
       continue;
     /* The test below can only trigger if dep_replaces start having
@@ -344,16 +345,17 @@ does_replace(struct pkginfo *new_pkg, struct pkgbin *new_pkgbin,
 static void
 tarobject_extract(struct tarcontext *tc, struct tar_entry *te,
                   const char *path, struct file_stat *st,
-                  struct filenamenode *namenode)
+                  struct fsys_namenode *namenode)
 {
   static struct varbuf hardlinkfn;
   static int fd;
 
   struct dpkg_error err;
-  struct filenamenode *linknode;
+  struct fsys_namenode *linknode;
   char fnamebuf[256];
   char fnamenewbuf[256];
   char *newhash;
+  int rc;
 
   switch (te->type) {
   case TAR_FILETYPE_FILE:
@@ -363,7 +365,7 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te,
     if (fd < 0)
       ohshite(_("unable to create '%.255s' (while processing '%.255s')"),
               path, te->name);
-    push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd);
+    push_cleanup(cu_closefd, ehflag_bombout, 1, &fd);
     debug(dbg_eachfiledetail, "tarobject file open size=%jd",
           (intmax_t)te->size);
 
@@ -389,14 +391,16 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te,
             namenode->statoverride->uid,
             namenode->statoverride->gid,
             namenode->statoverride->mode);
-    if (fchown(fd, st->uid, st->gid))
+    rc = fchown(fd, st->uid, st->gid);
+    if (forcible_nonroot_error(rc))
       ohshite(_("error setting ownership of '%.255s'"), te->name);
-    if (fchmod(fd, st->mode & ~S_IFMT))
+    rc = fchmod(fd, st->mode & ~S_IFMT);
+    if (forcible_nonroot_error(rc))
       ohshite(_("error setting permissions of '%.255s'"), te->name);
 
     /* Postpone the fsync, to try to avoid massive I/O degradation. */
-    if (!fc_unsafe_io)
-      namenode->flags |= fnnf_deferred_fsync;
+    if (!in_force(FORCE_UNSAFE_IO))
+      namenode->flags |= FNNF_DEFERRED_FSYNC;
 
     pop_cleanup(ehflag_normaltidy); /* fd = open(path) */
     if (close(fd))
@@ -420,10 +424,10 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te,
   case TAR_FILETYPE_HARDLINK:
     varbuf_reset(&hardlinkfn);
     varbuf_add_str(&hardlinkfn, instdir);
-    linknode = findnamenode(te->linkname, 0);
+    linknode = fsys_hash_find_node(te->linkname, 0);
     varbuf_add_str(&hardlinkfn,
                    namenodetouse(linknode, tc->pkg, &tc->pkg->available)->name);
-    if (linknode->flags & (fnnf_deferred_rename | fnnf_new_conff))
+    if (linknode->flags & (FNNF_DEFERRED_RENAME | FNNF_NEW_CONFF))
       varbuf_add_str(&hardlinkfn, DPKGNEWEXT);
     varbuf_end_str(&hardlinkfn);
     if (link(hardlinkfn.buf, path))
@@ -450,7 +454,7 @@ tarobject_extract(struct tarcontext *tc, struct tar_entry *te,
 
 static void
 tarobject_hash(struct tarcontext *tc, struct tar_entry *te,
-               struct filenamenode *namenode)
+               struct fsys_namenode *namenode)
 {
   if (te->type == TAR_FILETYPE_FILE) {
     struct dpkg_error err;
@@ -466,9 +470,9 @@ tarobject_hash(struct tarcontext *tc, struct tar_entry *te,
     namenode->newhash = newhash;
     debug(dbg_eachfiledetail, "tarobject file hash=%s", namenode->newhash);
   } else if (te->type == TAR_FILETYPE_HARDLINK) {
-    struct filenamenode *linknode;
+    struct fsys_namenode *linknode;
 
-    linknode = findnamenode(te->linkname, 0);
+    linknode = fsys_hash_find_node(te->linkname, 0);
     namenode->newhash = linknode->newhash;
     debug(dbg_eachfiledetail, "tarobject hardlink hash=%s", namenode->newhash);
   }
@@ -498,16 +502,21 @@ tarobject_set_mtime(struct tar_entry *te, const char *path)
 static void
 tarobject_set_perms(struct tar_entry *te, const char *path, struct file_stat *st)
 {
+  int rc;
+
   if (te->type == TAR_FILETYPE_FILE)
     return; /* Already handled using the file descriptor. */
 
   if (te->type == TAR_FILETYPE_SYMLINK) {
-    if (lchown(path, st->uid, st->gid))
+    rc = lchown(path, st->uid, st->gid);
+    if (forcible_nonroot_error(rc))
       ohshite(_("error setting ownership of symlink '%.255s'"), path);
   } else {
-    if (chown(path, st->uid, st->gid))
+    rc = chown(path, st->uid, st->gid);
+    if (forcible_nonroot_error(rc))
       ohshite(_("error setting ownership of '%.255s'"), path);
-    if (chmod(path, st->mode & ~S_IFMT))
+    rc = chmod(path, st->mode & ~S_IFMT);
+    if (forcible_nonroot_error(rc))
       ohshite(_("error setting permissions of '%.255s'"), path);
   }
 }
@@ -522,7 +531,7 @@ static void
 tarobject_matches(struct tarcontext *tc,
                   const char *fn_old, struct stat *stab, char *oldhash,
                   const char *fn_new, struct tar_entry *te,
-                  struct filenamenode *namenode)
+                  struct fsys_namenode *namenode)
 {
   char *linkname;
   ssize_t linksize;
@@ -572,7 +581,7 @@ tarobject_matches(struct tarcontext *tc,
     /* Fall through. */
   case TAR_FILETYPE_FILE:
     /* Only check metadata for non-conffiles. */
-    if (!(namenode->flags & fnnf_new_conff) &&
+    if (!(namenode->flags & FNNF_NEW_CONFF) &&
         !(S_ISREG(stab->st_mode) && te->size == stab->st_size))
       break;
     if (strcmp(oldhash, namenode->newhash) == 0)
@@ -582,7 +591,7 @@ tarobject_matches(struct tarcontext *tc,
     internerr("unknown tar type '%d', but already checked", te->type);
   }
 
-  forcibleerr(fc_overwrite,
+  forcibleerr(FORCE_OVERWRITE,
               _("trying to overwrite shared '%.250s', which is different "
                 "from other instances of package %.250s"),
               namenode->name, pkg_name(tc->pkg, pnaw_nonambig));
@@ -631,7 +640,8 @@ linktosameexistingdir(const struct tar_entry *ti, const char *fname,
     varbuf_add_str(symlinkfn, instdir);
   } else {
     lastslash= strrchr(fname, '/');
-    assert(lastslash);
+    if (lastslash == NULL)
+      internerr("tar entry filename '%s' does not contain '/'", fname);
     varbuf_add_buf(symlinkfn, fname, (lastslash - fname) + 1);
   }
   varbuf_add_str(symlinkfn, ti->linkname);
@@ -653,14 +663,14 @@ linktosameexistingdir(const struct tar_entry *ti, const char *fname,
 }
 
 int
-tarobject(void *ctx, struct tar_entry *ti)
+tarobject(struct tar_archive *tar, struct tar_entry *ti)
 {
   static struct varbuf conffderefn, symlinkfn;
   const char *usename;
-  struct filenamenode *usenode;
+  struct fsys_namenode *usenode;
 
   struct conffile *conff;
-  struct tarcontext *tc = ctx;
+  struct tarcontext *tc = tar->ctx;
   bool existingdir, keepexisting;
   bool refcounting;
   char oldhash[MD5HASHLEN + 1];
@@ -668,7 +678,7 @@ tarobject(void *ctx, struct tar_entry *ti)
   ssize_t r;
   struct stat stab, stabtmp;
   struct file_stat nodestat;
-  struct fileinlist *nifd, **oldnifd;
+  struct fsys_namenode_list *nifd, **oldnifd;
   struct pkgset *divpkgset;
   struct pkginfo *otherpkg;
 
@@ -682,9 +692,9 @@ tarobject(void *ctx, struct tar_entry *ti)
    * The trailing ‘/’ put on the end of names in tarfiles has already
    * been stripped by tar_extractor(). */
   oldnifd = tc->newfiles_queue->tail;
-  nifd = tar_filenamenode_queue_push(tc->newfiles_queue,
-                                     findnamenode(ti->name, 0));
-  nifd->namenode->flags |= fnnf_new_inarchive;
+  nifd = tar_fsys_namenode_queue_push(tc->newfiles_queue,
+                                     fsys_hash_find_node(ti->name, 0));
+  nifd->namenode->flags |= FNNF_NEW_INARCHIVE;
 
   debug(dbg_eachfile,
         "tarobject ti->name='%s' mode=%lo owner=%u:%u type=%d(%c)"
@@ -702,13 +712,13 @@ tarobject(void *ctx, struct tar_entry *ti)
     divpkgset = nifd->namenode->divert->pkgset;
 
     if (divpkgset) {
-      forcibleerr(fc_overwritediverted,
+      forcibleerr(FORCE_OVERWRITE_DIVERTED,
                   _("trying to overwrite '%.250s', which is the "
                     "diverted version of '%.250s' (package: %.100s)"),
                   nifd->namenode->name, nifd->namenode->divert->camefrom->name,
                   divpkgset->name);
     } else {
-      forcibleerr(fc_overwritediverted,
+      forcibleerr(FORCE_OVERWRITE_DIVERTED,
                   _("trying to overwrite '%.250s', which is the "
                     "diverted version of '%.250s'"),
                   nifd->namenode->name, nifd->namenode->divert->camefrom->name);
@@ -727,12 +737,12 @@ tarobject(void *ctx, struct tar_entry *ti)
 
   trig_file_activate(usenode, tc->pkg);
 
-  if (nifd->namenode->flags & fnnf_new_conff) {
+  if (nifd->namenode->flags & FNNF_NEW_CONFF) {
     /* If it's a conffile we have to extract it next to the installed
      * version (i.e. we do the usual link-following). */
     if (conffderef(tc->pkg, &conffderefn, usename))
       usename= conffderefn.buf;
-    debug(dbg_conff, "tarobject fnnf_new_conff deref='%s'", usename);
+    debug(dbg_conff, "tarobject FNNF_NEW_CONFF deref='%s'", usename);
   }
 
   setupfnamevbs(usename);
@@ -799,10 +809,10 @@ tarobject(void *ctx, struct tar_entry *ti)
   keepexisting = false;
   refcounting = false;
   if (!existingdir) {
-    struct filepackages_iterator *iter;
+    struct fsys_node_pkgs_iter *iter;
 
-    iter = filepackages_iter_new(nifd->namenode);
-    while ((otherpkg = filepackages_iter_next(iter))) {
+    iter = fsys_node_pkgs_iter_new(nifd->namenode);
+    while ((otherpkg = fsys_node_pkgs_iter_next(iter))) {
       if (otherpkg == tc->pkg)
         continue;
       debug(dbg_eachfile, "tarobject ... found in %s",
@@ -818,7 +828,7 @@ tarobject(void *ctx, struct tar_entry *ti)
           refcounting = true;
         debug(dbg_eachfiledetail, "tarobject ... shared with %s %s (syncing=%d)",
               pkg_name(otherpkg, pnaw_always),
-              versiondescribe(&otherpkg->installed.version, vdew_nonambig),
+              versiondescribe_c(&otherpkg->installed.version, vdew_nonambig),
               tc->pkgset_getting_in_sync);
         continue;
       }
@@ -843,6 +853,8 @@ tarobject(void *ctx, struct tar_entry *ti)
         continue;
       }
 
+      ensure_package_clientdata(otherpkg);
+
       /* Nope? Hmm, file conflict, perhaps. Check Replaces. */
       switch (otherpkg->clientdata->replacingfilesandsaid) {
       case 2:
@@ -864,7 +876,7 @@ tarobject(void *ctx, struct tar_entry *ti)
 
       /* Is the file an obsolete conffile in the other package
        * and a conffile in the new package? */
-      if ((nifd->namenode->flags & fnnf_new_conff) &&
+      if ((nifd->namenode->flags & FNNF_NEW_CONFF) &&
           !statr && S_ISREG(stab.st_mode)) {
         for (conff = otherpkg->installed.conffiles;
              conff;
@@ -893,19 +905,19 @@ tarobject(void *ctx, struct tar_entry *ti)
                pkg_name(otherpkg, pnaw_nonambig),
                versiondescribe(&otherpkg->installed.version, vdew_nonambig));
         otherpkg->clientdata->replacingfilesandsaid = 2;
-        nifd->namenode->flags &= ~fnnf_new_inarchive;
+        nifd->namenode->flags &= ~FNNF_NEW_INARCHIVE;
         keepexisting = true;
       } else {
         /* At this point we are replacing something without a Replaces. */
         if (!statr && S_ISDIR(stab.st_mode)) {
-          forcibleerr(fc_overwritedir,
+          forcibleerr(FORCE_OVERWRITE_DIR,
                       _("trying to overwrite directory '%.250s' "
                         "in package %.250s %.250s with nondirectory"),
                       nifd->namenode->name, pkg_name(otherpkg, pnaw_nonambig),
                       versiondescribe(&otherpkg->installed.version,
                                       vdew_nonambig));
         } else {
-          forcibleerr(fc_overwrite,
+          forcibleerr(FORCE_OVERWRITE,
                       _("trying to overwrite '%.250s', "
                         "which is also in package %.250s %.250s"),
                       nifd->namenode->name, pkg_name(otherpkg, pnaw_nonambig),
@@ -914,20 +926,20 @@ tarobject(void *ctx, struct tar_entry *ti)
         }
       }
     }
-    filepackages_iter_free(iter);
+    fsys_node_pkgs_iter_free(iter);
   }
 
   if (keepexisting) {
-    if (nifd->namenode->flags & fnnf_new_conff)
-      nifd->namenode->flags |= fnnf_obs_conff;
-    tar_filenamenode_queue_pop(tc->newfiles_queue, oldnifd, nifd);
+    if (nifd->namenode->flags & FNNF_NEW_CONFF)
+      nifd->namenode->flags |= FNNF_OBS_CONFF;
+    tar_fsys_namenode_queue_pop(tc->newfiles_queue, oldnifd, nifd);
     tarobject_skip_entry(tc, ti);
     return 0;
   }
 
   if (filter_should_skip(ti)) {
-    nifd->namenode->flags &= ~fnnf_new_inarchive;
-    nifd->namenode->flags |= fnnf_filtered;
+    nifd->namenode->flags &= ~FNNF_NEW_INARCHIVE;
+    nifd->namenode->flags |= FNNF_FILTERED;
     tarobject_skip_entry(tc, ti);
 
     return 0;
@@ -941,7 +953,7 @@ tarobject(void *ctx, struct tar_entry *ti)
   if (refcounting) {
     debug(dbg_eachfiledetail, "tarobject hashing on-disk file '%s', refcounting",
           fnamevb.buf);
-    if (nifd->namenode->flags & fnnf_new_conff) {
+    if (nifd->namenode->flags & FNNF_NEW_CONFF) {
       md5hash_prev_conffile(tc->pkg, oldhash, fnamenewvb.buf, nifd->namenode);
     } else if (S_ISREG(stab.st_mode)) {
       md5hash(tc->pkg, oldhash, fnamevb.buf);
@@ -950,7 +962,7 @@ tarobject(void *ctx, struct tar_entry *ti)
     }
   }
 
-  if (refcounting && !fc_overwrite) {
+  if (refcounting && !in_force(FORCE_OVERWRITE)) {
     /* If we are not forced to overwrite the path and are refcounting,
      * just compute the hash w/o extracting the object. */
     tarobject_hash(tc, ti, nifd->namenode);
@@ -963,7 +975,7 @@ tarobject(void *ctx, struct tar_entry *ti)
     /* Now we start to do things that we need to be able to undo
      * if something goes wrong. Watch out for the CLEANUP comments to
      * keep an eye on what's installed on the disk at each point. */
-    push_cleanup(cu_installnew, ~ehflag_normaltidy, NULL, 0, 1, nifd->namenode);
+    push_cleanup(cu_installnew, ~ehflag_normaltidy, 1, nifd->namenode);
 
     /*
      * CLEANUP: Now we either have the old file on the disk, or not, in
@@ -980,7 +992,7 @@ tarobject(void *ctx, struct tar_entry *ti)
                           fnamenewvb.buf, ti, nifd->namenode);
 
   /* If we didn't extract anything, there's nothing else to do. */
-  if (refcounting && !fc_overwrite)
+  if (refcounting && !in_force(FORCE_OVERWRITE))
     return 0;
 
   tarobject_set_perms(ti, fnamenewvb.buf, &nodestat);
@@ -998,9 +1010,9 @@ tarobject(void *ctx, struct tar_entry *ti)
 
   /* First, check to see if it's a conffile. If so we don't install
    * it now - we leave it in .dpkg-new for --configure to take care of. */
-  if (nifd->namenode->flags & fnnf_new_conff) {
+  if (nifd->namenode->flags & FNNF_NEW_CONFF) {
     debug(dbg_conffdetail,"tarobject conffile extracted");
-    nifd->namenode->flags |= fnnf_elide_other_lists;
+    nifd->namenode->flags |= FNNF_ELIDE_OTHER_LISTS;
     return 0;
   }
 
@@ -1013,11 +1025,13 @@ tarobject(void *ctx, struct tar_entry *ti)
     if (ti->type == TAR_FILETYPE_DIR || S_ISDIR(stab.st_mode)) {
       /* One of the two is a directory - can't do atomic install. */
       debug(dbg_eachfiledetail,"tarobject directory, nonatomic");
-      nifd->namenode->flags |= fnnf_no_atomic_overwrite;
+      nifd->namenode->flags |= FNNF_NO_ATOMIC_OVERWRITE;
       if (rename(fnamevb.buf,fnametmpvb.buf))
         ohshite(_("unable to move aside '%.255s' to install new version"),
                 ti->name);
     } else if (S_ISLNK(stab.st_mode)) {
+      int rc;
+
       /* We can't make a symlink with two hardlinks, so we'll have to
        * copy it. (Pretend that making a copy of a symlink is the same
        * as linking to it.) */
@@ -1036,7 +1050,8 @@ tarobject(void *ctx, struct tar_entry *ti)
       varbuf_end_str(&symlinkfn);
       if (symlink(symlinkfn.buf,fnametmpvb.buf))
         ohshite(_("unable to make backup symlink for '%.255s'"), ti->name);
-      if (lchown(fnametmpvb.buf,stab.st_uid,stab.st_gid))
+      rc = lchown(fnametmpvb.buf, stab.st_uid, stab.st_gid);
+      if (forcible_nonroot_error(rc))
         ohshite(_("unable to chown backup symlink for '%.255s'"), ti->name);
       tarobject_set_se_context(fnamevb.buf, fnametmpvb.buf, stab.st_mode);
     } else {
@@ -1054,7 +1069,7 @@ tarobject(void *ctx, struct tar_entry *ti)
 
   if (ti->type == TAR_FILETYPE_FILE || ti->type == TAR_FILETYPE_HARDLINK ||
       ti->type == TAR_FILETYPE_SYMLINK) {
-    nifd->namenode->flags |= fnnf_deferred_rename;
+    nifd->namenode->flags |= FNNF_DEFERRED_RENAME;
 
     debug(dbg_eachfiledetail, "tarobject done and installation deferred");
   } else {
@@ -1068,8 +1083,8 @@ tarobject(void *ctx, struct tar_entry *ti)
      * remove the new file.
      */
 
-    nifd->namenode->flags |= fnnf_placed_on_disk;
-    nifd->namenode->flags |= fnnf_elide_other_lists;
+    nifd->namenode->flags |= FNNF_PLACED_ON_DISK;
+    nifd->namenode->flags |= FNNF_ELIDE_OTHER_LISTS;
 
     debug(dbg_eachfiledetail, "tarobject done and installed");
   }
@@ -1079,15 +1094,15 @@ tarobject(void *ctx, struct tar_entry *ti)
 
 #if defined(SYNC_FILE_RANGE_WAIT_BEFORE)
 static void
-tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg)
+tar_writeback_barrier(struct fsys_namenode_list *files, struct pkginfo *pkg)
 {
-  struct fileinlist *cfile;
+  struct fsys_namenode_list *cfile;
 
   for (cfile = files; cfile; cfile = cfile->next) {
-    struct filenamenode *usenode;
+    struct fsys_namenode *usenode;
     int fd;
 
-    if (!(cfile->namenode->flags & fnnf_deferred_fsync))
+    if (!(cfile->namenode->flags & FNNF_DEFERRED_FSYNC))
       continue;
 
     usenode = namenodetouse(cfile->namenode, pkg, &pkg->available);
@@ -1107,30 +1122,30 @@ tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg)
 }
 #else
 static void
-tar_writeback_barrier(struct fileinlist *files, struct pkginfo *pkg)
+tar_writeback_barrier(struct fsys_namenode_list *files, struct pkginfo *pkg)
 {
 }
 #endif
 
 void
-tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg)
+tar_deferred_extract(struct fsys_namenode_list *files, struct pkginfo *pkg)
 {
-  struct fileinlist *cfile;
-  struct filenamenode *usenode;
+  struct fsys_namenode_list *cfile;
+  struct fsys_namenode *usenode;
 
   tar_writeback_barrier(files, pkg);
 
   for (cfile = files; cfile; cfile = cfile->next) {
     debug(dbg_eachfile, "deferred extract of '%.255s'", cfile->namenode->name);
 
-    if (!(cfile->namenode->flags & fnnf_deferred_rename))
+    if (!(cfile->namenode->flags & FNNF_DEFERRED_RENAME))
       continue;
 
     usenode = namenodetouse(cfile->namenode, pkg, &pkg->available);
 
     setupfnamevbs(usenode->name);
 
-    if (cfile->namenode->flags & fnnf_deferred_fsync) {
+    if (cfile->namenode->flags & FNNF_DEFERRED_FSYNC) {
       int fd;
 
       debug(dbg_eachfiledetail, "deferred extract needs fsync");
@@ -1143,7 +1158,7 @@ tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg)
       if (close(fd))
         ohshite(_("error closing/writing '%.255s'"), fnamenewvb.buf);
 
-      cfile->namenode->flags &= ~fnnf_deferred_fsync;
+      cfile->namenode->flags &= ~FNNF_DEFERRED_FSYNC;
     }
 
     debug(dbg_eachfiledetail, "deferred extract needs rename");
@@ -1152,7 +1167,7 @@ tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg)
       ohshite(_("unable to install new version of '%.255s'"),
               cfile->namenode->name);
 
-    cfile->namenode->flags &= ~fnnf_deferred_rename;
+    cfile->namenode->flags &= ~FNNF_DEFERRED_RENAME;
 
     /*
      * CLEANUP: Now the new file is in the destination file, and the
@@ -1161,8 +1176,8 @@ tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg)
      * remove the new file.
      */
 
-    cfile->namenode->flags |= fnnf_placed_on_disk;
-    cfile->namenode->flags |= fnnf_elide_other_lists;
+    cfile->namenode->flags |= FNNF_PLACED_ON_DISK;
+    cfile->namenode->flags |= FNNF_ELIDE_OTHER_LISTS;
 
     debug(dbg_eachfiledetail, "deferred extract done and installed");
   }
@@ -1175,7 +1190,7 @@ enqueue_deconfigure(struct pkginfo *pkg, struct pkginfo *pkg_removal)
 
   ensure_package_clientdata(pkg);
   pkg->clientdata->istobe = PKG_ISTOBE_DECONFIGURE;
-  newdeconf = m_malloc(sizeof(struct pkg_deconf_list));
+  newdeconf = m_malloc(sizeof(*newdeconf));
   newdeconf->next = deconfigure;
   newdeconf->pkg = pkg;
   newdeconf->pkg_removal = pkg_removal;
@@ -1220,7 +1235,7 @@ try_deconfigure_can(bool (*force_p)(struct deppossi *), struct pkginfo *pkg,
     return 2;
   } else if (f_autodeconf) {
     if (pkg->installed.essential) {
-      if (fc_removeessential) {
+      if (in_force(FORCE_REMOVE_ESSENTIAL)) {
         warning(_("considering deconfiguration of essential\n"
                   " package %s, to enable %s"),
                 pkg_name(pkg, pnaw_nonambig), action);
@@ -1267,7 +1282,11 @@ void check_breaks(struct dependency *dep, struct pkginfo *pkg,
     char action[512];
 
     ensure_package_clientdata(fixbydeconf);
-    assert(fixbydeconf->clientdata->istobe == PKG_ISTOBE_NORMAL);
+
+    if (fixbydeconf->clientdata->istobe != PKG_ISTOBE_NORMAL)
+      internerr("package %s being fixed by deconf is not to be normal, "
+                "is to be %d",
+                pkg_name(pkg, pnaw_always), fixbydeconf->clientdata->istobe);
 
     sprintf(action, _("installation of %.250s"),
             pkgbin_name(pkg, &pkg->available, pnaw_nonambig));
@@ -1308,7 +1327,7 @@ void check_breaks(struct dependency *dep, struct pkginfo *pkg,
 void check_conflict(struct dependency *dep, struct pkginfo *pkg,
                     const char *pfilename) {
   struct pkginfo *fixbyrm;
-  struct deppossi *pdep, flagdeppossi;
+  struct deppossi *pdep, flagdeppossi = { 0 };
   struct varbuf conflictwhy = VARBUF_INIT, removalwhy = VARBUF_INIT;
   struct dependency *providecheck;
 
@@ -1328,9 +1347,12 @@ void check_conflict(struct dependency *dep, struct pkginfo *pkg,
          (((fixbyrm->want != PKG_WANT_INSTALL &&
             fixbyrm->want != PKG_WANT_HOLD) ||
            does_replace(pkg, &pkg->available, fixbyrm, &fixbyrm->installed)) &&
-          (!fixbyrm->installed.essential || fc_removeessential)))) {
-      assert(fixbyrm->clientdata->istobe == PKG_ISTOBE_NORMAL ||
-             fixbyrm->clientdata->istobe == PKG_ISTOBE_DECONFIGURE);
+          (!fixbyrm->installed.essential || in_force(FORCE_REMOVE_ESSENTIAL))))) {
+      if (fixbyrm->clientdata->istobe != PKG_ISTOBE_NORMAL &&
+          fixbyrm->clientdata->istobe != PKG_ISTOBE_DECONFIGURE)
+        internerr("package %s to be fixed by removal is not to be normal "
+                  "nor deconfigure, is to be %d",
+                  pkg_name(pkg, pnaw_always), fixbyrm->clientdata->istobe);
       fixbyrm->clientdata->istobe = PKG_ISTOBE_REMOVE;
       notice(_("considering removing %s in favour of %s ..."),
              pkg_name(fixbyrm, pnaw_nonambig),
@@ -1381,7 +1403,7 @@ void check_conflict(struct dependency *dep, struct pkginfo *pkg,
         pdep= &flagdeppossi;
       }
       if (!pdep && (fixbyrm->eflag & PKG_EFLAG_REINSTREQ)) {
-        if (fc_removereinstreq) {
+        if (in_force(FORCE_REMOVE_REINSTREQ)) {
           notice(_("package %s requires reinstallation, but will "
                    "remove anyway as you requested"),
                  pkg_name(fixbyrm, pnaw_nonambig));
@@ -1442,7 +1464,7 @@ archivefiles(const char *const *argv)
     msdbflags = msdbrw_readonly;
   else if (cipaction->arg_int == act_avail)
     msdbflags = msdbrw_readonly | msdbrw_available_write;
-  else if (fc_nonroot)
+  else if (in_force(FORCE_NON_ROOT))
     msdbflags = msdbrw_write;
   else
     msdbflags = msdbrw_needsuperuser;
@@ -1614,7 +1636,7 @@ wanttoinstall(struct pkginfo *pkg)
       return true;
     }
   } else {
-    if (fc_downgrade) {
+    if (in_force(FORCE_DOWNGRADE)) {
       warning(_("downgrading %.250s from %.250s to %.250s"),
               pkg_name(pkg, pnaw_nonambig),
               versiondescribe(&pkg->installed.version, vdew_nonambig),
diff --git a/src/archives.h b/src/archives.h
index 34d1678cc..2ceab9b1b 100644
--- a/src/archives.h
+++ b/src/archives.h
@@ -29,8 +29,8 @@
 struct tarcontext {
   int backendpipe;
   struct pkginfo *pkg;
-  /** A queue of filenamenode that have been extracted anew. */
-  struct filenamenode_queue *newfiles_queue;
+  /** A queue of fsys_namenode that have been extracted anew. */
+  struct fsys_namenode_queue *newfiles_queue;
   /** Are all “Multi-arch: same” instances about to be in sync? */
   bool pkgset_getting_in_sync;
 };
@@ -70,16 +70,20 @@ void ok_prermdeconfigure(int argc, void **argv);
 
 void setupfnamevbs(const char *filename);
 
-int tarobject(void *ctx, struct tar_entry *ti);
-int tarfileread(void *ud, char *buf, int len);
-void tar_deferred_extract(struct fileinlist *files, struct pkginfo *pkg);
+int
+tarobject(struct tar_archive *tar, struct tar_entry *ti);
+int
+tarfileread(struct tar_archive *tar, char *buf, int len);
+void
+tar_deferred_extract(struct fsys_namenode_list *files, struct pkginfo *pkg);
 
-struct fileinlist *
-tar_filenamenode_queue_push(struct filenamenode_queue *queue,
-                            struct filenamenode *namenode);
+struct fsys_namenode_list *
+tar_fsys_namenode_queue_push(struct fsys_namenode_queue *queue,
+                             struct fsys_namenode *namenode);
 
-bool filesavespackage(struct fileinlist *, struct pkginfo *,
-                      struct pkginfo *pkgbeinginstalled);
+bool
+filesavespackage(struct fsys_namenode_list *, struct pkginfo *,
+                 struct pkginfo *pkgbeinginstalled);
 
 void check_conflict(struct dependency *dep, struct pkginfo *pkg,
                     const char *pfilename);
diff --git a/src/cleanup.c b/src/cleanup.c
index ded8219c0..3539fbf31 100644
--- a/src/cleanup.c
+++ b/src/cleanup.c
@@ -40,8 +40,8 @@
 #include <dpkg/pkg.h>
 #include <dpkg/path.h>
 #include <dpkg/options.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
 #include "main.h"
 #include "archives.h"
 
@@ -66,7 +66,7 @@ int cleanup_pkg_failed=0, cleanup_conflictor_failed=0;
  * look for it.
  */
 void cu_installnew(int argc, void **argv) {
-  struct filenamenode *namenode = argv[0];
+  struct fsys_namenode *namenode = argv[0];
   struct stat stab;
 
   cleanup_pkg_failed++; cleanup_conflictor_failed++;
@@ -76,10 +76,10 @@ void cu_installnew(int argc, void **argv) {
 
   setupfnamevbs(namenode->name);
 
-  if (!(namenode->flags & fnnf_new_conff) && !lstat(fnametmpvb.buf,&stab)) {
+  if (!(namenode->flags & FNNF_NEW_CONFF) && !lstat(fnametmpvb.buf,&stab)) {
     /* OK, «pathname».dpkg-tmp exists. Remove «pathname» and
      * restore «pathname».dpkg-tmp ... */
-    if (namenode->flags & fnnf_no_atomic_overwrite) {
+    if (namenode->flags & FNNF_NO_ATOMIC_OVERWRITE) {
       /* If we can't do an atomic overwrite we have to delete first any
        * link to the new version we may have created. */
       debug(dbg_eachfiledetail,"cu_installnew restoring nonatomic");
@@ -96,7 +96,7 @@ void cu_installnew(int argc, void **argv) {
      * atomic rename did nothing, so we make sure to remove the backup. */
     else if (unlink(fnametmpvb.buf) && errno != ENOENT)
       ohshite(_("unable to remove backup copy of '%.250s'"), namenode->name);
-  } else if (namenode->flags & fnnf_placed_on_disk) {
+  } else if (namenode->flags & FNNF_PLACED_ON_DISK) {
     debug(dbg_eachfiledetail,"cu_installnew removing new file");
     if (secure_remove(fnamevb.buf) && errno != ENOENT && errno != ENOTDIR)
       ohshite(_("unable to remove newly-installed version of '%.250s'"),
diff --git a/src/configure.c b/src/configure.c
index 815882425..12f290451 100644
--- a/src/configure.c
+++ b/src/configure.c
@@ -29,7 +29,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <ctype.h>
 #include <string.h>
@@ -53,9 +52,10 @@
 #include <dpkg/path.h>
 #include <dpkg/subproc.h>
 #include <dpkg/command.h>
+#include <dpkg/pager.h>
 #include <dpkg/triglib.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
 #include "main.h"
 
 enum conffopt {
@@ -119,13 +119,13 @@ show_prompt(const char *cfgfile, const char *realold, const char *realnew,
 
 	/* No --force-confdef but a forcible situation. */
 	/* TODO: check if this condition can not be simplified to
-	 *       just !fc_conff_def */
-	if (!(fc_conff_def && (what & (CFOF_INSTALL | CFOF_KEEP)))) {
-		if (fc_conff_new) {
+	 *       just !in_force(FORCE_CONFF_DEF) */
+	if (!(in_force(FORCE_CONFF_DEF) && (what & (CFOF_INSTALL | CFOF_KEEP)))) {
+		if (in_force(FORCE_CONFF_NEW)) {
 			fprintf(stderr,
 			        _(" ==> Using new file as you requested.\n"));
 			return 'y';
-		} else if (fc_conff_old) {
+		} else if (in_force(FORCE_CONFF_OLD)) {
 			fprintf(stderr,
 			        _(" ==> Using current old file as you requested.\n"));
 			return 'n';
@@ -133,7 +133,7 @@ show_prompt(const char *cfgfile, const char *realold, const char *realnew,
 	}
 
 	/* Force the default action (if there is one. */
-	if (fc_conff_def) {
+	if (in_force(FORCE_CONFF_DEF)) {
 		if (what & CFOF_KEEP) {
 			fprintf(stderr,
 			        _(" ==> Keeping old config file as default.\n"));
@@ -198,22 +198,27 @@ show_prompt(const char *cfgfile, const char *realold, const char *realnew,
 static void
 show_diff(const char *old, const char *new)
 {
+	struct pager *pager;
 	pid_t pid;
 
+	pager = pager_spawn(_("conffile difference visualizer"));
+
 	pid = subproc_fork();
 	if (!pid) {
 		/* Child process. */
-		char cmdbuf[1024];
-
-		sprintf(cmdbuf, DIFF " -Nu %.250s %.250s | %.250s",
-		        str_quote_meta(old), str_quote_meta(new),
-		        command_get_pager());
-
-		command_shell(cmdbuf, _("conffile difference visualizer"));
+		struct command cmd;
+
+		command_init(&cmd, DIFF, _("conffile difference visualizer"));
+		command_add_arg(&cmd, DIFF);
+		command_add_arg(&cmd, "-Nu");
+		command_add_arg(&cmd, old);
+		command_add_arg(&cmd, new);
+		command_exec(&cmd);
 	}
 
 	/* Parent process. */
 	subproc_reap(pid, _("conffile difference visualizer"), SUBPROC_NOCHECK);
+	pager_reap(pager);
 }
 
 /**
@@ -230,6 +235,10 @@ spawn_shell(const char *confold, const char *confnew)
 {
 	pid_t pid;
 
+	fputs(_("Useful environment variables:\n"), stderr);
+	fputs(" - DPKG_SHELL_REASON\n", stderr);
+	fputs(" - DPKG_CONFFILE_OLD\n", stderr);
+	fputs(" - DPKG_CONFFILE_NEW\n", stderr);
 	fputs(_("Type 'exit' when you're done.\n"), stderr);
 
 	pid = subproc_fork();
@@ -365,7 +374,7 @@ deferred_configure_ghost_conffile(struct pkginfo *pkg, struct conffile *conff)
 static void
 deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 {
-	struct filenamenode *usenode;
+	struct fsys_namenode *usenode;
 	char currenthash[MD5HASHLEN + 1], newdisthash[MD5HASHLEN + 1];
 	int useredited, distedited;
 	enum conffopt what;
@@ -374,7 +383,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 	char *cdr2rest;
 	int rc;
 
-	usenode = namenodetouse(findnamenode(conff->name, fnn_nocopy),
+	usenode = namenodetouse(fsys_hash_find_node(conff->name, FHFF_NOCOPY),
                                 pkg, &pkg->installed);
 
 	rc = conffderef(pkg, &cdr, usenode->name);
@@ -421,7 +430,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 		useredited = -1;
 		distedited = -1;
 		what = CFO_IDENTICAL;
-	} else if (strcmp(currenthash, NONEXISTENTFLAG) == 0 && fc_conff_miss) {
+	} else if (strcmp(currenthash, NONEXISTENTFLAG) == 0 && in_force(FORCE_CONFF_MISS)) {
 		fprintf(stderr,
 		        _("\n"
 		          "Configuration file '%s', does not exist on system.\n"
@@ -445,7 +454,7 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 		useredited = strcmp(conff->hash, currenthash) != 0;
 		distedited = strcmp(conff->hash, newdisthash) != 0;
 
-		if (fc_conff_ask && useredited)
+		if (in_force(FORCE_CONFF_ASK) && useredited)
 			what = CFO_PROMPT_KEEP;
 		else
 			what = conffoptcells[useredited][distedited];
@@ -527,30 +536,6 @@ deferred_configure_conffile(struct pkginfo *pkg, struct conffile *conff)
 /**
  * Process the deferred configure package.
  *
- * The algorithm for deciding what to configure first is as follows:
- * Loop through all packages doing a ‘try 1’ until we've been round
- * and nothing has been done, then do ‘try 2’ and ‘try 3’ likewise.
- * The incrementing of ‘dependtry’ is done by process_queue().
- *
- * Try 1:
- *   Are all dependencies of this package done? If so, do it.
- *   Are any of the dependencies missing or the wrong version?
- *     If so, abort (unless --force-depends, in which case defer).
- *   Will we need to configure a package we weren't given as an
- *     argument? If so, abort ─ except if --force-configure-any,
- *     in which case we add the package to the argument list.
- *   If none of the above, defer the package.
- *
- * Try 2:
- *   Find a cycle and break it (see above).
- *   Do as for try 1.
- *
- * Try 3 (only if --force-depends-version):
- *   Same as for try 2, but don't mind version number in dependencies.
- *
- * Try 4 (only if --force-depends):
- *   Do anyway.
- *
  * @param pkg The package to act on.
  */
 void
@@ -599,13 +584,14 @@ deferred_configure(struct pkginfo *pkg)
 			                       vdew_nonambig));
 	}
 
-	if (dependtry > 1)
+	if (dependtry >= DEPEND_TRY_CYCLES)
 		if (findbreakcycle(pkg))
 			sincenothing = 0;
 
 	ok = dependencies_ok(pkg, NULL, &aemsgs);
 	if (ok == DEP_CHECK_DEFER) {
 		varbuf_destroy(&aemsgs);
+		ensure_package_clientdata(pkg);
 		pkg->clientdata->istobe = PKG_ISTOBE_INSTALLNEW;
 		enqueue_package(pkg);
 		return;
@@ -638,7 +624,7 @@ deferred_configure(struct pkginfo *pkg)
 	sincenothing = 0;
 
 	if (pkg->eflag & PKG_EFLAG_REINSTREQ)
-		forcibleerr(fc_removereinstreq,
+		forcibleerr(FORCE_REMOVE_REINSTREQ,
 		            _("package is in a very bad inconsistent state; you should\n"
 		              " reinstall it before attempting configuration"));
 
@@ -650,6 +636,7 @@ deferred_configure(struct pkginfo *pkg)
 
 	if (f_noact) {
 		pkg_set_status(pkg, PKG_STAT_INSTALLED);
+		ensure_package_clientdata(pkg);
 		pkg->clientdata->istobe = PKG_ISTOBE_NORMAL;
 		return;
 	}
@@ -681,7 +668,9 @@ deferred_configure(struct pkginfo *pkg)
 		pkg_set_status(pkg, PKG_STAT_HALFCONFIGURED);
 	}
 
-	assert(pkg->status == PKG_STAT_HALFCONFIGURED);
+	if (pkg->status != PKG_STAT_HALFCONFIGURED)
+		internerr("package %s in state %s, instead of half-configured",
+		          pkg_name(pkg, pnaw_always), pkg_status_name(pkg));
 
 	modstatdb_note(pkg);
 
@@ -824,7 +813,7 @@ md5hash(struct pkginfo *pkg, char *hashbuf, const char *fn)
 	fd = open(fn, O_RDONLY);
 
 	if (fd >= 0) {
-		push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd);
+		push_cleanup(cu_closefd, ehflag_bombout, 1, &fd);
 		if (fd_md5(fd, hashbuf, -1, &err) < 0)
 			ohshit(_("cannot compute MD5 hash for file '%s': %s"),
 			       fn, err.str);
diff --git a/src/depcon.c b/src/depcon.c
index 924c53ac8..593edfb8c 100644
--- a/src/depcon.c
+++ b/src/depcon.c
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -35,9 +34,9 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 struct deppossi_pkg_iterator {
@@ -76,7 +75,8 @@ deppossi_pkg_iter_next(struct deppossi_pkg_iterator *iter)
       pkgbin = &pkg_cur->available;
       break;
     case wpb_by_istobe:
-      if (pkg_cur->clientdata->istobe == PKG_ISTOBE_INSTALLNEW)
+      if (pkg_cur->clientdata &&
+          pkg_cur->clientdata->istobe == PKG_ISTOBE_INSTALLNEW)
         pkgbin = &pkg_cur->available;
       else
         pkgbin = &pkg_cur->installed;
@@ -224,16 +224,16 @@ findbreakcyclerecursive(struct pkginfo *pkg, struct cyclesofarlink *sofar)
 bool
 findbreakcycle(struct pkginfo *pkg)
 {
-  struct pkgiterator *iter;
+  struct pkg_hash_iter *iter;
   struct pkginfo *tpkg;
 
   /* Clear the visited flag of all packages before we traverse them. */
-  iter = pkg_db_iter_new();
-  while ((tpkg = pkg_db_iter_next_pkg(iter))) {
+  iter = pkg_hash_iter_new();
+  while ((tpkg = pkg_hash_iter_next_pkg(iter))) {
     ensure_package_clientdata(tpkg);
     tpkg->clientdata->color = PKG_CYCLE_WHITE;
   }
-  pkg_db_iter_free(iter);
+  pkg_hash_iter_free(iter);
 
   return findbreakcyclerecursive(pkg, NULL);
 }
@@ -314,10 +314,14 @@ depisok(struct dependency *dep, struct varbuf *whynot,
    * Allow 250x3 for package names, versions, &c, + 250 for ourselves. */
   char linebuf[1024];
 
-  assert(dep->type == dep_depends || dep->type == dep_predepends ||
-	 dep->type == dep_breaks || dep->type == dep_conflicts ||
-	 dep->type == dep_recommends || dep->type == dep_suggests ||
-	 dep->type == dep_enhances);
+  if (dep->type != dep_depends &&
+      dep->type != dep_predepends &&
+      dep->type != dep_breaks &&
+      dep->type != dep_conflicts &&
+      dep->type != dep_recommends &&
+      dep->type != dep_suggests &&
+      dep->type != dep_enhances)
+    internerr("unknown dependency type %d", dep->type);
 
   if (canfixbyremove)
     *canfixbyremove = NULL;
@@ -331,7 +335,7 @@ depisok(struct dependency *dep, struct varbuf *whynot,
   case PKG_ISTOBE_DECONFIGURE:
     return true;
   case PKG_ISTOBE_NORMAL:
-    /* Only installed packages can be make dependency problems. */
+    /* Only installed packages can be made dependency problems. */
     switch (dep->up->status) {
     case PKG_STAT_INSTALLED:
     case PKG_STAT_TRIGGERSPENDING:
diff --git a/src/divertcmd.c b/src/divertcmd.c
index 6972e510c..dfc1c9033 100644
--- a/src/divertcmd.c
+++ b/src/divertcmd.c
@@ -3,7 +3,7 @@
  *
  * Copyright © 1995 Ian Jackson
  * Copyright © 2000, 2001 Wichert Akkerman
- * Copyright © 2006-2014 Guillem Jover <guillem@debian.org>
+ * Copyright © 2006-2015, 2017-2018 Guillem Jover <guillem@debian.org>
  * Copyright © 2011 Linaro Limited
  * Copyright © 2011 Raphaël Hertzog <hertzog@debian.org>
  *
@@ -45,14 +45,14 @@
 #include <dpkg/glob.h>
 #include <dpkg/buffer.h>
 #include <dpkg/options.h>
-
-#include "filesdb.h"
+#include <dpkg/db-fsys.h>
 
 
 static const char printforhelp[] = N_(
 "Use --help for help about diverting files.");
 
 static const char *admindir;
+const char *instdir;
 
 static bool opt_pkgname_match_any = true;
 static const char *opt_pkgname = NULL;
@@ -60,7 +60,7 @@ static const char *opt_divertto = NULL;
 
 static int opt_verbose = 1;
 static int opt_test = 0;
-static int opt_rename = 0;
+static int opt_rename = -1;
 
 
 static void
@@ -101,7 +101,10 @@ usage(const struct cmdinfo *cip, const char *value)
 "  --local                  all packages' versions are diverted.\n"
 "  --divert <divert-to>     the name used by other packages' versions.\n"
 "  --rename                 actually move the file aside (or back).\n"
+"  --no-rename              do not move the file aside (or back) (default).\n"
 "  --admindir <directory>   set the directory with the diversions file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
@@ -118,6 +121,17 @@ usage(const struct cmdinfo *cip, const char *value)
 	exit(0);
 }
 
+static void
+opt_rename_setup(void)
+{
+	if (opt_rename >= 0)
+		return;
+
+	opt_rename = 0;
+	warning(_("please specify --no-rename explicitly, the default "
+	          "will change to --rename in 1.20.x"));
+}
+
 struct file {
 	const char *name;
 	enum {
@@ -131,7 +145,13 @@ struct file {
 static void
 file_init(struct file *f, const char *filename)
 {
-	f->name = filename;
+	struct varbuf usefilename = VARBUF_INIT;
+
+	varbuf_add_str(&usefilename, instdir);
+	varbuf_add_str(&usefilename, filename);
+	varbuf_end_str(&usefilename);
+
+	f->name = varbuf_detach(&usefilename);
 	f->stat_state = FILE_STAT_INVALID;
 }
 
@@ -221,7 +241,7 @@ file_copy(const char *src, const char *dst)
 	if (dstfd < 0)
 		ohshite(_("unable to create file '%s'"), tmp);
 
-	push_cleanup(cu_filename, ~ehflag_normaltidy, NULL, 0, 1, tmp);
+	push_cleanup(cu_filename, ~ehflag_normaltidy, 1, tmp);
 
 	if (fd_fd_copy(srcfd, dstfd, -1, &err) < 0)
 		ohshit(_("cannot copy '%s' to '%s': %s"), src, tmp, err.str);
@@ -276,7 +296,7 @@ diversion_check_filename(const char *filename)
 }
 
 static const char *
-diversion_pkg_name(struct diversion *d)
+diversion_pkg_name(struct fsys_diversion *d)
 {
 	if (d->pkgset == NULL)
 		return ":";
@@ -329,7 +349,7 @@ diversion_current(const char *filename)
 }
 
 static const char *
-diversion_describe(struct diversion *d)
+diversion_describe(struct fsys_diversion *d)
 {
 	static struct varbuf str = VARBUF_INIT;
 	const char *pkgname;
@@ -356,17 +376,17 @@ divertdb_write(void)
 {
 	char *dbname;
 	struct atomic_file *file;
-	struct fileiterator *iter;
-	struct filenamenode *namenode;
+	struct fsys_hash_iter *iter;
+	struct fsys_namenode *namenode;
 
 	dbname = dpkg_db_get_path(DIVERSIONSFILE);
 
 	file = atomic_file_new(dbname, ATOMIC_FILE_BACKUP);
 	atomic_file_open(file);
 
-	iter = files_db_iter_new();
-	while ((namenode = files_db_iter_next(iter))) {
-		struct diversion *d = namenode->divert;
+	iter = fsys_hash_iter_new();
+	while ((namenode = fsys_hash_iter_next(iter))) {
+		struct fsys_diversion *d = namenode->divert;
 
 		if (d == NULL || d->useinstead == NULL)
 			continue;
@@ -376,7 +396,7 @@ divertdb_write(void)
 		        d->useinstead->name,
 		        diversion_pkg_name(d));
 	}
-	files_db_iter_free(iter);
+	fsys_hash_iter_free(iter);
 
 	atomic_file_sync(file);
 	atomic_file_close(file);
@@ -387,10 +407,37 @@ divertdb_write(void)
 }
 
 static bool
-diversion_is_owned_by_self(struct pkgset *set, struct filenamenode *namenode)
+diversion_is_essential(struct fsys_namenode *namenode)
 {
 	struct pkginfo *pkg;
-	struct filepackages_iterator *iter;
+	struct pkg_hash_iter *pkg_iter;
+	struct fsys_node_pkgs_iter *iter;
+	bool essential = false;
+
+	pkg_iter = pkg_hash_iter_new();
+	while ((pkg = pkg_hash_iter_next_pkg(pkg_iter))) {
+		if (pkg->installed.essential)
+			ensure_packagefiles_available(pkg);
+	}
+	pkg_hash_iter_free(pkg_iter);
+
+	iter = fsys_node_pkgs_iter_new(namenode);
+	while ((pkg = fsys_node_pkgs_iter_next(iter))) {
+		if (pkg->installed.essential) {
+			essential = true;
+			break;
+		}
+	}
+	fsys_node_pkgs_iter_free(iter);
+
+	return essential;
+}
+
+static bool
+diversion_is_owned_by_self(struct pkgset *set, struct fsys_namenode *namenode)
+{
+	struct pkginfo *pkg;
+	struct fsys_node_pkgs_iter *iter;
 	bool owned = false;
 
 	if (set == NULL)
@@ -399,14 +446,14 @@ diversion_is_owned_by_self(struct pkgset *set, struct filenamenode *namenode)
 	for (pkg = &set->pkg; pkg; pkg = pkg->arch_next)
 		ensure_packagefiles_available(pkg);
 
-	iter = filepackages_iter_new(namenode);
-	while ((pkg = filepackages_iter_next(iter))) {
+	iter = fsys_node_pkgs_iter_new(namenode);
+	while ((pkg = fsys_node_pkgs_iter_next(iter))) {
 		if (pkg->set == set) {
 			owned = true;
 			break;
 		}
 	}
-	filepackages_iter_free(iter);
+	fsys_node_pkgs_iter_free(iter);
 
 	return owned;
 }
@@ -416,11 +463,12 @@ diversion_add(const char *const *argv)
 {
 	const char *filename = argv[0];
 	struct file file_from, file_to;
-	struct diversion *contest, *altname;
-	struct filenamenode *fnn_from, *fnn_to;
+	struct fsys_diversion *contest, *altname;
+	struct fsys_namenode *fnn_from, *fnn_to;
 	struct pkgset *pkgset;
 
 	opt_pkgname_match_any = false;
+	opt_rename_setup();
 
 	/* Handle filename. */
 	if (!filename || argv[1])
@@ -435,7 +483,7 @@ diversion_add(const char *const *argv)
 	    S_ISDIR(file_from.stat.st_mode))
 		badusage(_("cannot divert directories"));
 
-	fnn_from = findnamenode(filename, 0);
+	fnn_from = fsys_hash_find_node(filename, 0);
 
 	/* Handle divertto. */
 	if (opt_divertto == NULL)
@@ -446,13 +494,13 @@ diversion_add(const char *const *argv)
 
 	file_init(&file_to, opt_divertto);
 
-	fnn_to = findnamenode(opt_divertto, 0);
+	fnn_to = fsys_hash_find_node(opt_divertto, 0);
 
 	/* Handle package name. */
 	if (opt_pkgname == NULL)
 		pkgset = NULL;
 	else
-		pkgset = pkg_db_find_set(opt_pkgname);
+		pkgset = pkg_hash_find_set(opt_pkgname);
 
 	/* Check we are not stomping over an existing diversion. */
 	if (fnn_from->divert || fnn_to->divert) {
@@ -501,6 +549,9 @@ diversion_add(const char *const *argv)
 			       filename, pkgset->name);
 		opt_rename = false;
 	}
+	if (opt_rename && diversion_is_essential(fnn_from))
+		warning(_("diverting file '%s' from an Essential package with "
+		          "rename is dangerous, use --no-rename"), filename);
 	if (!opt_test) {
 		divertdb_write();
 		if (opt_rename)
@@ -511,12 +562,12 @@ diversion_add(const char *const *argv)
 }
 
 static bool
-diversion_is_shared(struct pkgset *set, struct filenamenode *namenode)
+diversion_is_shared(struct pkgset *set, struct fsys_namenode *namenode)
 {
 	const char *archname;
 	struct pkginfo *pkg;
 	struct dpkg_arch *arch;
-	struct filepackages_iterator *iter;
+	struct fsys_node_pkgs_iter *iter;
 	bool shared = false;
 
 	if (set == NULL)
@@ -530,14 +581,14 @@ diversion_is_shared(struct pkgset *set, struct filenamenode *namenode)
 	for (pkg = &set->pkg; pkg; pkg = pkg->arch_next)
 		ensure_packagefiles_available(pkg);
 
-	iter = filepackages_iter_new(namenode);
-	while ((pkg = filepackages_iter_next(iter))) {
+	iter = fsys_node_pkgs_iter_new(namenode);
+	while ((pkg = fsys_node_pkgs_iter_next(iter))) {
 		if (pkg->set == set && pkg->installed.arch != arch) {
 			shared = true;
 			break;
 		}
 	}
-	filepackages_iter_free(iter);
+	fsys_node_pkgs_iter_free(iter);
 
 	return shared;
 }
@@ -546,17 +597,19 @@ static int
 diversion_remove(const char *const *argv)
 {
 	const char *filename = argv[0];
-	struct filenamenode *namenode;
-	struct diversion *contest, *altname;
+	struct fsys_namenode *namenode;
+	struct fsys_diversion *contest, *altname;
 	struct file file_from, file_to;
 	struct pkgset *pkgset;
 
+	opt_rename_setup();
+
 	if (!filename || argv[1])
 		badusage(_("--%s needs a single argument"), cipaction->olong);
 
 	diversion_check_filename(filename);
 
-	namenode = findnamenode(filename, fnn_nonew);
+	namenode = fsys_hash_find_node(filename, FHFF_NONE);
 
 	if (namenode == NULL || namenode->divert == NULL ||
 	    namenode->divert->useinstead == NULL) {
@@ -569,7 +622,7 @@ diversion_remove(const char *const *argv)
 	if (opt_pkgname == NULL)
 		pkgset = NULL;
 	else
-		pkgset = pkg_db_find_set(opt_pkgname);
+		pkgset = pkg_hash_find_set(opt_pkgname);
 
 	contest = namenode->divert;
 	altname = contest->useinstead->divert;
@@ -622,8 +675,8 @@ diversion_remove(const char *const *argv)
 static int
 diversion_list(const char *const *argv)
 {
-	struct fileiterator *iter;
-	struct filenamenode *namenode;
+	struct fsys_hash_iter *iter;
+	struct fsys_namenode *namenode;
 	struct glob_node *glob_list = NULL;
 	const char *pattern;
 
@@ -633,14 +686,14 @@ diversion_list(const char *const *argv)
 	if (glob_list == NULL)
 		glob_list_prepend(&glob_list, m_strdup("*"));
 
-	iter = files_db_iter_new();
-	while ((namenode = files_db_iter_next(iter))) {
+	iter = fsys_hash_iter_new();
+	while ((namenode = fsys_hash_iter_next(iter))) {
 		struct glob_node *g;
-		struct diversion *contest = namenode->divert;
-		struct diversion *altname;
+		struct fsys_diversion *contest = namenode->divert;
+		struct fsys_diversion *altname;
 		const char *pkgname;
 
-		if (contest->useinstead == NULL)
+		if (contest == NULL || contest->useinstead == NULL)
 			continue;
 
 		altname = contest->useinstead->divert;
@@ -656,7 +709,7 @@ diversion_list(const char *const *argv)
 			}
 		}
 	}
-	files_db_iter_free(iter);
+	fsys_hash_iter_free(iter);
 
 	glob_list_free(glob_list);
 
@@ -667,17 +720,17 @@ static int
 diversion_truename(const char *const *argv)
 {
 	const char *filename = argv[0];
-	struct filenamenode *namenode;
+	struct fsys_namenode *namenode;
 
 	if (!filename || argv[1])
 		badusage(_("--%s needs a single argument"), cipaction->olong);
 
 	diversion_check_filename(filename);
 
-	namenode = findnamenode(filename, fnn_nonew);
+	namenode = fsys_hash_find_node(filename, FHFF_NONE);
 
 	/* Print the given name if file is not diverted. */
-	if (namenode && namenode->divert->useinstead)
+	if (namenode && namenode->divert && namenode->divert->useinstead)
 		printf("%s\n", namenode->divert->useinstead->name);
 	else
 		printf("%s\n", filename);
@@ -689,17 +742,17 @@ static int
 diversion_listpackage(const char *const *argv)
 {
 	const char *filename = argv[0];
-	struct filenamenode *namenode;
+	struct fsys_namenode *namenode;
 
 	if (!filename || argv[1])
 		badusage(_("--%s needs a single argument"), cipaction->olong);
 
 	diversion_check_filename(filename);
 
-	namenode = findnamenode(filename, fnn_nonew);
+	namenode = fsys_hash_find_node(filename, FHFF_NONE);
 
 	/* Print nothing if file is not diverted. */
-	if (namenode == NULL)
+	if (namenode == NULL || namenode->divert == NULL)
 		return 0;
 
 	if (namenode->divert->pkgset == NULL)
@@ -735,6 +788,19 @@ set_divertto(const struct cmdinfo *cip, const char *value)
 		badusage(_("divert-to may not contain newlines"));
 }
 
+static void
+set_instdir(const struct cmdinfo *cip, const char *value)
+{
+	instdir = dpkg_fsys_set_dir(value);
+}
+
+static void
+set_root(const struct cmdinfo *cip, const char *value)
+{
+	instdir = dpkg_fsys_set_dir(value);
+	admindir = dpkg_fsys_get_path(ADMINDIR);
+}
+
 static const struct cmdinfo cmdinfo_add =
 	ACTION("add",         0, 0, diversion_add);
 
@@ -746,11 +812,14 @@ static const struct cmdinfo cmdinfos[] = {
 	ACTION("truename",    0, 0, diversion_truename),
 
 	{ "admindir",   0,   1,  NULL,         &admindir, NULL          },
+	{ "instdir",    0,   1,  NULL,         NULL,      set_instdir,  0 },
+	{ "root",       0,   1,  NULL,         NULL,      set_root,     0 },
 	{ "divert",     0,   1,  NULL,         NULL,      set_divertto  },
 	{ "package",    0,   1,  NULL,         NULL,      set_package   },
 	{ "local",      0,   0,  NULL,         NULL,      set_package   },
 	{ "quiet",      0,   0,  &opt_verbose, NULL,      NULL, 0       },
 	{ "rename",     0,   0,  &opt_rename,  NULL,      NULL, 1       },
+	{ "no-rename",  0,   0,  &opt_rename,  NULL,      NULL, 0       },
 	{ "test",       0,   0,  &opt_test,    NULL,      NULL, 1       },
 	{ "help",      '?',  0,  NULL,         NULL,      usage         },
 	{ "version",    0,   0,  NULL,         NULL,      printversion  },
@@ -768,6 +837,7 @@ main(int argc, const char * const *argv)
 	dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
 	admindir = dpkg_db_set_dir(admindir);
+	instdir = dpkg_fsys_set_dir(instdir);
 
 	env_pkgname = getenv("DPKG_MAINTSCRIPT_PACKAGE");
 	if (opt_pkgname_match_any && env_pkgname)
@@ -777,7 +847,7 @@ main(int argc, const char * const *argv)
 		setaction(&cmdinfo_add, NULL);
 
 	modstatdb_open(msdbrw_readonly);
-	filesdbinit();
+	fsys_hash_init();
 	ensure_diversions();
 
 	ret = cipaction->action(argv);
@@ -785,6 +855,7 @@ main(int argc, const char * const *argv)
 	modstatdb_shutdown();
 
 	dpkg_program_done();
+	dpkg_locales_done();
 
 	return ret;
 }
diff --git a/src/enquiry.c b/src/enquiry.c
index b299f841b..4c67dffa7 100644
--- a/src/enquiry.c
+++ b/src/enquiry.c
@@ -26,7 +26,6 @@
 
 #include <sys/types.h>
 
-#include <assert.h>
 #include <string.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -43,9 +42,9 @@
 #include <dpkg/triglib.h>
 #include <dpkg/string.h>
 #include <dpkg/options.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 struct audit_problem {
@@ -170,7 +169,7 @@ static void describebriefly(struct pkginfo *pkg) {
   l= strlen(pkg->set->name);
   if (l>20) maxl -= (l-20);
 
-  pdesc = pkgbin_summary(pkg, &pkg->installed, &l);
+  pdesc = pkgbin_synopsis(pkg, &pkg->installed, &l);
   l = min(l, maxl);
 
   printf(" %-20s %.*s\n", pkg_name(pkg, pnaw_nonambig), l, pdesc);
@@ -199,7 +198,7 @@ audit(const char *const *argv)
   modstatdb_open(msdbrw_readonly);
 
   if (!*argv)
-    pkg_array_init_from_db(&array);
+    pkg_array_init_from_hash(&array);
   else
     pkg_array_init_from_names(&array, pkg_array_mapper, (const char **)argv);
 
@@ -274,7 +273,7 @@ unpackchk(const char *const *argv)
 {
   int totalcount, sects;
   struct sectionentry *sectionentries, *se, **sep;
-  struct pkgiterator *iter;
+  struct pkg_hash_iter *iter;
   struct pkginfo *pkg;
   const char *thissect;
   char buf[20];
@@ -288,12 +287,12 @@ unpackchk(const char *const *argv)
   totalcount= 0;
   sectionentries = NULL;
   sects= 0;
-  iter = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(iter))) {
+  iter = pkg_hash_iter_new();
+  while ((pkg = pkg_hash_iter_next_pkg(iter))) {
     if (!yettobeunpacked(pkg, &thissect)) continue;
     for (se= sectionentries; se && strcasecmp(thissect,se->name); se= se->next);
     if (!se) {
-      se= nfmalloc(sizeof(struct sectionentry));
+      se = nfmalloc(sizeof(*se));
       for (sep= &sectionentries;
            *sep && strcasecmp(thissect,(*sep)->name) > 0;
            sep= &(*sep)->next);
@@ -305,27 +304,27 @@ unpackchk(const char *const *argv)
     }
     se->count++; totalcount++;
   }
-  pkg_db_iter_free(iter);
+  pkg_hash_iter_free(iter);
 
   if (totalcount == 0)
     return 0;
 
   if (totalcount <= 12) {
-    iter = pkg_db_iter_new();
-    while ((pkg = pkg_db_iter_next_pkg(iter))) {
+    iter = pkg_hash_iter_new();
+    while ((pkg = pkg_hash_iter_next_pkg(iter))) {
       if (!yettobeunpacked(pkg, NULL))
         continue;
       describebriefly(pkg);
     }
-    pkg_db_iter_free(iter);
+    pkg_hash_iter_free(iter);
   } else if (sects <= 12) {
     for (se= sectionentries; se; se= se->next) {
       sprintf(buf,"%d",se->count);
       printf(_(" %d in %s: "),se->count,se->name);
       width= 70-strlen(se->name)-strlen(buf);
       while (width > 59) { putchar(' '); width--; }
-      iter = pkg_db_iter_new();
-      while ((pkg = pkg_db_iter_next_pkg(iter))) {
+      iter = pkg_hash_iter_new();
+      while ((pkg = pkg_hash_iter_next_pkg(iter))) {
         const char *pkgname;
 
         if (!yettobeunpacked(pkg,&thissect)) continue;
@@ -336,7 +335,7 @@ unpackchk(const char *const *argv)
         if (width < 4) { printf(" ..."); break; }
         printf(" %s", pkgname);
       }
-      pkg_db_iter_free(iter);
+      pkg_hash_iter_free(iter);
       putchar('\n');
     }
   } else {
@@ -370,7 +369,7 @@ assert_version_support(const char *const *argv,
 
   modstatdb_open(msdbrw_readonly);
 
-  pkg = pkg_db_find_singleton("dpkg");
+  pkg = pkg_hash_find_singleton("dpkg");
   switch (pkg->status) {
   case PKG_STAT_INSTALLED:
   case PKG_STAT_TRIGGERSPENDING:
@@ -459,7 +458,7 @@ predeppackage(const char *const *argv)
 {
   static struct varbuf vb;
 
-  struct pkgiterator *iter;
+  struct pkg_hash_iter *iter;
   struct pkginfo *pkg = NULL, *startpkg, *trypkg;
   struct dependency *dep;
   struct deppossi *possi, *provider;
@@ -472,13 +471,13 @@ predeppackage(const char *const *argv)
   clear_istobes();
 
   dep = NULL;
-  iter = pkg_db_iter_new();
-  while (!dep && (pkg = pkg_db_iter_next_pkg(iter))) {
+  iter = pkg_hash_iter_new();
+  while (!dep && (pkg = pkg_hash_iter_next_pkg(iter))) {
     /* Ignore packages user doesn't want. */
     if (pkg->want != PKG_WANT_INSTALL)
       continue;
     /* Ignore packages not available. */
-    if (!pkg->files)
+    if (!pkg->archives)
       continue;
     pkg->clientdata->istobe = PKG_ISTOBE_PREINSTALL;
     for (dep= pkg->available.depends; dep; dep= dep->next) {
@@ -491,11 +490,13 @@ predeppackage(const char *const *argv)
     pkg->clientdata->istobe = PKG_ISTOBE_NORMAL;
     /* If dep is NULL we go and get the next package. */
   }
-  pkg_db_iter_free(iter);
+  pkg_hash_iter_free(iter);
 
   if (!dep)
     return 1; /* Not found. */
-  assert(pkg);
+  if (pkg == NULL)
+    internerr("unexpected unfound package");
+
   startpkg= pkg;
   pkg->clientdata->istobe = PKG_ISTOBE_PREINSTALL;
 
@@ -511,7 +512,7 @@ predeppackage(const char *const *argv)
 
       possi_iter = deppossi_pkg_iter_new(possi, wpb_available);
       while (!pkg && (trypkg = deppossi_pkg_iter_next(possi_iter))) {
-        if (trypkg->files &&
+        if (trypkg->archives &&
             trypkg->clientdata->istobe == PKG_ISTOBE_NORMAL &&
             versionsatisfied(&trypkg->available, possi)) {
           pkg = trypkg;
@@ -525,7 +526,7 @@ predeppackage(const char *const *argv)
           if (!pkg_virtual_deppossi_satisfied(possi, provider))
             continue;
           trypkg = provider->up->up;
-          if (!trypkg->files)
+          if (!trypkg->archives)
             continue;
           if (trypkg->clientdata->istobe == PKG_ISTOBE_NORMAL) {
             pkg = trypkg;
@@ -741,8 +742,8 @@ cmpversions(const char *const *argv)
   }
   rc = dpkg_version_compare(&a, &b);
   debug(dbg_general, "cmpversions a='%s' b='%s' r=%d",
-        versiondescribe(&a,vdew_always),
-        versiondescribe(&b,vdew_always),
+        versiondescribe_c(&a,vdew_always),
+        versiondescribe_c(&b,vdew_always),
         rc);
   if (rc > 0)
     return rip->if_greater;
diff --git a/src/errors.c b/src/errors.c
index 3d2d71967..50d41554d 100644
--- a/src/errors.c
+++ b/src/errors.c
@@ -59,7 +59,7 @@ enqueue_error_report(const char *arg)
 {
   struct error_report *nr;
 
-  nr= malloc(sizeof(struct error_report));
+  nr = malloc(sizeof(*nr));
   if (!nr) {
     notice(_("failed to allocate memory for new entry in list of failed packages: %s"),
            strerror(errno));
@@ -71,7 +71,8 @@ enqueue_error_report(const char *arg)
   *lastreport= nr;
   lastreport= &nr->next;
 
-  if (nerrs++ < errabort) return;
+  if (++nerrs < errabort)
+    return;
   notice(_("too many errors, stopping"));
   abort_processing = true;
 }
@@ -124,7 +125,7 @@ skip_due_to_hold(struct pkginfo *pkg)
 {
   if (pkg->want != PKG_WANT_HOLD)
     return false;
-  if (fc_hold) {
+  if (in_force(FORCE_HOLD)) {
     notice(_("package %s was on hold, processing it anyway as you requested"),
            pkg_name(pkg, pnaw_nonambig));
     return false;
@@ -134,15 +135,3 @@ skip_due_to_hold(struct pkginfo *pkg)
   return true;
 }
 
-void forcibleerr(int forceflag, const char *fmt, ...) {
-  va_list args;
-
-  va_start(args, fmt);
-  if (forceflag) {
-    warning(_("overriding problem because --force enabled:"));
-    warningv(fmt, args);
-  } else {
-    ohshitv(fmt, args);
-  }
-  va_end(args);
-}
diff --git a/src/filesdb.c b/src/filesdb.c
deleted file mode 100644
index 5050144e8..000000000
--- a/src/filesdb.c
+++ /dev/null
@@ -1,635 +0,0 @@
-/*
- * dpkg - main program for package management
- * filesdb.c - management of database of files installed on system
- *
- * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * Copyright © 2000,2001 Wichert Akkerman <wakkerma@debian.org>
- * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include <config.h>
-#include <compat.h>
-
-#ifdef HAVE_LINUX_FIEMAP_H
-#include <linux/fiemap.h>
-#include <linux/fs.h>
-#include <sys/ioctl.h>
-#include <sys/vfs.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <pwd.h>
-#include <grp.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-
-#include <dpkg/i18n.h>
-#include <dpkg/dpkg.h>
-#include <dpkg/dpkg-db.h>
-#include <dpkg/string.h>
-#include <dpkg/path.h>
-#include <dpkg/dir.h>
-#include <dpkg/fdio.h>
-#include <dpkg/pkg-array.h>
-#include <dpkg/progress.h>
-
-#include "filesdb.h"
-#include "infodb.h"
-#include "main.h"
-
-/*** filepackages support for tracking packages owning a file. ***/
-
-struct filepackages_iterator {
-  struct pkg_list *pkg_node;
-};
-
-struct filepackages_iterator *
-filepackages_iter_new(struct filenamenode *fnn)
-{
-  struct filepackages_iterator *iter;
-
-  iter = m_malloc(sizeof(*iter));
-  iter->pkg_node = fnn->packages;
-
-  return iter;
-}
-
-struct pkginfo *
-filepackages_iter_next(struct filepackages_iterator *iter)
-{
-  struct pkg_list *pkg_node;
-
-  if (iter->pkg_node == NULL)
-    return NULL;
-
-  pkg_node = iter->pkg_node;
-  iter->pkg_node = pkg_node->next;
-
-  return pkg_node->pkg;
-}
-
-void
-filepackages_iter_free(struct filepackages_iterator *iter)
-{
-  free(iter);
-}
-
-/*** Generic data structures and routines. ***/
-
-static bool allpackagesdone = false;
-static int nfiles= 0;
-
-void
-ensure_package_clientdata(struct pkginfo *pkg)
-{
-  if (pkg->clientdata)
-    return;
-  pkg->clientdata = nfmalloc(sizeof(struct perpackagestate));
-  pkg->clientdata->istobe = PKG_ISTOBE_NORMAL;
-  pkg->clientdata->color = PKG_CYCLE_WHITE;
-  pkg->clientdata->enqueued = false;
-  pkg->clientdata->fileslistvalid = false;
-  pkg->clientdata->files = NULL;
-  pkg->clientdata->replacingfilesandsaid = 0;
-  pkg->clientdata->cmdline_seen = 0;
-  pkg->clientdata->listfile_phys_offs = 0;
-  pkg->clientdata->trigprocdeferred = NULL;
-}
-
-void note_must_reread_files_inpackage(struct pkginfo *pkg) {
-  allpackagesdone = false;
-  ensure_package_clientdata(pkg);
-  pkg->clientdata->fileslistvalid = false;
-}
-
-enum pkg_filesdb_load_status {
-  PKG_FILESDB_LOAD_NONE = 0,
-  PKG_FILESDB_LOAD_INPROGRESS = 1,
-  PKG_FILESDB_LOAD_DONE = 2,
-};
-
-static enum pkg_filesdb_load_status saidread = PKG_FILESDB_LOAD_NONE;
-
-/**
- * Erase the files saved in pkg.
- */
-static void
-pkg_files_blank(struct pkginfo *pkg)
-{
-  struct fileinlist *current;
-
-  /* Anything to empty? */
-  if (!pkg->clientdata)
-    return;
-
-  for (current= pkg->clientdata->files;
-       current;
-       current= current->next) {
-    struct pkg_list *pkg_node, *pkg_prev = NULL;
-
-    /* For each file that used to be in the package,
-     * go through looking for this package's entry in the list
-     * of packages containing this file, and blank it out. */
-    for (pkg_node = current->namenode->packages;
-         pkg_node;
-         pkg_node = pkg_node->next) {
-      if (pkg_node->pkg == pkg) {
-        if (pkg_prev)
-          pkg_prev->next = pkg_node->next;
-        else
-          current->namenode->packages = pkg_node->next;
-
-        /* The actual filelist links were allocated using nfmalloc, so
-         * we shouldn't free them. */
-        break;
-      }
-      pkg_prev = pkg_node;
-    }
-  }
-  pkg->clientdata->files = NULL;
-}
-
-static struct fileinlist **
-pkg_files_add_file(struct pkginfo *pkg, struct filenamenode *namenode,
-                   struct fileinlist **file_tail)
-{
-  struct fileinlist *newent;
-  struct pkg_list *pkg_node;
-
-  ensure_package_clientdata(pkg);
-
-  if (file_tail == NULL)
-    file_tail = &pkg->clientdata->files;
-
-  /* Make sure we're at the end. */
-  while ((*file_tail) != NULL) {
-    file_tail = &((*file_tail)->next);
-  }
-
-  /* Create a new node. */
-  newent = nfmalloc(sizeof(struct fileinlist));
-  newent->namenode = namenode;
-  newent->next = NULL;
-  *file_tail = newent;
-  file_tail = &newent->next;
-
-  /* Add pkg to newent's package list. */
-  pkg_node = nfmalloc(sizeof(*pkg_node));
-  pkg_node->pkg = pkg;
-  pkg_node->next = newent->namenode->packages;
-  newent->namenode->packages = pkg_node;
-
-  /* Return the position for the next guy. */
-  return file_tail;
-}
-
-/**
- * Load the list of files in this package into memory, or update the
- * list if it is there but stale.
- */
-void
-ensure_packagefiles_available(struct pkginfo *pkg)
-{
-  static int fd;
-  const char *filelistfile;
-  struct fileinlist **lendp;
-  struct stat stat_buf;
-  char *loaded_list, *loaded_list_end, *thisline, *nextline, *ptr;
-
-  if (pkg->clientdata && pkg->clientdata->fileslistvalid)
-    return;
-  ensure_package_clientdata(pkg);
-
-  /* Throw away any stale data, if there was any. */
-  pkg_files_blank(pkg);
-
-  /* Packages which aren't installed don't have a files list. */
-  if (pkg->status == PKG_STAT_NOTINSTALLED) {
-    pkg->clientdata->fileslistvalid = true;
-    return;
-  }
-
-  filelistfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE);
-
-  onerr_abort++;
-
-  fd= open(filelistfile,O_RDONLY);
-
-  if (fd==-1) {
-    if (errno != ENOENT)
-      ohshite(_("unable to open files list file for package '%.250s'"),
-              pkg_name(pkg, pnaw_nonambig));
-    onerr_abort--;
-    if (pkg->status != PKG_STAT_CONFIGFILES &&
-        dpkg_version_is_informative(&pkg->configversion)) {
-      warning(_("files list file for package '%.250s' missing; assuming "
-                "package has no files currently installed"),
-              pkg_name(pkg, pnaw_nonambig));
-    }
-    pkg->clientdata->files = NULL;
-    pkg->clientdata->fileslistvalid = true;
-    return;
-  }
-
-  push_cleanup(cu_closefd, ehflag_bombout, NULL, 0, 1, &fd);
-
-  if (fstat(fd, &stat_buf))
-    ohshite(_("unable to stat files list file for package '%.250s'"),
-            pkg_name(pkg, pnaw_nonambig));
-
-  if (!S_ISREG(stat_buf.st_mode))
-    ohshit(_("files list for package '%.250s' is not a regular file"),
-           pkg_name(pkg, pnaw_nonambig));
-
-  if (stat_buf.st_size) {
-    loaded_list = nfmalloc(stat_buf.st_size);
-    loaded_list_end = loaded_list + stat_buf.st_size;
-
-    if (fd_read(fd, loaded_list, stat_buf.st_size) < 0)
-      ohshite(_("reading files list for package '%.250s'"),
-              pkg_name(pkg, pnaw_nonambig));
-
-    lendp= &pkg->clientdata->files;
-    thisline = loaded_list;
-    while (thisline < loaded_list_end) {
-      struct filenamenode *namenode;
-
-      ptr = memchr(thisline, '\n', loaded_list_end - thisline);
-      if (ptr == NULL)
-        ohshit(_("files list file for package '%.250s' is missing final newline"),
-               pkg_name(pkg, pnaw_nonambig));
-      /* Where to start next time around. */
-      nextline = ptr + 1;
-      /* Strip trailing ‘/’. */
-      if (ptr > thisline && ptr[-1] == '/') ptr--;
-      /* Add the file to the list. */
-      if (ptr == thisline)
-        ohshit(_("files list file for package '%.250s' contains empty filename"),
-               pkg_name(pkg, pnaw_nonambig));
-      *ptr = '\0';
-
-      namenode = findnamenode(thisline, fnn_nocopy);
-      lendp = pkg_files_add_file(pkg, namenode, lendp);
-      thisline = nextline;
-    }
-  }
-  pop_cleanup(ehflag_normaltidy); /* fd = open() */
-  if (close(fd))
-    ohshite(_("error closing files list file for package '%.250s'"),
-            pkg_name(pkg, pnaw_nonambig));
-
-  onerr_abort--;
-
-  pkg->clientdata->fileslistvalid = true;
-}
-
-#if defined(HAVE_LINUX_FIEMAP_H)
-static int
-pkg_sorter_by_listfile_phys_offs(const void *a, const void *b)
-{
-  const struct pkginfo *pa = *(const struct pkginfo **)a;
-  const struct pkginfo *pb = *(const struct pkginfo **)b;
-
-  /* We can't simply subtract, because the difference may be greater than
-   * INT_MAX. */
-  if (pa->clientdata->listfile_phys_offs < pb->clientdata->listfile_phys_offs)
-    return -1;
-  else if (pa->clientdata->listfile_phys_offs > pb->clientdata->listfile_phys_offs)
-    return 1;
-  else
-    return 0;
-}
-
-static void
-pkg_files_optimize_load(struct pkg_array *array)
-{
-  struct statfs fs;
-  int i;
-
-  /* Get the filesystem block size. */
-  if (statfs(pkg_infodb_get_dir(), &fs) < 0)
-    return;
-
-  /* Sort packages by the physical location of their list files, so that
-   * scanning them later will minimize disk drive head movements. */
-  for (i = 0; i < array->n_pkgs; i++) {
-    struct pkginfo *pkg = array->pkgs[i];
-    struct {
-      struct fiemap fiemap;
-      struct fiemap_extent extent;
-    } fm;
-    const char *listfile;
-    int fd;
-
-    ensure_package_clientdata(pkg);
-
-    if (pkg->status == PKG_STAT_NOTINSTALLED ||
-        pkg->clientdata->listfile_phys_offs != 0)
-      continue;
-
-    pkg->clientdata->listfile_phys_offs = -1;
-
-    listfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE);
-
-    fd = open(listfile, O_RDONLY);
-    if (fd < 0)
-      continue;
-
-    memset(&fm, 0, sizeof(fm));
-    fm.fiemap.fm_start = 0;
-    fm.fiemap.fm_length = fs.f_bsize;
-    fm.fiemap.fm_flags = 0;
-    fm.fiemap.fm_extent_count = 1;
-
-    if (ioctl(fd, FS_IOC_FIEMAP, (unsigned long)&fm) == 0)
-      pkg->clientdata->listfile_phys_offs = fm.fiemap.fm_extents[0].fe_physical;
-
-    close(fd);
-  }
-
-  pkg_array_sort(array, pkg_sorter_by_listfile_phys_offs);
-}
-#elif defined(HAVE_POSIX_FADVISE)
-static void
-pkg_files_optimize_load(struct pkg_array *array)
-{
-  int i;
-
-  /* Ask the kernel to start preloading the list files, so as to get a
-   * boost when later we actually load them. */
-  for (i = 0; i < array->n_pkgs; i++) {
-    struct pkginfo *pkg = array->pkgs[i];
-    const char *listfile;
-    int fd;
-
-    listfile = pkg_infodb_get_file(pkg, &pkg->installed, LISTFILE);
-
-    fd = open(listfile, O_RDONLY | O_NONBLOCK);
-    if (fd != -1) {
-      posix_fadvise(fd, 0, 0, POSIX_FADV_WILLNEED);
-      close(fd);
-    }
-  }
-}
-#else
-static void
-pkg_files_optimize_load(struct pkg_array *array)
-{
-}
-#endif
-
-void ensure_allinstfiles_available(void) {
-  struct pkg_array array;
-  struct pkginfo *pkg;
-  struct progress progress;
-  int i;
-
-  if (allpackagesdone) return;
-  if (saidread < PKG_FILESDB_LOAD_DONE) {
-    int max = pkg_db_count_pkg();
-
-    saidread = PKG_FILESDB_LOAD_INPROGRESS;
-    progress_init(&progress, _("(Reading database ... "), max);
-  }
-
-  pkg_array_init_from_db(&array);
-
-  pkg_files_optimize_load(&array);
-
-  for (i = 0; i < array.n_pkgs; i++) {
-    pkg = array.pkgs[i];
-    ensure_packagefiles_available(pkg);
-
-    if (saidread == PKG_FILESDB_LOAD_INPROGRESS)
-      progress_step(&progress);
-  }
-
-  pkg_array_destroy(&array);
-
-  allpackagesdone = true;
-
-  if (saidread == PKG_FILESDB_LOAD_INPROGRESS) {
-    progress_done(&progress);
-    printf(P_("%d file or directory currently installed.)\n",
-              "%d files and directories currently installed.)\n", nfiles),
-           nfiles);
-    saidread = PKG_FILESDB_LOAD_DONE;
-  }
-}
-
-void ensure_allinstfiles_available_quiet(void) {
-  saidread = PKG_FILESDB_LOAD_DONE;
-  ensure_allinstfiles_available();
-}
-
-/*
- * If mask is nonzero, will not write any file whose filenamenode
- * has any flag bits set in mask.
- */
-void
-write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                      struct fileinlist *list, enum filenamenode_flags mask)
-{
-  struct atomic_file *file;
-  struct fileinlist *node;
-  const char *listfile;
-
-  listfile = pkg_infodb_get_file(pkg, pkgbin, LISTFILE);
-
-  file = atomic_file_new(listfile, 0);
-  atomic_file_open(file);
-
-  for (node = list; node; node = node->next) {
-    if (!(mask && (node->namenode->flags & mask))) {
-      fputs(node->namenode->name, file->fp);
-      putc('\n', file->fp);
-    }
-  }
-
-  atomic_file_sync(file);
-  atomic_file_close(file);
-  atomic_file_commit(file);
-  atomic_file_free(file);
-
-  dir_sync_path(pkg_infodb_get_dir());
-
-  note_must_reread_files_inpackage(pkg);
-}
-
-/*
- * Initializes an iterator that appears to go through the file
- * list ‘files’ in reverse order, returning the namenode from
- * each. What actually happens is that we walk the list here,
- * building up a reverse list, and then peel it apart one
- * entry at a time.
- */
-void
-reversefilelist_init(struct reversefilelistiter *iter, struct fileinlist *files)
-{
-  struct fileinlist *newent;
-
-  iter->todo = NULL;
-  while (files) {
-    newent= m_malloc(sizeof(struct fileinlist));
-    newent->namenode= files->namenode;
-    newent->next = iter->todo;
-    iter->todo = newent;
-    files= files->next;
-  }
-}
-
-struct filenamenode *
-reversefilelist_next(struct reversefilelistiter *iter)
-{
-  struct filenamenode *ret;
-  struct fileinlist *todo;
-
-  todo = iter->todo;
-  if (!todo)
-    return NULL;
-  ret= todo->namenode;
-  iter->todo = todo->next;
-  free(todo);
-  return ret;
-}
-
-/*
- * Clients must call this function to clean up the reversefilelistiter
- * if they wish to break out of the iteration before it is all done.
- * Calling this function is not necessary if reversefilelist_next has
- * been called until it returned 0.
- */
-void
-reversefilelist_abort(struct reversefilelistiter *iter)
-{
-  while (reversefilelist_next(iter));
-}
-
-struct fileiterator {
-  struct filenamenode *namenode;
-  int nbinn;
-};
-
-/* This must always be a prime for optimal performance.
- * This is the closest one to 2^18 (262144). */
-#define BINS 262139
-
-static struct filenamenode *bins[BINS];
-
-struct fileiterator *
-files_db_iter_new(void)
-{
-  struct fileiterator *iter;
-
-  iter = m_malloc(sizeof(struct fileiterator));
-  iter->namenode = NULL;
-  iter->nbinn = 0;
-
-  return iter;
-}
-
-struct filenamenode *
-files_db_iter_next(struct fileiterator *iter)
-{
-  struct filenamenode *r= NULL;
-
-  while (!iter->namenode) {
-    if (iter->nbinn >= BINS)
-      return NULL;
-    iter->namenode = bins[iter->nbinn++];
-  }
-  r = iter->namenode;
-  iter->namenode = r->next;
-
-  return r;
-}
-
-void
-files_db_iter_free(struct fileiterator *iter)
-{
-  free(iter);
-}
-
-void filesdbinit(void) {
-  struct filenamenode *fnn;
-  int i;
-
-  for (i=0; i<BINS; i++)
-    for (fnn= bins[i]; fnn; fnn= fnn->next) {
-      fnn->flags= 0;
-      fnn->oldhash = NULL;
-      fnn->newhash = EMPTYHASHFLAG;
-      fnn->filestat = NULL;
-    }
-}
-
-void
-files_db_reset(void)
-{
-  int i;
-
-  for (i = 0; i < BINS; i++)
-    bins[i] = NULL;
-}
-
-struct filenamenode *findnamenode(const char *name, enum fnnflags flags) {
-  struct filenamenode **pointerp, *newnode;
-  const char *orig_name = name;
-
-  /* We skip initial slashes and ‘./’ pairs, and add our own single
-   * leading slash. */
-  name = path_skip_slash_dotslash(name);
-
-  pointerp = bins + (str_fnv_hash(name) % (BINS));
-  while (*pointerp) {
-    /* XXX: Why is the assert needed? It's checking already added entries. */
-    assert((*pointerp)->name[0] == '/');
-    if (strcmp((*pointerp)->name + 1, name) == 0)
-      break;
-    pointerp= &(*pointerp)->next;
-  }
-  if (*pointerp) return *pointerp;
-
-  if (flags & fnn_nonew)
-    return NULL;
-
-  newnode= nfmalloc(sizeof(struct filenamenode));
-  newnode->packages = NULL;
-  if((flags & fnn_nocopy) && name > orig_name && name[-1] == '/')
-    newnode->name = name - 1;
-  else {
-    char *newname= nfmalloc(strlen(name)+2);
-    newname[0]= '/'; strcpy(newname+1,name);
-    newnode->name= newname;
-  }
-  newnode->flags= 0;
-  newnode->next = NULL;
-  newnode->divert = NULL;
-  newnode->statoverride = NULL;
-  newnode->oldhash = NULL;
-  newnode->newhash = EMPTYHASHFLAG;
-  newnode->filestat = NULL;
-  newnode->trig_interested = NULL;
-  *pointerp= newnode;
-  nfiles++;
-
-  return newnode;
-}
diff --git a/src/filesdb.h b/src/filesdb.h
deleted file mode 100644
index 954d67bd8..000000000
--- a/src/filesdb.h
+++ /dev/null
@@ -1,196 +0,0 @@
-/*
- * dpkg - main program for package management
- * filesdb.h - management of database of files installed on system
- *
- * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
- * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
- *
- * This is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#ifndef FILESDB_H
-#define FILESDB_H
-
-#include <dpkg/file.h>
-
-/*
- * Data structure here is as follows:
- *
- * For each package we have a ‘struct fileinlist *’, the head of a list of
- * files in that package. They are in ‘forwards’ order. Each entry has a
- * pointer to the ‘struct filenamenode’.
- *
- * The struct filenamenodes are in a hash table, indexed by name.
- * (This hash table is not visible to callers.)
- *
- * Each filenamenode has a (possibly empty) list of ‘struct filepackage’,
- * giving a list of the packages listing that filename.
- *
- * When we read files contained info about a particular package we set the
- * ‘files’ member of the clientdata struct to the appropriate thing. When
- * not yet set the files pointer is made to point to ‘fileslist_uninited’
- * (this is available only internally, within filesdb.c - the published
- * interface is ensure_*_available).
- */
-
-struct pkginfo;
-
-/**
- * Flags to findnamenode().
- */
-enum fnnflags {
-    /** Do not need to copy filename. */
-    fnn_nocopy			= DPKG_BIT(0),
-    /** findnamenode may return NULL. */
-    fnn_nonew			= DPKG_BIT(1),
-};
-
-enum filenamenode_flags {
-	/** In the newconffiles list. */
-	fnnf_new_conff			= DPKG_BIT(0),
-	/** In the new filesystem archive. */
-	fnnf_new_inarchive		= DPKG_BIT(1),
-	/** In the old package's conffiles list. */
-	fnnf_old_conff			= DPKG_BIT(2),
-	/** Obsolete conffile. */
-	fnnf_obs_conff			= DPKG_BIT(3),
-	/** Must remove from other packages' lists. */
-	fnnf_elide_other_lists		= DPKG_BIT(4),
-	/** >= 1 instance is a dir, cannot rename over. */
-	fnnf_no_atomic_overwrite	= DPKG_BIT(5),
-	/** New file has been placed on the disk. */
-	fnnf_placed_on_disk		= DPKG_BIT(6),
-	fnnf_deferred_fsync		= DPKG_BIT(7),
-	fnnf_deferred_rename		= DPKG_BIT(8),
-	/** Path being filtered. */
-	fnnf_filtered			= DPKG_BIT(9),
-};
-
-struct filenamenode {
-  struct filenamenode *next;
-  const char *name;
-  struct pkg_list *packages;
-  struct diversion *divert;
-
-  /** We allow the administrator to override the owner, group and mode of
-   * a file. If such an override is present we use that instead of the
-   * stat information stored in the archive.
-   *
-   * This functionality used to be in the suidmanager package. */
-  struct file_stat *statoverride;
-
-  /*
-   * Fields from here on are used by archives.c &c, and cleared by
-   * filesdbinit.
-   */
-
-  /** Set to zero when a new node is created. */
-  enum filenamenode_flags flags;
-
-  /** Valid iff this namenode is in the newconffiles list. */
-  const char *oldhash;
-
-  /** Valid iff the file was unpacked and hashed on this run. */
-  const char *newhash;
-
-  struct stat *filestat;
-  struct trigfileint *trig_interested;
-};
-
-struct fileinlist {
-  struct fileinlist *next;
-  struct filenamenode *namenode;
-};
-
-/**
- * Queue of filenamenode entries.
- */
-struct filenamenode_queue {
-  struct fileinlist *head, **tail;
-};
-
-/**
- * When we deal with an ‘overridden’ file, every package except the
- * overriding one is considered to contain the other file instead. Both
- * files have entries in the filesdb database, and they refer to each other
- * via these diversion structures.
- *
- * The contested filename's filenamenode has an diversion entry with
- * useinstead set to point to the redirected filename's filenamenode; the
- * redirected filenamenode has camefrom set to the contested filenamenode.
- * Both sides' diversion entries will have pkg set to the package (if any)
- * which is allowed to use the contended filename.
- *
- * Packages that contain either version of the file will all refer to the
- * contested filenamenode in their per-file package lists (both in core and
- * on disk). References are redirected to the other filenamenode's filename
- * where appropriate.
- */
-struct diversion {
-  struct filenamenode *useinstead;
-  struct filenamenode *camefrom;
-  struct pkgset *pkgset;
-
-  /** The ‘contested’ halves are in this list for easy cleanup. */
-  struct diversion *next;
-};
-
-struct filepackages_iterator;
-struct filepackages_iterator *filepackages_iter_new(struct filenamenode *fnn);
-struct pkginfo *filepackages_iter_next(struct filepackages_iterator *iter);
-void filepackages_iter_free(struct filepackages_iterator *iter);
-
-void filesdbinit(void);
-void files_db_reset(void);
-
-struct fileiterator;
-struct fileiterator *files_db_iter_new(void);
-struct filenamenode *files_db_iter_next(struct fileiterator *iter);
-void files_db_iter_free(struct fileiterator *iter);
-
-void ensure_package_clientdata(struct pkginfo *pkg);
-
-void ensure_diversions(void);
-
-enum statdb_parse_flags {
-	STATDB_PARSE_NORMAL = 0,
-	STATDB_PARSE_LAX = 1,
-};
-
-uid_t statdb_parse_uid(const char *str);
-gid_t statdb_parse_gid(const char *str);
-mode_t statdb_parse_mode(const char *str);
-void ensure_statoverrides(enum statdb_parse_flags flags);
-
-#define LISTFILE           "list"
-#define HASHFILE           "md5sums"
-
-void ensure_packagefiles_available(struct pkginfo *pkg);
-void ensure_allinstfiles_available(void);
-void ensure_allinstfiles_available_quiet(void);
-void note_must_reread_files_inpackage(struct pkginfo *pkg);
-struct filenamenode *findnamenode(const char *filename, enum fnnflags flags);
-void parse_filehash(struct pkginfo *pkg, struct pkgbin *pkgbin);
-void write_filelist_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                           struct fileinlist *list, enum filenamenode_flags mask);
-void write_filehash_except(struct pkginfo *pkg, struct pkgbin *pkgbin,
-                           struct fileinlist *list, enum filenamenode_flags mask);
-
-struct reversefilelistiter { struct fileinlist *todo; };
-
-void reversefilelist_init(struct reversefilelistiter *iterptr, struct fileinlist *files);
-struct filenamenode *reversefilelist_next(struct reversefilelistiter *iterptr);
-void reversefilelist_abort(struct reversefilelistiter *iterptr);
-
-#endif /* FILESDB_H */
diff --git a/src/filters.c b/src/filters.c
index 2b8b43263..f770fb74c 100644
--- a/src/filters.c
+++ b/src/filters.c
@@ -29,9 +29,9 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
+#include <dpkg/db-fsys.h>
 
 #include "main.h"
-#include "filesdb.h"
 #include "filters.h"
 
 struct filter_node {
diff --git a/src/force.c b/src/force.c
new file mode 100644
index 000000000..07c1daa24
--- /dev/null
+++ b/src/force.c
@@ -0,0 +1,395 @@
+/*
+ * dpkg - main program for package management
+ * force.c - force operation support
+ *
+ * Copyright © 1994,1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright © 2006-2019 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <errno.h>
+#include <string.h>
+#include <stdbool.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <dpkg/macros.h>
+#include <dpkg/i18n.h>
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+#include <dpkg/options.h>
+
+#include "force.h"
+
+static int force_mask;
+static int force_flags;
+
+enum forcetype {
+	FORCETYPE_DISABLED,
+	FORCETYPE_ENABLED,
+	FORCETYPE_DAMAGE,
+};
+
+static const char *
+forcetype_str(enum forcetype type)
+{
+	switch (type) {
+	case FORCETYPE_DISABLED:
+		return "   ";
+	case FORCETYPE_ENABLED:
+		return "[*]";
+	case FORCETYPE_DAMAGE:
+		return "[!]";
+	default:
+		internerr("unknown force type '%d'", type);
+	}
+}
+
+static const struct forceinfo {
+	const char *name;
+	int flag;
+	char type;
+	const char *desc;
+} forceinfos[] = {
+	{
+		"all",
+		FORCE_ALL,
+		FORCETYPE_DAMAGE,
+		N_("Set all force options"),
+	}, {
+		"security-mac",
+		FORCE_SECURITY_MAC,
+		FORCETYPE_ENABLED,
+		N_("Use MAC based security if available"),
+	}, {
+		"downgrade",
+		FORCE_DOWNGRADE,
+		FORCETYPE_ENABLED,
+		N_("Replace a package with a lower version"),
+	}, {
+		"configure-any",
+		FORCE_CONFIGURE_ANY,
+		FORCETYPE_DISABLED,
+		N_("Configure any package which may help this one"),
+	}, {
+		"hold",
+		FORCE_HOLD,
+		FORCETYPE_DISABLED,
+		N_("Install or remove incidental packages even when on hold"),
+	}, {
+		"not-root",
+		FORCE_NON_ROOT,
+		FORCETYPE_DISABLED,
+		N_("Try to (de)install things even when not root"),
+	}, {
+		"bad-path",
+		FORCE_BAD_PATH,
+		FORCETYPE_DISABLED,
+		N_("PATH is missing important programs, problems likely"),
+	}, {
+		"bad-verify",
+		FORCE_BAD_VERIFY,
+		FORCETYPE_DISABLED,
+		N_("Install a package even if it fails authenticity check"),
+	}, {
+		"bad-version",
+		FORCE_BAD_VERSION,
+		FORCETYPE_DISABLED,
+		N_("Process even packages with wrong versions"),
+	}, {
+		"statoverride-add",
+		FORCE_STATOVERRIDE_ADD,
+		FORCETYPE_DISABLED,
+		N_("Overwrite an existing stat override when adding it"),
+	}, {
+		"statoverride-remove",
+		FORCE_STATOVERRIDE_DEL,
+		FORCETYPE_DISABLED,
+		N_("Ignore a missing stat override when removing it"),
+	}, {
+		"overwrite",
+		FORCE_OVERWRITE,
+		FORCETYPE_DISABLED,
+		N_("Overwrite a file from one package with another"),
+	}, {
+		"overwrite-diverted",
+		FORCE_OVERWRITE_DIVERTED,
+		FORCETYPE_DISABLED,
+		N_("Overwrite a diverted file with an undiverted version"),
+	}, {
+		"overwrite-dir",
+		FORCE_OVERWRITE_DIR,
+		FORCETYPE_DAMAGE,
+		N_("Overwrite one package's directory with another's file"),
+	}, {
+		"unsafe-io",
+		FORCE_UNSAFE_IO,
+		FORCETYPE_DAMAGE,
+		N_("Do not perform safe I/O operations when unpacking"),
+	}, {
+		"script-chrootless",
+		FORCE_SCRIPT_CHROOTLESS,
+		FORCETYPE_DAMAGE,
+		N_("Do not chroot into maintainer script environment"),
+	}, {
+		"confnew",
+		FORCE_CONFF_NEW,
+		FORCETYPE_DAMAGE,
+		N_("Always use the new config files, don't prompt"),
+	}, {
+		"confold",
+		FORCE_CONFF_OLD,
+		FORCETYPE_DAMAGE,
+		N_("Always use the old config files, don't prompt"),
+	}, {
+		"confdef",
+		FORCE_CONFF_DEF,
+		FORCETYPE_DAMAGE,
+		N_("Use the default option for new config files if one\n"
+		   "is available, don't prompt. If no default can be found,\n"
+		   "you will be prompted unless one of the confold or\n"
+		   "confnew options is also given"),
+	}, {
+		"confmiss",
+		FORCE_CONFF_MISS,
+		FORCETYPE_DAMAGE,
+		N_("Always install missing config files"),
+	}, {
+		"confask",
+		FORCE_CONFF_ASK,
+		FORCETYPE_DAMAGE,
+		N_("Offer to replace config files with no new versions"),
+	}, {
+		"architecture",
+		FORCE_ARCHITECTURE,
+		FORCETYPE_DAMAGE,
+		N_("Process even packages with wrong or no architecture"),
+	}, {
+		"breaks",
+		FORCE_BREAKS,
+		FORCETYPE_DAMAGE,
+		N_("Install even if it would break another package"),
+	}, {
+		"conflicts",
+		FORCE_CONFLICTS,
+		FORCETYPE_DAMAGE,
+		N_("Allow installation of conflicting packages"),
+	}, {
+		"depends",
+		FORCE_DEPENDS,
+		FORCETYPE_DAMAGE,
+		N_("Turn all dependency problems into warnings"),
+	}, {
+		"depends-version",
+		FORCE_DEPENDS_VERSION,
+		FORCETYPE_DAMAGE,
+		N_("Turn dependency version problems into warnings"),
+	}, {
+		"remove-reinstreq",
+		FORCE_REMOVE_REINSTREQ,
+		FORCETYPE_DAMAGE,
+		N_("Remove packages which require installation"),
+	}, {
+		"remove-essential",
+		FORCE_REMOVE_ESSENTIAL,
+		FORCETYPE_DAMAGE,
+		N_("Remove an essential package"),
+	}, {
+		NULL
+	}
+};
+
+bool
+in_force(int flags)
+{
+	return (flags & force_flags) == flags;
+}
+
+void
+set_force(int flags)
+{
+	force_flags |= flags;
+}
+
+void
+reset_force(int flags)
+{
+	force_flags &= ~flags;
+}
+
+char *
+get_force_string(void)
+{
+	const struct forceinfo *fip;
+	struct varbuf vb = VARBUF_INIT;
+
+	for (fip = forceinfos; fip->name; fip++) {
+		if ((enum force_flags)fip->flag == FORCE_ALL ||
+		    (fip->flag & force_mask) != fip->flag ||
+		    !in_force(fip->flag))
+			continue;
+
+		if (vb.used)
+			varbuf_add_char(&vb, ',');
+		varbuf_add_str(&vb, fip->name);
+	}
+	varbuf_end_str(&vb);
+
+	return varbuf_detach(&vb);
+}
+
+static inline void
+print_forceinfo_line(int type, const char *name, const char *desc)
+{
+	printf("  %s %-18s %s\n", forcetype_str(type), name, desc);
+}
+
+static void
+print_forceinfo(const struct forceinfo *fi)
+{
+	char *desc, *line;
+
+	desc = m_strdup(gettext(fi->desc));
+
+	line = strtok(desc, "\n");
+	print_forceinfo_line(fi->type, fi->name, line);
+	while ((line = strtok(NULL, "\n")))
+		print_forceinfo_line(FORCETYPE_DISABLED, "", line);
+
+	free(desc);
+}
+
+void
+parse_force(const char *value, bool set)
+{
+	const char *comma;
+	size_t l;
+	const struct forceinfo *fip;
+
+	if (strcmp(value, "help") == 0) {
+		printf(_(
+"%s forcing options - control behaviour when problems found:\n"
+"  warn but continue:  --force-<thing>,<thing>,...\n"
+"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
+" Forcing things:\n"), dpkg_get_progname());
+
+		for (fip = forceinfos; fip->name; fip++)
+			if ((enum force_flags)fip->flag == FORCE_ALL ||
+			    (fip->flag & force_mask) == fip->flag)
+				print_forceinfo(fip);
+
+		printf(_(
+"\n"
+"WARNING - use of options marked [!] can seriously damage your installation.\n"
+"Forcing options marked [*] are enabled by default.\n"));
+		m_output(stdout, _("<standard output>"));
+
+		printf(_(
+"\n"
+"Currently enabled options:\n"
+" %s\n"), get_force_string());
+
+		exit(0);
+	}
+
+	for (;;) {
+		comma = strchrnul(value, ',');
+		l = (size_t)(comma - value);
+		for (fip = forceinfos; fip->name; fip++)
+			if (strncmp(fip->name, value, l) == 0 &&
+			    strlen(fip->name) == l)
+				break;
+
+		if (!fip->name) {
+			badusage(_("unknown force/refuse option '%.*s'"),
+			         (int)min(l, 250), value);
+		} else if (fip->flag) {
+			if (set)
+				set_force(fip->flag);
+			else
+				reset_force(fip->flag);
+		} else {
+			warning(_("obsolete force/refuse option '%s'"),
+			        fip->name);
+		}
+
+		if (*comma == '\0')
+			break;
+		value = ++comma;
+	}
+}
+
+void
+set_force_default(int mask)
+{
+	const char *force_env;
+	const struct forceinfo *fip;
+
+	force_mask = mask;
+
+	/* If we get passed force options from the environment, do not
+	 * initialize from the built-in defaults. */
+	force_env = getenv("DPKG_FORCE");
+	if (force_env != NULL) {
+		if (force_env[0] != '\0')
+			parse_force(force_env, 1);
+		return;
+	}
+
+	for (fip = forceinfos; fip->name; fip++)
+		if (fip->type == FORCETYPE_ENABLED)
+			set_force(fip->flag);
+}
+
+void
+set_force_option(const struct cmdinfo *cip, const char *value)
+{
+	bool set = cip->arg_int;
+
+	parse_force(value, set);
+}
+
+void
+reset_force_option(const struct cmdinfo *cip, const char *value)
+{
+	reset_force(cip->arg_int);
+}
+
+void
+forcibleerr(int forceflag, const char *fmt, ...)
+{
+	va_list args;
+
+	va_start(args, fmt);
+	if (in_force(forceflag)) {
+		warning(_("overriding problem because --force enabled:"));
+		warningv(fmt, args);
+	} else {
+		ohshitv(fmt, args);
+	}
+	va_end(args);
+}
+
+int
+forcible_nonroot_error(int rc)
+{
+	if (in_force(FORCE_NON_ROOT) && errno == EPERM)
+		return 0;
+	return rc;
+}
diff --git a/src/force.h b/src/force.h
new file mode 100644
index 000000000..986e7fa81
--- /dev/null
+++ b/src/force.h
@@ -0,0 +1,84 @@
+/*
+ * dpkg - main program for package management
+ * force.h - forced operation support
+ *
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright © 2006, 2008-2019 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef DPKG_FORCE_H
+#define DPKG_FORCE_H
+
+#include <dpkg/dpkg.h>
+#include <dpkg/options.h>
+
+enum force_flags {
+	FORCE_ARCHITECTURE = DPKG_BIT(0),
+	FORCE_BAD_PATH = DPKG_BIT(1),
+	FORCE_BAD_VERIFY = DPKG_BIT(2),
+	FORCE_BAD_VERSION = DPKG_BIT(3),
+	FORCE_BREAKS = DPKG_BIT(4),
+	FORCE_CONFF_ASK = DPKG_BIT(5),
+	FORCE_CONFF_DEF = DPKG_BIT(6),
+	FORCE_CONFF_MISS = DPKG_BIT(7),
+	FORCE_CONFF_NEW = DPKG_BIT(8),
+	FORCE_CONFF_OLD = DPKG_BIT(9),
+	FORCE_CONFIGURE_ANY = DPKG_BIT(10),
+	FORCE_CONFLICTS = DPKG_BIT(11),
+	FORCE_DEPENDS = DPKG_BIT(12),
+	FORCE_DEPENDS_VERSION = DPKG_BIT(13),
+	FORCE_DOWNGRADE = DPKG_BIT(14),
+	FORCE_HOLD = DPKG_BIT(15),
+	FORCE_NON_ROOT = DPKG_BIT(16),
+	FORCE_OVERWRITE = DPKG_BIT(17),
+	FORCE_OVERWRITE_DIR = DPKG_BIT(18),
+	FORCE_OVERWRITE_DIVERTED = DPKG_BIT(19),
+	FORCE_REMOVE_ESSENTIAL = DPKG_BIT(20),
+	FORCE_REMOVE_REINSTREQ = DPKG_BIT(21),
+	FORCE_SCRIPT_CHROOTLESS = DPKG_BIT(22),
+	FORCE_UNSAFE_IO = DPKG_BIT(23),
+	FORCE_STATOVERRIDE_ADD = DPKG_BIT(24),
+	FORCE_STATOVERRIDE_DEL = DPKG_BIT(25),
+	FORCE_SECURITY_MAC = DPKG_BIT(26),
+	FORCE_ALL = 0xffffffff,
+};
+
+bool
+in_force(int flags);
+void
+set_force(int flags);
+void
+reset_force(int flags);
+
+char *
+get_force_string(void);
+
+void
+parse_force(const char *value, bool set);
+
+void
+set_force_default(int mask);
+void
+set_force_option(const struct cmdinfo *cip, const char *value);
+void
+reset_force_option(const struct cmdinfo *cip, const char *value);
+
+void
+forcibleerr(int forceflag, const char *format, ...) DPKG_ATTR_PRINTF(2);
+int
+forcible_nonroot_error(int rc);
+
+#endif /* DPKG_FORCE_H */
diff --git a/src/help.c b/src/help.c
index aa9b11c38..f8f8a8070 100644
--- a/src/help.c
+++ b/src/help.c
@@ -34,8 +34,8 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/path.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
 #include "main.h"
 
 const char *const statusstrings[]= {
@@ -49,32 +49,29 @@ const char *const statusstrings[]= {
   [PKG_STAT_INSTALLED]       = N_("installed")
 };
 
-struct filenamenode *
-namenodetouse(struct filenamenode *namenode, struct pkginfo *pkg,
+struct fsys_namenode *
+namenodetouse(struct fsys_namenode *namenode, struct pkginfo *pkg,
               struct pkgbin *pkgbin)
 {
-  struct filenamenode *r;
+  struct fsys_namenode *fnn;
 
-  if (!namenode->divert) {
-    r = namenode;
-    return r;
-  }
+  if (!namenode->divert)
+    return namenode;
 
   debug(dbg_eachfile, "namenodetouse namenode='%s' pkg=%s",
         namenode->name, pkgbin_name(pkg, pkgbin, pnaw_always));
 
-  r=
-    (namenode->divert->useinstead && namenode->divert->pkgset != pkg->set)
-      ? namenode->divert->useinstead : namenode;
+  fnn = (namenode->divert->useinstead && namenode->divert->pkgset != pkg->set)
+        ? namenode->divert->useinstead : namenode;
 
   debug(dbg_eachfile,
         "namenodetouse ... useinstead=%s camefrom=%s pkg=%s return %s",
         namenode->divert->useinstead ? namenode->divert->useinstead->name : "<none>",
         namenode->divert->camefrom ? namenode->divert->camefrom->name : "<none>",
         namenode->divert->pkgset ? namenode->divert->pkgset->name : "<none>",
-        r->name);
+        fnn->name);
 
-  return r;
+  return fnn;
 }
 
 bool
@@ -90,9 +87,9 @@ find_command(const char *prog)
   if (!path_list)
     ohshit(_("PATH is not set"));
 
-  for (path = path_list; path; path = path_end ? path_end + 1 : NULL) {
-    path_end = strchr(path, ':');
-    path_len = path_end ? (size_t)(path_end - path) : strlen(path);
+  for (path = path_list; path; path = *path_end ? path_end + 1 : NULL) {
+    path_end = strchrnul(path, ':');
+    path_len = (size_t)(path_end - path);
 
     varbuf_reset(&filename);
     varbuf_add_buf(&filename, path, path_len);
@@ -125,7 +122,8 @@ void checkpath(void) {
      * an ldconfig. */
 #if defined(__APPLE__) && defined(__MACH__)
     "update_dyld_shared_cache",
-#else
+#elif defined(__GLIBC__) || defined(__UCLIBC__) || \
+      defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
     "ldconfig",
 #endif
 #if BUILD_START_STOP_DAEMON
@@ -145,7 +143,7 @@ void checkpath(void) {
   }
 
   if (warned)
-    forcibleerr(fc_badpath,
+    forcibleerr(FORCE_BAD_PATH,
                 P_("%d expected program not found in PATH or not executable\n%s",
                    "%d expected programs not found in PATH or not executable\n%s",
                    warned),
@@ -184,7 +182,7 @@ ignore_depends_possi(struct deppossi *possi)
 bool
 force_depends(struct deppossi *possi)
 {
-  return fc_depends ||
+  return in_force(FORCE_DEPENDS) ||
          ignore_depends_possi(possi) ||
          ignore_depends(possi->up->up);
 }
@@ -192,7 +190,7 @@ force_depends(struct deppossi *possi)
 bool
 force_breaks(struct deppossi *possi)
 {
-  return fc_breaks ||
+  return in_force(FORCE_BREAKS) ||
          ignore_depends_possi(possi) ||
          ignore_depends(possi->up->up);
 }
@@ -200,20 +198,20 @@ force_breaks(struct deppossi *possi)
 bool
 force_conflicts(struct deppossi *possi)
 {
-  return fc_conflicts;
+  return in_force(FORCE_CONFLICTS);
 }
 
 void clear_istobes(void) {
-  struct pkgiterator *iter;
+  struct pkg_hash_iter *iter;
   struct pkginfo *pkg;
 
-  iter = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(iter)) != NULL) {
+  iter = pkg_hash_iter_new();
+  while ((pkg = pkg_hash_iter_next_pkg(iter)) != NULL) {
     ensure_package_clientdata(pkg);
     pkg->clientdata->istobe = PKG_ISTOBE_NORMAL;
     pkg->clientdata->replacingfilesandsaid= 0;
   }
-  pkg_db_iter_free(iter);
+  pkg_hash_iter_free(iter);
 }
 
 /*
@@ -221,7 +219,7 @@ void clear_istobes(void) {
  * false otherwise.
  */
 bool
-dir_has_conffiles(struct filenamenode *file, struct pkginfo *pkg)
+dir_has_conffiles(struct fsys_namenode *file, struct pkginfo *pkg)
 {
   struct conffile *conff;
   size_t namelen;
@@ -248,26 +246,26 @@ dir_has_conffiles(struct filenamenode *file, struct pkginfo *pkg)
  * false otherwise.
  */
 bool
-dir_is_used_by_others(struct filenamenode *file, struct pkginfo *pkg)
+dir_is_used_by_others(struct fsys_namenode *file, struct pkginfo *pkg)
 {
-  struct filepackages_iterator *iter;
+  struct fsys_node_pkgs_iter *iter;
   struct pkginfo *other_pkg;
 
   debug(dbg_veryverbose, "dir_is_used_by_others '%s' (except %s)", file->name,
         pkg ? pkg_name(pkg, pnaw_always) : "<none>");
 
-  iter = filepackages_iter_new(file);
-  while ((other_pkg = filepackages_iter_next(iter))) {
+  iter = fsys_node_pkgs_iter_new(file);
+  while ((other_pkg = fsys_node_pkgs_iter_next(iter))) {
     debug(dbg_veryverbose, "dir_is_used_by_others considering %s ...",
           pkg_name(other_pkg, pnaw_always));
     if (other_pkg == pkg)
       continue;
 
-    filepackages_iter_free(iter);
+    fsys_node_pkgs_iter_free(iter);
     debug(dbg_veryverbose, "dir_is_used_by_others yes");
     return true;
   }
-  filepackages_iter_free(iter);
+  fsys_node_pkgs_iter_free(iter);
 
   debug(dbg_veryverbose, "dir_is_used_by_others no");
   return false;
@@ -277,10 +275,10 @@ dir_is_used_by_others(struct filenamenode *file, struct pkginfo *pkg)
  * Returns true if the file is used by pkg, false otherwise.
  */
 bool
-dir_is_used_by_pkg(struct filenamenode *file, struct pkginfo *pkg,
-                   struct fileinlist *list)
+dir_is_used_by_pkg(struct fsys_namenode *file, struct pkginfo *pkg,
+                   struct fsys_namenode_list *list)
 {
-  struct fileinlist *node;
+  struct fsys_namenode_list *node;
   size_t namelen;
 
   debug(dbg_veryverbose, "dir_is_used_by_pkg '%s' (by %s)",
@@ -312,7 +310,7 @@ dir_is_used_by_pkg(struct filenamenode *file, struct pkginfo *pkg,
  * @param namenode	The namenode for the obsolete conffile.
  */
 void
-conffile_mark_obsolete(struct pkginfo *pkg, struct filenamenode *namenode)
+conffile_mark_obsolete(struct pkginfo *pkg, struct fsys_namenode *namenode)
 {
   struct conffile *conff;
 
@@ -335,11 +333,11 @@ void
 pkg_conffiles_mark_old(struct pkginfo *pkg)
 {
   const struct conffile *conff;
-  struct filenamenode *namenode;
+  struct fsys_namenode *namenode;
 
   for (conff = pkg->installed.conffiles; conff; conff = conff->next) {
-    namenode = findnamenode(conff->name, 0); /* XXX */
-    namenode->flags |= fnnf_old_conff;
+    namenode = fsys_hash_find_node(conff->name, 0); /* XXX */
+    namenode->flags |= FNNF_OLD_CONFF;
     if (!namenode->oldhash)
       namenode->oldhash = conff->hash;
     debug(dbg_conffdetail, "%s '%s' namenode '%s' flags %o", __func__,
@@ -351,8 +349,8 @@ void
 log_action(const char *action, struct pkginfo *pkg, struct pkgbin *pkgbin)
 {
   log_message("%s %s %s %s", action, pkgbin_name(pkg, pkgbin, pnaw_always),
-	      versiondescribe(&pkg->installed.version, vdew_nonambig),
-	      versiondescribe(&pkg->available.version, vdew_nonambig));
+              versiondescribe_c(&pkg->installed.version, vdew_nonambig),
+              versiondescribe_c(&pkg->available.version, vdew_nonambig));
   statusfd_send("processing: %s: %s", action,
                 pkgbin_name(pkg, pkgbin, pnaw_nonambig));
 }
diff --git a/src/main.c b/src/main.c
index af9c96f1c..602d4d5d3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,13 +46,13 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/arch.h>
-#include <dpkg/path.h>
 #include <dpkg/subproc.h>
 #include <dpkg/command.h>
+#include <dpkg/pager.h>
 #include <dpkg/options.h>
+#include <dpkg/db-fsys.h>
 
 #include "main.h"
-#include "filesdb.h"
 #include "filters.h"
 
 static void DPKG_ATTR_NORET
@@ -83,27 +83,27 @@ usage(const struct cmdinfo *ci, const char *value)
 
   printf(_(
 "Commands:\n"
-"  -i|--install       <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --unpack           <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  -A|--record-avail  <.deb file name> ... | -R|--recursive <directory> ...\n"
-"  --configure        <package> ... | -a|--pending\n"
-"  --triggers-only    <package> ... | -a|--pending\n"
-"  -r|--remove        <package> ... | -a|--pending\n"
-"  -P|--purge         <package> ... | -a|--pending\n"
-"  -V|--verify <package> ...        Verify the integrity of package(s).\n"
-"  --get-selections [<pattern> ...] Get list of selections to stdout.\n"
+"  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
+"  --unpack           <.deb file name>... | -R|--recursive <directory>...\n"
+"  -A|--record-avail  <.deb file name>... | -R|--recursive <directory>...\n"
+"  --configure        <package>... | -a|--pending\n"
+"  --triggers-only    <package>... | -a|--pending\n"
+"  -r|--remove        <package>... | -a|--pending\n"
+"  -P|--purge         <package>... | -a|--pending\n"
+"  -V|--verify [<package>...]       Verify the integrity of package(s).\n"
+"  --get-selections [<pattern>...]  Get list of selections to stdout.\n"
 "  --set-selections                 Set package selections from stdin.\n"
 "  --clear-selections               Deselect every non-essential package.\n"
 "  --update-avail [<Packages-file>] Replace available packages info.\n"
 "  --merge-avail [<Packages-file>]  Merge with info from file.\n"
 "  --clear-avail                    Erase existing available info.\n"
 "  --forget-old-unavail             Forget uninstalled unavailable pkgs.\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"  -C|--audit [<package> ...]       Check for broken package(s).\n"
+"  -s|--status [<package>...]       Display package status details.\n"
+"  -p|--print-avail [<package>...]  Display available version details.\n"
+"  -L|--listfiles <package>...      List files 'owned' by package(s).\n"
+"  -l|--list [<pattern>...]         List packages concisely.\n"
+"  -S|--search <pattern>...         Find package(s) owning file(s).\n"
+"  -C|--audit [<package>...]        Check for broken package(s).\n"
 "  --yet-to-unpack                  Print packages selected for installation.\n"
 "  --predep-package                 Print pre-dependencies to unpack.\n"
 "  --add-architecture <arch>        Add <arch> to the list of architectures.\n"
@@ -192,100 +192,12 @@ static const char printforhelp[] = N_(
 int f_pending=0, f_recursive=0, f_alsoselect=1, f_skipsame=0, f_noact=0;
 int f_autodeconf=0, f_nodebsig=0;
 int f_triggers = 0;
-int fc_downgrade=1, fc_configureany=0, fc_hold=0, fc_removereinstreq=0, fc_overwrite=0;
-int fc_removeessential=0, fc_conflicts=0, fc_depends=0, fc_dependsversion=0;
-int fc_breaks=0, fc_badpath=0, fc_overwritediverted=0, fc_architecture=0;
-int fc_nonroot=0, fc_overwritedir=0, fc_conff_new=0, fc_conff_miss=0;
-int fc_conff_old=0, fc_conff_def=0;
-int fc_conff_ask = 0;
-int fc_unsafe_io = 0;
-int fc_badverify = 0;
-int fc_badversion = 0;
-int fc_script_chrootless = 0;
 
 int errabort = 50;
-static const char *admindir = ADMINDIR;
+static const char *admindir;
 const char *instdir= "";
 struct pkg_list *ignoredependss = NULL;
 
-static const char *
-forcetype_str(char type)
-{
-  switch (type) {
-  case '\0':
-  case ' ':
-    return "   ";
-  case '*':
-    return "[*]";
-  case '!':
-    return "[!]";
-  default:
-    internerr("unknown force type '%c'", type);
-  }
-}
-
-static const struct forceinfo {
-  const char *name;
-  int *opt;
-  char type;
-  const char *desc;
-} forceinfos[]= {
-  { "all",                 NULL,
-    '!', N_("Set all force options")},
-  { "downgrade",           &fc_downgrade,
-    '*', N_("Replace a package with a lower version") },
-  { "configure-any",       &fc_configureany,
-    ' ', N_("Configure any package which may help this one") },
-  { "hold",                &fc_hold,
-    ' ', N_("Process incidental packages even when on hold") },
-  { "not-root",            &fc_nonroot,
-    ' ', N_("Try to (de)install things even when not root") },
-  { "bad-path",            &fc_badpath,
-    ' ', N_("PATH is missing important programs, problems likely") },
-  { "bad-verify",          &fc_badverify,
-    ' ', N_("Install a package even if it fails authenticity check") },
-  { "bad-version",         &fc_badversion,
-    ' ', N_("Process even packages with wrong versions") },
-  { "overwrite",           &fc_overwrite,
-    ' ', N_("Overwrite a file from one package with another") },
-  { "overwrite-diverted",  &fc_overwritediverted,
-    ' ', N_("Overwrite a diverted file with an undiverted version") },
-  { "overwrite-dir",       &fc_overwritedir,
-    '!', N_("Overwrite one package's directory with another's file") },
-  { "unsafe-io",           &fc_unsafe_io,
-    '!', N_("Do not perform safe I/O operations when unpacking") },
-  { "script-chrootless",   &fc_script_chrootless,
-    '!', N_("Do not chroot into maintainer script environment") },
-  { "confnew",             &fc_conff_new,
-    '!', N_("Always use the new config files, don't prompt") },
-  { "confold",             &fc_conff_old,
-    '!', N_("Always use the old config files, don't prompt") },
-  { "confdef",             &fc_conff_def,
-    '!', N_("Use the default option for new config files if one\n"
-            "is available, don't prompt. If no default can be found,\n"
-            "you will be prompted unless one of the confold or\n"
-            "confnew options is also given") },
-  { "confmiss",            &fc_conff_miss,
-    '!', N_("Always install missing config files") },
-  { "confask",             &fc_conff_ask,
-    '!', N_("Offer to replace config files with no new versions") },
-  { "architecture",        &fc_architecture,
-    '!', N_("Process even packages with wrong or no architecture") },
-  { "breaks",              &fc_breaks,
-    '!', N_("Install even if it would break another package") },
-  { "conflicts",           &fc_conflicts,
-    '!', N_("Allow installation of conflicting packages") },
-  { "depends",             &fc_depends,
-    '!', N_("Turn all dependency problems into warnings") },
-  { "depends-version",     &fc_dependsversion,
-    '!', N_("Turn dependency version problems into warnings") },
-  { "remove-reinstreq",    &fc_removereinstreq,
-    '!', N_("Remove packages which require installation") },
-  { "remove-essential",    &fc_removeessential,
-    '!', N_("Remove an essential package") },
-  { NULL }
-};
-
 #define DBG_DEF(n, d) \
   { .flag = dbg_##n, .name = #n, .desc = d }
 
@@ -342,6 +254,15 @@ set_debug(const struct cmdinfo *cpi, const char *value)
 }
 
 static void
+set_no_pager(const struct cmdinfo *ci, const char *value)
+{
+  pager_enable(false);
+
+  /* Let's communicate this to our backends. */
+  setenv("DPKG_PAGER", "cat", 1);
+}
+
+static void
 set_filter(const struct cmdinfo *cip, const char *value)
 {
   filter_add(value, cip->arg_int);
@@ -357,19 +278,14 @@ set_verify_format(const struct cmdinfo *cip, const char *value)
 static void
 set_instdir(const struct cmdinfo *cip, const char *value)
 {
-  char *new_instdir;
-
-  new_instdir = m_strdup(value);
-  path_trim_slash_slashdot(new_instdir);
-
-  instdir = new_instdir;
+  instdir = dpkg_fsys_set_dir(value);
 }
 
 static void
 set_root(const struct cmdinfo *cip, const char *value)
 {
-  set_instdir(cip, value);
-  admindir = str_fmt("%s%s", instdir, ADMINDIR);
+  instdir = dpkg_fsys_set_dir(value);
+  admindir = dpkg_fsys_get_path(ADMINDIR);
 }
 
 static void
@@ -434,9 +350,18 @@ is_invoke_action(enum action action)
   }
 }
 
-struct invoke_list pre_invoke_hooks = { .head = NULL, .tail = &pre_invoke_hooks.head };
-struct invoke_list post_invoke_hooks = { .head = NULL, .tail = &post_invoke_hooks.head };
-struct invoke_list status_loggers = { .head = NULL, .tail = &status_loggers.head };
+static struct invoke_list pre_invoke_hooks = {
+  .head = NULL,
+  .tail = &pre_invoke_hooks.head,
+};
+static struct invoke_list post_invoke_hooks = {
+  .head = NULL,
+  .tail = &post_invoke_hooks.head,
+};
+static struct invoke_list status_loggers = {
+  .head = NULL,
+  .tail = &status_loggers.head,
+};
 
 static void
 set_invoke_hook(const struct cmdinfo *cip, const char *value)
@@ -444,7 +369,7 @@ set_invoke_hook(const struct cmdinfo *cip, const char *value)
   struct invoke_list *hook_list = cip->arg_ptr;
   struct invoke_hook *hook_new;
 
-  hook_new = m_malloc(sizeof(struct invoke_hook));
+  hook_new = m_malloc(sizeof(*hook_new));
   hook_new->command = m_strdup(value);
   hook_new->next = NULL;
 
@@ -556,7 +481,7 @@ arch_remove(const char *const *argv)
 {
   const char *archname = *argv++;
   struct dpkg_arch *arch;
-  struct pkgiterator *iter;
+  struct pkg_hash_iter *iter;
   struct pkginfo *pkg;
 
   if (archname == NULL || *argv)
@@ -571,12 +496,12 @@ arch_remove(const char *const *argv)
   }
 
   /* Check if it's safe to remove the architecture from the db. */
-  iter = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(iter))) {
+  iter = pkg_hash_iter_new();
+  while ((pkg = pkg_hash_iter_next_pkg(iter))) {
     if (pkg->status < PKG_STAT_HALFINSTALLED)
       continue;
     if (pkg->installed.arch == arch) {
-      if (fc_architecture)
+      if (in_force(FORCE_ARCHITECTURE))
         warning(_("removing architecture '%s' currently in use by database"),
                 arch->name);
       else
@@ -585,7 +510,7 @@ arch_remove(const char *const *argv)
       break;
     }
   }
-  pkg_db_iter_free(iter);
+  pkg_hash_iter_free(iter);
 
   dpkg_arch_unmark(arch);
   dpkg_arch_save_list();
@@ -595,77 +520,6 @@ arch_remove(const char *const *argv)
   return 0;
 }
 
-static inline void
-print_forceinfo_line(int type, const char *name, const char *desc)
-{
-  printf("  %s %-18s %s\n", forcetype_str(type), name, desc);
-}
-
-static void
-print_forceinfo(const struct forceinfo *fi)
-{
-  char *desc, *line;
-
-  desc = m_strdup(gettext(fi->desc));
-
-  line = strtok(desc, "\n");
-  print_forceinfo_line(fi->type, fi->name, line);
-  while ((line = strtok(NULL, "\n")))
-    print_forceinfo_line(' ', "", line);
-
-  free(desc);
-}
-
-static void
-set_force(const struct cmdinfo *cip, const char *value)
-{
-  const char *comma;
-  size_t l;
-  const struct forceinfo *fip;
-
-  if (strcmp(value, "help") == 0) {
-    printf(_(
-"%s forcing options - control behaviour when problems found:\n"
-"  warn but continue:  --force-<thing>,<thing>,...\n"
-"  stop with error:    --refuse-<thing>,<thing>,... | --no-force-<thing>,...\n"
-" Forcing things:\n"), DPKG);
-
-    for (fip = forceinfos; fip->name; fip++)
-      print_forceinfo(fip);
-
-    printf(_(
-"\n"
-"WARNING - use of options marked [!] can seriously damage your installation.\n"
-"Forcing options marked [*] are enabled by default.\n"));
-    m_output(stdout, _("<standard output>"));
-    exit(0);
-  }
-
-  for (;;) {
-    comma= strchr(value,',');
-    l = comma ? (size_t)(comma - value) : strlen(value);
-    for (fip=forceinfos; fip->name; fip++)
-      if (strncmp(fip->name, value, l) == 0 && strlen(fip->name) == l)
-        break;
-
-    if (!fip->name) {
-      badusage(_("unknown force/refuse option '%.*s'"),
-               (int)min(l, 250), value);
-    } else if (strcmp(fip->name, "all") == 0) {
-      for (fip = forceinfos; fip->name; fip++)
-        if (fip->opt)
-          *fip->opt = cip->arg_int;
-    } else if (fip->opt) {
-      *fip->opt = cip->arg_int;
-    } else {
-      warning(_("obsolete force/refuse option '%s'"), fip->name);
-    }
-
-    if (!comma) break;
-    value= ++comma;
-  }
-}
-
 int execbackend(const char *const *argv) DPKG_ATTR_NORET;
 int commandfd(const char *const *argv);
 
@@ -731,9 +585,10 @@ static const struct cmdinfo cmdinfos[]= {
   { "no-act",            0,   0, &f_noact,      NULL,      NULL,    1 },
   { "dry-run",           0,   0, &f_noact,      NULL,      NULL,    1 },
   { "simulate",          0,   0, &f_noact,      NULL,      NULL,    1 },
+  { "no-pager",          0,   0, NULL,          NULL,      set_no_pager,  0 },
   { "no-debsig",         0,   0, &f_nodebsig,   NULL,      NULL,    1 },
   /* Alias ('G') for --refuse. */
-  {  NULL,               'G', 0, &fc_downgrade, NULL,      NULL,    0 },
+  {  NULL,               'G', 0, NULL,          NULL,      reset_force_option, FORCE_DOWNGRADE },
   { "selected-only",     'O', 0, &f_alsoselect, NULL,      NULL,    0 },
   { "triggers",           0,  0, &f_triggers,   NULL,      NULL,    1 },
   { "no-triggers",        0,  0, &f_triggers,   NULL,      NULL,   -1 },
@@ -746,9 +601,9 @@ static const struct cmdinfo cmdinfos[]= {
   { "admindir",          0,   1, NULL,          &admindir, NULL,          0 },
   { "instdir",           0,   1, NULL,          NULL,      set_instdir,   0 },
   { "ignore-depends",    0,   1, NULL,          NULL,      set_ignore_depends, 0 },
-  { "force",             0,   2, NULL,          NULL,      set_force,     1 },
-  { "refuse",            0,   2, NULL,          NULL,      set_force,     0 },
-  { "no-force",          0,   2, NULL,          NULL,      set_force,     0 },
+  { "force",             0,   2, NULL,          NULL,      set_force_option,   1 },
+  { "refuse",            0,   2, NULL,          NULL,      set_force_option,   0 },
+  { "no-force",          0,   2, NULL,          NULL,      set_force_option,   0 },
   { "debug",             'D', 1, NULL,          NULL,      set_debug,     0 },
   { "help",              '?', 0, NULL,          NULL,      usage,         0 },
   { "version",           0,   0, NULL,          NULL,      printversion,  0 },
@@ -877,15 +732,17 @@ commandfd(const char *const *argv)
     dpkg_options_parse((const char *const **)&endargs, cmdinfos, printforhelp);
     if (!cipaction) badusage(_("need an action option"));
 
-    filesdbinit();
+    fsys_hash_init();
 
     ret |= cipaction->action(endargs);
 
-    files_db_reset();
+    fsys_hash_reset();
 
     pop_error_context(ehflag_normaltidy);
   }
 
+  fclose(in);
+
   return ret;
 }
 
@@ -894,12 +751,13 @@ int main(int argc, const char *const *argv) {
 
   dpkg_locales_init(PACKAGE);
   dpkg_program_init("dpkg");
+  set_force_default(FORCE_ALL);
   dpkg_options_load(DPKG, cmdinfos);
   dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
   /* When running as root, make sure our primary group is also root, so
    * that files created by maintainer scripts have correct ownership. */
-  if (!fc_nonroot && getuid() == 0)
+  if (!in_force(FORCE_NON_ROOT) && getuid() == 0)
     if (setgid(0) < 0)
       ohshite(_("cannot set primary group ID to root"));
 
@@ -912,6 +770,8 @@ int main(int argc, const char *const *argv) {
     ohshite(_("unable to setenv for subprocesses"));
   if (setenv("DPKG_ROOT", instdir, 1) < 0)
     ohshite(_("unable to setenv for subprocesses"));
+  if (setenv("DPKG_FORCE", get_force_string(), 1) < 0)
+    ohshite(_("unable to setenv for subprocesses"));
 
   if (!f_triggers)
     f_triggers = (cipaction->arg_int == act_triggers && *argv) ? -1 : 1;
@@ -921,7 +781,7 @@ int main(int argc, const char *const *argv) {
     run_status_loggers(&status_loggers);
   }
 
-  filesdbinit();
+  fsys_hash_init();
 
   ret = cipaction->action(argv);
 
@@ -932,6 +792,7 @@ int main(int argc, const char *const *argv) {
   free_invoke_hooks(&post_invoke_hooks);
 
   dpkg_program_done();
+  dpkg_locales_done();
 
   return reportbroken_retexitstatus(ret);
 }
diff --git a/src/main.h b/src/main.h
index 1600abc25..3418c7bcc 100644
--- a/src/main.h
+++ b/src/main.h
@@ -25,9 +25,11 @@
 #include <dpkg/debug.h>
 #include <dpkg/pkg-list.h>
 
-/* These two are defined in filesdb.h. */
-struct fileinlist;
-struct filenamenode;
+#include "force.h"
+
+/* These two are defined in <dpkg/fsys.h>. */
+struct fsys_namenode_list;
+struct fsys_namenode;
 
 enum pkg_istobe {
 	/** Package is to be left in a normal state. */
@@ -56,22 +58,9 @@ struct perpackagestate {
 
   bool enqueued;
 
-  /**
-   * filelistvalid  files  Meaning
-   * -------------  -----  -------
-   * false          NULL   Not read yet, must do so if want them.
-   * false          !NULL  Read, but rewritten and now out of date. If want
-   *                         info must throw away old and reread file.
-   * true           !NULL  Read, all is OK.
-   * true           NULL   Read OK, but, there were no files.
-   */
-  bool fileslistvalid;
-  struct fileinlist *files;
   int replacingfilesandsaid;
   int cmdline_seen;
 
-  off_t listfile_phys_offs;
-
   /** Non-NULL iff in trigproc.c:deferred. */
   struct pkg_list *trigprocdeferred;
 };
@@ -136,16 +125,6 @@ extern const char *const statusstrings[];
 extern int f_pending, f_recursive, f_alsoselect, f_skipsame, f_noact;
 extern int f_autodeconf, f_nodebsig;
 extern int f_triggers;
-extern int fc_downgrade, fc_configureany, fc_hold, fc_removereinstreq, fc_overwrite;
-extern int fc_removeessential, fc_conflicts, fc_depends, fc_dependsversion;
-extern int fc_breaks, fc_badpath, fc_overwritediverted, fc_architecture;
-extern int fc_nonroot, fc_overwritedir, fc_conff_new, fc_conff_miss;
-extern int fc_conff_old, fc_conff_def;
-extern int fc_conff_ask;
-extern int fc_badverify;
-extern int fc_badversion;
-extern int fc_unsafe_io;
-extern int fc_script_chrootless;
 
 extern bool abort_processing;
 extern int errabort;
@@ -161,6 +140,10 @@ struct invoke_list {
 	struct invoke_hook *head, **tail;
 };
 
+/* from perpkgstate.c */
+
+void ensure_package_clientdata(struct pkginfo *pkg);
+
 /* from archives.c */
 
 int archivefiles(const char *const *argv);
@@ -226,7 +209,53 @@ enum dep_check breakses_ok(struct pkginfo *pkg, struct varbuf *aemsgs);
 void deferred_remove(struct pkginfo *pkg);
 void deferred_configure(struct pkginfo *pkg);
 
-extern int sincenothing, dependtry;
+/*
+ * During the packages queue processing, the algorithm for deciding what to
+ * configure first is as follows:
+ *
+ * Loop through all packages doing a ‘try 1’ until we've been round and
+ * nothing has been done, then do ‘try 2’, and subsequent ones likewise.
+ * The incrementing of ‘dependtry’ is done by process_queue().
+ *
+ * Try 1:
+ *   Are all dependencies of this package done? If so, do it.
+ *   Are any of the dependencies missing or the wrong version?
+ *     If so, abort (unless --force-depends, in which case defer).
+ *   Will we need to configure a package we weren't given as an
+ *     argument? If so, abort ─ except if --force-configure-any,
+ *     in which case we add the package to the argument list.
+ *   If none of the above, defer the package.
+ *
+ * Try 2:
+ *   Find a cycle and break it (see above).
+ *   Do as for try 1.
+ *
+ * Try 3:
+ *   Start processing triggers if necessary.
+ *   Do as for try 2.
+ *
+ * Try 4:
+ *   Same as for try 3, but check trigger cycles even when deferring
+ *   processing due to unsatisfiable dependencies.
+ *
+ * Try 5 (only if --force-depends-version):
+ *   Same as for try 2, but don't mind version number in dependencies.
+ *
+ * Try 6 (only if --force-depends):
+ *   Do anyway.
+ */
+enum dependtry {
+	DEPEND_TRY_NORMAL = 1,
+	DEPEND_TRY_CYCLES = 2,
+	DEPEND_TRY_TRIGGERS = 3,
+	DEPEND_TRY_TRIGGERS_CYCLES = 4,
+	DEPEND_TRY_FORCE_DEPENDS_VERSION = 5,
+	DEPEND_TRY_FORCE_DEPENDS = 6,
+	DEPEND_TRY_LAST,
+};
+
+extern enum dependtry dependtry;
+extern int sincenothing;
 
 /* from cleanup.c (most of these are declared in archives.h) */
 
@@ -236,7 +265,6 @@ void cu_prermremove(int argc, void **argv);
 
 void print_error_perpackage(const char *emsg, const void *data);
 void print_error_perarchive(const char *emsg, const void *data);
-void forcibleerr(int forceflag, const char *format, ...) DPKG_ATTR_PRINTF(2);
 int reportbroken_retexitstatus(int ret);
 bool skip_due_to_hold(struct pkginfo *pkg);
 
@@ -248,13 +276,15 @@ bool ignore_depends(struct pkginfo *pkg);
 bool force_breaks(struct deppossi *possi);
 bool force_depends(struct deppossi *possi);
 bool force_conflicts(struct deppossi *possi);
-void conffile_mark_obsolete(struct pkginfo *pkg, struct filenamenode *namenode);
+void
+conffile_mark_obsolete(struct pkginfo *pkg, struct fsys_namenode *namenode);
 void pkg_conffiles_mark_old(struct pkginfo *pkg);
 bool find_command(const char *prog);
 void checkpath(void);
 
-struct filenamenode *namenodetouse(struct filenamenode *namenode,
-                                   struct pkginfo *pkg, struct pkgbin *pkgbin);
+struct fsys_namenode *
+namenodetouse(struct fsys_namenode *namenode,
+              struct pkginfo *pkg, struct pkgbin *pkgbin);
 
 int maintscript_installed(struct pkginfo *pkg, const char *scriptname,
                           const char *desc, ...) DPKG_ATTR_SENTINEL;
@@ -274,10 +304,13 @@ int maintscript_postinst(struct pkginfo *pkg, ...) DPKG_ATTR_SENTINEL;
 void post_postinst_tasks(struct pkginfo *pkg, enum pkgstatus new_status);
 
 void clear_istobes(void);
-bool dir_is_used_by_others(struct filenamenode *namenode, struct pkginfo *pkg);
-bool dir_is_used_by_pkg(struct filenamenode *namenode, struct pkginfo *pkg,
-                        struct fileinlist *list);
-bool dir_has_conffiles(struct filenamenode *namenode, struct pkginfo *pkg);
+bool
+dir_is_used_by_others(struct fsys_namenode *namenode, struct pkginfo *pkg);
+bool
+dir_is_used_by_pkg(struct fsys_namenode *namenode, struct pkginfo *pkg,
+                   struct fsys_namenode_list *list);
+bool
+dir_has_conffiles(struct fsys_namenode *namenode, struct pkginfo *pkg);
 
 void log_action(const char *action, struct pkginfo *pkg, struct pkgbin *pkgbin);
 
@@ -290,8 +323,10 @@ void dpkg_selabel_close(void);
 /* from trigproc.c */
 
 enum trigproc_type {
-	/** Opportunistic trigger processing. */
-	TRIGPROC_TRY,
+	/** Opportunistic deferred trigger processing. */
+	TRIGPROC_TRY_DEFERRED,
+	/** Opportunistic queued trigger processing. */
+	TRIGPROC_TRY_QUEUED,
 	/** Required trigger processing. */
 	TRIGPROC_REQUIRED,
 };
diff --git a/src/packages.c b/src/packages.c
index f68c971ef..932b88bf9 100644
--- a/src/packages.c
+++ b/src/packages.c
@@ -27,7 +27,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <string.h>
 #include <fcntl.h>
 #include <dirent.h>
@@ -42,15 +41,16 @@
 #include <dpkg/pkg-queue.h>
 #include <dpkg/string.h>
 #include <dpkg/options.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 static struct pkginfo *progress_bytrigproc;
 static struct pkg_queue queue = PKG_QUEUE_INIT;
 
-int sincenothing = 0, dependtry = 1;
+enum dependtry dependtry = DEPEND_TRY_NORMAL;
+int sincenothing = 0;
 
 void
 enqueue_package(struct pkginfo *pkg)
@@ -72,24 +72,26 @@ enqueue_package_mark_seen(struct pkginfo *pkg)
 static void
 enqueue_pending(void)
 {
-  struct pkgiterator *iter;
+  struct pkg_hash_iter *iter;
   struct pkginfo *pkg;
 
-  iter = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(iter)) != NULL) {
+  iter = pkg_hash_iter_new();
+  while ((pkg = pkg_hash_iter_next_pkg(iter)) != NULL) {
     switch (cipaction->arg_int) {
     case act_configure:
       if (!(pkg->status == PKG_STAT_UNPACKED ||
             pkg->status == PKG_STAT_HALFCONFIGURED ||
             pkg->trigpend_head))
         continue;
-      if (pkg->want != PKG_WANT_INSTALL)
+      if (pkg->want != PKG_WANT_INSTALL &&
+          pkg->want != PKG_WANT_HOLD)
         continue;
       break;
     case act_triggers:
       if (!pkg->trigpend_head)
         continue;
-      if (pkg->want != PKG_WANT_INSTALL)
+      if (pkg->want != PKG_WANT_INSTALL &&
+          pkg->want != PKG_WANT_HOLD)
         continue;
       break;
     case act_remove:
@@ -108,7 +110,7 @@ enqueue_pending(void)
     }
     enqueue_package(pkg);
   }
-  pkg_db_iter_free(iter);
+  pkg_hash_iter_free(iter);
 }
 
 static void
@@ -137,9 +139,9 @@ packages(const char *const *argv)
 {
   trigproc_install_hooks();
 
-  modstatdb_open(f_noact ?    msdbrw_readonly :
-                 fc_nonroot ? msdbrw_write :
-                              msdbrw_needsuperuser);
+  modstatdb_open(f_noact ?                  msdbrw_readonly :
+                 in_force(FORCE_NON_ROOT) ? msdbrw_write :
+                                            msdbrw_needsuperuser);
   checkpath();
   pkg_infodb_upgrade();
 
@@ -232,17 +234,22 @@ void process_queue(void) {
        * trigger processing, w/o jumping into the next dependtry. */
       dependtry++;
       sincenothing = 0;
-      assert(dependtry <= 4);
+      if (dependtry >= DEPEND_TRY_LAST)
+        internerr("exceeded dependtry %d (sincenothing=%d; queue.length=%d)",
+                  dependtry, sincenothing, queue.length);
     } else if (sincenothing > queue.length * 2 + 2) {
-      /* XXX: This probably needs moving into a new dependtry instead. */
-      if (progress_bytrigproc && progress_bytrigproc->trigpend_head) {
+      if (dependtry >= DEPEND_TRY_TRIGGERS &&
+          progress_bytrigproc && progress_bytrigproc->trigpend_head) {
         enqueue_package(pkg);
         pkg = progress_bytrigproc;
+        progress_bytrigproc = NULL;
         action_todo = act_configure;
       } else {
         dependtry++;
         sincenothing = 0;
-        assert(dependtry <= 4);
+        if (dependtry >= DEPEND_TRY_LAST)
+          internerr("exceeded dependtry %d (sincenothing=%d, queue.length=%d)",
+                    dependtry, sincenothing, queue.length);
       }
     }
 
@@ -250,7 +257,8 @@ void process_queue(void) {
           pkg_name(pkg, pnaw_always), queue.length, sincenothing, dependtry);
 
     if (pkg->status > PKG_STAT_INSTALLED)
-      internerr("package status (%d) > PKG_STAT_INSTALLED", pkg->status);
+      internerr("package %s status %d is out-of-bounds",
+                pkg_name(pkg, pnaw_always), pkg->status);
 
     if (setjmp(ejbuf)) {
       /* Give up on it from the point of view of other packages, i.e. reset
@@ -280,7 +288,7 @@ void process_queue(void) {
     case act_configure:
       /* Do whatever is most needed. */
       if (pkg->trigpend_head)
-        trigproc(pkg, TRIGPROC_REQUIRED);
+        trigproc(pkg, TRIGPROC_TRY_QUEUED);
       else
         deferred_configure(pkg);
       break;
@@ -295,7 +303,10 @@ void process_queue(void) {
 
     pop_error_context(ehflag_normaltidy);
   }
-  assert(!queue.length);
+
+  if (queue.length)
+    internerr("finished package processing with non-empty queue length %d",
+              queue.length);
 }
 
 /*** Dependency processing - common to --configure and --remove. ***/
@@ -342,6 +353,15 @@ enum found_status {
   FOUND_OK = 3,
 };
 
+static enum found_status
+found_forced_on(enum dependtry dependtry_forced)
+{
+  if (dependtry >= dependtry_forced)
+    return FOUND_FORCED;
+  else
+    return FOUND_DEFER;
+}
+
 /*
  * Return values:
  *   0: cannot be satisfied.
@@ -398,8 +418,8 @@ deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby,
                         checkversion->ed->name,
                         pkg_name(possdependee, pnaw_always),
                         versiondescribe(&provider->version, vdew_nonambig));
-          if (fc_dependsversion)
-            thisf = (dependtry >= 3) ? FOUND_FORCED : FOUND_DEFER;
+          if (in_force(FORCE_DEPENDS_VERSION))
+            thisf = found_forced_on(DEPEND_TRY_FORCE_DEPENDS_VERSION);
           debug(dbg_depcondetail, "      bad version");
           goto unsuitable;
         }
@@ -411,8 +431,8 @@ deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby,
                         pkg_name(possdependee, pnaw_nonambig),
                         versiondescribe(&possdependee->installed.version,
                                         vdew_nonambig));
-          if (fc_dependsversion)
-            thisf = (dependtry >= 3) ? FOUND_FORCED : FOUND_DEFER;
+          if (in_force(FORCE_DEPENDS_VERSION))
+            thisf = found_forced_on(DEPEND_TRY_FORCE_DEPENDS_VERSION);
           debug(dbg_depcondetail, "      bad version");
           goto unsuitable;
         }
@@ -424,10 +444,15 @@ deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby,
       return FOUND_OK;
     }
     if (possdependee->status == PKG_STAT_TRIGGERSAWAITED) {
-      assert(possdependee->trigaw.head);
+      if (possdependee->trigaw.head == NULL)
+        internerr("package %s in state %s, has no awaited triggers",
+                  pkg_name(possdependee, pnaw_always),
+                  pkg_status_name(possdependee));
+
       if (removing ||
           !(f_triggers ||
-            possdependee->clientdata->istobe == PKG_ISTOBE_INSTALLNEW)) {
+            (possdependee->clientdata &&
+             possdependee->clientdata->istobe == PKG_ISTOBE_INSTALLNEW))) {
         if (provider) {
           varbuf_printf(oemsgs,
                         _("  Package %s which provides %s awaits trigger processing.\n"),
@@ -461,7 +486,7 @@ deppossi_ok_found(struct pkginfo *possdependee, struct pkginfo *requiredby,
         possdependee->clientdata->istobe == PKG_ISTOBE_INSTALLNEW) {
       debug(dbg_depcondetail,"      unpacked/halfconfigured, defer");
       return FOUND_DEFER;
-    } else if (!removing && fc_configureany &&
+    } else if (!removing && in_force(FORCE_CONFIGURE_ANY) &&
                !skip_due_to_hold(possdependee) &&
                !(possdependee->status == PKG_STAT_HALFCONFIGURED)) {
       notice(_("also configuring '%s' (required by '%s')"),
@@ -550,7 +575,8 @@ breaks_check_one(struct varbuf *aemsgs, enum dep_check *ok,
     varbuf_printf(aemsgs, _("  Version of %s to be configured is %s.\n"),
                   pkg_name(broken, pnaw_nonambig),
                   versiondescribe(&broken->installed.version, vdew_nonambig));
-    if (fc_dependsversion) return;
+    if (in_force(FORCE_DEPENDS_VERSION))
+      return;
   }
   if (force_breaks(breaks)) return;
   *ok = DEP_CHECK_HALT;
@@ -675,8 +701,8 @@ dependencies_ok(struct pkginfo *pkg, struct pkginfo *removing,
       debug(dbg_depcondetail,"    found %d",found);
       if (thisf > found) found= thisf;
     }
-    if (fc_depends) {
-      thisf = (dependtry >= 4) ? FOUND_FORCED : FOUND_DEFER;
+    if (in_force(FORCE_DEPENDS)) {
+      thisf = found_forced_on(DEPEND_TRY_FORCE_DEPENDS);
       if (thisf > found) {
         found = thisf;
         debug(dbg_depcondetail, "  rescued by force-depends, found %d", found);
diff --git a/src/perpkgstate.c b/src/perpkgstate.c
new file mode 100644
index 000000000..75421122a
--- /dev/null
+++ b/src/perpkgstate.c
@@ -0,0 +1,43 @@
+/*
+ * dpkg - main program for package management
+ * perpkgstate.c - struct perpackagestate and function handling
+ *
+ * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
+ * Copyright © 2000,2001 Wichert Akkerman <wakkerma@debian.org>
+ * Copyright © 2008-2014 Guillem Jover <guillem@debian.org>
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+#include <compat.h>
+
+#include <dpkg/dpkg.h>
+#include <dpkg/dpkg-db.h>
+
+#include "main.h"
+
+void
+ensure_package_clientdata(struct pkginfo *pkg)
+{
+	if (pkg->clientdata)
+		return;
+	pkg->clientdata = nfmalloc(sizeof(*pkg->clientdata));
+	pkg->clientdata->istobe = PKG_ISTOBE_NORMAL;
+	pkg->clientdata->color = PKG_CYCLE_WHITE;
+	pkg->clientdata->enqueued = false;
+	pkg->clientdata->replacingfilesandsaid = 0;
+	pkg->clientdata->cmdline_seen = 0;
+	pkg->clientdata->trigprocdeferred = NULL;
+}
diff --git a/src/querycmd.c b/src/querycmd.c
index 127f0c883..eba5e53ef 100644
--- a/src/querycmd.c
+++ b/src/querycmd.c
@@ -27,7 +27,6 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/ioctl.h>
 
 #if HAVE_LOCALE_H
 #include <locale.h>
@@ -38,7 +37,6 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <fnmatch.h>
-#include <termios.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -53,48 +51,17 @@
 #include <dpkg/string.h>
 #include <dpkg/path.h>
 #include <dpkg/file.h>
+#include <dpkg/pager.h>
 #include <dpkg/options.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 static const char *showformat = "${binary:Package}\t${Version}\n";
 
 static int opt_loadavail = 0;
 
-static int getwidth(void) {
-  int fd;
-  long res;
-  struct winsize ws;
-  const char *columns;
-  char *endptr;
-
-  columns = getenv("COLUMNS");
-  if (columns) {
-    errno = 0;
-    res = strtol(columns, &endptr, 10);
-    if (errno == 0 && columns != endptr && *endptr == '\0' &&
-        res > 0 && res < INT_MAX)
-      return res;
-  }
-
-  if (!isatty(1))
-    return -1;
-  else {
-    res = 80;
-
-    fd = open("/dev/tty", O_RDONLY);
-    if (fd != -1) {
-      if (ioctl(fd, TIOCGWINSZ, &ws) == 0)
-        res = ws.ws_col;
-      close(fd);
-    }
-
-    return res;
-  }
-}
-
 static int
 pkg_array_match_patterns(struct pkg_array *array,
                          pkg_array_visitor_func *pkg_visitor, void *pkg_data,
@@ -155,56 +122,36 @@ struct list_format {
 static void
 list_format_init(struct list_format *fmt, struct pkg_array *array)
 {
-  int w;
+  int i;
 
   if (fmt->nw != 0)
     return;
 
-  w = getwidth();
-  if (w == -1) {
-    int i;
-
-    fmt->nw = 14;
-    fmt->vw = 12;
-    fmt->aw = 12;
-    fmt->dw = 33;
-
-    for (i = 0; i < array->n_pkgs; i++) {
-      int plen, vlen, alen, dlen;
-
-      if (array->pkgs[i] == NULL)
-        continue;
+  fmt->nw = 14;
+  fmt->vw = 12;
+  fmt->aw = 12;
+  fmt->dw = 33;
 
-      plen = str_width(pkg_name(array->pkgs[i], pnaw_nonambig));
-      vlen = str_width(versiondescribe(&array->pkgs[i]->installed.version,
-                                       vdew_nonambig));
-      alen = str_width(dpkg_arch_describe(array->pkgs[i]->installed.arch));
-      pkgbin_summary(array->pkgs[i], &array->pkgs[i]->installed, &dlen);
-
-      if (plen > fmt->nw)
-        fmt->nw = plen;
-      if (vlen > fmt->vw)
-        fmt->vw = vlen;
-      if (alen > fmt->aw)
-        fmt->aw = alen;
-      if (dlen > fmt->dw)
-        fmt->dw = dlen;
-    }
-  } else {
-    w -= 80;
-    /* Let's not try to deal with terminals that are too small. */
-    if (w < 0)
-      w = 0;
-    /* Halve that so we can add it to both the name and description. */
-    w >>= 1;
-    /* Name width. */
-    fmt->nw = (14 + (w / 2));
-    /* Version width. */
-    fmt->vw = (12 + (w / 4));
-    /* Architecture width. */
-    fmt->aw = (12 + (w / 4));
-    /* Description width. */
-    fmt->dw = (33 + w);
+  for (i = 0; i < array->n_pkgs; i++) {
+    int plen, vlen, alen, dlen;
+
+    if (array->pkgs[i] == NULL)
+      continue;
+
+    plen = str_width(pkg_name(array->pkgs[i], pnaw_nonambig));
+    vlen = str_width(versiondescribe(&array->pkgs[i]->installed.version,
+                                     vdew_nonambig));
+    alen = str_width(dpkg_arch_describe(array->pkgs[i]->installed.arch));
+    pkg_synopsis(array->pkgs[i], &dlen);
+
+    if (plen > fmt->nw)
+      fmt->nw = plen;
+    if (vlen > fmt->vw)
+      fmt->vw = vlen;
+    if (alen > fmt->aw)
+      fmt->aw = alen;
+    if (dlen > fmt->dw)
+      fmt->dw = dlen;
   }
 }
 
@@ -285,7 +232,7 @@ pkg_array_list_item(struct pkg_array *array, struct pkginfo *pkg, void *pkg_data
   list_format_init(fmt, array);
   list_format_print_header(fmt);
 
-  pdesc = pkgbin_summary(pkg, &pkg->installed, &l);
+  pdesc = pkg_synopsis(pkg, &l);
   l = min(l, fmt->dw);
 
   list_format_print(fmt,
@@ -306,17 +253,20 @@ listpackages(const char *const *argv)
   int i;
   int rc = 0;
   struct list_format fmt;
+  struct pager *pager;
 
   if (!opt_loadavail)
     modstatdb_open(msdbrw_readonly);
   else
     modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
 
-  pkg_array_init_from_db(&array);
+  pkg_array_init_from_hash(&array);
   pkg_array_sort(&array, pkg_sorter_by_nonambig_name_arch);
 
   memset(&fmt, 0, sizeof(fmt));
 
+  pager = pager_spawn(_("showing package list on pager"));
+
   if (!*argv) {
     for (i = 0; i < array.n_pkgs; i++) {
       pkg = array.pkgs[i];
@@ -332,14 +282,18 @@ listpackages(const char *const *argv)
   m_output(stdout, _("<standard output>"));
   m_output(stderr, _("<standard error>"));
 
+  pager_reap(pager);
+
   pkg_array_destroy(&array);
   modstatdb_shutdown();
 
   return rc;
 }
 
-static int searchoutput(struct filenamenode *namenode) {
-  struct filepackages_iterator *iter;
+static int
+searchoutput(struct fsys_namenode *namenode)
+{
+  struct fsys_node_pkgs_iter *iter;
   struct pkginfo *pkg_owner;
   int found;
 
@@ -361,14 +315,14 @@ static int searchoutput(struct filenamenode *namenode) {
   }
   found= 0;
 
-  iter = filepackages_iter_new(namenode);
-  while ((pkg_owner = filepackages_iter_next(iter))) {
+  iter = fsys_node_pkgs_iter_new(namenode);
+  while ((pkg_owner = fsys_node_pkgs_iter_next(iter))) {
     if (found)
       fputs(", ", stdout);
     fputs(pkg_name(pkg_owner, pnaw_nonambig), stdout);
     found++;
   }
-  filepackages_iter_free(iter);
+  fsys_node_pkgs_iter_free(iter);
 
   if (found) printf(": %s\n",namenode->name);
   return found + (namenode->divert ? 1 : 0);
@@ -377,8 +331,8 @@ static int searchoutput(struct filenamenode *namenode) {
 static int
 searchfiles(const char *const *argv)
 {
-  struct filenamenode *namenode;
-  struct fileiterator *iter;
+  struct fsys_namenode *namenode;
+  struct fsys_hash_iter *iter;
   const char *thisarg;
   int found;
   int failures = 0;
@@ -411,15 +365,15 @@ searchfiles(const char *const *argv)
       varbuf_end_str(&path);
       varbuf_trunc(&path, path_trim_slash_slashdot(path.buf));
 
-      namenode = findnamenode(path.buf, 0);
+      namenode = fsys_hash_find_node(path.buf, 0);
       found += searchoutput(namenode);
     } else {
-      iter = files_db_iter_new();
-      while ((namenode = files_db_iter_next(iter)) != NULL) {
+      iter = fsys_hash_iter_new();
+      while ((namenode = fsys_hash_iter_next(iter)) != NULL) {
         if (fnmatch(thisarg,namenode->name,0)) continue;
         found+= searchoutput(namenode);
       }
-      files_db_iter_free(iter);
+      fsys_hash_iter_free(iter);
     }
     if (!found) {
       notice(_("no path found matching pattern %s"), thisarg);
@@ -437,31 +391,24 @@ searchfiles(const char *const *argv)
 }
 
 static int
-enqperpackage(const char *const *argv)
+print_status(const char *const *argv)
 {
   const char *thisarg;
-  struct fileinlist *file;
   struct pkginfo *pkg;
-  struct filenamenode *namenode;
   int failures = 0;
 
-  if (!*argv)
-    badusage(_("--%s needs at least one package name argument"), cipaction->olong);
-
-  if (cipaction->arg_int == act_printavail)
-    modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
-  else
-    modstatdb_open(msdbrw_readonly);
+  modstatdb_open(msdbrw_readonly);
 
-  while ((thisarg = *argv++) != NULL) {
-    pkg = dpkg_options_parse_pkgname(cipaction, thisarg);
+  if (!*argv) {
+    writedb_records(stdout, _("<standard output>"), 0);
+  } else {
+    while ((thisarg = *argv++) != NULL) {
+      pkg = dpkg_options_parse_pkgname(cipaction, thisarg);
 
-    switch (cipaction->arg_int) {
-    case act_status:
       if (pkg->status == PKG_STAT_NOTINSTALLED &&
           pkg->priority == PKG_PRIO_UNKNOWN &&
           str_is_unset(pkg->section) &&
-          !pkg->files &&
+          !pkg->archives &&
           pkg->want == PKG_WANT_UNKNOWN &&
           !pkg_is_informative(pkg, &pkg->installed)) {
         notice(_("package '%s' is not installed and no information is available"),
@@ -470,8 +417,39 @@ enqperpackage(const char *const *argv)
       } else {
         writerecord(stdout, _("<standard output>"), pkg, &pkg->installed);
       }
-      break;
-    case act_printavail:
+
+      if (*argv != NULL)
+        putchar('\n');
+    }
+  }
+
+  m_output(stdout, _("<standard output>"));
+  if (failures) {
+    fputs(_("Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"),
+          stderr);
+    m_output(stderr, _("<standard error>"));
+  }
+
+  modstatdb_shutdown();
+
+  return failures;
+}
+
+static int
+print_avail(const char *const *argv)
+{
+  const char *thisarg;
+  struct pkginfo *pkg;
+  int failures = 0;
+
+  modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
+
+  if (!*argv) {
+    writedb_records(stdout, _("<standard output>"), wdb_dump_available);
+  } else {
+    while ((thisarg = *argv++) != NULL) {
+      pkg = dpkg_options_parse_pkgname(cipaction, thisarg);
+
       if (!pkg_is_informative(pkg, &pkg->available)) {
         notice(_("package '%s' is not available"),
                pkgbin_name(pkg, &pkg->available, pnaw_nonambig));
@@ -479,58 +457,84 @@ enqperpackage(const char *const *argv)
       } else {
         writerecord(stdout, _("<standard output>"), pkg, &pkg->available);
       }
+
+      if (*argv != NULL)
+        putchar('\n');
+    }
+  }
+
+  m_output(stdout, _("<standard output>"));
+  if (failures)
+    m_output(stderr, _("<standard error>"));
+
+  modstatdb_shutdown();
+
+  return failures;
+}
+
+static int
+list_files(const char *const *argv)
+{
+  const char *thisarg;
+  struct fsys_namenode_list *file;
+  struct pkginfo *pkg;
+  struct fsys_namenode *namenode;
+  int failures = 0;
+
+  if (!*argv)
+    badusage(_("--%s needs at least one package name argument"), cipaction->olong);
+
+  modstatdb_open(msdbrw_readonly);
+
+  while ((thisarg = *argv++) != NULL) {
+    pkg = dpkg_options_parse_pkgname(cipaction, thisarg);
+
+    switch (pkg->status) {
+    case PKG_STAT_NOTINSTALLED:
+      notice(_("package '%s' is not installed"),
+             pkg_name(pkg, pnaw_nonambig));
+      failures++;
       break;
-    case act_listfiles:
-      switch (pkg->status) {
-      case PKG_STAT_NOTINSTALLED:
-        notice(_("package '%s' is not installed"),
+    default:
+      ensure_packagefiles_available(pkg);
+      ensure_diversions();
+      file = pkg->files;
+      if (!file) {
+        printf(_("Package '%s' does not contain any files (!)\n"),
                pkg_name(pkg, pnaw_nonambig));
-        failures++;
-        break;
-      default:
-        ensure_packagefiles_available(pkg);
-        ensure_diversions();
-        file= pkg->clientdata->files;
-        if (!file) {
-          printf(_("Package '%s' does not contain any files (!)\n"),
-                 pkg_name(pkg, pnaw_nonambig));
-        } else {
-          while (file) {
-            namenode= file->namenode;
-            puts(namenode->name);
-            if (namenode->divert && !namenode->divert->camefrom) {
-              if (!namenode->divert->pkgset)
-		printf(_("locally diverted to: %s\n"),
-		       namenode->divert->useinstead->name);
-              else if (pkg->set == namenode->divert->pkgset)
-		printf(_("package diverts others to: %s\n"),
-		       namenode->divert->useinstead->name);
-              else
-		printf(_("diverted by %s to: %s\n"),
-		       namenode->divert->pkgset->name,
-		       namenode->divert->useinstead->name);
-            }
-            file= file->next;
+      } else {
+        while (file) {
+          namenode = file->namenode;
+          puts(namenode->name);
+          if (namenode->divert && !namenode->divert->camefrom) {
+            if (!namenode->divert->pkgset)
+              printf(_("locally diverted to: %s\n"),
+                     namenode->divert->useinstead->name);
+            else if (pkg->set == namenode->divert->pkgset)
+              printf(_("package diverts others to: %s\n"),
+                     namenode->divert->useinstead->name);
+            else
+              printf(_("diverted by %s to: %s\n"),
+                     namenode->divert->pkgset->name,
+                     namenode->divert->useinstead->name);
           }
+          file = file->next;
         }
-        break;
       }
       break;
-    default:
-      internerr("unknown action '%d'", cipaction->arg_int);
     }
 
     if (*argv != NULL)
       putchar('\n');
-
-    m_output(stdout, _("<standard output>"));
   }
 
+  m_output(stdout, _("<standard output>"));
   if (failures) {
-    fputs(_("Use dpkg --info (= dpkg-deb --info) to examine archive files,\n"
-         "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"),stderr);
+    fputs(_("Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"),
+             stderr);
     m_output(stderr, _("<standard error>"));
   }
+
   modstatdb_shutdown();
 
   return failures;
@@ -567,7 +571,7 @@ showpackages(const char *const *argv)
   else
     modstatdb_open(msdbrw_readonly | msdbrw_available_readonly);
 
-  pkg_array_init_from_db(&array);
+  pkg_array_init_from_hash(&array);
   pkg_array_sort(&array, pkg_sorter_by_nonambig_name_arch);
 
   if (!*argv) {
@@ -637,16 +641,16 @@ pkg_infodb_print_filetype(const char *filename, const char *filetype)
 static void
 control_path_file(struct pkginfo *pkg, const char *control_file)
 {
-  const char *control_path;
+  const char *control_pathname;
   struct stat st;
 
-  control_path = pkg_infodb_get_file(pkg, &pkg->installed, control_file);
-  if (stat(control_path, &st) < 0)
+  control_pathname = pkg_infodb_get_file(pkg, &pkg->installed, control_file);
+  if (stat(control_pathname, &st) < 0)
     return;
   if (!S_ISREG(st.st_mode))
     return;
 
-  pkg_infodb_print_filename(control_path, control_file);
+  pkg_infodb_print_filename(control_pathname, control_file);
 }
 
 static int
@@ -745,6 +749,12 @@ control_show(const char *const *argv)
   return 0;
 }
 
+static void
+set_no_pager(const struct cmdinfo *ci, const char *value)
+{
+  pager_enable(false);
+}
+
 static void DPKG_ATTR_NORET
 printversion(const struct cmdinfo *ci, const char *value)
 {
@@ -768,16 +778,16 @@ usage(const struct cmdinfo *ci, const char *value)
 
   printf(_(
 "Commands:\n"
-"  -s|--status <package> ...        Display package status details.\n"
-"  -p|--print-avail <package> ...   Display available version details.\n"
-"  -L|--listfiles <package> ...     List files 'owned' by package(s).\n"
-"  -l|--list [<pattern> ...]        List packages concisely.\n"
-"  -W|--show [<pattern> ...]        Show information on package(s).\n"
-"  -S|--search <pattern> ...        Find package(s) owning file(s).\n"
-"     --control-list <package>      Print the package control file list.\n"
-"     --control-show <package> <file>\n"
+"  -s, --status [<package>...]      Display package status details.\n"
+"  -p, --print-avail [<package>...] Display available version details.\n"
+"  -L, --listfiles <package>...     List files 'owned' by package(s).\n"
+"  -l, --list [<pattern>...]        List packages concisely.\n"
+"  -W, --show [<pattern>...]        Show information on package(s).\n"
+"  -S, --search <pattern>...        Find package(s) owning file(s).\n"
+"      --control-list <package>     Print the package control file list.\n"
+"      --control-show <package> <file>\n"
 "                                   Show the package control file.\n"
-"  -c|--control-path <package> [<file>]\n"
+"  -c, --control-path <package> [<file>]\n"
 "                                   Print path for package control file.\n"
 "\n"));
 
@@ -816,9 +826,9 @@ static const char *admindir;
  * The action entries are made with the ACTION macro, as they all
  * have a very similar structure. */
 static const struct cmdinfo cmdinfos[]= {
-  ACTION( "listfiles",                      'L', act_listfiles,     enqperpackage   ),
-  ACTION( "status",                         's', act_status,        enqperpackage   ),
-  ACTION( "print-avail",                    'p', act_printavail,    enqperpackage   ),
+  ACTION( "listfiles",                      'L', act_listfiles,     list_files      ),
+  ACTION( "status",                         's', act_status,        print_status    ),
+  ACTION( "print-avail",                    'p', act_printavail,    print_avail     ),
   ACTION( "list",                           'l', act_listpackages,  listpackages    ),
   ACTION( "search",                         'S', act_searchfiles,   searchfiles     ),
   ACTION( "show",                           'W', act_listpackages,  showpackages    ),
@@ -829,6 +839,7 @@ static const struct cmdinfo cmdinfos[]= {
   { "admindir",   0,   1, NULL, &admindir,   NULL          },
   { "load-avail", 0,   0, &opt_loadavail, NULL, NULL, 1    },
   { "showformat", 'f', 1, NULL, &showformat, NULL          },
+  { "no-pager",   0,   0, NULL, NULL,        set_no_pager  },
   { "help",       '?', 0, NULL, NULL,        usage         },
   { "version",    0,   0, NULL, NULL,        printversion  },
   {  NULL,        0,   0, NULL, NULL,        NULL          }
@@ -846,11 +857,12 @@ int main(int argc, const char *const *argv) {
 
   if (!cipaction) badusage(_("need an action option"));
 
-  filesdbinit();
+  fsys_hash_init();
 
   ret = cipaction->action(argv);
 
   dpkg_program_done();
+  dpkg_locales_done();
 
   return !!ret;
 }
diff --git a/src/remove.c b/src/remove.c
index 9cfd7d044..b63d699e1 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -42,9 +42,9 @@
 #include <dpkg/dir.h>
 #include <dpkg/options.h>
 #include <dpkg/triglib.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 
-#include "infodb.h"
-#include "filesdb.h"
 #include "main.h"
 
 /*
@@ -71,10 +71,14 @@ static void checkforremoval(struct pkginfo *pkgtoremove,
             pkg_name(depender, pnaw_always));
       continue;
     }
-    if (dependtry > 1) { if (findbreakcycle(pkgtoremove)) sincenothing= 0; }
+    if (dependtry >= DEPEND_TRY_CYCLES) {
+      if (findbreakcycle(pkgtoremove))
+        sincenothing = 0;
+    }
     varbuf_snapshot(raemsgs, &raemsgs_state);
     ok= dependencies_ok(depender,pkgtoremove,raemsgs);
     if (ok == DEP_CHECK_HALT &&
+        depender->clientdata &&
         depender->clientdata->istobe == PKG_ISTOBE_REMOVE)
       ok = DEP_CHECK_DEFER;
     if (ok == DEP_CHECK_DEFER)
@@ -102,6 +106,8 @@ void deferred_remove(struct pkginfo *pkg) {
       modstatdb_note(pkg);
   }
 
+  ensure_package_clientdata(pkg);
+
   if (pkg->status == PKG_STAT_NOTINSTALLED) {
     sincenothing = 0;
     warning(_("ignoring request to remove %.250s which isn't installed"),
@@ -120,7 +126,7 @@ void deferred_remove(struct pkginfo *pkg) {
   }
 
   if (pkg->installed.essential && pkg->status != PKG_STAT_CONFIGFILES)
-    forcibleerr(fc_removeessential,
+    forcibleerr(FORCE_REMOVE_ESSENTIAL,
                 _("this is an essential package; it should not be removed"));
 
   debug(dbg_general, "checking dependencies for remove '%s'",
@@ -153,12 +159,12 @@ void deferred_remove(struct pkginfo *pkg) {
   sincenothing= 0;
 
   if (pkg->eflag & PKG_EFLAG_REINSTREQ)
-    forcibleerr(fc_removereinstreq,
+    forcibleerr(FORCE_REMOVE_REINSTREQ,
                 _("package is in a very bad inconsistent state; you should\n"
                   " reinstall it before attempting a removal"));
 
   ensure_allinstfiles_available();
-  filesdbinit();
+  fsys_hash_init();
 
   if (f_noact) {
     printf(_("Would remove or purge %s (%s) ...\n"),
@@ -186,7 +192,7 @@ void deferred_remove(struct pkginfo *pkg) {
     oldpkgstatus= pkg->status;
     pkg_set_status(pkg, PKG_STAT_HALFCONFIGURED);
     modstatdb_note(pkg);
-    push_cleanup(cu_prermremove, ~ehflag_normaltidy, NULL, 0, 2,
+    push_cleanup(cu_prermremove, ~ehflag_normaltidy, 2,
                  (void *)pkg, (void *)&oldpkgstatus);
     maintscript_installed(pkg, PRERMFILE, "pre-removal", "remove", NULL);
 
@@ -197,10 +203,13 @@ void deferred_remove(struct pkginfo *pkg) {
   removal_bulk(pkg);
 }
 
-static void push_leftover(struct fileinlist **leftoverp,
-                          struct filenamenode *namenode) {
-  struct fileinlist *newentry;
-  newentry= nfmalloc(sizeof(struct fileinlist));
+static void
+push_leftover(struct fsys_namenode_list **leftoverp,
+              struct fsys_namenode *namenode)
+{
+  struct fsys_namenode_list *newentry;
+
+  newentry = nfmalloc(sizeof(*newentry));
   newentry->next= *leftoverp;
   newentry->namenode= namenode;
   *leftoverp= newentry;
@@ -223,17 +232,17 @@ removal_bulk_remove_file(const char *filename, const char *filetype)
 }
 
 static bool
-removal_bulk_file_is_shared(struct pkginfo *pkg, struct filenamenode *namenode)
+removal_bulk_file_is_shared(struct pkginfo *pkg, struct fsys_namenode *namenode)
 {
-  struct filepackages_iterator *iter;
+  struct fsys_node_pkgs_iter *iter;
   struct pkginfo *otherpkg;
   bool shared = false;
 
   if (pkgset_installed_instances(pkg->set) <= 1)
     return false;
 
-  iter = filepackages_iter_new(namenode);
-  while ((otherpkg = filepackages_iter_next(iter))) {
+  iter = fsys_node_pkgs_iter_new(namenode);
+  while ((otherpkg = fsys_node_pkgs_iter_next(iter))) {
     if (otherpkg == pkg)
       continue;
     if (otherpkg->set != pkg->set)
@@ -244,7 +253,7 @@ removal_bulk_file_is_shared(struct pkginfo *pkg, struct filenamenode *namenode)
     shared = true;
     break;
   }
-  filepackages_iter_free(iter);
+  fsys_node_pkgs_iter_free(iter);
 
   return shared;
 }
@@ -252,9 +261,9 @@ removal_bulk_file_is_shared(struct pkginfo *pkg, struct filenamenode *namenode)
 static void
 removal_bulk_remove_files(struct pkginfo *pkg)
 {
-  struct reversefilelistiter rev_iter;
-  struct fileinlist *leftover;
-  struct filenamenode *namenode;
+  struct fsys_hash_rev_iter rev_iter;
+  struct fsys_namenode_list *leftover;
+  struct fsys_namenode *namenode;
   static struct varbuf fnvb;
   struct varbuf_state fnvb_state;
   struct stat stab;
@@ -263,10 +272,10 @@ removal_bulk_remove_files(struct pkginfo *pkg)
     modstatdb_note(pkg);
     push_checkpoint(~ehflag_bombout, ehflag_normaltidy);
 
-    reversefilelist_init(&rev_iter, pkg->clientdata->files);
+    fsys_hash_rev_iter_init(&rev_iter, pkg->files);
     leftover = NULL;
-    while ((namenode = reversefilelist_next(&rev_iter))) {
-      struct filenamenode *usenode;
+    while ((namenode = fsys_hash_rev_iter_next(&rev_iter))) {
+      struct fsys_namenode *usenode;
       bool is_dir;
 
       debug(dbg_eachfile, "removal_bulk '%s' flags=%o",
@@ -289,7 +298,7 @@ removal_bulk_remove_files(struct pkginfo *pkg)
         continue;
 
       /* Non-shared conffiles are kept. */
-      if (namenode->flags & fnnf_old_conff) {
+      if (namenode->flags & FNNF_OLD_CONFF) {
         push_leftover(&leftover, namenode);
         continue;
       }
@@ -374,9 +383,9 @@ removal_bulk_remove_files(struct pkginfo *pkg)
 }
 
 static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) {
-  struct reversefilelistiter rev_iter;
-  struct fileinlist *leftover;
-  struct filenamenode *namenode;
+  struct fsys_hash_rev_iter rev_iter;
+  struct fsys_namenode_list *leftover;
+  struct fsys_namenode *namenode;
   static struct varbuf fnvb;
   struct stat stab;
 
@@ -386,14 +395,14 @@ static void removal_bulk_remove_leftover_dirs(struct pkginfo *pkg) {
   modstatdb_note(pkg);
   push_checkpoint(~ehflag_bombout, ehflag_normaltidy);
 
-  reversefilelist_init(&rev_iter, pkg->clientdata->files);
+  fsys_hash_rev_iter_init(&rev_iter, pkg->files);
   leftover = NULL;
-  while ((namenode = reversefilelist_next(&rev_iter))) {
-    struct filenamenode *usenode;
+  while ((namenode = fsys_hash_rev_iter_next(&rev_iter))) {
+    struct fsys_namenode *usenode;
 
     debug(dbg_eachfile, "removal_bulk '%s' flags=%o",
           namenode->name, namenode->flags);
-    if (namenode->flags & fnnf_old_conff) {
+    if (namenode->flags & FNNF_OLD_CONFF) {
       /* This can only happen if removal_bulk_remove_configfiles() got
        * interrupted half way. */
       debug(dbg_eachfiledetail, "removal_bulk expecting only left over dirs, "
@@ -471,7 +480,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
   int conffnameused, conffbasenamelen;
   char *conffbasename;
   struct conffile *conff, **lconffp;
-  struct fileinlist *searchfile;
+  struct fsys_namenode_list *searchfile;
   DIR *dsd;
   struct dirent *de;
   char *p;
@@ -495,7 +504,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
      * are involved in diversions, except if we are the package doing the
      * diverting. */
     for (lconffp = &pkg->installed.conffiles; (conff = *lconffp) != NULL; ) {
-      for (searchfile= pkg->clientdata->files;
+      for (searchfile = pkg->files;
            searchfile && strcmp(searchfile->namenode->name,conff->name);
            searchfile= searchfile->next);
       if (!searchfile) {
@@ -519,7 +528,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
     modstatdb_note(pkg);
 
     for (conff= pkg->installed.conffiles; conff; conff= conff->next) {
-      struct filenamenode *namenode, *usenode;
+      struct fsys_namenode *namenode, *usenode;
     static struct varbuf fnvb, removevb;
       struct varbuf_state removevb_state;
 
@@ -534,7 +543,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
       if (rc == -1)
         continue;
 
-      namenode = findnamenode(conff->name, 0);
+      namenode = fsys_hash_find_node(conff->name, 0);
       usenode = namenodetouse(namenode, pkg, &pkg->installed);
 
       trig_path_activate(usenode, pkg);
@@ -561,7 +570,7 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
                 fnvb.buf, conff->name);
       }
       debug(dbg_conffdetail, "removal_bulk conffile cleaning dsd %s", fnvb.buf);
-      push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)dsd);
+      push_cleanup(cu_closedir, ~0, 1, (void *)dsd);
       *p= '/';
       conffbasenamelen= strlen(++p);
       conffbasename= fnvb.buf+conffnameused-conffbasenamelen;
@@ -602,8 +611,8 @@ static void removal_bulk_remove_configfiles(struct pkginfo *pkg) {
     }
 
     /* Remove the conffiles from the file list file. */
-    write_filelist_except(pkg, &pkg->installed, pkg->clientdata->files,
-                          fnnf_old_conff);
+    write_filelist_except(pkg, &pkg->installed, pkg->files,
+                          FNNF_OLD_CONFF);
 
     pkg->installed.conffiles = NULL;
     modstatdb_note(pkg);
diff --git a/src/script.c b/src/script.c
index ac58779d1..abe65b6f7 100644
--- a/src/script.c
+++ b/src/script.c
@@ -25,7 +25,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <unistd.h>
@@ -43,9 +42,9 @@
 #include <dpkg/subproc.h>
 #include <dpkg/command.h>
 #include <dpkg/triglib.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 void
@@ -101,12 +100,14 @@ maintscript_pre_exec(struct command *cmd)
 	const char *changedir;
 	size_t instdirlen = strlen(instdir);
 
-	if (instdirlen > 0 && fc_script_chrootless)
+	if (instdirlen > 0 && in_force(FORCE_SCRIPT_CHROOTLESS))
 		changedir = instdir;
 	else
 		changedir = "/";
 
-	if (instdirlen > 0 && !fc_script_chrootless) {
+	if (instdirlen > 0 && !in_force(FORCE_SCRIPT_CHROOTLESS)) {
+		int rc;
+
 		if (strncmp(admindir, instdir, instdirlen) != 0)
 			ohshit(_("admindir must be inside instdir for dpkg to work properly"));
 		if (setenv("DPKG_ADMINDIR", admindir + instdirlen, 1) < 0)
@@ -114,7 +115,12 @@ maintscript_pre_exec(struct command *cmd)
 		if (setenv("DPKG_ROOT", "", 1) < 0)
 			ohshite(_("unable to setenv for subprocesses"));
 
-		if (chroot(instdir))
+		rc = chroot(instdir);
+		if (rc && in_force(FORCE_NON_ROOT) && errno == EPERM)
+			ohshit(_("not enough privileges to change root "
+			         "directory with --force-not-root, consider "
+			         "using --force-script-chrootless?"));
+		else if (rc)
 			ohshite(_("failed to chroot to '%.250s'"), instdir);
 	}
 	/* Switch to a known good directory to give the maintainer script
@@ -134,10 +140,13 @@ maintscript_pre_exec(struct command *cmd)
 		      args.buf);
 		varbuf_destroy(&args);
 	}
-	if (instdirlen == 0 || fc_script_chrootless)
+	if (instdirlen == 0 || in_force(FORCE_SCRIPT_CHROOTLESS))
 		return cmd->filename;
 
-	assert(strlen(cmd->filename) >= instdirlen);
+	if (strlen(cmd->filename) < instdirlen)
+		internerr("maintscript name '%s' length < instdir length %zd",
+		          cmd->filename, instdirlen);
+
 	return cmd->filename + instdirlen;
 }
 
@@ -149,15 +158,14 @@ maintscript_pre_exec(struct command *cmd)
  * one, use the given fallback.
  */
 static int
-maintscript_set_exec_context(struct command *cmd, const char *fallback)
+maintscript_set_exec_context(struct command *cmd)
 {
-	int rc = 0;
-
 #ifdef WITH_LIBSELINUX
-	rc = setexecfilecon(cmd->filename, fallback);
+	return setexecfilecon(cmd->filename, "dpkg_script_t");
+#else
+	return 0;
 #endif
 
-	return rc < 0 ? rc : 0;
 }
 
 static int
@@ -169,7 +177,7 @@ maintscript_exec(struct pkginfo *pkg, struct pkgbin *pkgbin,
 
 	setexecute(cmd->filename, stab);
 
-	push_cleanup(cu_post_script_tasks, ehflag_bombout, NULL, 0, 0);
+	push_cleanup(cu_post_script_tasks, ehflag_bombout, 0);
 
 	pid = subproc_fork();
 	if (pid == 0) {
@@ -190,7 +198,7 @@ maintscript_exec(struct pkginfo *pkg, struct pkgbin *pkgbin,
 
 		cmd->filename = cmd->argv[0] = maintscript_pre_exec(cmd);
 
-		if (maintscript_set_exec_context(cmd, "dpkg_script_t") < 0)
+		if (maintscript_set_exec_context(cmd) < 0)
 			ohshite(_("cannot set security execution context for "
 			          "maintainer script"));
 
@@ -224,12 +232,12 @@ vmaintscript_installed(struct pkginfo *pkg, const char *scriptname,
 
 	if (stat(scriptpath, &stab)) {
 		command_destroy(&cmd);
-		free(buf);
 
 		if (errno == ENOENT) {
 			debug(dbg_scripts,
 			      "vmaintscript_installed nonexistent %s",
 			      scriptname);
+			free(buf);
 			return 0;
 		}
 		ohshite(_("unable to stat %s '%.250s'"), buf, scriptpath);
@@ -300,12 +308,12 @@ maintscript_new(struct pkginfo *pkg, const char *scriptname,
 
 	if (stat(cidir, &stab)) {
 		command_destroy(&cmd);
-		free(buf);
 
 		if (errno == ENOENT) {
 			debug(dbg_scripts,
 			      "maintscript_new nonexistent %s '%s'",
 			      scriptname, cidir);
+			free(buf);
 			return 0;
 		}
 		ohshite(_("unable to stat %s '%.250s'"), buf, cidir);
@@ -373,7 +381,6 @@ maintscript_fallback(struct pkginfo *pkg,
 
 	if (stat(cidir, &stab)) {
 		command_destroy(&cmd);
-		free(buf);
 
 		if (errno == ENOENT)
 			ohshit(_("there is no script in the new version of the package - giving up"));
diff --git a/src/select.c b/src/select.c
index 8d8844905..5c8b16814 100644
--- a/src/select.c
+++ b/src/select.c
@@ -37,9 +37,9 @@
 #include <dpkg/pkg-show.h>
 #include <dpkg/pkg-spec.h>
 #include <dpkg/options.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 static void getsel1package(struct pkginfo *pkg) {
@@ -67,7 +67,7 @@ getselections(const char *const *argv)
 
   modstatdb_open(msdbrw_readonly);
 
-  pkg_array_init_from_db(&array);
+  pkg_array_init_from_hash(&array);
   pkg_array_sort(&array, pkg_sorter_by_nonambig_name_arch);
 
   if (!*argv) {
@@ -183,6 +183,7 @@ setselections(const char *const *argv)
         !pkg_is_informative(pkg, &pkg->available)) {
       db_possibly_outdated = true;
       warning(_("package not in status nor available database at line %d: %.250s"), lno, namevb.buf);
+      lno++;
       continue;
     }
 
@@ -211,7 +212,7 @@ int
 clearselections(const char *const *argv)
 {
   enum modstatdb_rw msdbflags;
-  struct pkgiterator *iter;
+  struct pkg_hash_iter *iter;
   struct pkginfo *pkg;
 
   if (*argv)
@@ -225,12 +226,12 @@ clearselections(const char *const *argv)
   modstatdb_open(msdbflags);
   pkg_infodb_upgrade();
 
-  iter = pkg_db_iter_new();
-  while ((pkg = pkg_db_iter_next_pkg(iter))) {
-    if (!pkg->installed.essential)
+  iter = pkg_hash_iter_new();
+  while ((pkg = pkg_hash_iter_next_pkg(iter))) {
+    if (!pkg->installed.essential && pkg->want != PKG_WANT_UNKNOWN)
       pkg_set_want(pkg, PKG_WANT_DEINSTALL);
   }
-  pkg_db_iter_free(iter);
+  pkg_hash_iter_free(iter);
 
   modstatdb_shutdown();
 
diff --git a/src/selinux.c b/src/selinux.c
index 91256b752..2218bd2ed 100644
--- a/src/selinux.c
+++ b/src/selinux.c
@@ -53,7 +53,8 @@ dpkg_selabel_load(void)
 		int rc;
 
 		/* Set selinux_enabled if it is not already set (singleton). */
-		selinux_enabled = (is_selinux_enabled() > 0);
+		selinux_enabled = (in_force(FORCE_SECURITY_MAC) &&
+		                   is_selinux_enabled() > 0);
 		if (!selinux_enabled)
 			return;
 
diff --git a/src/statcmd.c b/src/statcmd.c
index 7cd2d3056..2507b31be 100644
--- a/src/statcmd.c
+++ b/src/statcmd.c
@@ -40,13 +40,15 @@
 #include <dpkg/i18n.h>
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
+#include <dpkg/string.h>
 #include <dpkg/path.h>
 #include <dpkg/dir.h>
 #include <dpkg/glob.h>
+#include <dpkg/db-fsys.h>
 #include <dpkg/options.h>
 
+#include "force.h"
 #include "main.h"
-#include "filesdb.h"
 
 static const char printforhelp[] = N_(
 "Use --help for help about overriding file stat information.");
@@ -84,8 +86,13 @@ usage(const struct cmdinfo *cip, const char *value)
 	printf(_(
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
+"  --instdir <directory>    set the root directory, but not the admin dir.\n"
+"  --root <directory>       set the directory of the root filesystem.\n"
 "  --update                 immediately update <path> permissions.\n"
-"  --force                  force an action even if a sanity check fails.\n"
+"  --force                  deprecated alias for --force-all.\n"
+"  --force-...              override problems (see --force-help).\n"
+"  --no-force-...           stop when problems encountered.\n"
+"  --refuse-...             ditto.\n"
 "  --quiet                  quiet operation, minimal output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
@@ -96,12 +103,28 @@ usage(const struct cmdinfo *cip, const char *value)
 	exit(0);
 }
 
+#define FORCE_STATCMD_MASK \
+	FORCE_SECURITY_MAC | FORCE_STATOVERRIDE_ADD | FORCE_STATOVERRIDE_DEL
+
 static const char *admindir;
+const char *instdir;
 
 static int opt_verbose = 1;
-static int opt_force = 0;
 static int opt_update = 0;
 
+static void
+set_instdir(const struct cmdinfo *cip, const char *value)
+{
+	instdir = dpkg_fsys_set_dir(value);
+}
+
+static void
+set_root(const struct cmdinfo *cip, const char *value)
+{
+	instdir = dpkg_fsys_set_dir(value);
+	admindir = dpkg_fsys_get_path(ADMINDIR);
+}
+
 static char *
 path_cleanup(const char *path)
 {
@@ -137,9 +160,9 @@ statdb_node_new(const char *user, const char *group, const char *mode)
 static struct file_stat **
 statdb_node_find(const char *filename)
 {
-	struct filenamenode *file;
+	struct fsys_namenode *file;
 
-	file = findnamenode(filename, 0);
+	file = fsys_hash_find_node(filename, 0);
 
 	return &file->statoverride;
 }
@@ -147,10 +170,10 @@ statdb_node_find(const char *filename)
 static int
 statdb_node_remove(const char *filename)
 {
-	struct filenamenode *file;
+	struct fsys_namenode *file;
 
-	file = findnamenode(filename, fnn_nonew);
-	if (!file || (file && !file->statoverride))
+	file = fsys_hash_find_node(filename, FHFF_NONE);
+	if (!file || !file->statoverride)
 		return 0;
 
 	file->statoverride = NULL;
@@ -172,7 +195,7 @@ statdb_node_apply(const char *filename, struct file_stat *filestat)
 }
 
 static void
-statdb_node_print(FILE *out, struct filenamenode *file)
+statdb_node_print(FILE *out, struct fsys_namenode *file)
 {
 	struct file_stat *filestat = file->statoverride;
 	struct passwd *pw;
@@ -205,17 +228,17 @@ statdb_write(void)
 {
 	char *dbname;
 	struct atomic_file *dbfile;
-	struct fileiterator *iter;
-	struct filenamenode *file;
+	struct fsys_hash_iter *iter;
+	struct fsys_namenode *file;
 
 	dbname = dpkg_db_get_path(STATOVERRIDEFILE);
 	dbfile = atomic_file_new(dbname, ATOMIC_FILE_BACKUP);
 	atomic_file_open(dbfile);
 
-	iter = files_db_iter_new();
-	while ((file = files_db_iter_next(iter)))
+	iter = fsys_hash_iter_new();
+	while ((file = fsys_hash_iter_next(iter)))
 		statdb_node_print(dbfile->fp, file);
-	files_db_iter_free(iter);
+	fsys_hash_iter_free(iter);
 
 	atomic_file_sync(dbfile);
 	atomic_file_close(dbfile);
@@ -247,7 +270,7 @@ statoverride_add(const char *const *argv)
 
 	filestat = statdb_node_find(filename);
 	if (*filestat != NULL) {
-		if (opt_force)
+		if (in_force(FORCE_STATOVERRIDE_ADD))
 			warning(_("an override for '%s' already exists, "
 			          "but --force specified so will be ignored"),
 			        filename);
@@ -260,14 +283,21 @@ statoverride_add(const char *const *argv)
 
 	if (opt_update) {
 		struct stat st;
+		struct varbuf realfilename = VARBUF_INIT;
+
+		varbuf_add_str(&realfilename, instdir);
+		varbuf_add_str(&realfilename, filename);
+		varbuf_end_str(&realfilename);
 
-		if (stat(filename, &st) == 0) {
+		if (stat(realfilename.buf, &st) == 0) {
 			(*filestat)->mode |= st.st_mode & S_IFMT;
-			statdb_node_apply(filename, *filestat);
+			statdb_node_apply(realfilename.buf, *filestat);
 		} else if (opt_verbose) {
 			warning(_("--update given but %s does not exist"),
-			        filename);
+			        realfilename.buf);
 		}
+
+		varbuf_destroy(&realfilename);
 	}
 
 	statdb_write();
@@ -291,7 +321,7 @@ statoverride_remove(const char *const *argv)
 	if (!statdb_node_remove(filename)) {
 		if (opt_verbose)
 			warning(_("no override present"));
-		if (opt_force)
+		if (in_force(FORCE_STATOVERRIDE_DEL))
 			return 0;
 		else
 			return 2;
@@ -310,8 +340,8 @@ statoverride_remove(const char *const *argv)
 static int
 statoverride_list(const char *const *argv)
 {
-	struct fileiterator *iter;
-	struct filenamenode *file;
+	struct fsys_hash_iter *iter;
+	struct fsys_namenode *file;
 	const char *thisarg;
 	struct glob_node *glob_list = NULL;
 	int ret = 1;
@@ -324,8 +354,8 @@ statoverride_list(const char *const *argv)
 	if (glob_list == NULL)
 		glob_list_prepend(&glob_list, m_strdup("*"));
 
-	iter = files_db_iter_new();
-	while ((file = files_db_iter_next(iter))) {
+	iter = fsys_hash_iter_new();
+	while ((file = fsys_hash_iter_next(iter))) {
 		struct glob_node *g;
 
 		for (g = glob_list; g; g = g->next) {
@@ -336,21 +366,34 @@ statoverride_list(const char *const *argv)
 			}
 		}
 	}
-	files_db_iter_free(iter);
+	fsys_hash_iter_free(iter);
 
 	glob_list_free(glob_list);
 
 	return ret;
 }
 
+static void
+set_force_obsolete(const struct cmdinfo *cip, const char *value)
+{
+	warning(_("deprecated --%s option; use --%s instead"),
+	        cip->olong, "force-all");
+	set_force(FORCE_ALL);
+}
+
 static const struct cmdinfo cmdinfos[] = {
 	ACTION("add",    0, act_install,   statoverride_add),
 	ACTION("remove", 0, act_remove,    statoverride_remove),
 	ACTION("list",   0, act_listfiles, statoverride_list),
 
 	{ "admindir",   0,   1,  NULL,         &admindir, NULL          },
+	{ "instdir",    0,   1,  NULL,         NULL,      set_instdir,  0 },
+	{ "root",       0,   1,  NULL,         NULL,      set_root,     0 },
 	{ "quiet",      0,   0,  &opt_verbose, NULL,      NULL, 0       },
-	{ "force",      0,   0,  &opt_force,   NULL,      NULL, 1       },
+	{ "force",      0,   0,  NULL,         NULL,      set_force_obsolete },
+	{ "force",      0,   2,  NULL,         NULL,      set_force_option, 1 },
+	{ "no-force",   0,   2,  NULL,         NULL,      set_force_option, 0 },
+	{ "refuse",     0,   2,  NULL,         NULL,      set_force_option, 0 },
 	{ "update",     0,   0,  &opt_update,  NULL,      NULL, 1       },
 	{ "help",       '?', 0,  NULL,         NULL,      usage         },
 	{ "version",    0,   0,  NULL,         NULL,      printversion  },
@@ -364,19 +407,22 @@ main(int argc, const char *const *argv)
 
 	dpkg_locales_init(PACKAGE);
 	dpkg_program_init("dpkg-statoverride");
+	set_force_default(FORCE_STATCMD_MASK);
 	dpkg_options_parse(&argv, cmdinfos, printforhelp);
 
 	admindir = dpkg_db_set_dir(admindir);
+	instdir = dpkg_fsys_set_dir(instdir);
 
 	if (!cipaction)
 		badusage(_("need an action option"));
 
-	filesdbinit();
+	fsys_hash_init();
 	ensure_statoverrides(STATDB_PARSE_LAX);
 
 	ret = cipaction->action(argv);
 
 	dpkg_program_done();
+	dpkg_locales_done();
 
 	return ret;
 }
diff --git a/src/t/dpkg_divert.t b/src/t/dpkg_divert.t
index 71e3b2422..cf118e212 100644
--- a/src/t/dpkg_divert.t
+++ b/src/t/dpkg_divert.t
@@ -300,7 +300,7 @@ note('Adding diversion (2)');
 install_diversions('');
 
 system("touch $testdir/foo");
-call_divert(['--add', "$testdir/foo"],
+call_divert(['--no-rename', '--add', "$testdir/foo"],
             expect_stdout_like => qr{
                 Adding.*local.*diversion.*
                 \Q$testdir\E/foo.*
@@ -461,8 +461,8 @@ note('Remove diversions');
 
 install_diversions('');
 
-call_divert(['--remove', '/bin/sh'], expect_stdout_like => qr/No diversion/, expect_stderr => '');
-call_divert(['--remove', '--quiet', '/bin/sh'], expect_stdout => '', expect_stderr => '');
+call_divert(['--no-rename', '--remove', '/bin/sh'], expect_stdout_like => qr/No diversion/, expect_stderr => '');
+call_divert(['--no-rename', '--remove', '--quiet', '/bin/sh'], expect_stdout => '', expect_stderr => '');
 
 cleanup();
 
@@ -522,7 +522,8 @@ call_divert(["$testdir/foo"]);
 call_divert(["$testdir/bar"]);
 call_divert(['--package', 'bash', "$testdir/baz"]);
 
-call_divert(['--quiet', '--package', 'bash', '--remove', "$testdir/baz"],
+call_divert(['--no-rename', '--quiet', '--package', 'bash',
+             '--remove', "$testdir/baz"],
             expect_stdout => '', expect_stderr => '');
 diversions_eq(<<"EOF");
 $testdir/foo
diff --git a/src/trigcmd.c b/src/trigcmd.c
index 312cd8718..7c547a3bf 100644
--- a/src/trigcmd.c
+++ b/src/trigcmd.c
@@ -229,6 +229,8 @@ main(int argc, const char *const *argv)
 		badusage(_("illegal awaited package name '%.250s': %.250s"),
 		         bypackage, badname);
 
+	fsys_hash_init();
+
 	activate = argv[0];
 	badname = trig_name_is_illegal(activate);
 	if (badname)
@@ -249,6 +251,7 @@ main(int argc, const char *const *argv)
 	}
 
 	dpkg_program_done();
+	dpkg_locales_done();
 
 	return 0;
 }
diff --git a/src/trigproc.c b/src/trigproc.c
index b9681a273..2ef8a5234 100644
--- a/src/trigproc.c
+++ b/src/trigproc.c
@@ -25,7 +25,6 @@
 
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <fcntl.h>
 #include <stdlib.h>
 
@@ -34,11 +33,11 @@
 #include <dpkg/dpkg-db.h>
 #include <dpkg/pkg.h>
 #include <dpkg/pkg-queue.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 #include <dpkg/triglib.h>
 
 #include "main.h"
-#include "filesdb.h"
-#include "infodb.h"
 
 /*
  * Trigger processing algorithms:
@@ -49,10 +48,11 @@
  * we add it to that queue (unless --no-triggers).
  *
  *
- * We want to prefer configuring packages where possible to doing
- * trigger processing, but we want to prefer trigger processing to
- * cycle-breaking and dependency forcing. This is achieved as
- * follows:
+ * We want to prefer configuring packages where possible to doing trigger
+ * processing, although it would be better to prefer trigger processing
+ * to cycle-breaking we need to do the latter first or we might generate
+ * artificial trigger cycles, but we always want to prefer trigger
+ * processing to dependency forcing. This is achieved as follows:
  *
  * Each time during configure processing where a package D is blocked by
  * only (ie Depends unsatisfied but would be satisfied by) a t-awaiter W
@@ -60,10 +60,11 @@
  * (If --no-triggers and nonempty argument list and package isn't in
  * argument list then we don't do this.)
  *
- * Each time in packages.c where we increment dependtry, we instead see
- * if we have encountered such a t-pending T. If we do, we trigproc T
- * instead of incrementing dependtry and this counts as having done
- * something so we reset sincenothing.
+ * Each time in process_queue() where we increment dependtry, we instead
+ * see if we have encountered such a t-pending T. If we do and are in
+ * a trigger processing try, we trigproc T instead of incrementing
+ * dependtry and this counts as having done something so we reset
+ * sincenothing.
  *
  *
  * For --triggers-only and --configure, we go through each thing in the
@@ -121,11 +122,11 @@ trigproc_enqueue_deferred(struct pkginfo *pend)
 void
 trigproc_populate_deferred(void)
 {
-	struct pkgiterator *iter;
+	struct pkg_hash_iter *iter;
 	struct pkginfo *pkg;
 
-	iter = pkg_db_iter_new();
-	while ((pkg = pkg_db_iter_next_pkg(iter))) {
+	iter = pkg_hash_iter_new();
+	while ((pkg = pkg_hash_iter_next_pkg(iter))) {
 		if (!pkg->trigpend_head)
 			continue;
 
@@ -133,12 +134,13 @@ trigproc_populate_deferred(void)
 		    pkg->status != PKG_STAT_TRIGGERSPENDING)
 			continue;
 
-		if (pkg->want != PKG_WANT_INSTALL)
+		if (pkg->want != PKG_WANT_INSTALL &&
+		    pkg->want != PKG_WANT_HOLD)
 			continue;
 
 		trigproc_enqueue_deferred(pkg);
 	}
-	pkg_db_iter_free(iter);
+	pkg_hash_iter_free(iter);
 }
 
 void
@@ -161,8 +163,9 @@ trigproc_run_deferred(void)
 		push_error_context_jump(&ejbuf, print_error_perpackage,
 		                        pkg_name(pkg, pnaw_nonambig));
 
+		ensure_package_clientdata(pkg);
 		pkg->clientdata->trigprocdeferred = NULL;
-		trigproc(pkg, TRIGPROC_TRY);
+		trigproc(pkg, TRIGPROC_TRY_DEFERRED);
 
 		pop_error_context(ehflag_normaltidy);
 	}
@@ -207,8 +210,8 @@ trigproc_reset_cycle(void)
 }
 
 static bool
-tortoise_not_in_hare(struct pkginfo *processing_now,
-                     struct trigcycleperpkg *tortoise_pkg)
+tortoise_in_hare(struct pkginfo *processing_now,
+                 struct trigcycleperpkg *tortoise_pkg)
 {
 	const char *processing_now_name, *tortoise_name;
 	struct trigpend *hare_trig, *tortoise_trig;
@@ -241,35 +244,28 @@ tortoise_not_in_hare(struct pkginfo *processing_now,
 			/* Not found in hare, yay! */
 			debug(dbg_triggersdetail, "%s pnow=%s tortoise=%s OK",
 			      __func__, processing_now_name, tortoise_name);
-			return true;
+			return false;
 		}
 	}
 
-	return false;
+	return true;
 }
 
-/*
- * Returns package we're to give up on.
- */
-static struct pkginfo *
-check_trigger_cycle(struct pkginfo *processing_now)
+static struct trigcyclenode *
+trigproc_new_cyclenode(struct pkginfo *processing_now)
 {
 	struct trigcyclenode *tcn;
-	struct trigcycleperpkg *tcpp, *tortoise_pkg;
-	struct trigpend *tortoise_trig;
-	struct pkgiterator *iter;
-	struct pkginfo *pkg, *giveup;
-	const char *sep;
-
-	debug(dbg_triggers, "check_triggers_cycle pnow=%s",
-	      pkg_name(processing_now, pnaw_always));
+	struct trigcycleperpkg *tcpp;
+	struct pkginfo *pkg;
+	struct pkg_hash_iter *iter;
 
 	tcn = nfmalloc(sizeof(*tcn));
 	tcn->pkgs = NULL;
+	tcn->next = NULL;
 	tcn->then_processed = processing_now;
 
-	iter = pkg_db_iter_new();
-	while ((pkg = pkg_db_iter_next_pkg(iter))) {
+	iter = pkg_hash_iter_new();
+	while ((pkg = pkg_hash_iter_next_pkg(iter))) {
 		if (!pkg->trigpend_head)
 			continue;
 		tcpp = nfmalloc(sizeof(*tcpp));
@@ -278,18 +274,37 @@ check_trigger_cycle(struct pkginfo *processing_now)
 		tcpp->next = tcn->pkgs;
 		tcn->pkgs = tcpp;
 	}
-	pkg_db_iter_free(iter);
+	pkg_hash_iter_free(iter);
+
+	return tcn;
+}
+
+/*
+ * Returns package we are to give up on.
+ */
+static struct pkginfo *
+check_trigger_cycle(struct pkginfo *processing_now)
+{
+	struct trigcyclenode *tcn;
+	struct trigcycleperpkg *tortoise_pkg;
+	struct trigpend *tortoise_trig;
+	struct pkginfo *giveup;
+	const char *sep;
+
+	debug(dbg_triggers, "check_triggers_cycle pnow=%s",
+	      pkg_name(processing_now, pnaw_always));
+
+	tcn = trigproc_new_cyclenode(processing_now);
+
 	if (!hare) {
 		debug(dbg_triggersdetail, "check_triggers_cycle pnow=%s first",
 		      pkg_name(processing_now, pnaw_always));
-		tcn->next = NULL;
 		hare = tortoise = tcn;
 		return NULL;
 	}
 
-	tcn->next = NULL;
 	hare->next = tcn;
-	hare = tcn;
+	hare = hare->next;
 	if (tortoise_advance)
 		tortoise = tortoise->next;
 	tortoise_advance = !tortoise_advance;
@@ -301,7 +316,7 @@ check_trigger_cycle(struct pkginfo *processing_now)
 	for (tortoise_pkg = tortoise->pkgs;
 	     tortoise_pkg;
 	     tortoise_pkg = tortoise_pkg->next) {
-		if (tortoise_not_in_hare(processing_now, tortoise_pkg))
+		if (!tortoise_in_hare(processing_now, tortoise_pkg))
 			return NULL;
 	}
 	/* Oh dear. hare is a superset of tortoise. We are making no
@@ -335,8 +350,12 @@ check_trigger_cycle(struct pkginfo *processing_now)
 	debug(dbg_triggers, "check_triggers_cycle pnow=%s giveup=%s",
 	      pkg_name(processing_now, pnaw_always),
 	      pkg_name(giveup, pnaw_always));
-	assert(giveup->status == PKG_STAT_TRIGGERSAWAITED ||
-	       giveup->status == PKG_STAT_TRIGGERSPENDING);
+	if (giveup->status != PKG_STAT_TRIGGERSAWAITED &&
+	    giveup->status != PKG_STAT_TRIGGERSPENDING)
+		internerr("package %s in non-trigger state %s",
+		          pkg_name(giveup, pnaw_always),
+		          pkg_status_name(giveup));
+	giveup->clientdata->istobe = PKG_ISTOBE_NORMAL;
 	pkg_set_status(giveup, PKG_STAT_HALFCONFIGURED);
 	modstatdb_note(giveup);
 	print_error_perpackage(_("triggers looping, abandoned"),
@@ -360,6 +379,7 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type)
 
 	debug(dbg_triggers, "trigproc %s", pkg_name(pkg, pnaw_always));
 
+	ensure_package_clientdata(pkg);
 	if (pkg->clientdata->trigprocdeferred)
 		pkg->clientdata->trigprocdeferred->pkg = NULL;
 	pkg->clientdata->trigprocdeferred = NULL;
@@ -367,36 +387,48 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type)
 	if (pkg->trigpend_head) {
 		enum dep_check ok;
 
-		assert(pkg->status == PKG_STAT_TRIGGERSPENDING ||
-		       pkg->status == PKG_STAT_TRIGGERSAWAITED);
+		if (pkg->status != PKG_STAT_TRIGGERSPENDING &&
+		    pkg->status != PKG_STAT_TRIGGERSAWAITED)
+			internerr("package %s in non-trigger state %s",
+			          pkg_name(pkg, pnaw_always),
+			          pkg_status_name(pkg));
 
-		if (dependtry > 1) {
-			gaveup = check_trigger_cycle(pkg);
-			if (gaveup == pkg)
-				return;
+		if (dependtry < DEPEND_TRY_TRIGGERS &&
+		    type == TRIGPROC_TRY_QUEUED) {
+			/* We are not yet in a triggers run, so postpone this
+			 * package completely. */
+			enqueue_package(pkg);
+			return;
+		}
 
+		if (dependtry >= DEPEND_TRY_CYCLES) {
 			if (findbreakcycle(pkg))
 				sincenothing = 0;
 		}
 
 		ok = dependencies_ok(pkg, NULL, &depwhynot);
 		if (ok == DEP_CHECK_DEFER) {
+			if (dependtry >= DEPEND_TRY_TRIGGERS_CYCLES) {
+				gaveup = check_trigger_cycle(pkg);
+				if (gaveup == pkg)
+					return;
+			}
+
 			varbuf_destroy(&depwhynot);
 			enqueue_package(pkg);
 			return;
 		} else if (ok == DEP_CHECK_HALT) {
-			/* We cannot process this package on this dpkg run,
-			 * and we can get here repeatedly if this package is
-			 * required to make progress for other packages. So
-			 * reset the trigger cycles tracking to avoid bogus
-			 * cycle detections. */
-			trigproc_reset_cycle();
-
-			/* When doing opportunistic trigger processing, nothing
-			 * requires us to be able to make progress; skip the
-			 * package and silently ignore the error due to
-			 * unsatisfiable dependencies. */
-			if (type == TRIGPROC_TRY) {
+			/* When doing opportunistic deferred trigger processing,
+			 * nothing requires us to be able to make progress;
+			 * skip the package and silently ignore the error due
+			 * to unsatisfiable dependencies. And because we can
+			 * end up here repeatedly, if this package is required
+			 * to make progress for other packages, we need to
+			 * reset the trigger cycle tracking to avoid detecting
+			 * bogus cycles*/
+			if (type == TRIGPROC_TRY_DEFERRED) {
+				trigproc_reset_cycle();
+
 				varbuf_destroy(&depwhynot);
 				return;
 			}
@@ -416,11 +448,9 @@ trigproc(struct pkginfo *pkg, enum trigproc_type type)
 			varbuf_destroy(&depwhynot);
 		}
 
-		if (dependtry <= 1) {
-			gaveup = check_trigger_cycle(pkg);
-			if (gaveup == pkg)
-				return;
-		}
+		gaveup = check_trigger_cycle(pkg);
+		if (gaveup == pkg)
+			return;
 
 		printf(_("Processing triggers for %s (%s) ...\n"),
 		       pkg_name(pkg, pnaw_nonambig),
@@ -488,11 +518,11 @@ transitional_interest_callback(const char *trig, struct pkginfo *pkg,
 static void
 trig_transitional_activate(enum modstatdb_rw cstatus)
 {
-	struct pkgiterator *iter;
+	struct pkg_hash_iter *iter;
 	struct pkginfo *pkg;
 
-	iter = pkg_db_iter_new();
-	while ((pkg = pkg_db_iter_next_pkg(iter))) {
+	iter = pkg_hash_iter_new();
+	while ((pkg = pkg_hash_iter_next_pkg(iter))) {
 		if (pkg->status <= PKG_STAT_HALFINSTALLED)
 			continue;
 		debug(dbg_triggersdetail, "trig_transitional_activate %s %s",
@@ -519,7 +549,7 @@ trig_transitional_activate(enum modstatdb_rw cstatus)
 		else
 			pkg_set_status(pkg, PKG_STAT_INSTALLED);
 	}
-	pkg_db_iter_free(iter);
+	pkg_hash_iter_free(iter);
 
 	if (cstatus >= msdbrw_write) {
 		modstatdb_checkpoint();
@@ -529,18 +559,12 @@ trig_transitional_activate(enum modstatdb_rw cstatus)
 
 /*========== Hook setup. ==========*/
 
-static struct filenamenode *
-th_proper_nn_find(const char *name, bool nonew)
-{
-	return findnamenode(name, nonew ? fnn_nonew : 0);
-}
-
 TRIGHOOKS_DEFINE_NAMENODE_ACCESSORS
 
 static const struct trig_hooks trig_our_hooks = {
 	.enqueue_deferred = trigproc_enqueue_deferred,
 	.transitional_activate = trig_transitional_activate,
-	.namenode_find = th_proper_nn_find,
+	.namenode_find = th_nn_find,
 	.namenode_interested = th_nn_interested,
 	.namenode_name = th_nn_name,
 };
diff --git a/src/unpack.c b/src/unpack.c
index 45d3ff692..ee453a88d 100644
--- a/src/unpack.c
+++ b/src/unpack.c
@@ -28,7 +28,6 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <string.h>
 #include <time.h>
@@ -52,11 +51,11 @@
 #include <dpkg/dir.h>
 #include <dpkg/tarfn.h>
 #include <dpkg/options.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 #include <dpkg/triglib.h>
 
-#include "filesdb.h"
 #include "file-match.h"
-#include "infodb.h"
 #include "main.h"
 #include "archives.h"
 
@@ -95,7 +94,7 @@ deb_reassemble(const char **filename, const char **pfilename)
   if (unlink(reasmbuf) && errno != ENOENT)
     ohshite(_("error ensuring '%.250s' doesn't exist"), reasmbuf);
 
-  push_cleanup(cu_pathname, ~0, NULL, 0, 1, (void *)reasmbuf);
+  push_cleanup(cu_pathname, ~0, 1, (void *)reasmbuf);
 
   pid = subproc_fork();
   if (!pid) {
@@ -148,7 +147,7 @@ deb_verify(const char *filename)
 
     status = subproc_reap(pid, "debsig-verify", SUBPROC_NOCHECK);
     if (!(WIFEXITED(status) && WEXITSTATUS(status) == 0)) {
-      if (!fc_badverify)
+      if (!in_force(FORCE_BAD_VERIFY))
         ohshit(_("verification on package %s failed!"), filename);
       else
         notice(_("verification on package %s failed; "
@@ -208,6 +207,7 @@ pkg_check_depcon(struct pkginfo *pkg, const char *pfilename)
 
   /* Check if anything is installed that we conflict with, or not installed
    * that we need. */
+  ensure_package_clientdata(pkg);
   pkg->clientdata->istobe = PKG_ISTOBE_INSTALLNEW;
 
   for (dsearch = pkg->available.depends; dsearch; dsearch = dsearch->next) {
@@ -291,9 +291,9 @@ pkg_deconfigure_others(struct pkginfo *pkg)
     /* This means that we *either* go and run postinst abort-deconfigure,
      * *or* queue the package for later configure processing, depending
      * on which error cleanup route gets taken. */
-    push_cleanup(cu_prermdeconfigure, ~ehflag_normaltidy,
-                 ok_prermdeconfigure, ehflag_normaltidy,
-                 3, (void *)deconpil->pkg, (void *)removing, (void *)pkg);
+    push_cleanup_fallback(cu_prermdeconfigure, ~ehflag_normaltidy,
+                          ok_prermdeconfigure, ehflag_normaltidy,
+                          3, (void *)deconpil->pkg, (void *)removing, (void *)pkg);
 
     if (removing) {
       maintscript_installed(deconpil->pkg, PRERMFILE, "pre-removal",
@@ -322,7 +322,7 @@ pkg_deconfigure_others(struct pkginfo *pkg)
  */
 static void
 deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles,
-                    struct filenamenode_queue *newconffiles)
+                    struct fsys_namenode_queue *newconffiles)
 {
   FILE *conff;
   char conffilenamebuf[MAXCONFFILENAME];
@@ -334,18 +334,19 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles,
     ohshite(_("error trying to open %.250s"), control_conffiles);
   }
 
-  push_cleanup(cu_closestream, ehflag_bombout, NULL, 0, 1, conff);
+  push_cleanup(cu_closestream, ehflag_bombout, 1, conff);
 
   while (fgets(conffilenamebuf, MAXCONFFILENAME - 2, conff)) {
     struct pkginfo *otherpkg;
-    struct filepackages_iterator *iter;
-    struct filenamenode *namenode;
-    struct fileinlist *newconff;
+    struct fsys_node_pkgs_iter *iter;
+    struct fsys_namenode *namenode;
+    struct fsys_namenode_list *newconff;
     struct conffile *searchconff;
     char *p;
 
     p = conffilenamebuf + strlen(conffilenamebuf);
-    assert(p != conffilenamebuf);
+    if (p == conffilenamebuf)
+      ohshit(_("conffile file contains an empty line"));
     if (p[-1] != '\n')
       ohshit(_("conffile name '%s' is too long, or missing final newline"),
              conffilenamebuf);
@@ -355,9 +356,9 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles,
       continue;
     *p = '\0';
 
-    namenode = findnamenode(conffilenamebuf, 0);
+    namenode = fsys_hash_find_node(conffilenamebuf, 0);
     namenode->oldhash = NEWCONFFILEFLAG;
-    newconff = tar_filenamenode_queue_push(newconffiles, namenode);
+    newconff = tar_fsys_namenode_queue_push(newconffiles, namenode);
 
     /*
      * Let's see if any packages have this file.
@@ -376,8 +377,8 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles,
      */
     searchconff = NULL;
 
-    iter = filepackages_iter_new(newconff->namenode);
-    while ((otherpkg = filepackages_iter_next(iter))) {
+    iter = fsys_node_pkgs_iter_new(newconff->namenode);
+    while ((otherpkg = fsys_node_pkgs_iter_next(iter))) {
       debug(dbg_conffdetail,
             "process_archive conffile '%s' in package %s - conff ?",
             newconff->namenode->name, pkg_name(otherpkg, pnaw_always));
@@ -398,7 +399,7 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles,
           break;
       }
     }
-    filepackages_iter_free(iter);
+    fsys_node_pkgs_iter_free(iter);
 
     if (searchconff) {
       /* We don't copy ‘obsolete’; it's not obsolete in the new package. */
@@ -407,7 +408,7 @@ deb_parse_conffiles(struct pkginfo *pkg, const char *control_conffiles,
       debug(dbg_conff, "process_archive conffile '%s' no package, no hash",
             newconff->namenode->name);
     }
-    newconff->namenode->flags |= fnnf_new_conff;
+    newconff->namenode->flags |= FNNF_NEW_CONFF;
   }
 
   if (ferror(conff))
@@ -494,7 +495,7 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest)
   dsd = opendir(cidir);
   if (!dsd)
     ohshite(_("unable to open temp control directory"));
-  push_cleanup(cu_closedir, ~0, NULL, 0, 1, (void *)dsd);
+  push_cleanup(cu_closedir, ~0, 1, (void *)dsd);
   while ((de = readdir(dsd))) {
     const char *newinfofilename;
 
@@ -555,20 +556,20 @@ pkg_infodb_update(struct pkginfo *pkg, char *cidir, char *cidirrest)
 
 static void
 pkg_remove_old_files(struct pkginfo *pkg,
-                     struct filenamenode_queue *newfiles_queue,
-                     struct filenamenode_queue *newconffiles)
+                     struct fsys_namenode_queue *newfiles_queue,
+                     struct fsys_namenode_queue *newconffiles)
 {
-  struct reversefilelistiter rev_iter;
-  struct filenamenode *namenode;
+  struct fsys_hash_rev_iter rev_iter;
+  struct fsys_namenode *namenode;
   struct stat stab, oldfs;
 
-  reversefilelist_init(&rev_iter, pkg->clientdata->files);
+  fsys_hash_rev_iter_init(&rev_iter, pkg->files);
 
-  while ((namenode = reversefilelist_next(&rev_iter))) {
-    struct filenamenode *usenode;
+  while ((namenode = fsys_hash_rev_iter_next(&rev_iter))) {
+    struct fsys_namenode *usenode;
 
-    if ((namenode->flags & fnnf_new_conff) ||
-        (namenode->flags & fnnf_new_inarchive))
+    if ((namenode->flags & FNNF_NEW_CONFF) ||
+        (namenode->flags & FNNF_NEW_INARCHIVE))
       continue;
 
     usenode = namenodetouse(namenode, pkg, &pkg->installed);
@@ -600,14 +601,14 @@ pkg_remove_old_files(struct pkginfo *pkg,
       if (rmdir(fnamevb.buf)) {
         warning(_("unable to delete old directory '%.250s': %s"),
                 namenode->name, strerror(errno));
-      } else if ((namenode->flags & fnnf_old_conff)) {
+      } else if ((namenode->flags & FNNF_OLD_CONFF)) {
         warning(_("old conffile '%.250s' was an empty directory "
                   "(and has now been deleted)"), namenode->name);
       }
     } else {
-      struct fileinlist *sameas = NULL;
-      struct fileinlist *cfile;
-      static struct stat empty_stat;
+      struct fsys_namenode_list *sameas = NULL;
+      struct fsys_namenode_list *cfile;
+      static struct file_ondisk_id empty_ondisk_id;
       struct varbuf cfilename = VARBUF_INIT;
 
       /*
@@ -633,10 +634,10 @@ pkg_remove_old_files(struct pkginfo *pkg,
       for (cfile = newfiles_queue->head; cfile; cfile = cfile->next) {
         /* If the file has been filtered then treat it as if it didn't exist
          * on the file system. */
-        if (cfile->namenode->flags & fnnf_filtered)
+        if (cfile->namenode->flags & FNNF_FILTERED)
           continue;
 
-        if (!cfile->namenode->filestat) {
+        if (cfile->namenode->file_ondisk_id == NULL) {
           struct stat tmp_stat;
 
           varbuf_reset(&cfilename);
@@ -645,22 +646,26 @@ pkg_remove_old_files(struct pkginfo *pkg,
           varbuf_end_str(&cfilename);
 
           if (lstat(cfilename.buf, &tmp_stat) == 0) {
-            cfile->namenode->filestat = nfmalloc(sizeof(struct stat));
-            memcpy(cfile->namenode->filestat, &tmp_stat, sizeof(struct stat));
+            struct file_ondisk_id *file_ondisk_id;
+
+            file_ondisk_id = nfmalloc(sizeof(*file_ondisk_id));
+            file_ondisk_id->id_dev = tmp_stat.st_dev;
+            file_ondisk_id->id_ino = tmp_stat.st_ino;
+            cfile->namenode->file_ondisk_id = file_ondisk_id;
           } else {
             if (!(errno == ENOENT || errno == ELOOP || errno == ENOTDIR))
               ohshite(_("unable to stat other new file '%.250s'"),
                       cfile->namenode->name);
-            cfile->namenode->filestat = &empty_stat;
+            cfile->namenode->file_ondisk_id = &empty_ondisk_id;
             continue;
           }
         }
 
-        if (cfile->namenode->filestat == &empty_stat)
+        if (cfile->namenode->file_ondisk_id == &empty_ondisk_id)
           continue;
 
-        if (oldfs.st_dev == cfile->namenode->filestat->st_dev &&
-            oldfs.st_ino == cfile->namenode->filestat->st_ino) {
+        if (oldfs.st_dev == cfile->namenode->file_ondisk_id->id_dev &&
+            oldfs.st_ino == cfile->namenode->file_ondisk_id->id_ino) {
           if (sameas)
             warning(_("old file '%.250s' is the same as several new files! "
                       "(both '%.250s' and '%.250s')"), fnamevb.buf,
@@ -673,9 +678,9 @@ pkg_remove_old_files(struct pkginfo *pkg,
 
       varbuf_destroy(&cfilename);
 
-      if ((namenode->flags & fnnf_old_conff)) {
+      if ((namenode->flags & FNNF_OLD_CONFF)) {
         if (sameas) {
-          if (sameas->namenode->flags & fnnf_new_conff) {
+          if (sameas->namenode->flags & FNNF_NEW_CONFF) {
             if (strcmp(sameas->namenode->oldhash, NEWCONFFILEFLAG) == 0) {
               sameas->namenode->oldhash = namenode->oldhash;
               debug(dbg_eachfile, "process_archive: old conff %s "
@@ -690,9 +695,9 @@ pkg_remove_old_files(struct pkginfo *pkg,
         } else {
           debug(dbg_eachfile, "process_archive: old conff %s "
                 "is disappearing", namenode->name);
-          namenode->flags |= fnnf_obs_conff;
-          tar_filenamenode_queue_push(newconffiles, namenode);
-          tar_filenamenode_queue_push(newfiles_queue, namenode);
+          namenode->flags |= FNNF_OBS_CONFF;
+          tar_fsys_namenode_queue_push(newconffiles, namenode);
+          tar_fsys_namenode_queue_push(newfiles_queue, namenode);
         }
         continue;
       }
@@ -711,13 +716,13 @@ pkg_remove_old_files(struct pkginfo *pkg,
 }
 
 static void
-pkg_update_fields(struct pkginfo *pkg, struct filenamenode_queue *newconffiles)
+pkg_update_fields(struct pkginfo *pkg, struct fsys_namenode_queue *newconffiles)
 {
   struct dependency *newdeplist, **newdeplistlastp;
   struct dependency *newdep, *dep;
   struct deppossi **newpossilastp, *possi, *newpossi;
   struct conffile **iconffileslastp, *newiconff;
-  struct fileinlist *cfile;
+  struct fsys_namenode_list *cfile;
 
   /* The dependencies are the most difficult. We have to build
    * a whole new forward dependency tree. At least the reverse
@@ -726,14 +731,14 @@ pkg_update_fields(struct pkginfo *pkg, struct filenamenode_queue *newconffiles)
   newdeplist = NULL;
   newdeplistlastp = &newdeplist;
   for (dep = pkg->available.depends; dep; dep = dep->next) {
-    newdep = nfmalloc(sizeof(struct dependency));
+    newdep = nfmalloc(sizeof(*newdep));
     newdep->up = pkg;
     newdep->next = NULL;
     newdep->list = NULL;
     newpossilastp = &newdep->list;
 
     for (possi = dep->list; possi; possi = possi->next) {
-      newpossi = nfmalloc(sizeof(struct deppossi));
+      newpossi = nfmalloc(sizeof(*newpossi));
       newpossi->up = newdep;
       newpossi->ed = possi->ed;
       newpossi->next = NULL;
@@ -778,11 +783,11 @@ pkg_update_fields(struct pkginfo *pkg, struct filenamenode_queue *newconffiles)
   pkg->installed.conffiles = NULL;
   iconffileslastp = &pkg->installed.conffiles;
   for (cfile = newconffiles->head; cfile; cfile = cfile->next) {
-    newiconff = nfmalloc(sizeof(struct conffile));
+    newiconff = nfmalloc(sizeof(*newiconff));
     newiconff->next = NULL;
     newiconff->name = nfstrsave(cfile->namenode->name);
     newiconff->hash = nfstrsave(cfile->namenode->oldhash);
-    newiconff->obsolete = !!(cfile->namenode->flags & fnnf_obs_conff);
+    newiconff->obsolete = !!(cfile->namenode->flags & FNNF_OBS_CONFF);
     *iconffileslastp = newiconff;
     iconffileslastp = &newiconff->next;
   }
@@ -823,7 +828,7 @@ pkg_disappear(struct pkginfo *pkg, struct pkginfo *infavour)
   dpkg_version_blank(&pkg->configversion);
   pkgbin_blank(&pkg->installed);
 
-  pkg->clientdata->fileslistvalid = false;
+  pkg->files_list_valid = false;
 
   modstatdb_note(pkg);
 }
@@ -831,22 +836,22 @@ pkg_disappear(struct pkginfo *pkg, struct pkginfo *infavour)
 static void
 pkg_disappear_others(struct pkginfo *pkg)
 {
-  struct pkgiterator *iter;
+  struct pkg_hash_iter *iter;
   struct pkginfo *otherpkg;
-  struct fileinlist *cfile;
+  struct fsys_namenode_list *cfile;
   struct deppossi *pdep;
   struct dependency *providecheck;
   struct varbuf depprobwhy = VARBUF_INIT;
 
-  iter = pkg_db_iter_new();
-  while ((otherpkg = pkg_db_iter_next_pkg(iter)) != NULL) {
+  iter = pkg_hash_iter_new();
+  while ((otherpkg = pkg_hash_iter_next_pkg(iter)) != NULL) {
     ensure_package_clientdata(otherpkg);
 
     if (otherpkg == pkg ||
         otherpkg->status == PKG_STAT_NOTINSTALLED ||
         otherpkg->status == PKG_STAT_CONFIGFILES ||
         otherpkg->clientdata->istobe == PKG_ISTOBE_REMOVE ||
-        !otherpkg->clientdata->files)
+        !otherpkg->files)
       continue;
 
     /* Do not try to disappear other packages from the same set
@@ -858,17 +863,21 @@ pkg_disappear_others(struct pkginfo *pkg)
 
     debug(dbg_veryverbose, "process_archive checking disappearance %s",
           pkg_name(otherpkg, pnaw_always));
-    assert(otherpkg->clientdata->istobe == PKG_ISTOBE_NORMAL ||
-           otherpkg->clientdata->istobe == PKG_ISTOBE_DECONFIGURE);
 
-    for (cfile = otherpkg->clientdata->files;
+    if (otherpkg->clientdata->istobe != PKG_ISTOBE_NORMAL &&
+        otherpkg->clientdata->istobe != PKG_ISTOBE_DECONFIGURE)
+      internerr("disappearing package %s is not to be normal or deconfigure, "
+                "is to be %d",
+                pkg_name(otherpkg, pnaw_always), otherpkg->clientdata->istobe);
+
+    for (cfile = otherpkg->files;
          cfile && strcmp(cfile->namenode->name, "/.") == 0;
          cfile = cfile->next);
     if (!cfile) {
       debug(dbg_stupidlyverbose, "process_archive no non-root, no disappear");
       continue;
     }
-    for (cfile = otherpkg->clientdata->files;
+    for (cfile = otherpkg->files;
          cfile && !filesavespackage(cfile, otherpkg, pkg);
          cfile = cfile->next);
     if (cfile)
@@ -930,7 +939,7 @@ pkg_disappear_others(struct pkginfo *pkg)
      * what can we do ?  It has to be run this late. */
     pkg_disappear(otherpkg, pkg);
   } /* while (otherpkg= ... */
-  pkg_db_iter_free(iter);
+  pkg_hash_iter_free(iter);
 }
 
 /**
@@ -959,16 +968,16 @@ pkgset_getting_in_sync(struct pkginfo *pkg)
 }
 
 static void
-pkg_remove_files_from_others(struct pkginfo *pkg, struct fileinlist *newfileslist)
+pkg_remove_files_from_others(struct pkginfo *pkg, struct fsys_namenode_list *newfileslist)
 {
-  struct fileinlist *cfile;
+  struct fsys_namenode_list *cfile;
   struct pkginfo *otherpkg;
 
   for (cfile = newfileslist; cfile; cfile = cfile->next) {
-    struct filepackages_iterator *iter;
+    struct fsys_node_pkgs_iter *iter;
     struct pkgset *divpkgset;
 
-    if (!(cfile->namenode->flags & fnnf_elide_other_lists))
+    if (!(cfile->namenode->flags & FNNF_ELIDE_OTHER_LISTS))
       continue;
 
     if (cfile->namenode->divert && cfile->namenode->divert->useinstead) {
@@ -989,8 +998,8 @@ pkg_remove_files_from_others(struct pkginfo *pkg, struct fileinlist *newfileslis
             cfile->namenode->name);
     }
 
-    iter = filepackages_iter_new(cfile->namenode);
-    while ((otherpkg = filepackages_iter_next(iter))) {
+    iter = fsys_node_pkgs_iter_new(cfile->namenode);
+    while ((otherpkg = fsys_node_pkgs_iter_next(iter))) {
       debug(dbg_eachfiledetail, "process_archive ... found in %s",
             pkg_name(otherpkg, pnaw_always));
 
@@ -1004,37 +1013,36 @@ pkg_remove_files_from_others(struct pkginfo *pkg, struct fileinlist *newfileslis
         continue;
       }
 
-      if (cfile->namenode->flags & fnnf_new_conff)
+      if (cfile->namenode->flags & FNNF_NEW_CONFF)
         conffile_mark_obsolete(otherpkg, cfile->namenode);
 
-      /* If !fileslistvalid then it's one of the disappeared packages above
+      /* If !files_list_valid then it's one of the disappeared packages above
        * or we have already updated the files list file, and we don't bother
        * with it here, clearly. */
-      if (!otherpkg->clientdata->fileslistvalid)
+      if (!otherpkg->files_list_valid)
         continue;
 
       /* Found one. We delete the list entry for this file,
        * (and any others in the same package) and then mark the package
        * as requiring a reread. */
       write_filelist_except(otherpkg, &otherpkg->installed,
-                            otherpkg->clientdata->files, fnnf_elide_other_lists);
-      ensure_package_clientdata(otherpkg);
+                            otherpkg->files, FNNF_ELIDE_OTHER_LISTS);
       debug(dbg_veryverbose, "process_archive overwrote from %s",
             pkg_name(otherpkg, pnaw_always));
     }
-    filepackages_iter_free(iter);
+    fsys_node_pkgs_iter_free(iter);
   }
 }
 
 static void
-pkg_remove_backup_files(struct pkginfo *pkg, struct fileinlist *newfileslist)
+pkg_remove_backup_files(struct pkginfo *pkg, struct fsys_namenode_list *newfileslist)
 {
-  struct fileinlist *cfile;
+  struct fsys_namenode_list *cfile;
 
   for (cfile = newfileslist; cfile; cfile = cfile->next) {
-    struct filenamenode *usenode;
+    struct fsys_namenode *usenode;
 
-    if (cfile->namenode->flags & fnnf_new_conff)
+    if (cfile->namenode->flags & FNNF_NEW_CONFF)
       continue;
 
     usenode = namenodetouse(cfile->namenode, pkg, &pkg->installed);
@@ -1069,6 +1077,7 @@ void process_archive(const char *filename) {
   static enum pkgstatus oldversionstatus;
   static struct tarcontext tc;
 
+  struct tar_archive tar;
   struct dpkg_error err;
   enum parsedbflags parsedb_flags;
   int rc;
@@ -1079,7 +1088,7 @@ void process_archive(const char *filename) {
   char *cidirrest;
   char *psize;
   const char *pfilename;
-  struct filenamenode_queue newconffiles, newfiles_queue;
+  struct fsys_namenode_queue newconffiles, newfiles_queue;
   struct stat stab;
 
   cleanup_pkg_failed= cleanup_conflictor_failed= 0;
@@ -1102,7 +1111,7 @@ void process_archive(const char *filename) {
   /* Get the control information directory. */
   cidir = get_control_dir(cidir);
   cidirrest = cidir + strlen(cidir);
-  push_cleanup(cu_cidir, ~0, NULL, 0, 2, (void *)cidir, (void *)cidirrest);
+  push_cleanup(cu_cidir, ~0, 2, (void *)cidir, (void *)cidirrest);
 
   pid = subproc_fork();
   if (pid == 0) {
@@ -1126,22 +1135,24 @@ void process_archive(const char *filename) {
     parsedb_flags = pdb_parse_available;
   else
     parsedb_flags = pdb_parse_binary;
-  parsedb_flags |= pdb_ignorefiles;
-  if (fc_badversion)
+  parsedb_flags |= pdb_ignore_archives;
+  if (in_force(FORCE_BAD_VERSION))
     parsedb_flags |= pdb_lax_version_parser;
 
   parsedb(cidir, parsedb_flags, &pkg);
 
-  if (!pkg->files) {
-    pkg->files= nfmalloc(sizeof(struct filedetails));
-    pkg->files->next = NULL;
-    pkg->files->name = pkg->files->msdosname = pkg->files->md5sum = NULL;
+  if (!pkg->archives) {
+    pkg->archives = nfmalloc(sizeof(*pkg->archives));
+    pkg->archives->next = NULL;
+    pkg->archives->name = NULL;
+    pkg->archives->msdosname = NULL;
+    pkg->archives->md5sum = NULL;
   }
   /* Always nfmalloc. Otherwise, we may overwrite some other field (like
    * md5sum). */
   psize = nfmalloc(30);
   sprintf(psize, "%jd", (intmax_t)stab.st_size);
-  pkg->files->size = psize;
+  pkg->archives->size = psize;
 
   if (cipaction->arg_int == act_avail) {
     printf(_("Recorded info about %s from %s.\n"),
@@ -1153,7 +1164,7 @@ void process_archive(const char *filename) {
   if (pkg->available.arch->type != DPKG_ARCH_ALL &&
       pkg->available.arch->type != DPKG_ARCH_NATIVE &&
       pkg->available.arch->type != DPKG_ARCH_FOREIGN)
-    forcibleerr(fc_architecture,
+    forcibleerr(FORCE_ARCHITECTURE,
                 _("package architecture (%s) does not match system (%s)"),
                 pkg->available.arch->name,
                 dpkg_arch_get(DPKG_ARCH_NATIVE)->name);
@@ -1183,7 +1194,7 @@ void process_archive(const char *filename) {
   pkg_check_depcon(pkg, pfilename);
 
   ensure_allinstfiles_available();
-  filesdbinit();
+  fsys_hash_init();
   trig_file_interests_ensure();
 
   printf(_("Preparing to unpack %s ...\n"), pfilename);
@@ -1211,7 +1222,7 @@ void process_archive(const char *filename) {
   /* Read the conffiles, and copy the hashes across. */
   newconffiles.head = NULL;
   newconffiles.tail = &newconffiles.head;
-  push_cleanup(cu_fileslist, ~0, NULL, 0, 0);
+  push_cleanup(cu_fileslist, ~0, 0);
   strcpy(cidirrest,CONFFILESFILE);
   deb_parse_conffiles(pkg, cidir, &newconffiles);
 
@@ -1225,7 +1236,10 @@ void process_archive(const char *filename) {
 
   oldversionstatus= pkg->status;
 
-  assert(oldversionstatus <= PKG_STAT_INSTALLED);
+  if (oldversionstatus > PKG_STAT_INSTALLED)
+    internerr("package %s state %d is out-of-bounds",
+              pkg_name(pkg, pnaw_always), oldversionstatus);
+
   debug(dbg_general,"process_archive oldversionstatus=%s",
         statusstrings[oldversionstatus]);
 
@@ -1236,7 +1250,7 @@ void process_archive(const char *filename) {
     pkg_set_eflags(pkg, PKG_EFLAG_REINSTREQ);
     pkg_set_status(pkg, PKG_STAT_HALFCONFIGURED);
     modstatdb_note(pkg);
-    push_cleanup(cu_prermupgrade, ~ehflag_normaltidy, NULL, 0, 1, (void *)pkg);
+    push_cleanup(cu_prermupgrade, ~ehflag_normaltidy, 1, (void *)pkg);
     if (dpkg_version_compare(&pkg->available.version,
                              &pkg->installed.version) >= 0)
       /* Upgrade or reinstall. */
@@ -1269,7 +1283,7 @@ void process_archive(const char *filename) {
     trig_activate_packageprocessing(conflictor);
     pkg_set_status(conflictor, PKG_STAT_HALFCONFIGURED);
     modstatdb_note(conflictor);
-    push_cleanup(cu_prerminfavour, ~ehflag_normaltidy, NULL, 0,
+    push_cleanup(cu_prerminfavour, ~ehflag_normaltidy,
                  2, conflictor, pkg);
     maintscript_installed(conflictor, PRERMFILE, "pre-removal",
                           "remove", "in-favour",
@@ -1289,12 +1303,12 @@ void process_archive(const char *filename) {
   pkg_set_status(pkg, PKG_STAT_HALFINSTALLED);
   modstatdb_note(pkg);
   if (oldversionstatus == PKG_STAT_NOTINSTALLED) {
-    push_cleanup(cu_preinstverynew, ~ehflag_normaltidy, NULL, 0,
+    push_cleanup(cu_preinstverynew, ~ehflag_normaltidy,
                  3,(void*)pkg,(void*)cidir,(void*)cidirrest);
     maintscript_new(pkg, PREINSTFILE, "pre-installation", cidir, cidirrest,
                     "install", NULL);
   } else if (oldversionstatus == PKG_STAT_CONFIGFILES) {
-    push_cleanup(cu_preinstnew, ~ehflag_normaltidy, NULL, 0,
+    push_cleanup(cu_preinstnew, ~ehflag_normaltidy,
                  3,(void*)pkg,(void*)cidir,(void*)cidirrest);
     maintscript_new(pkg, PREINSTFILE, "pre-installation", cidir, cidirrest,
                     "install",
@@ -1302,7 +1316,7 @@ void process_archive(const char *filename) {
                     versiondescribe(&pkg->available.version, vdew_nonambig),
                     NULL);
   } else {
-    push_cleanup(cu_preinstupgrade, ~ehflag_normaltidy, NULL, 0,
+    push_cleanup(cu_preinstupgrade, ~ehflag_normaltidy,
                  4,(void*)pkg,(void*)cidir,(void*)cidirrest,(void*)&oldversionstatus);
     maintscript_new(pkg, PREINSTFILE, "pre-installation", cidir, cidirrest,
                     "upgrade",
@@ -1399,7 +1413,7 @@ void process_archive(const char *filename) {
    */
 
   m_pipe(p1);
-  push_cleanup(cu_closepipe, ehflag_bombout, NULL, 0, 1, (void *)&p1[0]);
+  push_cleanup(cu_closepipe, ehflag_bombout, 1, (void *)&p1[0]);
   pid = subproc_fork();
   if (pid == 0) {
     m_dup2(p1[1],1); close(p1[0]); close(p1[1]);
@@ -1413,19 +1427,20 @@ void process_archive(const char *filename) {
   newfiles_queue.head = NULL;
   newfiles_queue.tail = &newfiles_queue.head;
   tc.newfiles_queue = &newfiles_queue;
-  push_cleanup(cu_fileslist, ~0, NULL, 0, 0);
+  push_cleanup(cu_fileslist, ~0, 0);
   tc.pkg= pkg;
   tc.backendpipe= p1[0];
   tc.pkgset_getting_in_sync = pkgset_getting_in_sync(pkg);
 
-  rc = tar_extractor(&tc, &tf);
-  if (rc) {
-    if (errno) {
-      ohshite(_("error reading dpkg-deb tar output"));
-    } else {
-      ohshit(_("corrupted filesystem tarfile - corrupted package archive"));
-    }
-  }
+  /* Setup the tar archive. */
+  tar.err = DPKG_ERROR_OBJECT;
+  tar.ctx = &tc;
+  tar.ops = &tf;
+
+  rc = tar_extractor(&tar);
+  if (rc)
+    dpkg_error_print(&tar.err,
+                     _("corrupted filesystem tarfile in package archive"));
   if (fd_skip(p1[0], -1, &err) < 0)
     ohshit(_("cannot zap possible trailing zeros from dpkg-deb: %s"), err.str);
   close(p1[0]);
@@ -1440,7 +1455,7 @@ void process_archive(const char *filename) {
      * reduced to ‘unpacked’ by now, by the running of the prerm script. */
     pkg_set_status(pkg, PKG_STAT_HALFINSTALLED);
     modstatdb_note(pkg);
-    push_cleanup(cu_postrmupgrade, ~ehflag_normaltidy, NULL, 0, 1, (void *)pkg);
+    push_cleanup(cu_postrmupgrade, ~ehflag_normaltidy, 1, (void *)pkg);
     maintscript_fallback(pkg, POSTRMFILE, "post-removal", cidir, cidirrest,
                          "upgrade", "failed-upgrade");
   }
@@ -1515,7 +1530,9 @@ void process_archive(const char *filename) {
     if (otherpkg->installed.arch != pkg->installed.arch)
       continue;
 
-    assert(otherpkg->status == PKG_STAT_NOTINSTALLED);
+    if (otherpkg->status != PKG_STAT_NOTINSTALLED)
+      internerr("other package %s instance in state %s instead of not-installed",
+                pkg_name(otherpkg, pnaw_always), pkg_status_name(otherpkg));
 
     pkg_blank(otherpkg);
   }
diff --git a/src/update.c b/src/update.c
index fed9b22c9..4a9a95b5b 100644
--- a/src/update.c
+++ b/src/update.c
@@ -50,7 +50,7 @@ updateavailable(const char *const *argv)
   case act_avreplace: case act_avmerge:
     if (sourcefile == NULL)
       sourcefile = "-";
-    else if (sourcefile && argv[1])
+    else if (argv[1])
       badusage(_("--%s takes at most one Packages-file argument"),
                cipaction->olong);
     break;
@@ -59,11 +59,15 @@ updateavailable(const char *const *argv)
   }
 
   if (!f_noact) {
-    if (access(dpkg_db_get_dir(), W_OK)) {
+    const char *dbdir = dpkg_db_get_dir();
+
+    if (access(dbdir, W_OK)) {
       if (errno != EACCES)
-        ohshite(_("unable to access dpkg status area for bulk available update"));
+        ohshite(_("unable to access dpkg database directory '%s' for bulk available update"),
+                dbdir);
       else
-        ohshit(_("bulk available update requires write access to dpkg status area"));
+        ohshit(_("required write access to dpkg database directory '%s' for bulk available update"),
+               dbdir);
     }
     modstatdb_lock();
   }
diff --git a/src/verify.c b/src/verify.c
index e68ec7b44..9b6e18ad4 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -29,9 +29,9 @@
 #include <dpkg/dpkg.h>
 #include <dpkg/dpkg-db.h>
 #include <dpkg/options.h>
+#include <dpkg/db-ctrl.h>
+#include <dpkg/db-fsys.h>
 
-#include "filesdb.h"
-#include "infodb.h"
 #include "main.h"
 
 
@@ -45,7 +45,7 @@ struct verify_checks {
 	enum verify_result md5sum;
 };
 
-typedef void verify_output_func(struct filenamenode *, struct verify_checks *);
+typedef void verify_output_func(struct fsys_namenode *, struct verify_checks *);
 
 static int
 verify_result_rpm(enum verify_result result, int check)
@@ -62,7 +62,7 @@ verify_result_rpm(enum verify_result result, int check)
 }
 
 static void
-verify_output_rpm(struct filenamenode *namenode, struct verify_checks *checks)
+verify_output_rpm(struct fsys_namenode *namenode, struct verify_checks *checks)
 {
 	char result[9];
 	int attr;
@@ -71,7 +71,7 @@ verify_output_rpm(struct filenamenode *namenode, struct verify_checks *checks)
 
 	result[2] = verify_result_rpm(checks->md5sum, '5');
 
-	if (namenode->flags & fnnf_old_conff)
+	if (namenode->flags & FNNF_OLD_CONFF)
 		attr = 'c';
 	else
 		attr = ' ';
@@ -95,16 +95,16 @@ verify_set_output(const char *name)
 static void
 verify_package(struct pkginfo *pkg)
 {
-	struct fileinlist *file;
+	struct fsys_namenode_list *file;
 	struct varbuf filename = VARBUF_INIT;
 
 	ensure_packagefiles_available(pkg);
 	parse_filehash(pkg, &pkg->installed);
 	pkg_conffiles_mark_old(pkg);
 
-	for (file = pkg->clientdata->files; file; file = file->next) {
+	for (file = pkg->files; file; file = file->next) {
 		struct verify_checks checks;
-		struct filenamenode *fnn;
+		struct fsys_namenode *fnn;
 		char hash[MD5HASHLEN + 1];
 		int failures = 0;
 
@@ -147,12 +147,12 @@ verify(const char *const *argv)
 	ensure_diversions();
 
 	if (!*argv) {
-		struct pkgiterator *iter;
+		struct pkg_hash_iter *iter;
 
-		iter = pkg_db_iter_new();
-		while ((pkg = pkg_db_iter_next_pkg(iter)))
+		iter = pkg_hash_iter_new();
+		while ((pkg = pkg_hash_iter_next_pkg(iter)))
 			verify_package(pkg);
-		pkg_db_iter_free(iter);
+		pkg_hash_iter_free(iter);
 	} else {
 		const char *thisarg;
 
diff --git a/t-func/atlocal.in b/t-func/atlocal.in
index 683249c85..1e77669fa 100644
--- a/t-func/atlocal.in
+++ b/t-func/atlocal.in
@@ -3,6 +3,9 @@
 PATH="@abs_top_builddir@/dpkg-deb:@abs_top_builddir@/dpkg-split:@abs_top_builddir@/src:@abs_top_builddir@/utils:$PATH"
 export PATH
 
+TESTDATA="@abs_top_srcdir@/t-func"
+export TESTDATA
+
 # Setup a sane environment
 
 umask 0022
@@ -22,14 +25,3 @@ unset BZIP
 unset XZ_OPT
 unset XZ_DEFAULTS
 
-if [ "$(id -u)" = 0 ]; then
-  ASROOT=
-elif which fakeroot >/dev/null; then
-  ASROOT=fakeroot
-else
-  echo "skip: needs to run as root(ish)" >&2
-  exit 0
-fi
-export ASROOT
-
-TESTDATA="@abs_top_srcdir@/t-func"
diff --git a/t-func/deb-format.at b/t-func/deb-format.at
index cdfc648a8..956100ce9 100644
--- a/t-func/deb-format.at
+++ b/t-func/deb-format.at
@@ -18,7 +18,7 @@ AT_CHECK([
 mv pkg-deb-format pkg-templ
 chmod -R u+w pkg-templ
 find pkg-templ | xargs touch -t 197001010100.00
-$ASROOT dpkg-deb --uniform-compression -Znone -b pkg-templ >/dev/null
+dpkg-deb --uniform-compression --root-owner-group -Znone -b pkg-templ >/dev/null
 
 # Extract the base members
 ar x pkg-templ.deb
diff --git a/t-func/deb-split.at b/t-func/deb-split.at
index fe8f676a7..20a351950 100644
--- a/t-func/deb-split.at
+++ b/t-func/deb-split.at
@@ -14,11 +14,11 @@ DPKG_MOD_CONTROL([pkg-split],
 AT_CHECK([
 # Initialize the template package
 chmod -R u+w pkg-split
-# XXX: Some environments set SIGPIPE to ignore which we cannot reset, and yes
+# XXX: Some environments set SIGPIPE to ignore which we cannot reset, and 'yes'
 # does check print error conditions, so we ignore its error message here.
 yes 2>/dev/null | dd of=pkg-split/data-file bs=1024 count=1024 status=none
 find pkg-split | xargs touch -t 197001010100.00
-$ASROOT dpkg-deb -b -Znone pkg-split >/dev/null
+dpkg-deb --root-owner-group -Znone -b pkg-split >/dev/null
 ])
 
 AT_CHECK([
diff --git a/t/codespell.t b/t/codespell.t
new file mode 100644
index 000000000..7b4dd3c2a
--- /dev/null
+++ b/t/codespell.t
@@ -0,0 +1,65 @@
+#!/usr/bin/perl
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+use strict;
+use warnings;
+
+use Test::More;
+use Test::Dpkg qw(:needs);
+
+test_needs_author();
+test_needs_command('codespell');
+test_needs_srcdir_switch();
+
+plan tests => 1;
+
+my @codespell_skip = qw(
+  .git
+  *.po
+  *.pot
+  *.gmo
+  *.add
+  *.cache
+  ChangeLog
+  Makefile.in
+  Makefile
+  configure
+  libtool
+  libtool.m4
+  aclocal.m4
+  build-tree
+  tmp
+);
+my $codespell_skip = join ',', @codespell_skip;
+
+my @codespell_opts = (qw(
+  --ignore-words=t/codespell/stopwords
+), (
+  "--skip=$codespell_skip"
+));
+my $tags = qx(codespell @codespell_opts 2>&1);
+
+# Fixup the output:
+$tags =~ s/^WARNING: Binary file:.*\n//mg;
+$tags =~ s{^\./build-aux/.*\n}{}mg;
+$tags =~ s{^\./man/[a-zA-Z_]+/.*\n}{}mg;
+chomp $tags;
+
+my $ok = length $tags == 0;
+
+ok($ok, 'codespell');
+if (not $ok) {
+    diag($tags);
+}
diff --git a/t/codespell/stopwords b/t/codespell/stopwords
new file mode 100644
index 000000000..6c2c4c368
--- /dev/null
+++ b/t/codespell/stopwords
@@ -0,0 +1,29 @@
+accreting
+ba
+cas
+chage
+chang
+claus
+cmo
+creat
+dof
+files'
+finitel
+fo
+iff
+isnt
+ist
+ists
+lowercased
+mitre
+msdos
+objext
+od
+packages'
+process'
+readded
+rela
+te
+thru
+ths
+troup
diff --git a/t/cppcheck.t b/t/cppcheck.t
new file mode 100644
index 000000000..696b6b08c
--- /dev/null
+++ b/t/cppcheck.t
@@ -0,0 +1,45 @@
+#!/usr/bin/perl
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+use strict;
+use warnings;
+
+use Test::More;
+use Test::Dpkg qw(:needs);
+
+test_needs_author();
+test_needs_command('cppcheck');
+test_needs_srcdir_switch();
+
+plan tests => 1;
+
+my @cppcheck_opts = (qw(
+  -q --force --error-exitcode=2
+  --suppressions-list=t/cppcheck/cppcheck.supp
+), (
+  '--enable=warning,performance,portability,style',
+  '--template=\'{file}:{line}: {severity} ({id}): {message}\''
+));
+my $tags = qx(cppcheck @cppcheck_opts . 2>&1);
+
+# Fixup the output:
+chomp $tags;
+
+my $ok = length $tags == 0;
+
+ok($ok, 'cppcheck');
+if (not $ok) {
+    diag($tags);
+}
diff --git a/t/cppcheck/cppcheck.supp b/t/cppcheck/cppcheck.supp
new file mode 100644
index 000000000..8aa1de7ae
--- /dev/null
+++ b/t/cppcheck/cppcheck.supp
@@ -0,0 +1,67 @@
+//
+// Suppression file for cppcheck.
+///
+
+// We assume that the system has a sane NULL definition.
+varFuncNullUB
+
+// TODO: While perhaps valid there are many to handle right away.
+variableScope
+
+// Ignore, this is an imported module.
+unusedStructMember:lib/compat/obstack.c
+nullPointerArithmetic:lib/compat/obstack.c
+
+// Ignore, we are testing the functions.
+knownConditionTrueFalse:lib/dpkg/t/t-macros.c
+
+// Ignore, we use our own test assertions macros.
+literalWithCharPtrCompare:lib/dpkg/t/t-test.c
+
+// Ignore, the code is used only for its binary artifacts.
+uninitMemberVar:*/Dpkg_Shlibs/patterns.cpp
+
+// BUG: False positive, the variable uses operator() which writes to it.
+constVariable:dselect/pkgsublist.cc:111
+
+// BUG: False positive.
+syntaxError:lib/dpkg/t/*.c
+
+// BUG: False positive.
+knownConditionTrueFalse:src/depcon.c:585
+knownConditionTrueFalse:src/depcon.c:668
+
+// BUG: False positive, the loop does an early exit.
+identicalInnerCondition:lib/dpkg/fsys-hash.c:100
+
+// BUG: False positive, this is an enum not a boolean.
+redundantCondition:utils/update-alternatives.c:2711
+
+// BUG: False positive, the macros from lib/dpkg/dlist.h use the tail member.
+unusedStructMember:lib/dpkg/triglib.c:378
+
+// BUG: False positive, does not understand must-allocate functions.
+nullPointer:src/unpack.c:195
+
+// BUG: False positive, does not understand non-returning functions.
+nullPointer:utils/start-stop-daemon.c:756
+nullPointer:utils/start-stop-daemon.c:758
+
+// BUG: False positive, does not understand parser.
+nullPointerArithmeticRedundantCheck:lib/dpkg/pkg-format.c:82
+
+// BUG: False positive, does not understand setjmp-style error handling.
+redundantAssignment:lib/compat/selinux.c:73
+redundantAssignment:lib/dpkg/t/t-ehandle.c:108
+uninitStructMember:utils/update-alternatives.c:1305
+uninitStructMember:utils/update-alternatives.c:1306
+uninitStructMember:utils/update-alternatives.c:1307
+
+// BUG: False positive, does not understand ohshit(), ohshite() and
+//      bad_format as error terminators.
+doubleFree:src/script.c
+doubleFree:utils/update-alternatives.c:1213
+va_end_missing:lib/dpkg/parsehelp.c:68
+
+// BUG: False positive, due to our local va_copy().
+va_list_usedBeforeStarted:lib/compat/vasprintf.c
diff --git a/t/critic.t b/t/critic.t
index 0221c1b22..acb841f38 100644
--- a/t/critic.t
+++ b/t/critic.t
@@ -79,6 +79,7 @@ my @policies = qw(
     RegularExpressions::ProhibitUselessTopic
     RegularExpressions::RequireBracesForMultiline
     RegularExpressions::RequireExtendedFormatting
+    Subroutines::ProhibitAmpersandSigils
     Subroutines::ProhibitExplicitReturnUndef
     Subroutines::ProhibitManyArgs
     Subroutines::ProhibitNestedSubs
diff --git a/t/critic/perlcriticrc b/t/critic/perlcriticrc
index 990462f76..e3689543b 100644
--- a/t/critic/perlcriticrc
+++ b/t/critic/perlcriticrc
@@ -40,9 +40,6 @@ allow_if_string_contains_single_quote = 1
 # While this might be good for performance, it is bad for keeping docs updated.
 [-Documentation::RequirePodAtEnd]
 
-# BUG: Bogus check.
-[-Documentation::RequirePodLinksIncludeText]
-
 # Too many false positives.
 [-CodeLayout::RequireTidyCode]
 
diff --git a/t/minimum-version.t b/t/minimum-version.t
index 10a55630d..f3484dbff 100644
--- a/t/minimum-version.t
+++ b/t/minimum-version.t
@@ -28,5 +28,5 @@ my @files = Test::Dpkg::all_perl_files();
 plan tests => scalar @files;
 
 for my $file (@files) {
-    minimum_version_ok($file, '5.20.2');
+    minimum_version_ok($file, '5.24.1');
 }
diff --git a/t/po.t b/t/po.t
new file mode 100644
index 000000000..ce48395eb
--- /dev/null
+++ b/t/po.t
@@ -0,0 +1,51 @@
+#!/usr/bin/perl
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+use strict;
+use warnings;
+
+use Test::More;
+use Test::Dpkg qw(:needs);
+
+test_needs_author();
+test_needs_command('i18nspector');
+test_needs_srcdir_switch();
+
+my @files = Test::Dpkg::all_po_files();
+
+plan skip_all => 'no PO files distributed' if @files == 0;
+plan tests => scalar @files;
+
+sub po_ok {
+    my $file = shift;
+
+    my $tags = qx(i18nspector \"$file\" 2>&1);
+
+    # Fixup the output:
+    $tags =~ s/^.*\.pot: boilerplate-in-initial-comments .*\n//mg;
+    $tags =~ s/^.*\.po: duplicate-header-field X-POFile-SpellExtra\n//mg;
+    chomp $tags;
+
+    my $ok = length $tags == 0;
+
+    ok($ok, "PO check $file");
+    if (not $ok) {
+        diag($tags);
+    }
+}
+
+for my $file (@files) {
+    po_ok($file);
+}
diff --git a/t/pod-coverage.t b/t/pod-coverage.t
index 3cecd8b59..113feb264 100644
--- a/t/pod-coverage.t
+++ b/t/pod-coverage.t
@@ -34,7 +34,7 @@ sub all_pod_modules
     my $scan_perl_modules = sub {
         my $module = $File::Find::name;
 
-        # Only chack modules, scripts are documented in man pages.
+        # Only check modules, scripts are documented in man pages.
         return unless $module =~ s/\.pm$//;
 
         my $mod = Module::Metadata->new_from_file($File::Find::name);
diff --git a/t/pod-spell.t b/t/pod-spell.t
index 6d3f7ffc9..87b669d7e 100644
--- a/t/pod-spell.t
+++ b/t/pod-spell.t
@@ -72,17 +72,20 @@ dup'ed
 env
 envvar
 fieldnames
+forceplugin
 ge
 getters
 gettext
 hurd
 keyrings
 le
+libdir
 lzma
 modelines
 multiarch
 nocheck
 qa
+quiesced
 reportfile
 rfc822
 sig
diff --git a/t/pod.t b/t/pod.t
index e68ab2f54..680550a2d 100644
--- a/t/pod.t
+++ b/t/pod.t
@@ -17,13 +17,11 @@ use strict;
 use warnings;
 
 use Test::More;
-use Test::Dpkg qw(:needs);
+use Test::Dpkg qw(:needs :paths);
 
 test_needs_module('Test::Pod', '1.00');
 test_needs_srcdir_switch();
 
-my @dirs = qw(scripts/Dpkg);
-my @files = qw(scripts/Dpkg.pm);
-push @files, all_pod_files(@dirs);
+my @files = Test::Dpkg::all_perl_files();
 
 all_pod_files_ok(@files);
diff --git a/t/shellcheck.t b/t/shellcheck.t
new file mode 100644
index 000000000..0eb64bd05
--- /dev/null
+++ b/t/shellcheck.t
@@ -0,0 +1,70 @@
+#!/usr/bin/perl
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+use strict;
+use warnings;
+
+use Test::More;
+use Test::Dpkg qw(:needs);
+
+test_needs_author();
+test_needs_command('shellcheck');
+test_needs_srcdir_switch();
+
+my @todofiles = qw(
+    dselect/methods/disk/install
+    dselect/methods/disk/setup
+    dselect/methods/disk/update
+    dselect/methods/multicd/install
+    dselect/methods/multicd/setup
+    dselect/methods/multicd/update
+);
+my @files = qw(
+    autogen
+    get-version
+    run-script
+    debian/dpkg.cron.daily
+    debian/dpkg.postinst
+    debian/dpkg.postrm
+    scripts/dpkg-maintscript-helper.sh
+);
+my @shellcheck_opts = (
+    '--exclude=SC2039', # Allow local keyword.
+    '--exclude=SC2166', # Allow -a and -o.
+    '--exclude=SC2034', # Allow unused variables for colors.
+);
+
+plan tests => scalar @files;
+
+sub shell_syntax_ok
+{
+    my $file = shift;
+
+    my $tags = qx(shellcheck @shellcheck_opts $file 2>&1);
+
+    # Fixup the output:
+    chomp $tags;
+
+    my $ok = length $tags == 0;
+
+    ok($ok, 'shellcheck');
+    if (not $ok) {
+        diag($tags);
+    }
+}
+
+foreach my $file (@files) {
+    shell_syntax_ok($file);
+}
diff --git a/utils/start-stop-daemon.c b/utils/start-stop-daemon.c
index 06a5687f0..886fb8872 100644
--- a/utils/start-stop-daemon.c
+++ b/utils/start-stop-daemon.c
@@ -84,8 +84,9 @@
 #include <sys/wait.h>
 #include <sys/select.h>
 #include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
-#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <time.h>
@@ -189,6 +190,16 @@ enum action_code {
 	ACTION_STATUS,
 };
 
+enum match_code {
+	MATCH_NONE	= 0,
+	MATCH_PID	= 1 << 0,
+	MATCH_PPID	= 1 << 1,
+	MATCH_PIDFILE	= 1 << 2,
+	MATCH_EXEC	= 1 << 3,
+	MATCH_NAME	= 1 << 4,
+	MATCH_USER	= 1 << 5,
+};
+
 /* Time conversion constants. */
 enum {
 	NANOSEC_IN_SEC      = 1000000000L,
@@ -197,14 +208,19 @@ enum {
 };
 
 /* The minimum polling interval, 20ms. */
-static const long MIN_POLL_INTERVAL = 20 * NANOSEC_IN_MILLISEC;
+static const long MIN_POLL_INTERVAL = 20L * NANOSEC_IN_MILLISEC;
 
 static enum action_code action;
+static enum match_code match_mode;
 static bool testmode = false;
 static int quietmode = 0;
 static int exitnodo = 1;
 static bool background = false;
 static bool close_io = true;
+static bool notify_await = false;
+static int notify_timeout = 60;
+static char *notify_sockdir;
+static char *notify_socket;
 static bool mpidfile = false;
 static bool rpidfile = false;
 static int signal_nr = SIGTERM;
@@ -276,26 +292,51 @@ static struct schedule_item *schedule = NULL;
 
 
 static void DPKG_ATTR_PRINTF(1)
-warning(const char *format, ...)
+debug(const char *format, ...)
 {
 	va_list arglist;
 
-	fprintf(stderr, "%s: warning: ", progname);
+	if (quietmode >= 0)
+		return;
+
 	va_start(arglist, format);
-	vfprintf(stderr, format, arglist);
+	vprintf(format, arglist);
 	va_end(arglist);
 }
 
-static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1)
-fatal(const char *format, ...)
+static void DPKG_ATTR_PRINTF(1)
+info(const char *format, ...)
 {
 	va_list arglist;
-	int errno_fatal = errno;
 
-	fprintf(stderr, "%s: ", progname);
+	if (quietmode > 0)
+		return;
+
+	va_start(arglist, format);
+	vprintf(format, arglist);
+	va_end(arglist);
+}
+
+static void DPKG_ATTR_PRINTF(1)
+warning(const char *format, ...)
+{
+	va_list arglist;
+
+	fprintf(stderr, "%s: warning: ", progname);
 	va_start(arglist, format);
 	vfprintf(stderr, format, arglist);
 	va_end(arglist);
+}
+
+static void DPKG_ATTR_NORET DPKG_ATTR_VPRINTF(2)
+fatalv(int errno_fatal, const char *format, va_list args)
+{
+	va_list args_copy;
+
+	fprintf(stderr, "%s: ", progname);
+	va_copy(args_copy, args);
+	vfprintf(stderr, format, args_copy);
+	va_end(args_copy);
 	if (errno_fatal)
 		fprintf(stderr, " (%s)\n", strerror(errno_fatal));
 	else
@@ -307,6 +348,43 @@ fatal(const char *format, ...)
 		exit(2);
 }
 
+static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1)
+fatal(const char *format, ...)
+{
+	va_list args;
+
+	va_start(args, format);
+	fatalv(0, format, args);
+}
+
+static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(1)
+fatale(const char *format, ...)
+{
+	va_list args;
+
+	va_start(args, format);
+	fatalv(errno, format, args);
+}
+
+#define BUG(...) bug(__FILE__, __LINE__, __func__, __VA_ARGS__)
+
+static void DPKG_ATTR_NORET DPKG_ATTR_PRINTF(4)
+bug(const char *file, int line, const char *func, const char *format, ...)
+{
+	va_list arglist;
+
+	fprintf(stderr, "%s:%s:%d:%s: internal error: ",
+	        progname, file, line, func);
+	va_start(arglist, format);
+	vfprintf(stderr, format, arglist);
+	va_end(arglist);
+
+	if (action == ACTION_STATUS)
+		exit(STATUS_UNKNOWN);
+	else
+		exit(3);
+}
+
 static void *
 xmalloc(int size)
 {
@@ -315,7 +393,7 @@ xmalloc(int size)
 	ptr = malloc(size);
 	if (ptr)
 		return ptr;
-	fatal("malloc(%d) failed", size);
+	fatale("malloc(%d) failed", size);
 }
 
 static char *
@@ -326,7 +404,7 @@ xstrndup(const char *str, size_t n)
 	new_str = strndup(str, n);
 	if (new_str)
 		return new_str;
-	fatal("strndup(%s, %zu) failed", str, n);
+	fatale("strndup(%s, %zu) failed", str, n);
 }
 
 static void
@@ -335,12 +413,12 @@ timespec_gettime(struct timespec *ts)
 #if defined(_POSIX_TIMERS) && _POSIX_TIMERS > 0 && \
     defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK > 0
 	if (clock_gettime(CLOCK_MONOTONIC, ts) < 0)
-		fatal("clock_gettime failed");
+		fatale("clock_gettime failed");
 #else
 	struct timeval tv;
 
 	if (gettimeofday(&tv, NULL) != 0)
-		fatal("gettimeofday failed");
+		fatale("gettimeofday failed");
 
 	ts->tv_sec = tv.tv_sec;
 	ts->tv_nsec = tv.tv_usec * NANOSEC_IN_MICROSEC;
@@ -386,6 +464,26 @@ newpath(const char *dirname, const char *filename)
 	return path;
 }
 
+static int
+parse_unsigned(const char *string, int base, int *value_r)
+{
+	long value;
+	char *endptr;
+
+	errno = 0;
+	if (!string[0])
+		return -1;
+
+	value = strtol(string, &endptr, base);
+	if (string == endptr || *endptr != '\0' || errno != 0)
+		return -1;
+	if (value < 0 || value > INT_MAX)
+		return -1;
+
+	*value_r = value;
+	return 0;
+}
+
 static long
 get_open_fd_max(void)
 {
@@ -410,7 +508,7 @@ detach_controlling_tty(void)
 		return;
 
 	if (ioctl(tty_fd, TIOCNOTTY, 0) != 0)
-		fatal("unable to detach controlling tty");
+		fatale("unable to detach controlling tty");
 
 	close(tty_fd);
 #endif
@@ -456,6 +554,196 @@ wait_for_child(pid_t pid)
 }
 
 static void
+cleanup_socket_dir(void)
+{
+	unlink(notify_socket);
+	rmdir(notify_sockdir);
+}
+
+static char *
+setup_socket_name(const char *suffix)
+{
+	const char *basedir;
+
+	if (getuid() == 0 && access("/run", F_OK) == 0) {
+		basedir = "/run";
+	} else {
+		basedir = getenv("TMPDIR");
+		if (basedir == NULL)
+			basedir = P_tmpdir;
+	}
+
+	if (asprintf(&notify_sockdir, "%s/%s.XXXXXX", basedir, suffix) < 0)
+		fatale("cannot allocate socket directory name");
+
+	if (mkdtemp(notify_sockdir) == NULL)
+		fatale("cannot create socket directory %s", notify_sockdir);
+
+	atexit(cleanup_socket_dir);
+
+	if (chown(notify_sockdir, runas_uid, runas_gid))
+		fatale("cannot change socket directory ownership");
+
+	if (asprintf(&notify_socket, "%s/notify", notify_sockdir) < 0)
+		fatale("cannot allocate socket name");
+
+	setenv("NOTIFY_SOCKET", notify_socket, 1);
+
+	return notify_socket;
+}
+
+static void
+set_socket_passcred(int fd)
+{
+#ifdef SO_PASSCRED
+	static const int enable = 1;
+
+	setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable));
+#endif
+}
+
+static int
+create_notify_socket(void)
+{
+	const char *sockname;
+	struct sockaddr_un su;
+	int fd, rc, flags;
+
+	/* Create notification socket. */
+	fd = socket(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0);
+	if (fd < 0)
+		fatale("cannot create notification socket");
+
+	/* We could set SOCK_CLOEXEC instead, but then we would need to
+	 * check whether the socket call failed, try and then do this anyway,
+	 * when we have no threading problems to worry about. */
+	flags = fcntl(fd, F_GETFD);
+	if (flags < 0)
+		fatale("cannot read fd flags for notification socket");
+	if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0)
+		fatale("cannot set close-on-exec flag for notification socket");
+
+	sockname = setup_socket_name(".s-s-d-notify");
+
+	/* Bind to a socket in a temporary directory, selected based on
+	 * the platform. */
+	memset(&su, 0, sizeof(su));
+	su.sun_family = AF_UNIX;
+	strncpy(su.sun_path, sockname, sizeof(su.sun_path) - 1);
+
+	rc = bind(fd, &su, sizeof(su));
+	if (rc < 0)
+		fatale("cannot bind to notification socket");
+
+	rc = chmod(su.sun_path, 0660);
+	if (rc < 0)
+		fatale("cannot change notification socket permissions");
+
+	rc = chown(su.sun_path, runas_uid, runas_gid);
+	if (rc < 0)
+		fatale("cannot change notification socket ownership");
+
+	/* XXX: Verify we are talking to an expected child? Although it is not
+	 * clear whether this is feasible given the knowledge we have got. */
+	set_socket_passcred(fd);
+
+	return fd;
+}
+
+static void
+wait_for_notify(int fd)
+{
+	struct timespec startat, now, elapsed, timeout, timeout_orig;
+	fd_set fdrs;
+	int rc;
+
+	timeout.tv_sec = notify_timeout;
+	timeout.tv_nsec = 0;
+	timeout_orig = timeout;
+
+	timespec_gettime(&startat);
+
+	while (timeout.tv_sec >= 0 && timeout.tv_nsec >= 0) {
+		FD_ZERO(&fdrs);
+		FD_SET(fd, &fdrs);
+
+		/* Wait for input. */
+		debug("Waiting for notifications... (timeout %lusec %lunsec)\n",
+		      timeout.tv_sec, timeout.tv_nsec);
+		rc = pselect(fd + 1, &fdrs, NULL, NULL, &timeout, NULL);
+
+		/* Catch non-restartable errors, that is, not signals nor
+		 * kernel out of resources. */
+		if (rc < 0 && (errno != EINTR && errno != EAGAIN))
+			fatale("cannot monitor notification socket for activity");
+
+		/* Timed-out. */
+		if (rc == 0)
+			fatal("timed out waiting for a notification");
+
+		/* Update the timeout, as should not rely on pselect() having
+		 * done that for us, which is an unportable assumption. */
+		timespec_gettime(&now);
+		timespec_sub(&now, &startat, &elapsed);
+		timespec_sub(&timeout_orig, &elapsed, &timeout);
+
+		/* Restartable error, a signal or kernel out of resources. */
+		if (rc < 0)
+			continue;
+
+		/* Parse it and check for a supported notification message,
+		 * once we get a READY=1, we exit. */
+		for (;;) {
+			ssize_t nrecv;
+			char buf[4096];
+			char *line, *line_next;
+
+			nrecv = recv(fd, buf, sizeof(buf), 0);
+			if (nrecv < 0 && (errno != EINTR && errno != EAGAIN))
+				fatale("cannot receive notification packet");
+			if (nrecv < 0)
+				break;
+
+			buf[nrecv] = '\0';
+
+			for (line = buf; *line; line = line_next) {
+				line_next = strchrnul(line, '\n');
+				if (*line_next == '\n')
+					*line_next++ = '\0';
+
+				debug("Child sent some notification...\n");
+				if (strncmp(line, "EXTEND_TIMEOUT_USEC=", 20) == 0) {
+					int extend_usec = 0;
+
+					if (parse_unsigned(line + 20, 10, &extend_usec) != 0)
+						fatale("cannot parse extended timeout notification %s", line);
+
+					/* Reset the current timeout. */
+					timeout.tv_sec = extend_usec / 1000L;
+					timeout.tv_nsec = (extend_usec % 1000L) *
+					                  NANOSEC_IN_MILLISEC;
+					timeout_orig = timeout;
+
+					timespec_gettime(&startat);
+				} else if (strncmp(line, "ERRNO=", 6) == 0) {
+					int suberrno = 0;
+
+					if (parse_unsigned(line + 6, 10, &suberrno) != 0)
+						fatale("cannot parse errno notification %s", line);
+					errno = suberrno;
+					fatale("program failed to initialize");
+				} else if (strcmp(line, "READY=1") == 0) {
+					debug("-> Notification => ready for service.\n");
+					return;
+				} else {
+					debug("-> Notification line '%s' received\n", line);
+				}
+			}
+		}
+	}
+}
+
+static void
 write_pidfile(const char *filename, pid_t pid)
 {
 	FILE *fp;
@@ -468,61 +756,73 @@ write_pidfile(const char *filename, pid_t pid)
 		fp = fdopen(fd, "w");
 
 	if (fp == NULL)
-		fatal("unable to open pidfile '%s' for writing", filename);
+		fatale("unable to open pidfile '%s' for writing", filename);
 
 	fprintf(fp, "%d\n", (int)pid);
 
 	if (fclose(fp))
-		fatal("unable to close pidfile '%s'", filename);
+		fatale("unable to close pidfile '%s'", filename);
 }
 
 static void
 remove_pidfile(const char *filename)
 {
 	if (unlink(filename) < 0 && errno != ENOENT)
-		fatal("cannot remove pidfile '%s'", filename);
+		fatale("cannot remove pidfile '%s'", filename);
 }
 
 static void
 daemonize(void)
 {
+	int notify_fd = -1;
 	pid_t pid;
 	sigset_t mask;
 	sigset_t oldmask;
 
-	if (quietmode < 0)
-		printf("Detaching to start %s...", startas);
+	debug("Detaching to start %s...\n", startas);
 
 	/* Block SIGCHLD to allow waiting for the child process while it is
 	 * performing actions, such as creating a pidfile. */
 	sigemptyset(&mask);
 	sigaddset(&mask, SIGCHLD);
 	if (sigprocmask(SIG_BLOCK, &mask, &oldmask) == -1)
-		fatal("cannot block SIGCHLD");
+		fatale("cannot block SIGCHLD");
+
+	if (notify_await)
+		notify_fd = create_notify_socket();
 
 	pid = fork();
 	if (pid < 0)
-		fatal("unable to do first fork");
+		fatale("unable to do first fork");
 	else if (pid) { /* First Parent. */
 		/* Wait for the second parent to exit, so that if we need to
 		 * perform any actions there, like creating a pidfile, we do
 		 * not suffer from race conditions on return. */
 		wait_for_child(pid);
 
+		if (notify_await) {
+			/* Wait for a readiness notification from the second
+			 * child, so that we can safely exit when the service
+			 * is up. */
+			wait_for_notify(notify_fd);
+			close(notify_fd);
+			cleanup_socket_dir();
+		}
+
 		_exit(0);
 	}
 
 	/* Create a new session. */
 	if (setsid() < 0)
-		fatal("cannot set session ID");
+		fatale("cannot set session ID");
 
 	pid = fork();
 	if (pid < 0)
-		fatal("unable to do second fork");
+		fatale("unable to do second fork");
 	else if (pid) { /* Second parent. */
 		/* Set a default umask for dumb programs, which might get
 		 * overridden by the --umask option later on, so that we get
-		 * a defined umask when creating the pidfille. */
+		 * a defined umask when creating the pidfile. */
 		umask(022);
 
 		if (mpidfile && pidfile != NULL)
@@ -533,10 +833,9 @@ daemonize(void)
 	}
 
 	if (sigprocmask(SIG_SETMASK, &oldmask, NULL) == -1)
-		fatal("cannot restore signal mask");
+		fatale("cannot restore signal mask");
 
-	if (quietmode < 0)
-		printf("done.\n");
+	debug("Detaching complete...\n");
 }
 
 static void
@@ -607,6 +906,8 @@ usage(void)
 "                                  scheduler (default prio is 4)\n"
 "  -k, --umask <mask>            change the umask to <mask> before starting\n"
 "  -b, --background              force the process to detach\n"
+"      --notify-await            wait for a readiness notification\n"
+"      --notify-timeout <int>    timeout after <int> seconds of notify wait\n"
 "  -C, --no-close                do not close any file descriptor\n"
 "  -m, --make-pidfile            create the pidfile before starting\n"
 "      --remove-pidfile          delete the pidfile after stopping\n"
@@ -697,26 +998,6 @@ static const struct sigpair siglist[] = {
 };
 
 static int
-parse_unsigned(const char *string, int base, int *value_r)
-{
-	long value;
-	char *endptr;
-
-	if (!string[0])
-		return -1;
-
-	errno = 0;
-	value = strtol(string, &endptr, base);
-	if (string == endptr || *endptr != '\0' || errno != 0)
-		return -1;
-	if (value < 0 || value > INT_MAX)
-		return -1;
-
-	*value_r = value;
-	return 0;
-}
-
-static int
 parse_pid(const char *pid_str, int *pid_num)
 {
 	if (parse_unsigned(pid_str, 10, pid_num) != 0)
@@ -778,7 +1059,7 @@ parse_proc_schedule(const char *string)
 
 	if (string[policy_len] == ':' &&
 	    parse_unsigned(string + policy_len + 1, 10, &prio) != 0)
-		fatal("invalid process scheduler priority");
+		fatale("invalid process scheduler priority");
 
 	proc_sched = xmalloc(sizeof(*proc_sched));
 	proc_sched->policy_name = policy_str;
@@ -810,7 +1091,7 @@ parse_io_schedule(const char *string)
 
 	if (string[class_len] == ':' &&
 	    parse_unsigned(string + class_len + 1, 10, &prio) != 0)
-		fatal("invalid IO scheduler priority");
+		fatale("invalid IO scheduler priority");
 
 	io_sched = xmalloc(sizeof(*io_sched));
 	io_sched->policy_name = class_str;
@@ -842,7 +1123,7 @@ set_proc_schedule(struct res_schedule *sched)
 	param.sched_priority = sched->priority;
 
 	if (sched_setscheduler(getpid(), sched->policy, &param) == -1)
-		fatal("unable to set process scheduler");
+		fatale("unable to set process scheduler");
 #endif
 }
 
@@ -917,15 +1198,15 @@ parse_schedule(const char *schedule_str)
 	} else {
 		count = 0;
 		repeatat = -1;
-		while (schedule_str != NULL) {
-			slash = strchr(schedule_str, '/');
-			str_len = slash ? (size_t)(slash - schedule_str) : strlen(schedule_str);
+		while (*schedule_str) {
+			slash = strchrnul(schedule_str, '/');
+			str_len = (size_t)(slash - schedule_str);
 			if (str_len >= sizeof(item_buf))
 				badusage("invalid schedule item: far too long"
 				         " (you must delimit items with slashes)");
 			memcpy(item_buf, schedule_str, str_len);
 			item_buf[str_len] = '\0';
-			schedule_str = slash ? slash + 1 : NULL;
+			schedule_str = *slash ? slash + 1 : slash;
 
 			parse_schedule_item(item_buf, &schedule[count]);
 			if (schedule[count].type == sched_forever) {
@@ -945,7 +1226,9 @@ parse_schedule(const char *schedule_str)
 			schedule[count].value = repeatat;
 			count++;
 		}
-		assert(count == schedule_length);
+		if (count != schedule_length)
+			BUG("count=%d != schedule_length=%d",
+			    count, schedule_length);
 	}
 }
 
@@ -964,6 +1247,8 @@ set_action(enum action_code new_action)
 #define OPT_PID		500
 #define OPT_PPID	501
 #define OPT_RM_PIDFILE	502
+#define OPT_NOTIFY_AWAIT	503
+#define OPT_NOTIFY_TIMEOUT	504
 
 static void
 parse_options(int argc, char * const *argv)
@@ -994,6 +1279,8 @@ parse_options(int argc, char * const *argv)
 		{ "iosched",	  1, NULL, 'I'},
 		{ "umask",	  1, NULL, 'k'},
 		{ "background",	  0, NULL, 'b'},
+		{ "notify-await", 0, NULL, OPT_NOTIFY_AWAIT},
+		{ "notify-timeout", 1, NULL, OPT_NOTIFY_TIMEOUT},
 		{ "no-close",	  0, NULL, 'C'},
 		{ "make-pidfile", 0, NULL, 'm'},
 		{ "remove-pidfile", 0, NULL, OPT_RM_PIDFILE},
@@ -1008,6 +1295,7 @@ parse_options(int argc, char * const *argv)
 	const char *schedule_str = NULL;
 	const char *proc_schedule_str = NULL;
 	const char *io_schedule_str = NULL;
+	const char *notify_timeout_str = NULL;
 	size_t changeuser_len;
 	int c;
 
@@ -1037,18 +1325,22 @@ parse_options(int argc, char * const *argv)
 			startas = optarg;
 			break;
 		case 'n':  /* --name <process-name> */
+			match_mode |= MATCH_NAME;
 			cmdname = optarg;
 			break;
 		case 'o':  /* --oknodo */
 			exitnodo = 0;
 			break;
 		case OPT_PID: /* --pid <pid> */
+			match_mode |= MATCH_PID;
 			pid_str = optarg;
 			break;
 		case OPT_PPID: /* --ppid <ppid> */
+			match_mode |= MATCH_PPID;
 			ppid_str = optarg;
 			break;
 		case 'p':  /* --pidfile <pid-file> */
+			match_mode |= MATCH_PIDFILE;
 			pidfile = optarg;
 			break;
 		case 'q':  /* --quiet */
@@ -1061,12 +1353,14 @@ parse_options(int argc, char * const *argv)
 			testmode = true;
 			break;
 		case 'u':  /* --user <username>|<uid> */
+			match_mode |= MATCH_USER;
 			userspec = optarg;
 			break;
 		case 'v':  /* --verbose */
 			quietmode = -1;
 			break;
 		case 'x':  /* --exec <executable> */
+			match_mode |= MATCH_EXEC;
 			execname = optarg;
 			break;
 		case 'c':  /* --chuid <username>|<uid> */
@@ -1101,6 +1395,12 @@ parse_options(int argc, char * const *argv)
 		case 'b':  /* --background */
 			background = true;
 			break;
+		case OPT_NOTIFY_AWAIT:
+			notify_await = true;
+			break;
+		case OPT_NOTIFY_TIMEOUT:
+			notify_timeout_str = optarg;
+			break;
 		case 'C': /* --no-close */
 			close_io = false;
 			break;
@@ -1153,11 +1453,16 @@ parse_options(int argc, char * const *argv)
 			badusage("umask value must be a positive number");
 	}
 
+	if (notify_timeout_str != NULL)
+		if (parse_unsigned(notify_timeout_str, 10, &notify_timeout) != 0)
+			badusage("invalid notify timeout value");
+
 	if (action == ACTION_NONE)
 		badusage("need one of --start or --stop or --status");
 
-	if (!execname && !pid_str && !ppid_str && !pidfile && !userspec &&
-	    !cmdname)
+	if (match_mode == MATCH_NONE ||
+	    (!execname && !cmdname && !userspec &&
+	     !pid_str && !ppid_str && !pidfile))
 		badusage("need at least one of --exec, --pid, --ppid, --pidfile, --user or --name");
 
 #ifdef PROCESS_NAME_SIZE
@@ -1179,7 +1484,7 @@ parse_options(int argc, char * const *argv)
 		badusage("--remove-pidfile requires --pidfile");
 
 	if (pid_str && pidfile)
-		badusage("need either --pid of --pidfile, not both");
+		badusage("need either --pid or --pidfile, not both");
 
 	if (background && action != ACTION_START)
 		badusage("--background is only relevant with --start");
@@ -1204,7 +1509,7 @@ setup_options(void)
 			fullexecname = execname;
 
 		if (stat(fullexecname, &exec_stat))
-			fatal("unable to stat %s", fullexecname);
+			fatale("unable to stat %s", fullexecname);
 
 		if (fullexecname != execname)
 			free(fullexecname);
@@ -1215,7 +1520,7 @@ setup_options(void)
 
 		pw = getpwnam(userspec);
 		if (!pw)
-			fatal("user '%s' not found", userspec);
+			fatale("user '%s' not found", userspec);
 
 		user_id = pw->pw_uid;
 	}
@@ -1225,7 +1530,7 @@ setup_options(void)
 
 		gr = getgrnam(changegroup);
 		if (!gr)
-			fatal("group '%s' not found", changegroup);
+			fatale("group '%s' not found", changegroup);
 		changegroup = gr->gr_name;
 		runas_gid = gr->gr_gid;
 	}
@@ -1238,7 +1543,7 @@ setup_options(void)
 		else
 			pw = getpwnam(changeuser);
 		if (!pw)
-			fatal("user '%s' not found", changeuser);
+			fatale("user '%s' not found", changeuser);
 		changeuser = pw->pw_name;
 		runas_uid = pw->pw_uid;
 		if (changegroup == NULL) {
@@ -1294,10 +1599,16 @@ proc_get_psinfo(pid_t pid, struct psinfo *psinfo)
 	fp = fopen(filename, "r");
 	if (!fp)
 		return false;
-	if (fread(psinfo, sizeof(*psinfo), 1, fp) == 0)
+	if (fread(psinfo, sizeof(*psinfo), 1, fp) == 0) {
+		fclose(fp);
 		return false;
-	if (ferror(fp))
+	}
+	if (ferror(fp)) {
+		fclose(fp);
 		return false;
+	}
+
+	fclose(fp);
 
 	return true;
 }
@@ -2011,7 +2322,7 @@ pid_is_running(pid_t pid)
 	else if (errno == ESRCH)
 		return false;
 	else
-		fatal("error checking pid %u status", (unsigned)pid);
+		fatale("error checking pid %u status", pid);
 }
 #endif
 
@@ -2047,6 +2358,32 @@ do_pidfile(const char *name)
 	if (f) {
 		enum status_code pid_status;
 
+		/* If we are only matching on the pidfile, and it is owned by
+		 * a non-root user, then this is a security risk, and the
+		 * contents cannot be trusted, because the daemon might have
+		 * been compromised.
+		 *
+		 * If the pidfile is world-writable we refuse to parse it.
+		 *
+		 * If we got /dev/null specified as the pidfile, we ignore the
+		 * checks, as this is being used to run processes no matter
+		 * what. */
+		if (strcmp(name, "/dev/null") != 0) {
+			struct stat st;
+			int fd = fileno(f);
+
+			if (fstat(fd, &st) < 0)
+				fatale("cannot stat pidfile %s", name);
+
+			if (match_mode == MATCH_PIDFILE &&
+			    ((st.st_uid != getuid() && st.st_uid != 0) ||
+			     (st.st_gid != getgid() && st.st_gid != 0)))
+				fatal("matching only on non-root pidfile %s is insecure", name);
+			if (st.st_mode & 0002)
+				fatal("matching on world-writable pidfile %s is insecure", name);
+
+		}
+
 		if (fscanf(f, "%d", &pid) == 1)
 			pid_status = pid_check(pid);
 		else
@@ -2060,7 +2397,7 @@ do_pidfile(const char *name)
 	} else if (errno == ENOENT)
 		return STATUS_DEAD;
 	else
-		fatal("unable to open pidfile %s", name);
+		fatale("unable to open pidfile %s", name);
 }
 
 #if defined(OS_Linux) || defined(OS_sunos) || defined(OS_AIX)
@@ -2075,7 +2412,7 @@ do_procinit(void)
 
 	procdir = opendir("/proc");
 	if (!procdir)
-		fatal("unable to opendir /proc");
+		fatale("unable to opendir /proc");
 
 	foundany = 0;
 	while ((entry = readdir(procdir)) != NULL) {
@@ -2090,7 +2427,7 @@ do_procinit(void)
 			prog_status = pid_status;
 	}
 	closedir(procdir);
-	if (!foundany)
+	if (foundany == 0)
 		fatal("nothing in /proc - not mounted?");
 
 	return prog_status;
@@ -2271,8 +2608,7 @@ do_start(int argc, char **argv)
 	do_findprocs();
 
 	if (found) {
-		if (quietmode <= 0)
-			printf("%s already running.\n", execname ? execname : "process");
+		info("%s already running.\n", execname ? execname : "process");
 		return exitnodo;
 	}
 	if (testmode && quietmode <= 0) {
@@ -2300,8 +2636,7 @@ do_start(int argc, char **argv)
 	}
 	if (testmode)
 		return 0;
-	if (quietmode < 0)
-		printf("Starting %s...\n", startas);
+	debug("Starting %s...\n", startas);
 	*--argv = startas;
 	if (background)
 		/* Ok, we need to detach this process. */
@@ -2312,12 +2647,12 @@ do_start(int argc, char **argv)
 	if (background && close_io) {
 		devnull_fd = open("/dev/null", O_RDWR);
 		if (devnull_fd < 0)
-			fatal("unable to open '%s'", "/dev/null");
+			fatale("unable to open '%s'", "/dev/null");
 	}
 	if (nicelevel) {
 		errno = 0;
 		if ((nice(nicelevel) == -1) && (errno != 0))
-			fatal("unable to alter nice level by %i", nicelevel);
+			fatale("unable to alter nice level by %i", nicelevel);
 	}
 	if (proc_sched)
 		set_proc_schedule(proc_sched);
@@ -2327,19 +2662,19 @@ do_start(int argc, char **argv)
 		umask(umask_value);
 	if (changeroot != NULL) {
 		if (chdir(changeroot) < 0)
-			fatal("unable to chdir() to %s", changeroot);
+			fatale("unable to chdir() to %s", changeroot);
 		if (chroot(changeroot) < 0)
-			fatal("unable to chroot() to %s", changeroot);
+			fatale("unable to chroot() to %s", changeroot);
 	}
 	if (chdir(changedir) < 0)
-		fatal("unable to chdir() to %s", changedir);
+		fatale("unable to chdir() to %s", changedir);
 
 	rgid = getgid();
 	ruid = getuid();
 	if (changegroup != NULL) {
 		if (rgid != (gid_t)runas_gid)
 			if (setgid(runas_gid))
-				fatal("unable to set gid to %d", runas_gid);
+				fatale("unable to set gid to %d", runas_gid);
 	}
 	if (changeuser != NULL) {
 		/* We assume that if our real user and group are the same as
@@ -2347,12 +2682,12 @@ do_start(int argc, char **argv)
 		 * will be already in place. */
 		if (rgid != (gid_t)runas_gid || ruid != (uid_t)runas_uid)
 			if (initgroups(changeuser, runas_gid))
-				fatal("unable to set initgroups() with gid %d",
+				fatale("unable to set initgroups() with gid %d",
 				      runas_gid);
 
 		if (ruid != (uid_t)runas_uid)
 			if (setuid(runas_uid))
-				fatal("unable to set uid to %s", changeuser);
+				fatale("unable to set uid to %s", changeuser);
 	}
 
 	if (background && close_io) {
@@ -2367,7 +2702,7 @@ do_start(int argc, char **argv)
 			close(i);
 	}
 	execv(startas, argv);
-	fatal("unable to start %s", startas);
+	fatale("unable to start %s", startas);
 }
 
 static void
@@ -2387,9 +2722,7 @@ do_stop(int sig_num, int *n_killed, int *n_notkilled)
 
 	for (p = found; p; p = p->next) {
 		if (testmode) {
-			if (quietmode <= 0)
-				printf("Would send signal %d to %d.\n",
-				       sig_num, (int)p->pid);
+			info("Would send signal %d to %d.\n", sig_num, p->pid);
 			(*n_killed)++;
 		} else if (kill(p->pid, sig_num) == 0) {
 			pid_list_push(&killed, p->pid);
@@ -2431,7 +2764,7 @@ set_what_stop(const char *format, ...)
 	va_end(arglist);
 
 	if (rc < 0)
-		fatal("cannot allocate formatted string");
+		fatale("cannot allocate formatted string");
 }
 
 /*
@@ -2496,7 +2829,7 @@ do_stop_timeout(int timeout, int *n_killed, int *n_notkilled)
 
 		rc = pselect(0, NULL, NULL, NULL, &interval, NULL);
 		if (rc < 0 && errno != EINTR)
-			fatal("select() failed for pause");
+			fatale("select() failed for pause");
 	}
 }
 
@@ -2509,8 +2842,7 @@ finish_stop_schedule(bool anykilled)
 	if (anykilled)
 		return 0;
 
-	if (quietmode <= 0)
-		printf("No %s found running; none killed.\n", what_stop);
+	info("No %s found running; none killed.\n", what_stop);
 
 	return exitnodo;
 }
@@ -2523,8 +2855,7 @@ run_stop_schedule(void)
 
 	if (testmode) {
 		if (schedule != NULL) {
-			if (quietmode <= 0)
-				printf("Ignoring --retry in test mode\n");
+			info("Ignoring --retry in test mode\n");
 			schedule = NULL;
 		}
 	}
@@ -2542,7 +2873,7 @@ run_stop_schedule(void)
 	else if (userspec)
 		set_what_stop("process(es) owned by '%s'", userspec);
 	else
-		fatal("internal error, no match option, please report");
+		BUG("no match option, please report");
 
 	anykilled = false;
 	retry_nr = 0;
@@ -2550,8 +2881,8 @@ run_stop_schedule(void)
 	if (schedule == NULL) {
 		do_stop(signal_nr, &n_killed, &n_notkilled);
 		do_stop_summary(0);
-		if (n_notkilled > 0 && quietmode <= 0)
-			printf("%d pids were not killed\n", n_notkilled);
+		if (n_notkilled > 0)
+			info("%d pids were not killed\n", n_notkilled);
 		if (n_killed)
 			anykilled = true;
 		return finish_stop_schedule(anykilled);
@@ -2580,13 +2911,13 @@ run_stop_schedule(void)
 			else
 				continue;
 		default:
-			assert(!"schedule[].type value must be valid");
+			BUG("schedule[%d].type value %d is not valid",
+			    position, schedule[position].type);
 		}
 	}
 
-	if (quietmode <= 0)
-		printf("Program %s, %d process(es), refused to die.\n",
-		       what_stop, n_killed);
+	info("Program %s, %d process(es), refused to die.\n",
+	     what_stop, n_killed);
 
 	return 2;
 }
diff --git a/utils/t/update_alternatives.t b/utils/t/update_alternatives.t
index 491fee07d..c80edbad5 100644
--- a/utils/t/update_alternatives.t
+++ b/utils/t/update_alternatives.t
@@ -21,6 +21,7 @@ use Test::More;
 use File::Spec;
 
 use Dpkg::IPC;
+use Dpkg::File qw(file_slurp);
 use Dpkg::Path qw(find_command);
 
 my $srcdir = $ENV{srcdir} || '.';
@@ -93,7 +94,7 @@ my @choices = (
 );
 my $nb_slaves = 4;
 plan tests => (4 * ($nb_slaves + 1) + 2) * 26 # number of check_choices
-               + 106;                         # rest
+               + 110;                         # rest
 
 sub cleanup {
     system("rm -rf $tmpdir && mkdir -p $admindir && mkdir -p $altdir");
@@ -260,11 +261,7 @@ check_choice(0, 'auto', 'initial install 3');
 
 # verify that the administrative file is sorted properly
 {
-    local $/ = undef;
-    open(my $db_fh, '<', "$admindir/generic-test") or die $!;
-    my $content = <$db_fh>;
-    close($db_fh);
-
+    my $content = file_slurp("$admindir/generic-test");
     my $expected =
 "auto
 $bindir/generic-test
@@ -518,3 +515,54 @@ ok(-f "$bindir/slave2", 'install + switching keeps real files installed as slave
 set_choice(1, params => ['--force']);
 ok(!-e "$bindir/slave2", 'forced switching w/o slave drops real files installed as slave links');
 check_choice(1, 'manual', 'set --force replaces files with links');
+
+# check disappearence of obsolete slaves (#916799)
+cleanup();
+call_ua([
+    '--install', "$bindir/test-obsolete", 'test-obsolete', "$paths{date}", '10',
+    '--slave', "$bindir/test-slave-a", 'test-slave-a', "$bindir/impl-slave-a",
+    '--slave', "$bindir/test-slave-b", 'test-slave-b', "$bindir/impl-slave-b",
+    '--slave', "$bindir/test-slave-c", 'test-slave-c', "$bindir/impl-slave-c",
+], to_file => '/dev/null', error_to_file => '/dev/null');
+
+my $content;
+my $expected;
+
+$content = file_slurp("$admindir/test-obsolete");
+$expected =
+"auto
+$bindir/test-obsolete
+test-slave-a
+$bindir/test-slave-a
+test-slave-b
+$bindir/test-slave-b
+test-slave-c
+$bindir/test-slave-c
+
+$paths{date}
+10
+$bindir/impl-slave-a
+$bindir/impl-slave-b
+$bindir/impl-slave-c
+
+";
+is($content, $expected, 'administrative file for non-obsolete slaves is as expected');
+
+call_ua([
+    '--install', "$bindir/test-obsolete", 'test-obsolete', "$paths{date}", '20',
+    '--slave', "$bindir/test-slave-c", 'test-slave-c', "$bindir/impl-slave-c",
+], to_file => '/dev/null', error_to_file => '/dev/null');
+
+$content = file_slurp("$admindir/test-obsolete");
+$expected =
+"auto
+$bindir/test-obsolete
+test-slave-c
+$bindir/test-slave-c
+
+$paths{date}
+20
+$bindir/impl-slave-c
+
+";
+is($content, $expected, 'administrative file for obsolete slaves is as expected');
diff --git a/utils/update-alternatives.c b/utils/update-alternatives.c
index 9a9d10c62..a9180705b 100644
--- a/utils/update-alternatives.c
+++ b/utils/update-alternatives.c
@@ -3,7 +3,7 @@
  *
  * Copyright © 1995 Ian Jackson <ijackson@chiark.greenend.org.uk>
  * Copyright © 2000-2002 Wichert Akkerman <wakkerma@debian.org>
- * Copyright © 2006-2015 Guillem Jover <guillem@debian.org>
+ * Copyright © 2006-2017 Guillem Jover <guillem@debian.org>
  * Copyright © 2008 Pierre Habouzit <madcoder@debian.org>
  * Copyright © 2009-2010 Raphaël Hertzog <hertzog@debian.org>
  *
@@ -55,12 +55,54 @@ static const char *admdir;
 
 static const char *prog_path = "update-alternatives";
 
+enum action {
+	ACTION_NONE,
+	ACTION_INSTALL,
+	ACTION_SET,
+	ACTION_SET_SELECTIONS,
+	ACTION_GET_SELECTIONS,
+	ACTION_AUTO,
+	ACTION_CONFIG,
+	ACTION_CONFIG_ALL,
+	ACTION_REMOVE,
+	ACTION_REMOVE_ALL,
+	ACTION_LIST,
+	ACTION_QUERY,
+	ACTION_DISPLAY,
+};
+
+static struct action_name {
+	enum action action;
+	const char *name;
+} action_names[] = {
+	{ ACTION_NONE,			"" },
+	{ ACTION_INSTALL,		"install" },
+	{ ACTION_SET,			"set" },
+	{ ACTION_SET_SELECTIONS,	"set-selections" },
+	{ ACTION_GET_SELECTIONS,	"get-selections" },
+	{ ACTION_AUTO,			"auto" },
+	{ ACTION_CONFIG,		"config" },
+	{ ACTION_CONFIG_ALL,		"all" },
+	{ ACTION_REMOVE,		"remove" },
+	{ ACTION_REMOVE_ALL,		"remove-all" },
+	{ ACTION_LIST,			"list" },
+	{ ACTION_QUERY,			"query" },
+	{ ACTION_DISPLAY,		"display" },
+};
+
+enum output_mode {
+	OUTPUT_QUIET = -1,
+	OUTPUT_NORMAL = 0,
+	OUTPUT_VERBOSE = 1,
+	OUTPUT_DEBUG = 2,
+};
+
 /* Action to perform */
-static const char *action = NULL;
+static enum action action = ACTION_NONE;
 static const char *log_file = LOGDIR "/alternatives.log";
 /* Skip alternatives properly configured in auto mode (for --config) */
 static int opt_skip_auto = 0;
-static int opt_verbose = 0;
+static int opt_verbose = OUTPUT_NORMAL;
 static int opt_force = 0;
 
 /*
@@ -123,8 +165,9 @@ usage(void)
 "  --force                  allow replacing files with alternative links.\n"
 "  --skip-auto              skip prompt for alternatives correctly configured\n"
 "                           in automatic mode (relevant for --config only)\n"
-"  --verbose                verbose operation, more output.\n"
 "  --quiet                  quiet operation, minimal output.\n"
+"  --verbose                verbose operation, more output.\n"
+"  --debug                  debug output, way more output.\n"
 "  --help                   show this help message.\n"
 "  --version                show the version.\n"
 ));
@@ -177,7 +220,7 @@ warning(char const *fmt, ...)
 {
 	va_list args;
 
-	if (opt_verbose < 0)
+	if (opt_verbose < OUTPUT_NORMAL)
 		return;
 
 	fprintf(stderr, "%s: %s: ", PROGNAME, _("warning"));
@@ -190,15 +233,16 @@ warning(char const *fmt, ...)
 static void DPKG_ATTR_PRINTF(1)
 debug(char const *fmt, ...)
 {
-#if 0
 	va_list args;
 
+	if (opt_verbose < OUTPUT_DEBUG)
+		return;
+
 	fprintf(stderr, "DEBUG: ");
 	va_start(args, fmt);
 	vfprintf(stderr, fmt, args);
 	va_end(args);
 	fprintf(stderr, "\n");
-#endif
 }
 
 static void DPKG_ATTR_PRINTF(1)
@@ -206,7 +250,7 @@ verbose(char const *fmt, ...)
 {
 	va_list args;
 
-	if (opt_verbose < 1)
+	if (opt_verbose < OUTPUT_VERBOSE)
 		return;
 
 	printf("%s: ", PROGNAME);
@@ -221,7 +265,7 @@ info(char const *fmt, ...)
 {
 	va_list args;
 
-	if (opt_verbose < 0)
+	if (opt_verbose < OUTPUT_NORMAL)
 		return;
 
 	printf("%s: ", PROGNAME);
@@ -354,14 +398,29 @@ pathname_is_missing(const char *pathname)
 }
 
 static void
-set_action(const char *new_action)
+set_action(enum action new_action)
 {
 	if (action)
 		badusage(_("two commands specified: --%s and --%s"),
-		         action, new_action);
+		         action_names[action].name, action_names[new_action].name);
 	action = new_action;
 }
 
+static void
+set_action_from_name(const char *new_action)
+{
+	size_t i;
+
+	for (i = 0; i < array_count(action_names); i++) {
+		if (strcmp(new_action, action_names[i].name) == 0) {
+			set_action(action_names[i].action);
+			return;
+		}
+	}
+
+	assert(!"unknown action name");
+}
+
 static const char *
 admindir_init(void)
 {
@@ -1314,7 +1373,8 @@ alternative_save(struct alternative *a)
 
 	/* Cleanup unused slaves before writing admin file. */
 	sl_prev = NULL;
-	for (sl = a->slaves; sl; sl_prev = sl, sl = sl->next) {
+	sl = a->slaves;
+	while (sl) {
 		bool has_slave = false;
 
 		for (fs = a->choices; fs; fs = fs->next) {
@@ -1334,10 +1394,11 @@ alternative_save(struct alternative *a)
 			else
 				a->slaves = sl->next;
 			sl_rm = sl;
-			sl = sl_prev ? sl_prev : a->slaves;
+			sl = sl->next;
 			slave_link_free(sl_rm);
-			if (!sl)
-				break; /* No other slave left. */
+		} else {
+			sl_prev = sl;
+			sl = sl->next;
 		}
 	}
 
@@ -2579,15 +2640,17 @@ main(int argc, char **argv)
 		} else if (strcmp("--version", argv[i]) == 0) {
 			version();
 			exit(0);
-		} else if (strcmp("--verbose", argv[i]) == 0) {
-			opt_verbose++;
 		} else if (strcmp("--quiet", argv[i]) == 0) {
-			opt_verbose--;
+			opt_verbose = OUTPUT_QUIET;
+		} else if (strcmp("--verbose", argv[i]) == 0) {
+			opt_verbose = OUTPUT_VERBOSE;
+		} else if (strcmp("--debug", argv[i]) == 0) {
+			opt_verbose = OUTPUT_DEBUG;
 		} else if (strcmp("--install", argv[i]) == 0) {
 			char *prio_str, *prio_end;
 			long prio;
 
-			set_action("install");
+			set_action(ACTION_INSTALL);
 			if (MISSING_ARGS(4))
 				badusage(_("--install needs <link> <name> "
 				           "<path> <priority>"));
@@ -2612,7 +2675,7 @@ main(int argc, char **argv)
 			i += 4;
 		} else if (strcmp("--remove", argv[i]) == 0 ||
 			   strcmp("--set", argv[i]) == 0) {
-			set_action(argv[i] + 2);
+			set_action_from_name(argv[i] + 2);
 			if (MISSING_ARGS(2))
 				badusage(_("--%s needs <name> <path>"), argv[i] + 2);
 
@@ -2629,7 +2692,7 @@ main(int argc, char **argv)
 			   strcmp("--config", argv[i]) == 0 ||
 			   strcmp("--list", argv[i]) == 0 ||
 			   strcmp("--remove-all", argv[i]) == 0) {
-			set_action(argv[i] + 2);
+			set_action_from_name(argv[i] + 2);
 			if (MISSING_ARGS(1))
 				badusage(_("--%s needs <name>"), argv[i] + 2);
 			a = alternative_new(argv[i + 1]);
@@ -2640,13 +2703,12 @@ main(int argc, char **argv)
 		} else if (strcmp("--all", argv[i]) == 0 ||
 			   strcmp("--get-selections", argv[i]) == 0 ||
 			   strcmp("--set-selections", argv[i]) == 0) {
-			set_action(argv[i] + 2);
+			set_action_from_name(argv[i] + 2);
 		} else if (strcmp("--slave", argv[i]) == 0) {
 			const char *slink, *sname, *spath;
 			struct slave_link *sl;
 
-			if (action == NULL ||
-			    (action && strcmp(action, "install") != 0))
+			if (action == ACTION_NONE || action != ACTION_INSTALL)
 				badusage(_("--slave only allowed with --install"));
 			if (MISSING_ARGS(3))
 				badusage(_("--slave needs <link> <name> <path>"));
@@ -2703,40 +2765,40 @@ main(int argc, char **argv)
 		}
 	}
 
-	if (!action)
+	if (action == ACTION_NONE)
 		badusage(_("need --display, --query, --list, --get-selections, "
 		           "--config, --set, --set-selections, --install, "
 		           "--remove, --all, --remove-all or --auto"));
 
 	/* The following actions might modify the current alternative. */
-	if (strcmp(action, "set") == 0 ||
-	    strcmp(action, "auto") == 0 ||
-	    strcmp(action, "config") == 0 ||
-	    strcmp(action, "remove") == 0 ||
-	    strcmp(action, "remove-all") == 0 ||
-	    strcmp(action, "install") == 0)
+	if (action == ACTION_SET ||
+	    action == ACTION_AUTO ||
+	    action == ACTION_CONFIG ||
+	    action == ACTION_REMOVE ||
+	    action == ACTION_REMOVE_ALL ||
+	    action == ACTION_INSTALL)
 		modifies_alt = true;
 
 	/* The following actions might modify the system somehow. */
 	if (modifies_alt ||
-	    strcmp(action, "all") == 0 ||
-	    strcmp(action, "set-selections") == 0)
+	    action == ACTION_CONFIG_ALL ||
+	    action == ACTION_SET_SELECTIONS)
 		modifies_sys = true;
 
-	if (strcmp(action, "install") == 0)
+	if (action == ACTION_INSTALL)
 		alternative_check_install_args(inst_alt, fileset);
 
-	if (strcmp(action, "display") == 0 ||
-	    strcmp(action, "query") == 0 ||
-	    strcmp(action, "list") == 0 ||
-	    strcmp(action, "set") == 0 ||
-	    strcmp(action, "auto") == 0 ||
-	    strcmp(action, "config") == 0 ||
-	    strcmp(action, "remove-all") == 0) {
+	if (action == ACTION_DISPLAY ||
+	    action == ACTION_QUERY ||
+	    action == ACTION_LIST ||
+	    action == ACTION_SET ||
+	    action == ACTION_AUTO ||
+	    action == ACTION_CONFIG ||
+	    action == ACTION_REMOVE_ALL) {
 		/* Load the alternative info, stop on failure. */
 		if (!alternative_load(a, ALTDB_WARN_PARSER))
 			error(_("no alternatives for %s"), a->master_name);
-	} else if (strcmp(action, "remove") == 0) {
+	} else if (action == ACTION_REMOVE) {
 		/* FIXME: Be consistent for now with the case when we
 		 * try to remove a non-existing path from an existing
 		 * link group file. */
@@ -2744,7 +2806,7 @@ main(int argc, char **argv)
 			verbose(_("no alternatives for %s"), a->master_name);
 			exit(0);
 		}
-	} else if (strcmp(action, "install") == 0) {
+	} else if (action == ACTION_INSTALL) {
 		/* Load the alternative info, ignore failures. */
 		alternative_load(a, ALTDB_WARN_PARSER);
 	}
@@ -2758,29 +2820,29 @@ main(int argc, char **argv)
 	}
 
 	/* Handle actions. */
-	if (strcmp(action, "all") == 0) {
+	if (action == ACTION_CONFIG_ALL) {
 		alternative_config_all();
-	} else if (strcmp(action, "get-selections") == 0) {
+	} else if (action == ACTION_GET_SELECTIONS) {
 		alternative_get_selections();
-	} else if (strcmp(action, "set-selections") == 0) {
+	} else if (action == ACTION_SET_SELECTIONS) {
 		alternative_set_selections(stdin, _("<standard input>"));
-	} else if (strcmp(action, "display") == 0) {
+	} else if (action == ACTION_DISPLAY) {
 		alternative_display_user(a);
-	} else if (strcmp(action, "query") == 0) {
+	} else if (action == ACTION_QUERY) {
 		alternative_display_query(a);
-	} else if (strcmp(action, "list") == 0) {
+	} else if (action == ACTION_LIST) {
 		alternative_display_list(a);
-	} else if (strcmp(action, "set") == 0) {
+	} else if (action == ACTION_SET) {
 		new_choice = alternative_set_manual(a, path);
-	} else if (strcmp(action, "auto") == 0) {
+	} else if (action == ACTION_AUTO) {
 		new_choice = alternative_set_auto(a);
-	} else if (strcmp(action, "config") == 0) {
+	} else if (action == ACTION_CONFIG) {
 		new_choice = alternative_config(a, current_choice);
-	} else if (strcmp(action, "remove") == 0) {
+	} else if (action == ACTION_REMOVE) {
 		new_choice = alternative_remove(a, current_choice, path);
-	} else if (strcmp(action, "remove-all") == 0) {
+	} else if (action == ACTION_REMOVE_ALL) {
 		alternative_choices_free(a);
-	} else if (strcmp(action, "install") == 0) {
+	} else if (action == ACTION_INSTALL) {
 		if (a->master_link) {
 			/* Alternative already exists, check if anything got
 			 * updated. */