From 0e894ddaa68792246bd03a5dcf3f2e56fd2aeb74 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 27 Oct 2017 22:06:58 +0200
Subject: Dpkg::Vendor::Debian: Use proper use_feature key

We need to access the features within the feature area hash now. Missed
in a previous refactoring.

Fixes: commit 2125e8dd7388e2adb9b6c837f4832fe8f0f63b25
Reported-by: Mattia Rizzolo <mattia@debian.org> (on IRC)
Closes: #881051
---
 scripts/Dpkg/Vendor/Debian.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index e0fd01113..980597b5c 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -204,7 +204,7 @@ sub _add_build_flags {
         # 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}{fixdebugpath} = 0;
         }
     }
 
-- 
cgit v1.2.3


From fe186374cd2a287723fe227fe37ea4a5373822c0 Mon Sep 17 00:00:00 2001
From: Paul Wise <pabs@debian.org>
Date: Mon, 4 Dec 2017 15:12:50 +0800
Subject: Dpkg::Changelog: Print versions for incorrect changelog range
 warnings

Within scripts operating on lots of different package changelogs,
this can help track down where these warnings come from.

Signed-off-by: Guillem Jover <guillem@debian.org>
---
 debian/changelog          |  2 ++
 scripts/Dpkg/Changelog.pm | 18 +++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index cc537f866..8ed5546f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - Dpkg::Vendor::Debian: Use proper %use_feature key. This was causing perl
       errors on paths not accapted 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>.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index db8e3eb09..35e48ef02 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -254,7 +254,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 +270,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 +281,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 +297,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 +312,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
-- 
cgit v1.2.3


From d6ba39af48a8c8eadc1b1542fcd6db0edf2dbe7f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 29 Oct 2017 18:18:39 +0100
Subject: test: Consider *.PL also to be perl files

---
 debian/changelog     | 1 +
 scripts/Test/Dpkg.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 85921f820..96cb3175a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
   * Test suite:
     - Skip Dpkg::OpenPGP test if gpg is not present.
     - Check POD in all perl scripts.
+    - Consider *.PL also to be perl files.
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #881401
diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm
index 1b1a5d67e..f0a73f8af 100644
--- a/scripts/Test/Dpkg.pm
+++ b/scripts/Test/Dpkg.pm
@@ -65,7 +65,7 @@ sub test_get_perl_dirs
 
 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/;
-- 
cgit v1.2.3


From 33c866433dd4b186aae970e05c639b52ad5e7ece Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 29 Oct 2017 18:40:54 +0100
Subject: test: Infer automatically the unit test data directory

We can easily know the name of the calling unit test, and can thus infer
the pathname for the data directory, instead of having to duplicate the
name, and potentially ending with it being out of sync.
---
 debian/changelog                |  1 +
 scripts/Test/Dpkg.pm            | 18 ++++++++++++++++--
 scripts/t/Dpkg_Changelog.t      |  2 +-
 scripts/t/Dpkg_Checksums.t      |  2 +-
 scripts/t/Dpkg_Conf.t           |  2 +-
 scripts/t/Dpkg_Control.t        |  2 +-
 scripts/t/Dpkg_Control_Fields.t |  2 +-
 scripts/t/Dpkg_Control_Tests.t  |  2 +-
 scripts/t/Dpkg_Dist_Files.t     |  2 +-
 scripts/t/Dpkg_OpenPGP.t        |  2 +-
 scripts/t/Dpkg_Shlibs.t         |  2 +-
 scripts/t/Dpkg_Source_Patch.t   |  2 +-
 scripts/t/Dpkg_Source_Quilt.t   |  2 +-
 scripts/t/Dpkg_Substvars.t      |  2 +-
 scripts/t/mk.t                  |  4 +++-
 15 files changed, 32 insertions(+), 15 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 96cb3175a..761acad10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #881401
diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm
index f0a73f8af..2a3fec219 100644
--- a/scripts/Test/Dpkg.pm
+++ b/scripts/Test/Dpkg.pm
@@ -50,12 +50,26 @@ use File::Find;
 use IPC::Cmd qw(can_run);
 use Test::More;
 
+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) {
+        my $srcdir = $ENV{srcdir} || '.';
+        return "$srcdir/$path";
+    } else {
+        return _test_get_caller_dir();
+    }
 }
 
 sub test_get_perl_dirs
diff --git a/scripts/t/Dpkg_Changelog.t b/scripts/t/Dpkg_Changelog.t
index 1ca238acd..ed9f8a965 100644
--- a/scripts/t/Dpkg_Changelog.t
+++ b/scripts/t/Dpkg_Changelog.t
@@ -29,7 +29,7 @@ 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();
 
diff --git a/scripts/t/Dpkg_Checksums.t b/scripts/t/Dpkg_Checksums.t
index e549e640e..82a45fe31 100644
--- a/scripts/t/Dpkg_Checksums.t
+++ b/scripts/t/Dpkg_Checksums.t
@@ -23,7 +23,7 @@ BEGIN {
     use_ok('Dpkg::Checksums');
 }
 
-my $datadir = test_get_data_path('t/Dpkg_Checksums');
+my $datadir = test_get_data_path();
 
 my @data = (
     {
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..c83efed96 100644
--- a/scripts/t/Dpkg_Control_Fields.t
+++ b/scripts/t/Dpkg_Control_Fields.t
@@ -26,7 +26,7 @@ BEGIN {
     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
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_Dist_Files.t b/scripts/t/Dpkg_Dist_Files.t
index b29973d38..44d42d058 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 = (
diff --git a/scripts/t/Dpkg_OpenPGP.t b/scripts/t/Dpkg_OpenPGP.t
index 84b8401f3..0d2e4afef 100644
--- a/scripts/t/Dpkg_OpenPGP.t
+++ b/scripts/t/Dpkg_OpenPGP.t
@@ -31,7 +31,7 @@ use_ok('Dpkg::OpenPGP');
 
 report_options(quiet_warnings => 1);
 
-my $datadir = test_get_data_path('t/Dpkg_OpenPGP');
+my $datadir = test_get_data_path();
 my $tmpdir = 't.tmp/Dpkg_OpenPGP';
 
 mkdir $tmpdir;
diff --git a/scripts/t/Dpkg_Shlibs.t b/scripts/t/Dpkg_Shlibs.t
index 39163d75b..2310f4f1c 100644
--- a/scripts/t/Dpkg_Shlibs.t
+++ b/scripts/t/Dpkg_Shlibs.t
@@ -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;
 
diff --git a/scripts/t/Dpkg_Source_Patch.t b/scripts/t/Dpkg_Source_Patch.t
index d81a1a39d..d0e167dbd 100644
--- a/scripts/t/Dpkg_Source_Patch.t
+++ b/scripts/t/Dpkg_Source_Patch.t
@@ -25,7 +25,7 @@ BEGIN {
     use_ok('Dpkg::Source::Patch');
 }
 
-my $datadir = test_get_data_path('t/Dpkg_Source_Patch');
+my $datadir = test_get_data_path();
 my $tmpdir = 't.tmp/Dpkg_Source_Patch';
 
 sub test_patch_escape {
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..bb8e14039 100644
--- a/scripts/t/Dpkg_Substvars.t
+++ b/scripts/t/Dpkg_Substvars.t
@@ -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;
 
diff --git a/scripts/t/mk.t b/scripts/t/mk.t
index e711270c7..7eaf40cc8 100644
--- a/scripts/t/mk.t
+++ b/scripts/t/mk.t
@@ -17,6 +17,8 @@ use strict;
 use warnings;
 
 use Test::More tests => 6;
+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».
-- 
cgit v1.2.3


From 876855ff96f6dd72cbb92fa57bc316576f585737 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 29 Oct 2017 18:40:54 +0100
Subject: test: Infer automatically the unit test temp directory

Add new test_get_temp_path() function, and replace all hardcoded
settings of the temporary directory and its creation.
---
 debian/changelog              |  1 +
 scripts/Test/Dpkg.pm          | 13 +++++++++++++
 scripts/t/Dpkg_Compression.t  |  4 ++--
 scripts/t/Dpkg_OpenPGP.t      |  4 +---
 scripts/t/Dpkg_Path.t         |  4 ++--
 scripts/t/Dpkg_Source_Patch.t |  2 +-
 scripts/t/dpkg_buildpackage.t |  6 ++----
 scripts/t/dpkg_source.t       |  6 ++----
 8 files changed, 24 insertions(+), 16 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 761acad10..813b17053 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #881401
diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm
index 2a3fec219..5eea6184a 100644
--- a/scripts/Test/Dpkg.pm
+++ b/scripts/Test/Dpkg.pm
@@ -24,6 +24,7 @@ our @EXPORT_OK = qw(
     all_perl_modules
     test_get_perl_dirs
     test_get_data_path
+    test_get_temp_path
     test_needs_author
     test_needs_module
     test_needs_command
@@ -42,11 +43,14 @@ our %EXPORT_TAGS = (
         all_perl_modules
         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;
 
@@ -72,6 +76,15 @@ sub test_get_data_path
     }
 }
 
+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_perl_dirs
 {
     return qw(t src/t lib utils/t scripts dselect);
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_OpenPGP.t b/scripts/t/Dpkg_OpenPGP.t
index 0d2e4afef..b39613149 100644
--- a/scripts/t/Dpkg_OpenPGP.t
+++ b/scripts/t/Dpkg_OpenPGP.t
@@ -32,9 +32,7 @@ use_ok('Dpkg::OpenPGP');
 report_options(quiet_warnings => 1);
 
 my $datadir = test_get_data_path();
-my $tmpdir = 't.tmp/Dpkg_OpenPGP';
-
-mkdir $tmpdir;
+my $tmpdir = test_get_temp_path();
 
 openpgp_sig_to_asc("$datadir/package_1.0.orig.tar.sig",
                    "$tmpdir/package_1.0.orig.tar.sig2asc");
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_Source_Patch.t b/scripts/t/Dpkg_Source_Patch.t
index d0e167dbd..f50f15be2 100644
--- a/scripts/t/Dpkg_Source_Patch.t
+++ b/scripts/t/Dpkg_Source_Patch.t
@@ -26,7 +26,7 @@ BEGIN {
 }
 
 my $datadir = test_get_data_path();
-my $tmpdir = 't.tmp/Dpkg_Source_Patch';
+my $tmpdir = test_get_temp_path();
 
 sub test_patch_escape {
     my ($name, $symlink, $patchname, $desc) = @_;
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_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';
-- 
cgit v1.2.3


From b29058ea75ce28f95b373b0c36deffd4b57d466b Mon Sep 17 00:00:00 2001
From: Dmitry Shachnev <mitya57@debian.org>
Date: Sun, 3 Dec 2017 03:37:23 +0100
Subject: Dpkg::Shlibs::SymbolFile: Check that $state->{seen} exists instead of
 $state being defined

Fixes: commit 0d2b3cee25b74dd3fd9ddc3a469b8b144368c963
Closes: #880166
Signed-off-by: Guillem Jover <guillem@debian.org>
---
 debian/changelog                  | 3 +++
 scripts/Dpkg/Shlibs/SymbolFile.pm | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 813b17053..820135a0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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>.
+    - 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
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm
index d03ce2598..b36d542ce 100644
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -204,7 +204,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;
-- 
cgit v1.2.3


From 797ed78bd87c77b6fa9c3867d0fefa90bb21014c Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 5 Dec 2017 01:56:15 +0100
Subject: scripts/mk: Add new buildtools variables

This adds support for AS, STRIP, OBJCOPY, OBJDUMP, NM, AR and RANLIB.

Prompted-by: Helmut Grohne <helmut@subdivi.de>
---
 debian/changelog           |  2 ++
 scripts/mk/buildtools.mk   | 14 ++++++++++++++
 scripts/t/mk.t             |  7 +++++++
 scripts/t/mk/buildtools.mk | 14 ++++++++++++++
 4 files changed, 37 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 820135a0f..9b6533fc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
   * 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>.
   * Perl modules:
     - Check that $tarname is defined before use in Dpkg::Source::Package::V1.
       Thanks to Christoph Biedl <debian.axhn@manchmal.in-ulm.de>.
diff --git a/scripts/mk/buildtools.mk b/scripts/mk/buildtools.mk
index d5638f50e..c3b44bb8a 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,
@@ -44,6 +51,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 +61,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))
+$(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/t/mk.t b/scripts/t/mk.t
index 7eaf40cc8..0062e993c 100644
--- a/scripts/t/mk.t
+++ b/scripts/t/mk.t
@@ -82,6 +82,7 @@ $ENV{"TEST_$_"} = $buildflag{$_} foreach keys %buildflag;
 test_makefile('buildflags.mk');
 
 my %buildtools = (
+    AS => 'as',
     CPP => 'gcc -E',
     CC => 'gcc',
     CXX => 'g++',
@@ -91,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',
 );
 
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)"
-- 
cgit v1.2.3


From 2f5816d8be40b449d2473b22f9e0c33b32f3bd78 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 10 Dec 2017 12:07:42 +0100
Subject: scripts: Reject negated values in Architecture field

Add new positive options argument to arch validators, as the Architecture
field should not accept negated architectures. We preserve the current
functions default behavior and add a new option to control whether to
reject negated architectures.

Fixes: commit d355b340f3a6cde7fc1cb5649d82fbebd3b97ea1
Stable-Candidate: 1.18.x
---
 debian/changelog           |  3 +++
 scripts/Dpkg/Arch.pm       | 28 ++++++++++++++++++++++------
 scripts/dpkg-genchanges.pl |  4 ++--
 scripts/dpkg-gencontrol.pl |  2 +-
 scripts/t/Dpkg_Arch.t      |  9 ++++++++-
 5 files changed, 36 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 9b6533fc9..2d4f616f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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.
   * Perl modules:
     - Check that $tarname is defined before use in Dpkg::Source::Package::V1.
       Thanks to Christoph Biedl <debian.axhn@manchmal.in-ulm.de>.
@@ -30,6 +32,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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
+    - Add new positive options argument to arch validators in Dpkg::Arch.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index c3e891526..14709d6cc 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
@@ -599,17 +599,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)
@@ -651,15 +659,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);
         }
@@ -676,6 +687,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-genchanges.pl b/scripts/dpkg-genchanges.pl
index 84bdc4ba6..4f4b33608 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -369,7 +369,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)))
 	{
@@ -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 = '';
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 2e656a246..1c92e66dd 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 " .
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
index 525817085..0ef9d1899 100644
--- a/scripts/t/Dpkg_Arch.t
+++ b/scripts/t/Dpkg_Arch.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 16367;
+use Test::More tests => 16369;
 
 use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch
                         debarch_eq debarch_is debarch_is_wildcard
@@ -148,9 +148,16 @@ 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');
 
-- 
cgit v1.2.3


From ee0855cc66076691de4796be48f8a0d889fde001 Mon Sep 17 00:00:00 2001
From: "Manuel A. Fernandez Montecelo" <mafm@debian.org>
Date: Tue, 16 Jan 2018 00:43:51 +0100
Subject: arch: Add support for riscv64 CPU

[guillem@debian.org:
 - Update unit-tests. ]

Closes: #822914
Stable-Candidate: 1.18.x
Signed-off-by: Guillem Jover <guillem@debian.org>
---
 data/cputable         | 1 +
 debian/changelog      | 3 +++
 scripts/t/Dpkg_Arch.t | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'scripts')

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/debian/changelog b/debian/changelog
index 2d4f616f2..74bab5d95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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.
+  * Architecture support:
+    - Add support for riscv64 CPU. Closes: #822914
+      Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
   * Perl modules:
     - Check that $tarname is defined before use in Dpkg::Source::Package::V1.
       Thanks to Christoph Biedl <debian.axhn@manchmal.in-ulm.de>.
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
index 0ef9d1899..9d2aaf361 100644
--- a/scripts/t/Dpkg_Arch.t
+++ b/scripts/t/Dpkg_Arch.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 16369;
+use Test::More tests => 16832;
 
 use_ok('Dpkg::Arch', qw(debarch_to_debtuple debarch_to_multiarch
                         debarch_eq debarch_is debarch_is_wildcard
@@ -169,7 +169,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';
-- 
cgit v1.2.3


From 81591e0f2590052ff221964c8c554bbbd39763b5 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 13 Jan 2018 02:34:46 +0100
Subject: Dpkg::Vendor::Debian: Mark hurd-i386 as having built-in PIE support

Requested-by: Samuel Thibault <sthibault@debian.org>
---
 debian/changelog              | 2 ++
 scripts/Dpkg/Vendor/Debian.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 74bab5d95..f83b8b6ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       Fixes regression in dpkg-gensymbols symbols output.
       Thanks to Dmitry Shachnev <mitya57@debian.org>. Closes: #880166
     - Add new positive options argument to arch validators in Dpkg::Arch.
+    - Mark hurd-i386 as having gcc builtin PIE in Dpkg::Vendor::Debian.
+      Requested by Samuel Thibault <sthibault@debian.org>.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 980597b5c..08ed8250d 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -267,7 +267,7 @@ 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
+        amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386
         mips mipsel mips64el powerpc ppc64 ppc64el s390x sparc sparc64
     );
     if (not exists $builtin_pie_arch{$arch}) {
-- 
cgit v1.2.3


From cfb7a0e98b05e41cdbe9f695fd9f625c7a119b81 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 10 Dec 2017 13:36:11 +0100
Subject: dpkg-gensymbols: Print "error" instead of "warning" when these are
 fatal

It's confusing to emit the compare problems as warnings when they cause
the program to exit with an error exit code.

Closes: #881488
---
 debian/changelog           |  2 ++
 scripts/dpkg-gensymbols.pl | 31 +++++++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index f83b8b6ce..7883dacf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/scripts/dpkg-gensymbols.pl b/scripts/dpkg-gensymbols.pl
index 09b0aa6d6..ef0992883 100755
--- a/scripts/dpkg-gensymbols.pl
+++ b/scripts/dpkg-gensymbols.pl
@@ -253,27 +253,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'))
     }
 }
 
-- 
cgit v1.2.3


From 28fee8b445cd94bf7efd76f6c3fd0c62bdf94b6d Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 3 Jan 2018 01:54:51 +0100
Subject: spec/R³: Rename DPKG_GAIN_ROOT_CMD to DEB_GAIN_ROOT_CMD
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This variable should not be dpkg specific, as it is supposed to be set
by any builder driving the package build, and not just dpkg itself.

Introduce ephemereal backwards compatibility by mapping the old name to
the new one, even thught there are no known users.
---
 debian/changelog             |  4 ++++
 doc/rootless-builds.txt      | 14 +++++++++-----
 man/dpkg-buildpackage.man    |  2 +-
 scripts/dpkg-buildpackage.pl |  4 +++-
 4 files changed, 17 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 7883dacf9..bd41680a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,10 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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 ephemereal backwards compatibility even though there are no
+    known users.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/doc/rootless-builds.txt b/doc/rootless-builds.txt
index 98e387709..29b034a8d 100644
--- a/doc/rootless-builds.txt
+++ b/doc/rootless-builds.txt
@@ -93,21 +93,25 @@ 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 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
 ------------
 
@@ -128,7 +132,7 @@ 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-buildpackage must export DPKG_GAIN_ROOT_CMD (for starters, doing this
+dpkg-buildpackage must export DEB_GAIN_ROOT_CMD (for starters, doing this
 unconditionally would be fine).
 
 
@@ -143,7 +147,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/man/dpkg-buildpackage.man b/man/dpkg-buildpackage.man
index 12c121c49..165e63ff2 100644
--- a/man/dpkg-buildpackage.man
+++ b/man/dpkg-buildpackage.man
@@ -519,7 +519,7 @@ 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_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.
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 3a9ba5b3d..4b3e2b9d6 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -720,7 +720,9 @@ sub parse_rules_requires_root {
               '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;
+        # XXX: For ephemeral backwards compatibility.
+        $ENV{DPKG_GAIN_ROOT_CMD} = $ENV{DEB_GAIN_ROOT_CMD};
     }
 
     return %rrr;
-- 
cgit v1.2.3


From f6095fa5db1e4d277a0660806875375d60286250 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 3 Jan 2018 01:57:30 +0100
Subject: dpkg-buildpackage: Do not set DEB_GAIN_ROOT_CMD on
 <implementations-keywords>

The specification is clear on this, and we should not be setting this
variable when the values are different to "no" and "binary-targets".
---
 debian/changelog             | 2 ++
 scripts/dpkg-buildpackage.pl | 5 +++++
 2 files changed, 7 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index bd41680a4..c6080560c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     the variable is expected to be set by any builder, not just dpkg. And
     introduce ephemereal 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.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 4b3e2b9d6..d790b3177 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -723,6 +723,11 @@ sub parse_rules_requires_root {
         $ENV{DEB_GAIN_ROOT_CMD} = join ' ', @rootcommand;
         # XXX: For ephemeral backwards compatibility.
         $ENV{DPKG_GAIN_ROOT_CMD} = $ENV{DEB_GAIN_ROOT_CMD};
+    } else {
+        # We should not provide the variable otherwise.
+        delete $ENV{DEB_GAIN_ROOT_CMD};
+        # XXX: For ephemeral backwards compatibility.
+        delete $ENV{DPKG_GAIN_ROOT_CMD};
     }
 
     return %rrr;
-- 
cgit v1.2.3


From 566a4b61b6c3359c3d4cffa05519ecbc967b292c Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 3 Jan 2018 02:20:20 +0100
Subject: spec/R³: Add new DEB_RULES_REQUIRES_ROOT variable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This variable is set by the builder to notify debian/rules that it
supports this specification.

Wordsmithing-by: Niels Thykier <niels@thykier.net>
---
 debian/changelog             | 1 +
 doc/rootless-builds.txt      | 9 +++++++++
 man/dpkg-buildpackage.man    | 7 +++++++
 scripts/dpkg-buildpackage.pl | 3 +++
 4 files changed, 20 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 4b630810a..0a1789908 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     <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.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/doc/rootless-builds.txt b/doc/rootless-builds.txt
index 68617d5b4..a17a5ad17 100644
--- a/doc/rootless-builds.txt
+++ b/doc/rootless-builds.txt
@@ -52,6 +52,15 @@ The values are defined as:
      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 choosen 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
 compatibility when builds are performed by legacy builders or older versions
diff --git a/man/dpkg-buildpackage.man b/man/dpkg-buildpackage.man
index 165e63ff2..76545ebb8 100644
--- a/man/dpkg-buildpackage.man
+++ b/man/dpkg-buildpackage.man
@@ -519,6 +519,13 @@ 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 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
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index d790b3177..bd0a6f6a6 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -715,6 +715,9 @@ sub parse_rules_requires_root {
         setup_rootcommand();
     }
 
+    # Notify the childs 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');
-- 
cgit v1.2.3


From 585db35d2356193e679dff3eb73d99e65c575f7b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 28 Oct 2017 12:56:42 +0200
Subject: dpkg-buildpackage: Add new --rules-requires-root

This new option makes it possible to force falling back to the legacy
behavior of assuming that debian/rules files require root.
---
 debian/changelog             | 1 +
 man/dpkg-buildpackage.man    | 4 ++++
 scripts/dpkg-buildpackage.pl | 8 +++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 0a1789908..fcfcf6aff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
   * 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.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/man/dpkg-buildpackage.man b/man/dpkg-buildpackage.man
index 76545ebb8..906351100 100644
--- a/man/dpkg-buildpackage.man
+++ b/man/dpkg-buildpackage.man
@@ -276,6 +276,10 @@ 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).
 Implies \fB\-b\fP if nothing else has been selected among \fB\-F\fP,
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index bd0a6f6a6..49c7173a4 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -80,6 +80,7 @@ sub usage {
                               do not check builtin build dependencies.
   -P, --build-profiles=<profiles>
                               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.
@@ -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;
@@ -309,6 +311,8 @@ 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$/) {
@@ -683,10 +687,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}) {
-- 
cgit v1.2.3


From dde2a51557ccde71a536d5e4a9af236bcb45be9c Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 3 Feb 2018 03:24:00 +0100
Subject: Dpkg::Source::Package::V2: Print one building line per existing
 tarball

Lumping all found tarballs into a single line makes the output more
confusing.
---
 debian/changelog                  | 1 +
 scripts/Dpkg/Source/Package/V2.pm | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 659c055a7..252efd994 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - Add new positive options argument to arch validators in Dpkg::Arch.
     - Mark hurd-i386 as having gcc builtin PIE in Dpkg::Vendor::Debian.
       Requested by Samuel Thibault <sthibault@debian.org>.
+    - Dpkg::Source::Package::V2: Print one building line per existing tarball.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 818e32ddc..5fdd24957 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -428,8 +428,10 @@ 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 (@origtarballs) {
+            info(g_('building %s using existing %s'),
+                 $self->{fields}{'Source'}, $origtarfile);
+        }
     }
 
     # Unpack a second copy for comparison
-- 
cgit v1.2.3


From e226e6cf5507eebd4888d3d11e1b65752af6752f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 3 Feb 2018 03:24:00 +0100
Subject: Dpkg::Source::Package: Print building lines for upstream tarball
 signatures

When we are picking up upstream tarball signatures, we should also print
them as being used to create the source package.

Closes: #888787
---
 debian/changelog                  |  2 ++
 scripts/Dpkg/Source/Package/V1.pm |  5 ++++-
 scripts/Dpkg/Source/Package/V2.pm | 18 ++++++++++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 252efd994..541b0c206 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -52,6 +52,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - Mark hurd-i386 as having gcc builtin PIE in Dpkg::Vendor::Debian.
       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
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm
index 001d9ecd3..38c2498f4 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -413,7 +413,10 @@ sub do_build {
     if ($tarname and -e "$tarname.sig" and not -e "$tarname.asc") {
         openpgp_sig_to_asc("$tarname.sig", "$tarname.asc");
     }
-    $self->add_file($tarsign) if $tarsign and -e $tarsign;
+    if ($tarsign and -e $tarsign) {
+        info(g_('building %s using existing %s'), $sourcepackage, $tarsign);
+        $self->add_file($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 5fdd24957..13e5d7456 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -399,7 +399,7 @@ sub _generate_patch {
     # Identify original tarballs
     my ($tarfile, %addonfile);
     my $comp_ext_regex = compression_get_file_extension_regex();
-    my @origtarballs;
+    my @origtarfiles;
     foreach my $file (sort $self->find_original_tarballs()) {
         if ($file =~ /\.orig\.tar\.$comp_ext_regex$/) {
             if (defined($tarfile)) {
@@ -407,20 +407,26 @@ sub _generate_patch {
                          'one is allowed'), $tarfile, $file);
             }
             $tarfile = $file;
-            push @origtarballs, $file;
+            push @origtarfiles, $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";
+            if (-e "$file.asc") {
+                push @origtarfiles, "$file.asc";
+                $self->add_file("$file.asc")
+            }
         } elsif ($file =~ /\.orig-([[:alnum:]-]+)\.tar\.$comp_ext_regex$/) {
             $addonfile{$1} = $file;
-            push @origtarballs, $file;
+            push @origtarfiles, $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";
+            if (-e "$file.asc") {
+                push @origtarfiles, "$file.asc";
+                $self->add_file("$file.asc");
+            }
         }
     }
 
@@ -428,7 +434,7 @@ sub _generate_patch {
           $self->_upstream_tarball_template()) unless $tarfile;
 
     if ($opts{usage} eq 'build') {
-        foreach my $origtarfile (@origtarballs) {
+        foreach my $origtarfile (@origtarfiles) {
             info(g_('building %s using existing %s'),
                  $self->{fields}{'Source'}, $origtarfile);
         }
-- 
cgit v1.2.3


From f6e152b63f9eb183313807898be0569f5321bdf6 Mon Sep 17 00:00:00 2001
From: Jack Bates <wdz7eo@nottheoilrig.com>
Date: Tue, 30 Jan 2018 20:46:27 +0000
Subject: scripts/mk: Export architecture variables by default

The dpkg-architecture(1) man page states that these variables are
exported, and that's what dpkg-buildpackage does itself when setting
up the build environment. Doing this is always safe.

Closes: #888964
Signed-off-by: Guillem Jover <guillem@debian.org>
---
 debian/changelog           | 3 +++
 scripts/mk/architecture.mk | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 541b0c206..ad63a24d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
   * 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: #88896
+    Thanks to Jack Bates <wdz7eo@nottheoilrig.com>
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
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,\
-- 
cgit v1.2.3


From 79b681f5675ce9068b5b5e93da0def5f93c9c247 Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Thu, 22 Feb 2018 18:22:19 +0100
Subject: Update German scripts translation

Update to 599t.
---
 scripts/po/de.po | 65 +++++++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 29 deletions(-)

(limited to 'scripts')

diff --git a/scripts/po/de.po b/scripts/po/de.po
index 841792f4d..0922cf0e3 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-2018.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.18.8\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: 2018-02-22 18:08+0100\n"
+"PO-Revision-Date: 2018-02-22 18:21+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -259,6 +259,8 @@ msgid ""
 "  -P, --build-profiles=<profiles>\n"
 "                              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"
@@ -319,7 +321,10 @@ msgstr ""
 "                      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"
+"                        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 "
@@ -454,23 +459,6 @@ msgstr "-E und -W sind veraltet, sie haben keine Wirkung"
 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"
@@ -553,6 +541,23 @@ msgstr ""
 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"
@@ -2268,8 +2273,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 +2290,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"
-- 
cgit v1.2.3


From f7488217a506871f1aed58373220a76ea2e170ab Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 6 Feb 2017 03:17:32 +0100
Subject: Dpkg::Deps: Turn virtualpkg tracking from an arrayyref into a hashref

This is more extensible and more clear.
---
 debian/changelog             |  1 +
 scripts/Dpkg/Deps.pm         | 19 ++++++++++++++-----
 scripts/dpkg-genbuildinfo.pl |  3 +--
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 6fae00607..efd84ec45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index 3560e1a72..df8d9f4ec 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -1423,9 +1423,15 @@ field (if present).
 
 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}}, [ $by, $rel, $ver ];
+    push @{$self->{virtualpkg}{$pkg}}, $v;
 }
 
 =item ($check, $param) = $facts->check_package($package)
@@ -1453,7 +1459,10 @@ sub check_package {
 	return (1, $self->{pkg}{$pkg}[0]{version});
     }
     if (exists $self->{virtualpkg}{$pkg}) {
-	return (1, $self->{virtualpkg}{$pkg});
+        my $arrayref = [ map { [
+            $_->{provider}, $_->{relation}, $_->{version}
+        ] } @{$self->{virtualpkg}{$pkg}} ];
+        return (1, $arrayref);
     }
     return (0, undef);
 }
@@ -1510,11 +1519,11 @@ sub _evaluate_simple_dep {
 	}
     }
     foreach my $virtpkg ($self->_find_virtual_packages($pkg)) {
-	next if defined $virtpkg->[1] and $virtpkg->[1] ne REL_EQ;
+	next if defined $virtpkg->{relation} and $virtpkg->{relation} ne REL_EQ;
 
 	if (defined $dep->{relation}) {
-	    next if not defined $virtpkg->[2];
-	    return 1 if version_compare_relation($virtpkg->[2],
+	    next if not defined $virtpkg->{version};
+	    return 1 if version_compare_relation($virtpkg->{version},
 	                                         $dep->{relation},
 	                                         $dep->{version});
 	} else {
diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
index 45c45089d..96b06093a 100755
--- a/scripts/dpkg-genbuildinfo.pl
+++ b/scripts/dpkg-genbuildinfo.pl
@@ -232,8 +232,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
-- 
cgit v1.2.3


From 83272497c5be8c4e703ab179906cf904465fe775 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 6 Feb 2017 03:52:50 +0100
Subject: Dpkg::Deps: Accept $archqual for add_provided_package() method

---
 debian/changelog               |  1 +
 scripts/Dpkg/Deps.pm           | 14 ++++++++++----
 scripts/dpkg-checkbuilddeps.pl |  2 +-
 scripts/dpkg-genbuildinfo.pl   |  3 ++-
 scripts/dpkg-gencontrol.pl     |  3 ++-
 5 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index efd84ec45..a73e91077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - Dpkg::Source::Package: Print building lines for upstream tarball
       signatures. Closes: #888787
     - Dpkg::Deps: Turn virtualpkg tracking from an arrayyref into a hashref.
+    - Dpkg::Deps: Accept $archqual for add_provided_package() method.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index df8d9f4ec..3612eb303 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -49,7 +49,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
@@ -1413,18 +1413,20 @@ sub add_installed_package {
     push @{$self->{pkg}{$pkg}}, $p;
 }
 
-=item $facts->add_provided_package($virtual, $relation, $version, $by)
+=item $facts->add_provided_package($virtual, $relation, $version, $by, $archqual)
 
 Records that the "$by" package provides the $virtual package. $relation
 and $version correspond to the associated relation given in the Provides
-field (if present).
+field (if present). $archqual corresponds to the package arch qualifier
+(if present).
 
 =cut
 
 sub add_provided_package {
-    my ($self, $pkg, $rel, $ver, $by) = @_;
+    my ($self, $pkg, $rel, $ver, $by, $archqual) = @_;
     my $v = {
         package => $pkg,
+        archqual => $archqual,
         relation => $rel,
         version => $ver,
         provider => $by,
@@ -1536,6 +1538,10 @@ sub _evaluate_simple_dep {
 
 =head1 CHANGES
 
+=head2 Version 1.07 (dpkg 1.19.1)
+
+New argument: Add $archqual to $dep->add_provided_package().
+
 =head2 Version 1.06 (dpkg 1.18.7; module version bumped on dpkg 1.18.24)
 
 New option: Add tests_dep option to Dpkg::Deps::deps_parse().
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index 80b309f14..738afa042 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -173,7 +173,7 @@ sub parse_status {
 			{
 				$facts->add_provided_package($_->{package},
                                     $_->{relation}, $_->{version},
-                                    $package);
+                                    $package, $_->{archqual});
 			}
 		}
 	}
diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
index 96b06093a..c2916c2b2 100755
--- a/scripts/dpkg-genbuildinfo.pl
+++ b/scripts/dpkg-genbuildinfo.pl
@@ -115,7 +115,8 @@ sub parse_status {
             deps_iterate($provides, sub {
                 my $dep = shift;
                 $facts->add_provided_package($dep->{package}, $dep->{relation},
-                                             $dep->{version}, $package);
+                                             $dep->{version}, $package,
+                                             $dep->{archqual});
             });
         }
 
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 1c92e66dd..517db351b 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -263,7 +263,8 @@ if (exists $pkg->{'Provides'}) {
 	    if ($subdep->isa('Dpkg::Deps::Simple')) {
 		$facts->add_provided_package($subdep->{package},
                         $subdep->{relation}, $subdep->{version},
-                        $fields->{'Package'});
+                        $fields->{'Package'},
+                        $subdep->{archqual});
 	    }
 	}
     }
-- 
cgit v1.2.3


From cba523f59c2d8f18d8b1e9940681579f871034ce Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 22 Mar 2018 03:59:28 +0100
Subject: Dpkg::Vendor::Debian: Split pie builtin arches one per line

This makes changing them easier to see when diffing.
---
 scripts/Dpkg/Vendor/Debian.pm | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 08ed8250d..d7af8e3b7 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -267,8 +267,23 @@ 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 hurd-i386 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
+        s390x
+        sparc
+        sparc64
     );
     if (not exists $builtin_pie_arch{$arch}) {
         $builtin_feature{hardening}{pie} = 0;
-- 
cgit v1.2.3


From 544dd8967940aeee11b47b53a8df6f88110a9a16 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 22 Mar 2018 04:00:07 +0100
Subject: Dpkg::Vendor::Debian: Mark riscv64 as having gcc built-in PIE support

---
 debian/changelog              | 1 +
 scripts/Dpkg/Vendor/Debian.pm | 1 +
 2 files changed, 2 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index a73e91077..ed4d8e796 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,6 +61,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       signatures. Closes: #888787
     - Dpkg::Deps: Turn virtualpkg tracking from an arrayyref into a hashref.
     - Dpkg::Deps: Accept $archqual for add_provided_package() method.
+    - Dpkg::Vendor::Debian: Mark riscv64 as having gcc builtin PIE.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index d7af8e3b7..814948e83 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -281,6 +281,7 @@ sub _add_build_flags {
         powerpc
         ppc64
         ppc64el
+        riscv64
         s390x
         sparc
         sparc64
-- 
cgit v1.2.3


From 94728ead2cc22af5043b16483aab1e4f5a50223c Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 29 Apr 2018 01:26:10 +0200
Subject: Revert "Dpkg::Deps: Accept $archqual for add_provided_package()
 method"

This reverts commit 83272497c5be8c4e703ab179906cf904465fe775.

This commit introduced a regression in the author test suite. And there's
a patch by Johannes 'josch' Schauer <josch@mister-muffin.de> which should
be fixing this and other problems. If this is needed after all, we will
need to refactor the functions first to take a hash instead of a long list
of arguments.
---
 debian/changelog               |  1 -
 scripts/Dpkg/Deps.pm           | 14 ++++----------
 scripts/dpkg-checkbuilddeps.pl |  2 +-
 scripts/dpkg-genbuildinfo.pl   |  3 +--
 scripts/dpkg-gencontrol.pl     |  3 +--
 5 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 3d59b4278..59d2cffd6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,7 +74,6 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - Dpkg::Source::Package: Print building lines for upstream tarball
       signatures. Closes: #888787
     - Dpkg::Deps: Turn virtualpkg tracking from an arrayyref into a hashref.
-    - Dpkg::Deps: Accept $archqual for add_provided_package() method.
     - Dpkg::Vendor::Debian: Mark riscv64 as having gcc builtin PIE.
   * Documentation:
     - Update gettext minimal version in README.
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index 3612eb303..df8d9f4ec 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -49,7 +49,7 @@ All the deps_* functions are exported by default.
 use strict;
 use warnings;
 
-our $VERSION = '1.07';
+our $VERSION = '1.06';
 our @EXPORT = qw(
     deps_concat
     deps_parse
@@ -1413,20 +1413,18 @@ sub add_installed_package {
     push @{$self->{pkg}{$pkg}}, $p;
 }
 
-=item $facts->add_provided_package($virtual, $relation, $version, $by, $archqual)
+=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). $archqual corresponds to the package arch qualifier
-(if present).
+field (if present).
 
 =cut
 
 sub add_provided_package {
-    my ($self, $pkg, $rel, $ver, $by, $archqual) = @_;
+    my ($self, $pkg, $rel, $ver, $by) = @_;
     my $v = {
         package => $pkg,
-        archqual => $archqual,
         relation => $rel,
         version => $ver,
         provider => $by,
@@ -1538,10 +1536,6 @@ sub _evaluate_simple_dep {
 
 =head1 CHANGES
 
-=head2 Version 1.07 (dpkg 1.19.1)
-
-New argument: Add $archqual to $dep->add_provided_package().
-
 =head2 Version 1.06 (dpkg 1.18.7; module version bumped on dpkg 1.18.24)
 
 New option: Add tests_dep option to Dpkg::Deps::deps_parse().
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index 738afa042..80b309f14 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -173,7 +173,7 @@ sub parse_status {
 			{
 				$facts->add_provided_package($_->{package},
                                     $_->{relation}, $_->{version},
-                                    $package, $_->{archqual});
+                                    $package);
 			}
 		}
 	}
diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
index c2916c2b2..96b06093a 100755
--- a/scripts/dpkg-genbuildinfo.pl
+++ b/scripts/dpkg-genbuildinfo.pl
@@ -115,8 +115,7 @@ sub parse_status {
             deps_iterate($provides, sub {
                 my $dep = shift;
                 $facts->add_provided_package($dep->{package}, $dep->{relation},
-                                             $dep->{version}, $package,
-                                             $dep->{archqual});
+                                             $dep->{version}, $package);
             });
         }
 
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 517db351b..1c92e66dd 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -263,8 +263,7 @@ if (exists $pkg->{'Provides'}) {
 	    if ($subdep->isa('Dpkg::Deps::Simple')) {
 		$facts->add_provided_package($subdep->{package},
                         $subdep->{relation}, $subdep->{version},
-                        $fields->{'Package'},
-                        $subdep->{archqual});
+                        $fields->{'Package'});
 	    }
 	}
     }
-- 
cgit v1.2.3


From 5cc92fcf27b65c069a7e21da491debb0afa692a4 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 31 Mar 2018 17:22:39 +0200
Subject: Dpkg: Fix default DATADIR

Even though we always override it from the build system the default
pathname got out-of-sync with the repository when the architecture
tables got moved into the data directory.

Fixes: commit 97309bef8b664c2d58cb689a3e82848021ae9bad
---
 scripts/Dpkg.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm
index 0d171c080..7f06b15e6 100644
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -107,7 +107,7 @@ 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};
 
-- 
cgit v1.2.3


From 22685bcfa8aa4b13bfd95a117320fc0bedfa6715 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 31 Mar 2018 17:47:14 +0200
Subject: build: Add CPAN distribution machinery

Add a new dist-cpan target that takes care of preparing a perl
distribution to be uploaded to CPAN. Only the modules are shipped,
some of which do require dpkg tools being installed though.

Closes: #821177
---
 Makefile.am          |  4 ++-
 configure.ac         |  9 ++++++-
 cpan.am              | 48 ++++++++++++++++++++++++++++++++++
 debian/changelog     |  1 +
 scripts/.gitignore   |  1 +
 scripts/Build.PL.in  | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 scripts/Test/Dpkg.pm | 20 +++++++++++---
 7 files changed, 152 insertions(+), 5 deletions(-)
 create mode 100644 cpan.am
 create mode 100644 scripts/Build.PL.in

(limited to 'scripts')

diff --git a/Makefile.am b/Makefile.am
index 31e82a7a8..4cd8376f6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,9 +179,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/configure.ac b/configure.ac
index 2e09c63e1..822f6f654 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,8 +3,14 @@
 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])
 AC_SUBST([PACKAGE_COPYRIGHT_HOLDER], ['Dpkg Developers'])
+AC_SUBST([PACKAGE_VCS_TYPE], [git])
+AC_SUBST([PACKAGE_VCS_URL], [https://anonscm.debian.org/git/dpkg/dpkg.git])
+AC_SUBST([PACKAGE_VCS_WEB], [https://anonscm.debian.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])
@@ -208,6 +214,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..0cf4967ad
--- /dev/null
+++ b/cpan.am
@@ -0,0 +1,48 @@
+CPAN_DIST_NAME = $(PACKAGE_CPAN_NAME)
+CPAN_DIST_VERSION = $(PACKAGE_VERSION)
+CPAN_DIST = $(CPAN_DIST_NAME)-$(CPAN_DIST_VERSION)
+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)/data $(CPAN_DIST)
+	cp -fpR $(top_srcdir)/t/* \
+	         $(top_srcdir)/scripts/t/Dpkg* \
+	         $(top_srcdir)/scripts/t/origins \
+	         $(CPAN_DIST)/t
+	$(do_perl_subst) <$(top_srcdir)/scripts/Dpkg.pm \
+	                 >$(CPAN_DIST)/lib/Dpkg.pm
+	cp -fpR $(top_srcdir)/scripts/Dpkg.pm \
+	         $(top_srcdir)/scripts/Dpkg \
+	         $(CPAN_DIST)/lib/
+	cp -fpR $(top_srcdir)/scripts/Test $(CPAN_DIST)/lib/
+	cp -fpR $(top_srcdir)/scripts/Build.PL $(CPAN_DIST)
+
+	: # Fix permissions of the distributed files.
+	chmod a+x $(CPAN_DIST)/Build.PL
+	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) && ./Build.PL
+	cd $(CPAN_DIST) && ./Build manifest
+	cd $(CPAN_DIST) && ./Build distsign
+
+	: # 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/debian/changelog b/debian/changelog
index 59d2cffd6..372dcdcde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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
   * Packaging:
     - Install update-alternatives policykit-1 file.
     - Add Breaks to libdpkg-perl against pkg-kde-tools (<< 0.15.28~), as
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..40de90e41
--- /dev/null
+++ b/scripts/Build.PL.in
@@ -0,0 +1,74 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+use Module::Build ();
+
+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{
+        BEGIN {
+            $ENV{DPKG_TEST_MODE} = 'cpan';
+            $ENV{DPKG_DATADIR} = 'data';
+            $ENV{DPKG_ORIGINS_DIR} = 't/origins';
+        }
+    },
+);
+
+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',
+
+    # Set only to avoid warnings.
+    module_name     => '@PACKAGE_CPAN_NAME@',
+
+    meta_merge => {
+        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            => 1,
+    dynamic_config  => 0,
+
+    configure_requires => {
+        'Module::Build'         => '0.4004',
+    },
+    test_requires => {
+        'TAP::Harness'          => 0,
+        'Test::More'            => 0,
+        'Test::Pod'             => 0,
+        'Test::Strict'          => 0,
+    },
+    recommands => {
+        'Algorithm::Merge'      => 0,
+        'File::FcntlLock'       => 0,
+        'Locale::gettext'       => 0,
+
+    },
+    requires => {
+        'perl'                  => '@PERL_MIN_VERSION@',
+    },
+);
+
+$build->create_build_script();
+
+1;
diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm
index 5eea6184a..4900e1f91 100644
--- a/scripts/Test/Dpkg.pm
+++ b/scripts/Test/Dpkg.pm
@@ -54,6 +54,12 @@ 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;
@@ -69,8 +75,12 @@ sub test_get_data_path
     my $path = shift;
 
     if (defined $path) {
-        my $srcdir = $ENV{srcdir} || '.';
-        return "$srcdir/$path";
+        if ($test_mode eq 'cpan') {
+            return $path;
+        } else {
+            my $srcdir = $ENV{srcdir} || '.';
+            return "$srcdir/$path";
+        }
     } else {
         return _test_get_caller_dir();
     }
@@ -87,7 +97,11 @@ sub test_get_temp_path
 
 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_perl_files
-- 
cgit v1.2.3


From d6c8af723fb79f96e1bcc3d87e952e0a7a9eea0e Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 1 Apr 2018 03:23:10 +0200
Subject: dpkg-checkbuilddeps: Fix indentation

---
 scripts/dpkg-checkbuilddeps.pl | 69 +++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

(limited to 'scripts')

diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index 80b309f14..c5a65e1ab 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -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, 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
-- 
cgit v1.2.3


From 9dab03c99a64cd15536f153e0705ec16e686c2d5 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 12 Apr 2018 05:52:02 +0200
Subject: dpkg-source: Do not emit perl warnings on source formats w/o options

At least the format "3.0 (native)" supports no format specific options,
which makes the describe_cmdline_options() return an empty list.
---
 debian/changelog       | 2 ++
 scripts/dpkg-source.pl | 1 +
 2 files changed, 3 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 3542c13fc..0d4410be9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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>.
+  * Do not emit perl warnings in dpkg-source --help on source formats w/o
+    options.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 5c356c31a..107408d79 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -578,6 +578,7 @@ sub get_format_help {
     $srcpkg->upgrade_object_type(); # Fails if format is unsupported
 
     my @cmdline = $srcpkg->describe_cmdline_options();
+    return '' unless @cmdline;
 
     my $help_build = my $help_extract = '';
     my $help;
-- 
cgit v1.2.3


From b9090a05af10b4f12adbc796fdc846c667ac7670 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 8 Apr 2018 22:34:35 +0200
Subject: Dpkg::Shlibs::Objdump: Remove duplicate assignment in reset() method

---
 scripts/Dpkg/Shlibs/Objdump.pm | 1 -
 1 file changed, 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
index 91cc06488..2694f596f 100644
--- a/scripts/Dpkg/Shlibs/Objdump.pm
+++ b/scripts/Dpkg/Shlibs/Objdump.pm
@@ -268,7 +268,6 @@ sub reset {
 
     $self->{file} = '';
     $self->{id} = '';
-    $self->{SONAME} = '';
     $self->{HASH} = '';
     $self->{GNU_HASH} = '';
     $self->{SONAME} = '';
-- 
cgit v1.2.3


From c972dfdcd85d92a39998b81a0fb23dc63935b137 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 8 Apr 2018 22:38:27 +0200
Subject: Dpkg::Shlibs::Objdump: Fix ELF program detection

An ELF executable is defined by whether the object has the EXEC_P flag
defined or an interpreter in the program header. The former applies to
statically linked programs, the latter to dynamically linked programs
and possibly some shared libraries that can be executed, such as the
ones provided by glibc.

This is now more relevant as PIE makes normal executables show up as
shared objects, so they do not contain the EXEC_P flag, and were not
being detected as executables.
---
 debian/changelog               |  2 ++
 scripts/Dpkg/Shlibs/Objdump.pm | 10 ++++++++--
 scripts/t/Dpkg_Shlibs.t        |  6 ++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 0d4410be9..5098e7f2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
index 2694f596f..d0a7b56cb 100644
--- a/scripts/Dpkg/Shlibs/Objdump.pm
+++ b/scripts/Dpkg/Shlibs/Objdump.pm
@@ -270,6 +270,7 @@ sub reset {
     $self->{id} = '';
     $self->{HASH} = '';
     $self->{GNU_HASH} = '';
+    $self->{INTERP} = 0;
     $self->{SONAME} = '';
     $self->{NEEDED} = [];
     $self->{RPATH} = [];
@@ -324,7 +325,7 @@ sub parse_objdump_output {
 	    $section = 'dyninfo';
 	    next;
 	} elsif (/^Program Header:/) {
-	    $section = 'header';
+	    $section = 'program';
 	    next;
 	} elsif (/^Version definitions:/) {
 	    $section = 'verdef';
@@ -363,6 +364,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;
@@ -535,7 +540,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/t/Dpkg_Shlibs.t b/scripts/t/Dpkg_Shlibs.t
index 2310f4f1c..a271af587 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);
 
@@ -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 => '',
-- 
cgit v1.2.3


From fd8f838450ab89e3011c1a48061e0247d205ea96 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 8 Apr 2018 22:42:10 +0200
Subject: scripts: Refresh test data and update code to match

---
 scripts/t/Dpkg_Shlibs.t                       |   3 +-
 scripts/t/Dpkg_Shlibs/objdump.basictags-amd64 |  89 ++-
 scripts/t/Dpkg_Shlibs/objdump.basictags-i386  |  93 ++--
 scripts/t/Dpkg_Shlibs/objdump.basictags-mips  |  91 ++-
 scripts/t/Dpkg_Shlibs/objdump.ls              | 771 +++++++++++++++++---------
 scripts/t/Dpkg_Shlibs/objdump.patterns        | 377 +++++++------
 scripts/t/Dpkg_Shlibs/objdump.spacesyms       | 151 +++--
 7 files changed, 911 insertions(+), 664 deletions(-)

(limited to 'scripts')

diff --git a/scripts/t/Dpkg_Shlibs.t b/scripts/t/Dpkg_Shlibs.t
index a271af587..4dc98bb3f 100644
--- a/scripts/t/Dpkg_Shlibs.t
+++ b/scripts/t/Dpkg_Shlibs.t
@@ -382,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
 
 
-- 
cgit v1.2.3


From 981a18c37036b68f368b0bfab71d2a984abba9e6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 8 Apr 2018 22:43:09 +0200
Subject: Dpkg::Version: Fix bool overload behavior

The current bool overload has broken semantics, because it considers the
version "0" to be false.

The bool overload used to have sane semantics (equivalent to is_valid())
before commit 5b9f353b2940de751df47036608afbe71992d622, but there it got
changed to return the stringified version if it was valid, or undef
otherwise, to fix a problem within dpkg-shlibdeps, instead of properly
fixing the local-only problem in the tool. This makes the overload hard
to use, and broke existing callers from external projects.

We will emit a warning until dpkg 1.20.x to notify of the semantic change
in case there is code relying on the broken semantics. For fixed code the
warning can then be quiesced with:

  no warnings qw(Dpkg::Version::semantic_change::overload::bool);

Closes: #895004
---
 debian/changelog          |  4 ++++
 scripts/Dpkg/Version.pm   | 20 +++++++++++++++++---
 scripts/dpkg-shlibdeps.pl |  3 ++-
 scripts/t/Dpkg_Version.t  | 17 ++++++++---------
 t/pod-spell.t             |  1 +
 5 files changed, 32 insertions(+), 13 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 5098e7f2d..56b4c9e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -89,6 +89,10 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Version.pm b/scripts/Dpkg/Version.pm
index 477082b67..a06ba268d 100644
--- a/scripts/Dpkg/Version.pm
+++ b/scripts/Dpkg/Version.pm
@@ -20,6 +20,7 @@ package Dpkg::Version;
 
 use strict;
 use warnings;
+use warnings::register qw(semantic_change::overload::bool);
 
 our $VERSION = '1.01';
 our @EXPORT = qw(
@@ -55,7 +56,12 @@ use overload
     '<=>' => \&_comparison,
     'cmp' => \&_comparison,
     '""'  => sub { return $_[0]->as_string(); },
-    'bool' => sub { return $_[0]->as_string() if $_[0]->is_valid(); },
+    'bool' => sub {
+        warnings::warnif('Dpkg::Version::semantic_change::overload::bool',
+                         'bool overload behavior has changed back to be ' .
+                         'an is_valid() alias');
+        return $_[0]->is_valid();
+    },
     'fallback' => 1;
 
 =encoding utf8
@@ -121,8 +127,16 @@ 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
+C<no warnings qw(Dpkg::Version::semantic_change::overload::bool)>.
 
 =item $v->is_valid()
 
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 323fba9e1..4b18545e9 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -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;
diff --git a/scripts/t/Dpkg_Version.t b/scripts/t/Dpkg_Version.t
index 78db7aead..17e9b4b9e 100644
--- a/scripts/t/Dpkg_Version.t
+++ b/scripts/t/Dpkg_Version.t
@@ -20,6 +20,7 @@ use Test::More;
 
 use Dpkg::ErrorHandling;
 use Dpkg::IPC;
+use Dpkg::Version;
 
 report_options(quiet_warnings => 1);
 
@@ -30,7 +31,7 @@ my @ops = ('<', '<<', 'lt',
 	   '>=', 'ge',
 	   '>', '>>', 'gt');
 
-plan tests => scalar(@tests) * (3 * scalar(@ops) + 4) + 30;
+plan tests => scalar(@tests) * (3 * scalar(@ops) + 4) + 27;
 
 sub dpkg_vercmp {
      my ($a, $cmp, $b) = @_;
@@ -57,8 +58,6 @@ sub obj_vercmp {
      return $a gt $b if $cmp eq 'gt';
 }
 
-use_ok('Dpkg::Version');
-
 my $truth = {
     '-1' => {
 	'<<' => 1, 'lt' => 1,
@@ -83,6 +82,12 @@ my $truth = {
     },
 };
 
+# XXX: Some of the tests check the bool overload, which currently emits
+# the semantic_change warning. Disable it until we stop emitting the
+# warning in dpkg 1.20.x.
+## no critic (TestingAndDebugging::ProhibitNoWarnings)
+no warnings(qw(Dpkg::Version::semantic_change::overload::bool));
+
 # Handling of empty/invalid versions
 my $empty = Dpkg::Version->new('');
 ok($empty eq '', "Dpkg::Version->new('') eq ''");
@@ -128,12 +133,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;
diff --git a/t/pod-spell.t b/t/pod-spell.t
index 6d3f7ffc9..111d592ca 100644
--- a/t/pod-spell.t
+++ b/t/pod-spell.t
@@ -83,6 +83,7 @@ modelines
 multiarch
 nocheck
 qa
+quiesced
 reportfile
 rfc822
 sig
-- 
cgit v1.2.3


From 6f903af181057a046a1344aadca552b113a2c2ee Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 17 Aug 2016 00:55:56 +0200
Subject: dpkg-buildpackage: Validate OpenPGP signing key IDs

We should not accept short key IDs, and warn about long key IDs.
Recommend to use fingerprints.
---
 debian/changelog             |  2 ++
 scripts/dpkg-buildpackage.pl | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 56b4c9e12..f2a2ee0e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     same protocol. Thanks to Julian Andres Klode <jak@debian.org>.
   * 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.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 49c7173a4..dccb8f87e 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -477,6 +477,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;
@@ -810,6 +812,21 @@ sub update_files_field {
     $ctrl->{'Files'} =~ s/^$file_regex$/$md5sum $size $1/m;
 }
 
+sub signkey_validate {
+    # 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 instead'));
+    } elsif (length $keyid <= 16) {
+        warning(g_('long OpenPGP key IDs are strongly discouraged; ' .
+                   'please use key fingerprints instead'));
+    }
+}
+
 sub signfile {
     my $file = shift;
 
-- 
cgit v1.2.3


From ff99aabc8c3d966911137aa05bef4b4cd80671ec Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Fri, 4 May 2018 19:58:06 +0200
Subject: Update German scripts translation

Update to 601t.
---
 scripts/po/de.po | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/po/de.po b/scripts/po/de.po
index 0922cf0e3..9ac65ad1f 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.18.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-02-22 18:08+0100\n"
-"PO-Revision-Date: 2018-02-22 18:21+0100\n"
+"POT-Creation-Date: 2018-05-04 19:12+0200\n"
+"PO-Revision-Date: 2018-05-04 19:57+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -590,6 +590,20 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "unbekannte %% Substitution in Hook: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+msgstr ""
+"kurze OpenGPG-Schlüsselkennungen sind defekt; bitte verwenden Sie "
+"stattdessen Fingerabdrücke"
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"instead"
+msgstr ""
+"von langen OpenPGP-Schlüsselkennungen wird klar abgeraten; bitte verwenden "
+"Sie stattdessen Fingerabdrücke"
+
 #: 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
-- 
cgit v1.2.3


From 43dc5fa95f5241ce790b727c405f96caaad12c19 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 5 May 2018 02:50:03 +0200
Subject: Dpkg::Changelog::Parse: Stop using tail(1) to read the end of the
 file

Instead of relying on the tail command, simply read the end of the
file ourselves, assuming a packed set of 80 character lines, reading
4096 bytes before the end, implies around 51 lines, which is close
to the 40 lines currently used.

This should be both faster and should improve portability, because even
if we are using the POSIX -n option, some systems do not have a POSIX
compliant tail(1) on the default path, such as Solaris.

Analysis-by: James Clarke <jrtc27@debian.org>
---
 debian/changelog                |  4 ++++
 scripts/Dpkg/Changelog/Parse.pm | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 8eb639c44..36b5594d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -99,6 +99,10 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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).
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Changelog/Parse.pm b/scripts/Dpkg/Changelog/Parse.pm
index e107dcf6d..28bb6892a 100644
--- a/scripts/Dpkg/Changelog/Parse.pm
+++ b/scripts/Dpkg/Changelog/Parse.pm
@@ -56,12 +56,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;
-- 
cgit v1.2.3


From f75c579ac18d0a9956cd1fd5275fe797e8cb89f8 Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Sat, 5 May 2018 05:03:04 +0200
Subject: Update German scripts translation

Update to 600t.
---
 scripts/po/de.po | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/scripts/po/de.po b/scripts/po/de.po
index 9ac65ad1f..5b1ee4113 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.18.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-05-04 19:12+0200\n"
-"PO-Revision-Date: 2018-05-04 19:57+0200\n"
+"POT-Creation-Date: 2018-05-05 04:58+0200\n"
+"PO-Revision-Date: 2018-05-05 05:01+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -1842,7 +1842,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"
@@ -2430,13 +2431,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
@@ -3958,6 +3954,12 @@ 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 "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"
 
-- 
cgit v1.2.3


From df0a86de45006f9f2b2980a0ad2e81640271a685 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 8 May 2018 14:16:38 +0200
Subject: dpkg-buildpackage: Avoid using an uninitialized variable

If DEB_SIGN_KEYID is not set in the environment or the signing key is
not passed via --sign-key, dpkg-buildpackage emits a perl warning.

Warned-by: perl
Fixes: commit 6f903af181057a046a1344aadca552b113a2c2ee
Based-on-patch-by: Sven Joachim <svenjoac@gmx.de>
---
 scripts/dpkg-buildpackage.pl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scripts')

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index dccb8f87e..ee41555d7 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -813,6 +813,7 @@ sub update_files_field {
 }
 
 sub signkey_validate {
+    return unless defined $signkey;
     # Make sure this is an hex keyid.
     return unless $signkey =~ m/^(?:0x)?([[:xdigit:]]+)$/;
 
-- 
cgit v1.2.3


From 40eccd5c044c874cf7fa5f8dc8e2c75379395d8a Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 14 May 2018 23:26:07 +0200
Subject: scripts: Do not use stringy eval to define different sub
 implementations

We can just assign an anonymous sub to the typeglob.
---
 debian/changelog                |  3 +++
 scripts/Dpkg/Gettext.pm         | 58 +++++++++++++++++++----------------------
 scripts/dpkg-mergechangelogs.pl | 10 +++----
 3 files changed, 34 insertions(+), 37 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 01585aef7..14a311e31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -114,6 +114,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
+  * Code internals:
+    - Do not use stringy eval to define different sub implementations,
+      just assign an anonymous sub to the typeglob.
   * Build system:
     - Set distribution tarball format to ustar, instead of default v7 format.
     - Mark PO4A and POD2MAN as precious variables.
diff --git a/scripts/Dpkg/Gettext.pm b/scripts/Dpkg/Gettext.pm
index 2e3e5042e..33ef1c48d 100644
--- a/scripts/Dpkg/Gettext.pm
+++ b/scripts/Dpkg/Gettext.pm
@@ -118,41 +118,37 @@ 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 {
+        };
+        *ngettext = sub {
+            my ($msgid, $msgid_plural, $n) = @_;
+            if ($n == 1) {
                 return $msgid;
+            } else {
+                return $msgid_plural;
             }
-            sub P_ {
-                return ngettext(@_);
-            }
+        };
+        *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, @_);
         };
     }
 }
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index 7fd11fc96..20b33dc75 100755
--- a/scripts/dpkg-mergechangelogs.pl
+++ b/scripts/dpkg-mergechangelogs.pl
@@ -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);
         };
     }
 }
-- 
cgit v1.2.3


From 5cd52673aabdf5eaa58181972119a41041fc85f2 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 23 Jul 2018 13:13:19 +0200
Subject: dpkg-buildpackage: Fix --rules-file option parsing

Parse --rules-file instead of --rules-target, which made it a no-op.

Fixes: commit 293bd243a19149165fc4fd8830b16a51d471a5e9
Stable-Candidate: 1.18.x
---
 debian/changelog             | 2 ++
 scripts/dpkg-buildpackage.pl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 14a311e31..1cee622ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index ee41555d7..ea2c61a47 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -346,7 +346,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 {
-- 
cgit v1.2.3


From 503ab33b937ced36c154952c026c0f608ae1180e Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 5 Jul 2018 05:19:09 +0200
Subject: dpkg-buildpackage: Only check for fallback build targets on binary
 builds

If we are not going to build any binary package, there is no point in
checking whether we need to run any of the build targets.
---
 debian/changelog             | 2 ++
 scripts/dpkg-buildpackage.pl | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 1cee622ad..de40e2e23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index ea2c61a47..64c80635c 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -553,13 +553,14 @@ if (build_has_any(BUILD_SOURCE)) {
 
 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);
-- 
cgit v1.2.3


From ca394f0f03e9ab025a09e4c99ad4ccfc73550f46 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 23 Jul 2018 11:58:23 +0200
Subject: Dpkg::Build::Types: Fix set_build_type_from_options() description

---
 debian/changelog            | 1 +
 scripts/Dpkg/Build/Types.pm | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index de40e2e23..700f69715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -118,6 +118,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
   * Code internals:
     - Do not use stringy eval to define different sub implementations,
       just assign an anonymous sub to the typeglob.
diff --git a/scripts/Dpkg/Build/Types.pm b/scripts/Dpkg/Build/Types.pm
index 45a81d3ba..b6c2366f3 100644
--- a/scripts/Dpkg/Build/Types.pm
+++ b/scripts/Dpkg/Build/Types.pm
@@ -193,9 +193,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".
-- 
cgit v1.2.3


From 23322f43e80ce0c67a361b3b00c680e170fee58f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 23 Jul 2018 12:02:38 +0200
Subject: Dpkg::Build::Types: Add new set_build_type_from_targets() function

---
 debian/changelog            |  1 +
 scripts/Dpkg/Build/Types.pm | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 700f69715..059de6ed5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -109,6 +109,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Build/Types.pm b/scripts/Dpkg/Build/Types.pm
index b6c2366f3..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
 
@@ -217,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.
-- 
cgit v1.2.3


From 2dadfc74f74f66ee7685ad402ad99dc9ea1476c0 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 23 Jul 2018 12:08:58 +0200
Subject: dpkg-buildpackage: Only check required build dependencies for known
 targets

When we specify the debian/rules targets to call with --rules-target, we
should check only the build dependencies required bu those targets, and
nothing more.

Reported-by: Johannes Schauer <josch@debian.org>
---
 debian/changelog             | 3 +++
 scripts/dpkg-buildpackage.pl | 5 +++++
 2 files changed, 8 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 059de6ed5..58308cfdb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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>.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 64c80635c..5b9fd441f 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -354,6 +354,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';
-- 
cgit v1.2.3


From d9bc580a419232420abb9620638cfbfe74943ff2 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 23 May 2018 03:58:27 +0200
Subject: test: Add new po author test

Use i18nspector (if available) to check the .po and .pot files.
---
 Makefile.am          |  1 +
 debian/changelog     |  1 +
 scripts/Test/Dpkg.pm | 26 ++++++++++++++++++++++++++
 t/po.t               | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 78 insertions(+)
 create mode 100644 t/po.t

(limited to 'scripts')

diff --git a/Makefile.am b/Makefile.am
index 05bf93835..972889a89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,7 @@ coverage-clean:
 endif
 
 test_scripts = \
+	t/po.t \
 	t/pod.t \
 	t/pod-spell.t \
 	t/pod-coverage.t \
diff --git a/debian/changelog b/debian/changelog
index 81490983b..2ceefc850 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -159,6 +159,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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).
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #881401
diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm
index 4900e1f91..c59296858 100644
--- a/scripts/Test/Dpkg.pm
+++ b/scripts/Test/Dpkg.pm
@@ -20,8 +20,10 @@ 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
@@ -39,8 +41,10 @@ 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
@@ -95,6 +99,15 @@ sub test_get_temp_path
     return $path;
 }
 
+sub test_get_po_dirs
+{
+    if ($test_mode eq 'cpan') {
+        return qw(po);
+    } else {
+        return qw(po scripts/po dselect/po man/po);
+    }
+}
+
 sub test_get_perl_dirs
 {
     if ($test_mode eq 'cpan') {
@@ -104,6 +117,19 @@ sub test_get_perl_dirs
     }
 }
 
+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|pl|pm|t)$/;
diff --git a/t/po.t b/t/po.t
new file mode 100644
index 000000000..d2c01bd3f
--- /dev/null
+++ b/t/po.t
@@ -0,0 +1,50 @@
+#!/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 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 .*$//mg;
+    $tags =~ s/^.*\.po: duplicate-header-field X-POFile-SpellExtra$//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);
+}
-- 
cgit v1.2.3


From 76daf7b7dd594d720f81fa32fbf3e19c1fb9e5ff Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 5 Jun 2018 05:25:58 +0200
Subject: Dpkg::Version: Bump VERSION and improve semantic change description

Give context to the warning message, otherwise it's not clear what is
going on. If the users to not conditionalize the warning usage they will
get a perl warning about the unknown warning category itself, bump the
module version to be able to discern this change, and update documentation
to reflect this.
---
 scripts/Dpkg/Version.pm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Dpkg/Version.pm b/scripts/Dpkg/Version.pm
index a06ba268d..2900e5790 100644
--- a/scripts/Dpkg/Version.pm
+++ b/scripts/Dpkg/Version.pm
@@ -22,7 +22,7 @@ use strict;
 use warnings;
 use warnings::register qw(semantic_change::overload::bool);
 
-our $VERSION = '1.01';
+our $VERSION = '1.02';
 our @EXPORT = qw(
     version_compare
     version_compare_relation
@@ -58,8 +58,8 @@ use overload
     '""'  => sub { return $_[0]->as_string(); },
     'bool' => sub {
         warnings::warnif('Dpkg::Version::semantic_change::overload::bool',
-                         'bool overload behavior has changed back to be ' .
-                         'an is_valid() alias');
+                         'Dpkg::Version bool overload behavior has changed ' .
+                         'back to be an is_valid() alias');
         return $_[0]->is_valid();
     },
     'fallback' => 1;
@@ -136,7 +136,11 @@ $v->as_string() if $v->is_valid(), a breaking change in behavior that caused
 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
-C<no warnings qw(Dpkg::Version::semantic_change::overload::bool)>.
+
+  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()
 
@@ -469,6 +473,10 @@ sub version_check($) {
 
 =head1 CHANGES
 
+=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().
-- 
cgit v1.2.3


From 563fd74ef926b23207d58108071d91b7c8ba2507 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 14 Jun 2018 02:51:24 +0200
Subject: Dpkg::Shlibs::SymbolFile: Always assign proper Dpkg::Version to
 deprecated

We should always assign a proper Dpkg::Version object to the deprecated
variable. Otherwise it can get confused with the scalar value 0 used on
boolean context to denote it is *not* deprecated, instead of it being
a version number 0.
---
 debian/changelog                  | 4 ++++
 scripts/Dpkg/Shlibs/SymbolFile.pm | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index a5920996b..ab1757193 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -118,6 +118,10 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Shlibs/SymbolFile.pm b/scripts/Dpkg/Shlibs/SymbolFile.pm
index b36d542ce..1a165c9d0 100644
--- a/scripts/Dpkg/Shlibs/SymbolFile.pm
+++ b/scripts/Dpkg/Shlibs/SymbolFile.pm
@@ -224,7 +224,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}});
-- 
cgit v1.2.3


From 63e02e0aabe17cb87929037db3939b3e575e97f6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 14 Jun 2018 02:53:23 +0200
Subject: Dpkg::Shlibs: Disable bool overload Dpkg::Version warnings

The usage in this file is correct, but we are still doing boolean
evaluation.
---
 debian/changelog                  | 1 +
 scripts/Dpkg/Shlibs/Symbol.pm     | 4 ++++
 scripts/Dpkg/Shlibs/SymbolFile.pm | 4 ++++
 3 files changed, 9 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index ab1757193..2bd44d571 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -122,6 +122,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
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 1a165c9d0..4b1c7ef50 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
-- 
cgit v1.2.3


From 2d02a12697808b01b360e7ceb52864c0873f7eac Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Jun 2018 18:33:15 +0200
Subject: Dpkg::Vendor::Debian: Inline _parse_feature_area() into
 _add_build_flags()

This function was being called on each foreach iteration to parse the
options within the DEB_BUILD_MAINT_OPTIONS and DEB_BUILD_OPTIONS
environment variables, and needed to parse these at construction time
every time. Inlining it should make it more performant and in addition
reduce line count.
---
 debian/changelog              |  2 ++
 scripts/Dpkg/Vendor/Debian.pm | 20 +++++++-------------
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 2bd44d571..98146943d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -123,6 +123,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 814948e83..2e42a8b86 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -86,18 +86,6 @@ sub run_hook {
     }
 }
 
-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) = @_;
 
@@ -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;
-- 
cgit v1.2.3


From d5374bc618310917557daa9c9ac2f4930515a0b2 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Jun 2018 18:33:15 +0200
Subject: Dpkg::BuildFlags: Move default flags setting into the Dpkg::Vendor
 modules

This should really be a vendor specific default. It's also documented
that way in the man page.
---
 debian/changelog              |  2 ++
 scripts/Dpkg/BuildFlags.pm    | 18 +++++++-----------
 scripts/Dpkg/Vendor/Debian.pm | 18 +++++++++++++++++-
 3 files changed, 26 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 98146943d..1a1dbe0c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -125,6 +125,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm
index 0533b12b5..a8fd4584a 100644
--- a/scripts/Dpkg/BuildFlags.pm
+++ b/scripts/Dpkg/BuildFlags.pm
@@ -23,7 +23,6 @@ our $VERSION = '1.03';
 use Dpkg ();
 use Dpkg::Gettext;
 use Dpkg::Build::Env;
-use Dpkg::BuildOptions;
 use Dpkg::ErrorHandling;
 use Dpkg::Vendor qw(run_vendor_hook);
 
@@ -72,18 +71,15 @@ sub load_vendor_defaults {
     $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} = {
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 2e42a8b86..1e8f24397 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -150,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}) {
@@ -305,7 +321,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;
     }
-- 
cgit v1.2.3


From 48c809f7c8e1949519c209c6ec74a6e2db4fd164 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 24 Jul 2018 00:33:01 +0200
Subject: dpkg-buildpackage: Rename $cleansource to $postclean

Makes the purpose of the variable clear.
---
 scripts/dpkg-buildpackage.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 5b9fd441f..e8892269f 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -148,7 +148,7 @@ my @debian_rules = ('debian/rules');
 my @rootcommand = ();
 my $signcommand;
 my $noclean;
-my $cleansource;
+my $postclean = 0;
 my $parallel;
 my $parallel_force = 0;
 my $checkbuilddep = 1;
@@ -293,7 +293,7 @@ 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 (/^-t$/ or /^--host-type$/) {
 	$host_type = shift; # Order DOES matter!
     } elsif (/^-t(.*)$/ or /^--host-type=(.*)$/) {
@@ -599,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');
 }
 
-- 
cgit v1.2.3


From 4014981b968a8e3c734d5113ce7a323d3ace13ad Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 24 Jul 2018 00:37:33 +0200
Subject: dpkg-buildpackage: Rename and logic invert $noclean to $postclean

Makes the purpose of the variable clear.
---
 scripts/dpkg-buildpackage.pl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index e8892269f..460153c9d 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -147,7 +147,7 @@ my $admindir;
 my @debian_rules = ('debian/rules');
 my @rootcommand = ();
 my $signcommand;
-my $noclean;
+my $preclean = 1;
 my $postclean = 0;
 my $parallel;
 my $parallel_force = 0;
@@ -316,9 +316,9 @@ while (@ARGV) {
     } 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$/) {
@@ -370,7 +370,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
@@ -542,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');
 }
 
@@ -552,7 +552,7 @@ 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', '.');
 }
 
-- 
cgit v1.2.3


From 8a45c914095bcb19a873b20099e161efe3237bfc Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 24 Jul 2018 00:47:01 +0200
Subject: dpkg-buildpackage: Add new --no-post-clean option

This makes it possible to select the current default behavior.
---
 debian/changelog             | 2 ++
 man/dpkg-buildpackage.man    | 5 +++++
 scripts/dpkg-buildpackage.pl | 3 +++
 3 files changed, 10 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 1a1dbe0c8..8d449738a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -76,6 +76,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
   * 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.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/man/dpkg-buildpackage.man b/man/dpkg-buildpackage.man
index 906351100..4b3256e4b 100644
--- a/man/dpkg-buildpackage.man
+++ b/man/dpkg-buildpackage.man
@@ -295,6 +295,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
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 460153c9d..1eabd13d2 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -72,6 +72,7 @@ sub usage {
   -S                          source-only, no binary files.
   -nc, --no-pre-clean         do not pre clean source tree (implies -b).
        --pre-clean            pre clean source tree (default).
+      --no-post-clean         do not post 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.
@@ -294,6 +295,8 @@ while (@ARGV) {
 	push @source_opts, $_; # passed to dpkg-source
     } elsif (/^-tc$/ or /^--post-clean$/) {
         $postclean = 1;
+    } elsif (/^--no-post-clean$/) {
+        $postclean = 0;
     } elsif (/^-t$/ or /^--host-type$/) {
 	$host_type = shift; # Order DOES matter!
     } elsif (/^-t(.*)$/ or /^--host-type=(.*)$/) {
-- 
cgit v1.2.3


From 0a1573e5df2f38eb0d2c2c29654cb8c352474c1e Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 24 Jul 2018 00:47:01 +0200
Subject: dpkg-buildpackage: Clarify pre and post-clean options and their
 default state

---
 debian/changelog             | 2 ++
 man/dpkg-buildpackage.man    | 3 ++-
 scripts/dpkg-buildpackage.pl | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 8d449738a..71ccbbc37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -140,6 +140,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
   * Code internals:
     - Do not use stringy eval to define different sub implementations,
       just assign an anonymous sub to the typeglob.
diff --git a/man/dpkg-buildpackage.man b/man/dpkg-buildpackage.man
index 4b3256e4b..10c853ba2 100644
--- a/man/dpkg-buildpackage.man
+++ b/man/dpkg-buildpackage.man
@@ -281,13 +281,14 @@ 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
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 1eabd13d2..9bc8c9d28 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -71,9 +71,9 @@ sub usage {
   -A                          binary-only, only arch-indep files.
   -S                          source-only, no binary files.
   -nc, --no-pre-clean         do not pre clean source tree (implies -b).
-       --pre-clean            pre clean source tree (default).
+      --pre-clean             pre clean source tree (default).
       --no-post-clean         do not post clean source tree (default).
-  -tc, --post-clean           clean source tree when finished.
+  -tc, --post-clean           post clean source tree.
   -D                          check build dependencies and conflicts (default).
   -d                          do not check build dependencies and conflicts.
       --[no-]check-builddeps  ditto.
-- 
cgit v1.2.3


From 1c741c507eadcdfc6dbb43610d3aab1387a3122e Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 24 Jul 2018 00:47:01 +0200
Subject: dpkg-buildpackage: Add --build equivalents for short build type
 options

This makes the --help output clearer, and matches the man page.
---
 debian/changelog             |  2 ++
 scripts/dpkg-buildpackage.pl | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 71ccbbc37..23d0c626b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -142,6 +142,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
   * Code internals:
     - Do not use stringy eval to define different sub implementations,
       just assign an anonymous sub to the typeglob.
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 9bc8c9d28..1df9da44e 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -63,13 +63,13 @@ 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).
       --no-post-clean         do not post clean source tree (default).
-- 
cgit v1.2.3


From 869d40414e691ad2e7a6b42b48040a2bcd5e0e94 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 24 Jul 2018 00:47:01 +0200
Subject: dpkg-buildpackage: Fold --[no-]check-builddeps into short option
 descriptions

This makes it easier to read which long option matches the short option.
---
 debian/changelog             | 2 ++
 scripts/dpkg-buildpackage.pl | 5 ++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 23d0c626b..2ef3fc3f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -144,6 +144,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Code internals:
     - Do not use stringy eval to define different sub implementations,
       just assign an anonymous sub to the typeglob.
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 1df9da44e..fec4bd281 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -74,9 +74,8 @@ sub usage {
       --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 build dependencies and conflicts (default).
-  -d                          do not check build dependencies and conflicts.
-      --[no-]check-builddeps  ditto.
+  -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>
-- 
cgit v1.2.3


From c353a449b26b85bf512d92976fe5c1af23deeb06 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 24 Jul 2018 00:47:01 +0200
Subject: dpkg-buildpackage: Mark profiles as a replaceable item in --help
 output

---
 debian/changelog             | 1 +
 scripts/dpkg-buildpackage.pl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 2ef3fc3f2..4b34c8eca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -146,6 +146,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Code internals:
     - Do not use stringy eval to define different sub implementations,
       just assign an anonymous sub to the typeglob.
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index fec4bd281..9cc6969d3 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -79,7 +79,7 @@ sub usage {
       --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>.
-- 
cgit v1.2.3


From cf35077be42ef79da5d83ce26f4a27a22591f246 Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Wed, 25 Jul 2018 09:47:13 +0200
Subject: Update German scripts translation

Update to 600t.
---
 scripts/po/de.po | 62 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

(limited to 'scripts')

diff --git a/scripts/po/de.po b/scripts/po/de.po
index 5b1ee4113..ae49d766f 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg-dev 1.18.8\n"
+"Project-Id-Version: dpkg-dev 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-05-05 04:58+0200\n"
-"PO-Revision-Date: 2018-05-05 05:01+0200\n"
+"POT-Creation-Date: 2018-07-25 09:27+0200\n"
+"PO-Revision-Date: 2018-07-25 09:46+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -238,26 +238,26 @@ 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"
@@ -301,26 +301,26 @@ 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"
+"                      Kommata-getrennte übergebene Bau-<Profile> als aktiv\n"
 "                        annehmen\n"
 "  --rules-requires-root\n"
 "                      alten Feldwert »Rules-Requires-Root« annehmen\n"
-- 
cgit v1.2.3


From e3c32720167a6c23fc19471d3e3273965c3dc9e5 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 28 Jul 2018 04:08:58 +0200
Subject: Dpkg::Gettext: Fix fallback textdomain() to honor its expected
 interface

Even though we will not use the domain value set by this function, we
should honor its original interface and return a domain string, and
update it when requested.
---
 debian/changelog        | 1 +
 scripts/Dpkg/Gettext.pm | 7 +++++++
 2 files changed, 8 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 5a7b8630f..d818667d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -129,6 +129,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       _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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Gettext.pm b/scripts/Dpkg/Gettext.pm
index 33ef1c48d..89a4d154f 100644
--- a/scripts/Dpkg/Gettext.pm
+++ b/scripts/Dpkg/Gettext.pm
@@ -28,6 +28,7 @@ package Dpkg::Gettext;
 
 use strict;
 use warnings;
+use feature qw(state);
 
 our $VERSION = '1.03';
 our @EXPORT = qw(
@@ -122,6 +123,12 @@ BEGIN {
             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) = @_;
-- 
cgit v1.2.3


From 1d0be95366c19fbc88c891dbedf7613aedbbdea5 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 28 Jul 2018 04:11:17 +0200
Subject: Dpkg::Gettext: Document textdomain() and ngettext() replacement
 functions

We should mention when these functions are present and what they do,
so that users know when they can rely on these.

Warned-by: Test::Pod::Coverage
---
 debian/changelog        |  2 ++
 scripts/Dpkg/Gettext.pm | 13 +++++++++++++
 2 files changed, 15 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d818667d2..37e11b1ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -149,6 +149,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Code internals:
     - Do not use stringy eval to define different sub implementations,
       just assign an anonymous sub to the typeglob.
diff --git a/scripts/Dpkg/Gettext.pm b/scripts/Dpkg/Gettext.pm
index 89a4d154f..03b723c9d 100644
--- a/scripts/Dpkg/Gettext.pm
+++ b/scripts/Dpkg/Gettext.pm
@@ -89,6 +89,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
-- 
cgit v1.2.3


From ee2e18800f5fe0c63df39202586f38e28c00e860 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 28 Jul 2018 03:13:05 +0200
Subject: perl: Make Build.PL check Module::Build availability at run-time

Doing a normal import via use, means that we need the module to be
present for the unit tests, when we only need it as part of the
distribution process.
---
 scripts/Build.PL.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
index 40de90e41..2f81260bd 100644
--- a/scripts/Build.PL.in
+++ b/scripts/Build.PL.in
@@ -3,7 +3,11 @@
 use strict;
 use warnings;
 
-use Module::Build ();
+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" .
-- 
cgit v1.2.3


From 46ed057b6d95545f3ea55b72de29f52e9d8ba885 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 29 Jul 2018 19:56:17 +0200
Subject: Dpkg::Deps: Merge all Copyright notices into the same block

There should be no difference between Copyright and Portions Copyright,
remove the distinction, and merge all these notices.
---
 scripts/Dpkg/Deps.pm | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index df8d9f4ec..c7565b73d 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;
 
-- 
cgit v1.2.3


From 72742b569f2cf908bc05fa96c5419120e42a10c6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 29 Jul 2018 20:01:03 +0200
Subject: Dpkg::Deps: Fix typo in POD

---
 scripts/Dpkg/Deps.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index c7565b73d..885a6c2e1 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -419,7 +419,7 @@ package Dpkg::Deps::Simple;
 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
+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.
-- 
cgit v1.2.3


From 8fd30b60465acd90ffea6aab19ce15eea94a122a Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 28 Jul 2018 22:10:55 +0200
Subject: Dpkg::Deps: Clarify arch-qualified dependency simplification

Dependency simplification can only really be done for metadata for which
we have all its context and information during the simplification
process. Anything that relies on the state of the dependencies cannot be
simplified. This means that any dependency that might change the
satisfiability due to the value of Multi-Arch field of the depended on
package cannot be simplified.

Clarify this in the function commends, and add new test cases to cover
this.

Prompted-by: Stuart Prescott <stuart@debian.org>
---
 debian/changelog      |  2 ++
 scripts/Dpkg/Deps.pm  |  3 +++
 scripts/t/Dpkg_Deps.t | 22 +++++++++++++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 688c70b53..b76062154 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -151,6 +151,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
   * Code internals:
     - Do not use stringy eval to define different sub implementations,
       just assign an anonymous sub to the typeglob.
@@ -189,6 +190,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #881401
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index 885a6c2e1..88cb98eca 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -758,6 +758,9 @@ sub _arch_is_superset {
 # 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) = @_;
 
diff --git a/scripts/t/Dpkg_Deps.t b/scripts/t/Dpkg_Deps.t
index 71a3cf16a..a519f8166 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 => 74;
 
 use Dpkg::Arch qw(get_host_arch);
 use Dpkg::Version;
@@ -233,6 +233,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');
-- 
cgit v1.2.3


From 7c98f09aecc4c3a3b5809f57a0a6dc8ad8a1f16f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 29 Jul 2018 19:49:30 +0200
Subject: scripts/t: Improve Dpkg::Deps test cases

Add new TODO tests for behavior that is not yet implemented, but should.
---
 debian/changelog      |  1 +
 scripts/t/Dpkg_Deps.t | 42 +++++++++++++++++++++++++++++++++++++-----
 2 files changed, 38 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index b76062154..b129604d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -191,6 +191,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #881401
diff --git a/scripts/t/Dpkg_Deps.t b/scripts/t/Dpkg_Deps.t
index a519f8166..27fb12a15 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 => 74;
+use Test::More tests => 78;
 
 use Dpkg::Arch qw(get_host_arch);
 use Dpkg::Version;
@@ -169,7 +169,34 @@ 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');
+
+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 +248,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);
-- 
cgit v1.2.3


From 8940f102eb5eecfb8ff55cde52d4866ab50dfd1f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 30 Jul 2018 00:37:13 +0200
Subject: Dpkg::Deps: Improve modules and method documentation

Document each implemented method. This will make it easier to split the
modules into their own files.
---
 debian/changelog     |   1 +
 scripts/Dpkg/Deps.pm | 528 ++++++++++++++++++++++++++++++++++++---------------
 2 files changed, 378 insertions(+), 151 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index b129604d9..374c09cf8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -152,6 +152,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
   * Code internals:
     - Do not use stringy eval to define different sub implementations,
       just assign an anonymous sub to the typeglob.
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index 88cb98eca..d6c90cf77 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -433,87 +433,9 @@ 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
+=head2 OBJECT - Dpkg::Deps::Simple
 
-=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:
+This object has several interesting properties:
 
 =over 4
 
@@ -534,33 +456,26 @@ 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
+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's none).
+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".
 
-=back
-
-=head3 METHODS
-
-=over 4
-
-=item $simple_dep->parse_string('dpkg-dev (>= 1.14.8) [!hurd-i386]')
+=item restrictions
 
-Parses the dependency and modifies internal properties to match the parsed
-dependency.
+The restrictions formula for this dependency. It is undefined when there
+is no restriction formula. Otherwise it is an array ref.
 
-=item $simple_dep->merge_union($other_dep)
+=back
 
-Returns true if $simple_dep could be modified to represent the union of
-both dependencies. Otherwise returns false.
+=head2 METHODS - Dpkg::Deps::Simple
 
-=back
+=over 4
 
 =cut
 
@@ -577,6 +492,34 @@ use Dpkg::Gettext;
 
 use parent qw(Dpkg::Interface::Storable);
 
+=item $dep = Dpkg::Deps::Simple->new(%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;
@@ -591,6 +534,13 @@ sub new {
     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;
@@ -601,6 +551,12 @@ sub reset {
     $self->{restrictions} = undef;
 }
 
+=item $dep->parse($fh, $desc)
+
+Parses a line from a filehandle.
+
+=cut
+
 sub parse {
     my ($self, $fh, $desc) = @_;
     my $line = <$fh>;
@@ -608,6 +564,13 @@ sub parse {
     return $self->parse_string($line);
 }
 
+=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) = @_;
 
@@ -662,6 +625,15 @@ sub parse_string {
     }
 }
 
+=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};
@@ -799,9 +771,14 @@ sub _restrictions_imply {
     }
 }
 
-# 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.
+=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')) {
@@ -868,15 +845,34 @@ sub implies {
     }
 }
 
+=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) = @_;
 
@@ -886,6 +882,14 @@ sub arch_is_concerned {
     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)) {
@@ -895,6 +899,13 @@ sub reduce_arch {
     }
 }
 
+=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}) {
@@ -904,6 +915,12 @@ sub has_arch_restriction {
     }
 }
 
+=item $dep->profile_is_concerned()
+
+Returns true if the dependency applies to the indicated profile.
+
+=cut
+
 sub profile_is_concerned {
     my ($self, $build_profiles) = @_;
 
@@ -912,6 +929,14 @@ sub profile_is_concerned {
     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) = @_;
 
@@ -922,23 +947,56 @@ sub reduce_profiles {
     }
 }
 
+=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
+object 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');
@@ -975,20 +1033,19 @@ sub merge_union {
     return 0;
 }
 
-package Dpkg::Deps::Multiple;
+=back
 
-=head2 Dpkg::Deps::Multiple
+=cut
 
-This is the base class for Dpkg::Deps::{AND,OR,Union}. It implements
-the following methods:
+package Dpkg::Deps::Multiple;
 
-=over 4
+=head2 OBJECT - Dpkg::Deps::Multiple
 
-=item $mul->add($dep)
+This is the base class for Dpkg::Deps::{AND,OR,Union}.
 
-Adds a new dependency object at the end of the list.
+=head2 METHODS - Dpkg::Deps::Multiple
 
-=back
+=over 4
 
 =cut
 
@@ -1001,6 +1058,12 @@ use Dpkg::ErrorHandling;
 
 use parent qw(Dpkg::Interface::Storable);
 
+=item $dep = Dpkg::Deps::Multiple->new(%opts);
+
+Creates a new object.
+
+=cut
+
 sub new {
     my $this = shift;
     my $class = ref($this) || $this;
@@ -1009,21 +1072,46 @@ sub new {
     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 = ();
@@ -1031,6 +1119,13 @@ sub sort {
     $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;
@@ -1040,6 +1135,16 @@ sub arch_is_concerned {
     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;
@@ -1050,6 +1155,12 @@ sub reduce_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;
@@ -1059,6 +1170,12 @@ sub 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;
@@ -1069,6 +1186,15 @@ sub profile_is_concerned {
     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;
@@ -1080,29 +1206,43 @@ sub reduce_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';
 }
 
-package Dpkg::Deps::AND;
+=back
 
-=head2 Dpkg::Deps::AND
+=cut
 
-This object represents a list of dependencies who must be met at the same
-time.
+package Dpkg::Deps::AND;
 
-=over 4
+=head2 OBJECT - Dpkg::Deps::AND
 
-=item $and->output([$fh])
+This object represents a list of dependencies that must be met at the same
+time. It inherits from Dpkg::Deps::Multiple.
 
-The output method uses ", " to join the list of sub-dependencies.
+=head2 METHODS - Dpkg::Deps::AND
 
-=back
+=over 4
 
 =cut
 
@@ -1111,6 +1251,12 @@ use warnings;
 
 use parent -norequire, qw(Dpkg::Deps::Multiple);
 
+=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());
@@ -1120,6 +1266,14 @@ sub output {
     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
@@ -1144,6 +1298,17 @@ sub implies {
     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
@@ -1164,6 +1329,14 @@ sub get_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, @knowndeps) = @_;
     my @new;
@@ -1193,21 +1366,20 @@ WHILELOOP:
     $self->{list} = [ @new ];
 }
 
+=back
+
+=cut
 
 package Dpkg::Deps::OR;
 
-=head2 Dpkg::Deps::OR
+=head2 OBJECT - 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])
+for the dependency to be true. It inherits from Dpkg::Deps::Multiple.
 
-The output method uses " | " to join the list of sub-dependencies.
+=head2 METHODS - Dpkg::Deps::OR
 
-=back
+=over 4
 
 =cut
 
@@ -1216,6 +1388,12 @@ use warnings;
 
 use parent -norequire, qw(Dpkg::Deps::Multiple);
 
+=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());
@@ -1225,6 +1403,14 @@ sub output {
     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) = @_;
 
@@ -1252,6 +1438,17 @@ sub implies {
     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
@@ -1272,6 +1469,14 @@ sub get_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;
@@ -1292,30 +1497,20 @@ WHILELOOP:
     $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.
+=back
 
-=item $union->implies($other_dep)
+=cut
 
-=item $union->get_evaluation($other_dep)
+package Dpkg::Deps::Union;
 
-Those methods are not meaningful for this object and always return undef.
+=head2 OBJECT - Dpkg::Deps::Union
 
-=item $union->simplify_deps($facts)
+This object represents a list of relationships. It inherits from
+Dpkg::Deps::Multiple.
 
-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.
+=head2 METHODS - Dpkg::Deps::Union
 
-=back
+=over 4
 
 =cut
 
@@ -1324,6 +1519,12 @@ use warnings;
 
 use parent -norequire, qw(Dpkg::Deps::Multiple);
 
+=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());
@@ -1333,16 +1534,31 @@ sub output {
     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 are not useful on Union
+    # Implication test is not useful on Union.
     return;
 }
 
 sub get_evaluation {
-    # Evaluation are not useful on Union
+    # 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;
@@ -1358,18 +1574,20 @@ WHILELOOP:
     $self->{list} = [ @new ];
 }
 
+=back
+
+=cut
+
 package Dpkg::Deps::KnownFacts;
 
-=head2 Dpkg::Deps::KnownFacts
+=head2 OBJECT - 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();
+=head2 METHODS - Dpkg::Deps::KnownFacts
 
-Creates a new object.
+=over 4
 
 =cut
 
@@ -1378,6 +1596,12 @@ use warnings;
 
 use Dpkg::Version;
 
+=item $facts = Dpkg::Deps::KnownFacts->new();
+
+Creates a new object.
+
+=cut
+
 sub new {
     my $this = shift;
     my $class = ref($this) || $this;
@@ -1445,8 +1669,6 @@ 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 {
@@ -1467,7 +1689,9 @@ sub check_package {
     return (0, undef);
 }
 
-## The functions below are private to Dpkg::Deps
+##
+## The functions below are private to Dpkg::Deps::KnownFacts.
+##
 
 sub _find_package {
     my ($self, $dep, $lackinfos) = @_;
@@ -1534,6 +1758,8 @@ sub _evaluate_simple_dep {
     return 0;
 }
 
+=back
+
 =head1 CHANGES
 
 =head2 Version 1.06 (dpkg 1.18.7; module version bumped on dpkg 1.18.24)
-- 
cgit v1.2.3


From 3d4afe2967eccd7805d067a3eab6938f7f099a63 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 30 Jul 2018 04:31:32 +0200
Subject: Dpkg::Deps::KnownFacts: Rename _evaluate_simple_dep to
 evaluate_simple_dep

This method is currently used by Dpkg::Deps::Simple, and is marked as
private by way of its underscore prefix. This will be a problem once
we split the modules into different files, as then we are not supposed
to be using private methods from external modules.

Rename the method, and document it explicitly as being private, while
only giving a partial prototype to deter its use.
---
 scripts/Dpkg/Deps.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index d6c90cf77..613ca2d7a 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -961,7 +961,7 @@ is lacking to conclude.
 sub get_evaluation {
     my ($self, $facts) = @_;
     return if not defined $self->{package};
-    return $facts->_evaluate_simple_dep($self);
+    return $facts->evaluate_simple_dep($self);
 }
 
 =item $dep->simplify_deps($facts, @assumed_deps)
@@ -1726,7 +1726,13 @@ sub _find_virtual_packages {
     return @{$self->{virtualpkg}{$pkg}};
 }
 
-sub _evaluate_simple_dep {
+=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);
-- 
cgit v1.2.3


From 738c8d5d545e164c3e7450751960618443bf7431 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 30 Jul 2018 01:26:08 +0200
Subject: Dpkg::Deps: Split subpackages

This makes the structure easier to comprehend, and easier to read,
otherwise it's difficutl to search for specific methods or functions
and know immediately to what module they belong. It also makes for
more structured POD.
---
 debian/changelog                |    1 +
 scripts/Dpkg/Deps.pm            | 1379 +--------------------------------------
 scripts/Dpkg/Deps/AND.pm        |  182 ++++++
 scripts/Dpkg/Deps/KnownFacts.pm |  244 +++++++
 scripts/Dpkg/Deps/Multiple.pm   |  250 +++++++
 scripts/Dpkg/Deps/OR.pm         |  174 +++++
 scripts/Dpkg/Deps/Simple.pm     |  659 +++++++++++++++++++
 scripts/Dpkg/Deps/Union.pm      |  119 ++++
 scripts/Makefile.am             |    6 +
 scripts/po/POTFILES.in          |    6 +
 10 files changed, 1659 insertions(+), 1361 deletions(-)
 create mode 100644 scripts/Dpkg/Deps/AND.pm
 create mode 100644 scripts/Dpkg/Deps/KnownFacts.pm
 create mode 100644 scripts/Dpkg/Deps/Multiple.pm
 create mode 100644 scripts/Dpkg/Deps/OR.pm
 create mode 100644 scripts/Dpkg/Deps/Simple.pm
 create mode 100644 scripts/Dpkg/Deps/Union.pm

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 374c09cf8..d0c53872d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -130,6 +130,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index 613ca2d7a..f3a19e78e 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -63,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)
 
@@ -411,9 +416,6 @@ sub deps_compare {
     }
 }
 
-
-package Dpkg::Deps::Simple;
-
 =head1 OBJECTS - Dpkg::Deps::*
 
 There are several kind of dependencies. A Dpkg::Deps::Simple dependency
@@ -433,1377 +435,32 @@ dependencies and while trying to simplify them. It represents a set of
 installed packages along with the virtual packages that they might
 provide.
 
-=head2 OBJECT - Dpkg::Deps::Simple
-
-This object 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
-
-=head2 METHODS - Dpkg::Deps::Simple
-
-=over 4
-
-=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);
-
-=item $dep = Dpkg::Deps::Simple->new(%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($fh, $desc)
-
-Parses a line from a filehandle.
-
-=cut
-
-sub parse {
-    my ($self, $fh, $desc) = @_;
-    my $line = <$fh>;
-    chomp($line);
-    return $self->parse_string($line);
-}
-
-=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->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;
-}
-
-# _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.
-#
-# 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) && $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);
-    }
-}
-
-=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
-object 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
-
-=cut
-
-package Dpkg::Deps::Multiple;
-
-=head2 OBJECT - Dpkg::Deps::Multiple
-
-This is the base class for Dpkg::Deps::{AND,OR,Union}.
-
-=head2 METHODS - Dpkg::Deps::Multiple
-
-=over 4
-
-=cut
-
-use strict;
-use warnings;
-
-use Carp;
-
-use Dpkg::ErrorHandling;
-
-use parent qw(Dpkg::Interface::Storable);
-
-=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;
-}
+=head1 CHANGES
 
-=item $dep->reset()
+=head2 Version 1.06 (dpkg 1.18.7; module version bumped on dpkg 1.18.24)
 
-Clears any dependency information stored in $dep so that $dep->is_empty()
-returns true.
+New option: Add tests_dep option to Dpkg::Deps::deps_parse().
 
-=cut
+=head2 Version 1.05 (dpkg 1.17.14)
 
-sub reset {
-    my $self = shift;
-    $self->{list} = [];
-}
+New function: Dpkg::Deps::deps_iterate().
 
-=item $dep->add(@deps)
+=head2 Version 1.04 (dpkg 1.17.10)
 
-Adds new dependency objects at the end of the list.
+New options: Add use_profiles, build_profiles, reduce_profiles and
+reduce_restrictions to Dpkg::Deps::deps_parse().
 
-=cut
+=head2 Version 1.03 (dpkg 1.17.0)
 
-sub add {
-    my $self = shift;
-    push @{$self->{list}}, @_;
-}
+New option: Add build_arch option to Dpkg::Deps::deps_parse().
 
-=item $dep->get_deps()
+=head2 Version 1.02 (dpkg 1.17.0)
 
-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
-
-=cut
-
-package Dpkg::Deps::AND;
-
-=head2 OBJECT - Dpkg::Deps::AND
-
-This object represents a list of dependencies that must be met at the same
-time. It inherits from Dpkg::Deps::Multiple.
-
-=head2 METHODS - Dpkg::Deps::AND
-
-=over 4
-
-=cut
-
-use strict;
-use warnings;
-
-use parent -norequire, qw(Dpkg::Deps::Multiple);
-
-=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) && $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;
-}
-
-=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
-
-=cut
-
-package Dpkg::Deps::OR;
-
-=head2 OBJECT - Dpkg::Deps::OR
-
-This object represents a list of dependencies of which only one must be met
-for the dependency to be true. It inherits from Dpkg::Deps::Multiple.
-
-=head2 METHODS - Dpkg::Deps::OR
-
-=over 4
-
-=cut
-
-use strict;
-use warnings;
-
-use parent -norequire, qw(Dpkg::Deps::Multiple);
-
-=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
-
-=cut
-
-package Dpkg::Deps::Union;
-
-=head2 OBJECT - Dpkg::Deps::Union
-
-This object represents a list of relationships. It inherits from
-Dpkg::Deps::Multiple.
-
-=head2 METHODS - Dpkg::Deps::Union
-
-=over 4
-
-=cut
-
-use strict;
-use warnings;
-
-use parent -norequire, qw(Dpkg::Deps::Multiple);
-
-=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
-
-=cut
-
-package Dpkg::Deps::KnownFacts;
-
-=head2 OBJECT - Dpkg::Deps::KnownFacts
-
-This object represents a list of installed packages and a list of virtual
-packages provided (by the set of installed packages).
-
-=head2 METHODS - Dpkg::Deps::KnownFacts
-
-=over 4
-
-=cut
-
-use strict;
-use warnings;
-
-use Dpkg::Version;
-
-=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;
-}
-
-=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.
-
-=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}) {
-        my $arrayref = [ map { [
-            $_->{provider}, $_->{relation}, $_->{version}
-        ] } @{$self->{virtualpkg}{$pkg}} ];
-        return (1, $arrayref);
-    }
-    return (0, undef);
-}
-
-##
-## 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 $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}};
-}
-
-=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 1.06 (dpkg 1.18.7; module version bumped on dpkg 1.18.24)
-
-New option: Add tests_dep option to Dpkg::Deps::deps_parse().
-
-=head2 Version 1.05 (dpkg 1.17.14)
-
-New function: Dpkg::Deps::deps_iterate().
-
-=head2 Version 1.04 (dpkg 1.17.10)
-
-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().
-
-=head2 Version 1.02 (dpkg 1.17.0)
-
-New function: Dpkg::Deps::deps_concat()
+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..e16a2cf35
--- /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 object 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..95770ec00
--- /dev/null
+++ b/scripts/Dpkg/Deps/KnownFacts.pm
@@ -0,0 +1,244 @@
+# 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 object 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 = '1.01';
+
+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;
+}
+
+=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.
+
+=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}) {
+        my $arrayref = [ map { [
+            $_->{provider}, $_->{relation}, $_->{version}
+        ] } @{$self->{virtualpkg}{$pkg}} ];
+        return (1, $arrayref);
+    }
+    return (0, undef);
+}
+
+##
+## 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 $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}};
+}
+
+=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 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..b2f8d03ed
--- /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 object 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..0557c7cfc
--- /dev/null
+++ b/scripts/Dpkg/Deps/Simple.pm
@@ -0,0 +1,659 @@
+# 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 object 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(%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($fh, $desc)
+
+Parses a line from a filehandle.
+
+=cut
+
+sub parse {
+    my ($self, $fh, $desc) = @_;
+
+    my $line = <$fh>;
+    chomp $line;
+    return $self->parse_string($line);
+}
+
+=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->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;
+}
+
+# _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
+object 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..62cf5c38a
--- /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 object 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/Makefile.am b/scripts/Makefile.am
index 28bb4a742..d8160749b 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 \
diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in
index dea8cde0e..638fd8b97 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
-- 
cgit v1.2.3


From 9ab6c592c04c06952019e5c9bba57b2b54aa3fae Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 8 Jun 2018 03:22:36 +0200
Subject: Dpkg::Source: Do not change patch permissions if not necessary

To be able to build a source tree, a user needs write permisions on it,
but not necessarily ownership of those files. We check the existing file
permissions and avoid changing them if not necessary, which helps in the
case where the user does not have ownership of those files, and they
were already present.

Closes: #898010
Naming-by: Julian Andres Klode <jak@debian.org>
---
 debian/changelog                        |  2 ++
 scripts/Dpkg/Source/Functions.pm        | 13 +++++++++++++
 scripts/Dpkg/Source/Package/V2.pm       |  4 ++--
 scripts/Dpkg/Source/Package/V3/Quilt.pm |  4 ++--
 scripts/Dpkg/Source/Quilt.pm            |  4 ++--
 5 files changed, 21 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d0c53872d..28568a5c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -131,6 +131,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Source/Functions.pm b/scripts/Dpkg/Source/Functions.pm
index 0a940463e..dcb957e13 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 permisions 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.
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 13e5d7456..2c8529bc1 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -38,7 +38,7 @@ use Dpkg::Compression;
 use Dpkg::Source::Archive;
 use Dpkg::Source::Patch;
 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 is_binary fs_time);
 use Dpkg::Vendor qw(run_vendor_hook);
 use Dpkg::Control;
 use Dpkg::Changelog::Parse;
@@ -673,7 +673,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)
diff --git a/scripts/Dpkg/Source/Package/V3/Quilt.pm b/scripts/Dpkg/Source/Package/V3/Quilt.pm
index 9718ffa2d..7c6137c28 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;
 
@@ -249,7 +249,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/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 {
-- 
cgit v1.2.3


From c0c457246d25e7c64f65d1b37f976b7e804b10ab Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 31 Jul 2018 03:53:59 +0200
Subject: dselect: Use override attribute for virtual methods in derived
 classes

C++11 makes it possible to use these attributes so that errors can be
avoided, by helping the compiler know when we mean methods to override
the ones from the parent class.

Warned-by: cppcheck
---
 dselect/method.h                   | 18 +++++++++---------
 dselect/pkglist.h                  | 20 ++++++++++----------
 scripts/t/Dpkg_Shlibs/patterns.cpp |  2 +-
 3 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'scripts')

diff --git a/dselect/method.h b/dselect/method.h
index c21e5da0e..f9593ec27 100644
--- a/dselect/method.h
+++ b/dselect/method.h
@@ -62,15 +62,15 @@ protected:
   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 */
diff --git a/dselect/pkglist.h b/dselect/pkglist.h
index 077cabb88..f60a93169 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
 
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());
-- 
cgit v1.2.3


From a4f0c6f04636ed066eb7e5162403d20a369fceec Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 11 Aug 2018 03:32:37 +0200
Subject: Fix some typos

Thanks-to: Niels Thykier <niels@thykier.net> (for typo in dpkg(1))
---
 ChangeLog.old                    | 12 ++++++------
 debian/changelog                 |  4 ++--
 debian/control                   |  2 +-
 doc/rootless-builds.txt          |  2 +-
 lib/compat/getopt.c              |  2 +-
 lib/dpkg/path-remove.c           |  2 +-
 man/dpkg.man                     |  2 +-
 scripts/Dpkg/Source/Functions.pm |  2 +-
 scripts/dpkg-buildpackage.pl     |  4 ++--
 scripts/t/Dpkg_Changelog/shadow  |  8 ++++----
 t/pod-coverage.t                 |  2 +-
 11 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'scripts')

diff --git a/ChangeLog.old b/ChangeLog.old
index 770c9d630..252d901b7 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.
@@ -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>
@@ -13730,7 +13730,7 @@ 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
     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/debian/changelog b/debian/changelog
index b42616b84..fd30747c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -485,7 +485,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
@@ -12719,7 +12719,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/debian/control b/debian/control
index 29f9fc5ee..a3f819118 100644
--- a/debian/control
+++ b/debian/control
@@ -165,7 +165,7 @@ 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
diff --git a/doc/rootless-builds.txt b/doc/rootless-builds.txt
index 0157879a4..0b6b9d849 100644
--- a/doc/rootless-builds.txt
+++ b/doc/rootless-builds.txt
@@ -57,7 +57,7 @@ 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 choosen to commit to take effect during the build. When set,
+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.
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/dpkg/path-remove.c b/lib/dpkg/path-remove.c
index ef9cde7b5..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>
diff --git a/man/dpkg.man b/man/dpkg.man
index fdaa87b1c..772c1b324 100644
--- a/man/dpkg.man
+++ b/man/dpkg.man
@@ -623,7 +623,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
diff --git a/scripts/Dpkg/Source/Functions.pm b/scripts/Dpkg/Source/Functions.pm
index dcb957e13..262b80ad1 100644
--- a/scripts/Dpkg/Source/Functions.pm
+++ b/scripts/Dpkg/Source/Functions.pm
@@ -73,7 +73,7 @@ sub fixperms {
 
 # Only change the pathname permissions if they differ from the desired.
 #
-# To be able to build a source tree, a user needs write permisions on it,
+# 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) = @_;
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 9cc6969d3..c50416580 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -629,7 +629,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();
@@ -731,7 +731,7 @@ sub parse_rules_requires_root {
         setup_rootcommand();
     }
 
-    # Notify the childs we do support R³.
+    # 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) {
diff --git a/scripts/t/Dpkg_Changelog/shadow b/scripts/t/Dpkg_Changelog/shadow
index f9b2236f5..5f4bddb85 100644
--- a/scripts/t/Dpkg_Changelog/shadow
+++ b/scripts/t/Dpkg_Changelog/shadow
@@ -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/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);
-- 
cgit v1.2.3


From 6227aa720d9ce637e676bdc0096fb8316576348f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 23 Jul 2018 12:13:31 +0200
Subject: Dpkg::Substvars: Reword used/unused warnings to clarify their meaning

Clarify the unknown and unused substitution variable warnings, to try to
make them more clear as to what each implies.

Closes: #904258
---
 debian/changelog           | 2 ++
 scripts/Dpkg/Substvars.pm  | 6 ++++--
 scripts/t/Dpkg_Substvars.t | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index fd30747c2..19fa87c6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -134,6 +134,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Substvars.pm b/scripts/Dpkg/Substvars.pm
index 1e9f90173..637072846 100644
--- a/scripts/Dpkg/Substvars.pm
+++ b/scripts/Dpkg/Substvars.pm
@@ -342,7 +342,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 +367,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);
     }
 }
diff --git a/scripts/t/Dpkg_Substvars.t b/scripts/t/Dpkg_Substvars.t
index bb8e14039..6c7be24f2 100644
--- a/scripts/t/Dpkg_Substvars.t
+++ b/scripts/t/Dpkg_Substvars.t
@@ -97,7 +97,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 +117,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
-- 
cgit v1.2.3


From f277fc2e8e0fd80017e0fd4088789a09737c5c3a Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 11 Aug 2018 03:34:24 +0200
Subject: dpkg-gensymbols: Add new -l option

This option will make it possible to stop using LD_LIBRARY_PATH when
calling this script.
---
 debian/changelog           |  2 ++
 man/dpkg-gensymbols.man    | 11 +++++++++++
 scripts/dpkg-gensymbols.pl |  3 +++
 3 files changed, 16 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 849710fe8..90f81981d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -91,6 +91,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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.
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/man/dpkg-gensymbols.man b/man/dpkg-gensymbols.man
index a708b5e96..36aaf9a3a 100644
--- a/man/dpkg-gensymbols.man
+++ b/man/dpkg-gensymbols.man
@@ -436,6 +436,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.
diff --git a/scripts/dpkg-gensymbols.pl b/scripts/dpkg-gensymbols.pl
index ef0992883..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$/) {
-- 
cgit v1.2.3


From 174a5bd2a080847d0ed901d269a2ba74476eba8b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 11 Aug 2018 03:35:01 +0200
Subject: Dpkg::Shlibs: Warn when using LD_LIBRARY_PATH with a descendent of
 cwd

This makes the deprecation explicit, so that we can start noticing
what is inappropriately setting this variable for a purpose it was
not designed for.
---
 debian/changelog       |  2 ++
 scripts/Dpkg/Shlibs.pm | 10 ++++++++++
 2 files changed, 12 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 90f81981d..a335036fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -152,6 +152,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Shlibs.pm b/scripts/Dpkg/Shlibs.pm
index c8b43ab9d..b5d5bdf64 100644
--- a/scripts/Dpkg/Shlibs.pm
+++ b/scripts/Dpkg/Shlibs.pm
@@ -90,8 +90,18 @@ 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{/+$}{};
+
+            if (Cwd::realpath($path) =~ 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;
-- 
cgit v1.2.3


From b741076e2a70dfa9f385b6baa9bfc6b496bd902f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 20 Aug 2018 16:37:18 +0200
Subject: Dpkg::Source::Package::V3::Quilt: Print series file used when
 applying patches

We might use a vendor specific series file, so we should print the one
being used to notify if this fact.
---
 debian/changelog                        | 2 ++
 scripts/Dpkg/Source/Package/V3/Quilt.pm | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index a335036fb..dc0c41ba6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -154,6 +154,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Source/Package/V3/Quilt.pm b/scripts/Dpkg/Source/Package/V3/Quilt.pm
index 7c6137c28..45237d26a 100644
--- a/scripts/Dpkg/Source/Package/V3/Quilt.pm
+++ b/scripts/Dpkg/Source/Package/V3/Quilt.pm
@@ -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
-- 
cgit v1.2.3


From fd1b41d81578a97399284f72ae703c0a32e3f905 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 24 Aug 2018 21:18:12 +0200
Subject: Dpkg::OpenPGP: Return the destination path on successful ASCII armor
 conversion

This way we can distinguish the failure from the success case.
---
 debian/changelog        | 2 ++
 scripts/Dpkg/OpenPGP.pm | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index dc0c41ba6..9f5e81dfa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -156,6 +156,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm
index 858d3efcf..8d85e845d 100644
--- a/scripts/Dpkg/OpenPGP.pm
+++ b/scripts/Dpkg/OpenPGP.pm
@@ -49,7 +49,7 @@ 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')) {
@@ -71,7 +71,7 @@ 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;
-- 
cgit v1.2.3


From 786870e4bb9656b39df2bdeff5cc747e41d734c4 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 25 Aug 2018 01:28:17 +0200
Subject: Dpkg::Control::Fields: Do not use & sigil for function calls

Warned-by: perlcritic
Fixes: Subroutines::ProhibitAmpersandSigils
---
 debian/changelog               | 1 +
 scripts/Dpkg/Control/Fields.pm | 9 ++++++---
 t/critic.t                     | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 9f5e81dfa..2d9d9e0e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -158,6 +158,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       patches.
     - Dpkg::OpenPGP: Return the destination path on successful ASCII armor
       conversion.
+    - Dpkg::Control::Fields: Do not use & sigil for function calls.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
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/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
-- 
cgit v1.2.3


From 85aa070f774df38d1dcf0dc2d451bf6848eee1c6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 25 Aug 2018 02:32:40 +0200
Subject: build: Only sign the perl distribution if we are doing an actual
 release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Forcing the signing while not actually preparing a tarball for a
release disitribution, that is due to a signed tag, means that any
random «make distcheck» will trigger an annoying gpg prompt.
---
 configure.ac        |  2 ++
 cpan.am             |  2 +-
 m4/dpkg-build.m4    | 13 +++++++++++++
 scripts/Build.PL.in |  2 +-
 4 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/configure.ac b/configure.ac
index bdf05ffb4..121c7665a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,12 +5,14 @@ m4_pattern_forbid([^_?DPKG_])
 AC_PREREQ(2.60)
 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_SUBST([PACKAGE_CPAN_SIGN], [$dpkg_dist_is_release])
 AC_CONFIG_SRCDIR([lib/dpkg/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/cpan.am b/cpan.am
index 276fddc72..2ff9192ac 100644
--- a/cpan.am
+++ b/cpan.am
@@ -33,7 +33,7 @@ dist-cpan:
 	: # Prepare the CPAN distribution.
 	cd $(CPAN_DIST) && ./Build.PL
 	cd $(CPAN_DIST) && ./Build manifest
-	cd $(CPAN_DIST) && ./Build distsign
+	cd $(CPAN_DIST) && ./Build distdir
 
 	: # Pack the CPAN distribution.
 	$(TAR) -caf $(CPAN_DIST_ARCHIVE) -C $(CPAN_DIST) -Hustar \
diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4
index 1ea3e4b22..5b98849c3 100644
--- a/m4/dpkg-build.m4
+++ b/m4/dpkg-build.m4
@@ -84,6 +84,19 @@ 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.
+AC_DEFUN([DPKG_DIST_IS_RELEASE], [
+  dpkg_dist_version=$srcdir/.dist-version
+  AS_IF([test -f $dpkg_dist_version && grep -q -v '[-]' $dpkg_dist_version], [
+    dpkg_dist_is_release=1
+  ], [
+    dpkg_dist_is_release=0
+  ])
+  unset dpkg_dist_version
+])# DPKG_DIST_IS_RELEASE
+
 # DPKG_DIST_CHECK(COND, ERROR)
 # ---------------
 # Check if the condition is fulfilled when preparing a distribution tarball.
diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
index 2f81260bd..198c53780 100644
--- a/scripts/Build.PL.in
+++ b/scripts/Build.PL.in
@@ -50,7 +50,7 @@ my $build = $class->new(
         keywords => [ qw(dpkg debian perl) ],
     },
 
-    sign            => 1,
+    sign            => @PACKAGE_CPAN_SIGN@,
     dynamic_config  => 0,
 
     configure_requires => {
-- 
cgit v1.2.3


From e596defa91399a04792c7b37a6eb74a67cd10661 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 25 Aug 2018 01:30:06 +0200
Subject: scripts/t: Improve coverage of unit tests

---
 debian/changelog                |  1 +
 scripts/t/Dpkg_Arch.t           |  9 +++++++--
 scripts/t/Dpkg_BuildFlags.t     | 42 ++++++++++++++++++++++++++++++++++++++++-
 scripts/t/Dpkg_Build_Types.t    | 25 +++++++++++++++++++++++-
 scripts/t/Dpkg_Checksums.t      | 30 ++++++++++++++++++++++++++++-
 scripts/t/Dpkg_Control_Fields.t |  5 ++++-
 scripts/t/Dpkg_OpenPGP.t        | 23 +++++++++++++---------
 scripts/t/Dpkg_Substvars.t      | 19 ++++++++++++++++++-
 8 files changed, 138 insertions(+), 16 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 3b883b060..97ed4d959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -276,6 +276,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #881401
diff --git a/scripts/t/Dpkg_Arch.t b/scripts/t/Dpkg_Arch.t
index 9d2aaf361..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 => 16832;
+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
@@ -160,6 +160,11 @@ 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');
diff --git a/scripts/t/Dpkg_BuildFlags.t b/scripts/t/Dpkg_BuildFlags.t
index 0ebf878b8..776fdf1a4 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,46 @@ 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
+        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_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_Checksums.t b/scripts/t/Dpkg_Checksums.t
index 82a45fe31..33e2587e1 100644
--- a/scripts/t/Dpkg_Checksums.t
+++ b/scripts/t/Dpkg_Checksums.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 44;
+use Test::More tests => 59;
 use Test::Dpkg qw(:paths);
 
 BEGIN {
@@ -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_Control_Fields.t b/scripts/t/Dpkg_Control_Fields.t
index c83efed96..00f951052 100644
--- a/scripts/t/Dpkg_Control_Fields.t
+++ b/scripts/t/Dpkg_Control_Fields.t
@@ -32,10 +32,13 @@ 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
 );
diff --git a/scripts/t/Dpkg_OpenPGP.t b/scripts/t/Dpkg_OpenPGP.t
index b39613149..164395117 100644
--- a/scripts/t/Dpkg_OpenPGP.t
+++ b/scripts/t/Dpkg_OpenPGP.t
@@ -25,7 +25,7 @@ use Dpkg::ErrorHandling;
 
 test_needs_command('gpg');
 
-plan tests => 3;
+plan tests => 6;
 
 use_ok('Dpkg::OpenPGP');
 
@@ -33,22 +33,27 @@ report_options(quiet_warnings => 1);
 
 my $datadir = test_get_data_path();
 my $tmpdir = test_get_temp_path();
+my $ascfile;
 
-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.enoent";
+is(openpgp_sig_to_asc("$datadir/nonexistent", $ascfile),
+   undef, 'no conversion of inexistent file');
 
-ok(compare("$tmpdir/package_1.0.orig.tar.sig2asc",
-           "$datadir/package_1.0.orig.tar.asc") == 0,
+$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($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_Substvars.t b/scripts/t/Dpkg_Substvars.t
index 6c7be24f2..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 ();
@@ -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',
-- 
cgit v1.2.3


From 0674000c375ae1fda818093fa8073d61a5ad6565 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 28 Aug 2018 02:35:15 +0200
Subject: dpkg-shlibdeps: Split string at \n boundary
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Having the string read as “\nTo” confuses codespell, as a typo for not.
Just break the string at the newline to make it more clear for humans
and spell checkers alike.

Warned-by: codespell
---
 scripts/dpkg-shlibdeps.pl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 4b18545e9..fa6c37a4d 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -482,8 +482,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);
-- 
cgit v1.2.3


From 58a3470f3ac2ee394d6525ab4781838327e9bb13 Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Thu, 30 Aug 2018 08:35:56 +0200
Subject: Update German scripts translation

Update to 602t.
---
 scripts/po/de.po | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/po/de.po b/scripts/po/de.po
index ae49d766f..b65d5c7af 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-07-25 09:27+0200\n"
-"PO-Revision-Date: 2018-07-25 09:46+0200\n"
+"POT-Creation-Date: 2018-08-30 07:12+0200\n"
+"PO-Revision-Date: 2018-08-30 08:34+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -1092,6 +1092,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"
@@ -1125,6 +1127,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"
@@ -2780,6 +2784,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'"
@@ -3594,6 +3606,11 @@ msgstr "nichtnative Paketversion enthält keine Revision"
 msgid "can't create symlink %s"
 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"
@@ -3880,13 +3897,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
@@ -3954,6 +3971,9 @@ 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 "unknown substitution variable ${%s}"
+#~ msgstr "unbekannte Substitutionsvariable ${%s}"
+
 #~ msgid "cannot create pipe for %s"
 #~ msgstr "Pipe für %s kann nicht angelegt werden"
 
-- 
cgit v1.2.3


From 56810aa960e9ac8a51da178bb32e487726f60530 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 1 Sep 2018 22:37:43 +0200
Subject: Dpkg::Substvars: Fix typo

---
 scripts/Dpkg/Substvars.pm | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/Dpkg/Substvars.pm b/scripts/Dpkg/Substvars.pm
index 637072846..650eae7fa 100644
--- a/scripts/Dpkg/Substvars.pm
+++ b/scripts/Dpkg/Substvars.pm
@@ -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 an object which is able to substitute variables in strings.
 
 =cut
 
-- 
cgit v1.2.3


From 8fe2c1ebf907f325b6985f471a00843eca77992b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 3 Sep 2018 19:28:01 +0200
Subject: Dpkg::Shlibs: Ignore nonexistent directories present in
 LD_LIBRARY_PATH

We were trying to use realpath() on nonexistent directories, which means
we'd get undef. Instead just completely ignore nonexistent directories
from any processing.

Fixes: commit 174a5bd2a080847d0ed901d269a2ba74476eba8b
---
 debian/changelog       | 1 +
 scripts/Dpkg/Shlibs.pm | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index f2eef27f2..5030f6a7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -160,6 +160,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Shlibs.pm b/scripts/Dpkg/Shlibs.pm
index b5d5bdf64..2b19d14a7 100644
--- a/scripts/Dpkg/Shlibs.pm
+++ b/scripts/Dpkg/Shlibs.pm
@@ -96,7 +96,9 @@ sub setup_library_paths {
         foreach my $path (split /:/, $ENV{LD_LIBRARY_PATH}) {
             $path =~ s{/+$}{};
 
-            if (Cwd::realpath($path) =~ m/^\Q$cwd\E/) {
+            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'));
-- 
cgit v1.2.3


From e95082d78a4b11a411bb8c98dfc140ace452aa2b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 1 Sep 2018 22:42:30 +0200
Subject: dpkg-maintscript-helper: Check that DPKG_MAINTSCRIPT_PACKAGE is
 defined

When we need the environment variablem check that it is defined, and
error out otherwise.

Closes: #907772
---
 debian/changelog                   | 2 ++
 scripts/dpkg-maintscript-helper.sh | 8 ++++++++
 2 files changed, 10 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 5030f6a7a..6fea9b501 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -93,6 +93,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh
index 2e5d207bc..de6c863c2 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"
@@ -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#/}" ] || \
@@ -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" ] && \
-- 
cgit v1.2.3


From 9429372291069eab0f853f772fc76177413410ef Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 16 Sep 2018 03:31:25 +0200
Subject: Dpkg::Deps::KnownFacts: Satisfy :native with arch:all packages too

Architecture:all packages are treated as native ones as part of the
current multi-arch design, the only current exception is in
build dependencies with the :native arch-qualifier.

It looks like this was an oversight when implementing the :native
support, as there's been no rationale found for the current behavior.

Closes: #854438
Analysis-by: Johannes Schauer <josch@debian.org>
---
 debian/changelog                |  5 +++++
 scripts/Dpkg/Deps/KnownFacts.pm |  3 ++-
 scripts/t/Dpkg_Deps.t           | 21 ++++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 6fea9b501..d407098b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -163,6 +163,11 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/scripts/Dpkg/Deps/KnownFacts.pm b/scripts/Dpkg/Deps/KnownFacts.pm
index 95770ec00..192f6aa6b 100644
--- a/scripts/Dpkg/Deps/KnownFacts.pm
+++ b/scripts/Dpkg/Deps/KnownFacts.pm
@@ -167,7 +167,8 @@ sub _find_package {
         } 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';
+            return if $ma eq 'foreign';
+            return $p if $a eq $build_arch or $a eq 'all';
         } else {
             return $p if $a eq $archqual;
         }
diff --git a/scripts/t/Dpkg_Deps.t b/scripts/t/Dpkg_Deps.t
index 27fb12a15..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 => 78;
+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');
@@ -172,6 +174,23 @@ $dep_dup->simplify_deps($facts, $dep_opposite);
 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';
-- 
cgit v1.2.3


From a034e7d53b0c96c419d71c86921d2a509b0d79bc Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 30 Jul 2018 16:42:21 +0200
Subject: Dpkg::Vendor::Debian: Add fixfilepath support to reproducible feature

This is a superset of the fixdebugpath feature supported by gcc-8, but
covering in addition mappings for macros such as __FILE__ and similar.
---
 debian/changelog              |  1 +
 man/dpkg-buildflags.man       | 11 +++++++++++
 scripts/Dpkg/Vendor/Debian.pm | 21 +++++++++++++++++----
 scripts/t/Dpkg_BuildFlags.t   |  1 +
 4 files changed, 30 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d407098b0..5f45df110 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -168,6 +168,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - Update gettext minimal version in README.
     - Add a missing dot on the dpkg-buildflags(1) «lfs» feature paragraph.
diff --git a/man/dpkg-buildflags.man b/man/dpkg-buildflags.man
index 7712c5576..ba18dbbb7 100644
--- a/man/dpkg-buildflags.man
+++ b/man/dpkg-buildflags.man
@@ -476,6 +476,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 =.
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 1e8f24397..4bcf120e0 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -100,6 +100,7 @@ sub _add_build_flags {
         },
         reproducible => {
             timeless => 1,
+            fixfilepath => 0,
             fixdebugpath => 1,
         },
         sanitize => {
@@ -205,7 +206,8 @@ 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();
@@ -214,6 +216,7 @@ sub _add_build_flags {
         # so that we do not need to worry about escaping the characters
         # on output.
         if ($build_path =~ m/[^-+:.0-9a-zA-Z~\/_]/) {
+            $use_feature{reproducible}{fixfilepath} = 0;
             $use_feature{reproducible}{fixdebugpath} = 0;
         }
     }
@@ -223,9 +226,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);
diff --git a/scripts/t/Dpkg_BuildFlags.t b/scripts/t/Dpkg_BuildFlags.t
index 776fdf1a4..b087e0ab2 100644
--- a/scripts/t/Dpkg_BuildFlags.t
+++ b/scripts/t/Dpkg_BuildFlags.t
@@ -66,6 +66,7 @@ my %known_features = (
     ) ],
     reproducible => [ qw(
         fixdebugpath
+        fixfilepath
         timeless
     ) ],
     sanitize => [ qw(
-- 
cgit v1.2.3


From 37030e02cab5efe710834268f3d4ea426ec4a99a Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 18 Sep 2018 23:34:31 +0200
Subject: Dpkg::Dist::Files: Add support for file attributes

This will make it possible to track key/value attributes for each file,
so that we can track interesting information and pass it to the various
programs parsing the debian/files file.
---
 debian/changelog                       |  1 +
 man/deb-src-files.man                  |  7 +++++++
 scripts/Dpkg/Dist/Files.pm             | 17 ++++++++++++++---
 scripts/t/Dpkg_Dist_Files.t            | 31 ++++++++++++++++++++++---------
 scripts/t/Dpkg_Dist_Files/files-byhand |  4 ++--
 5 files changed, 46 insertions(+), 14 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 5f45df110..5b00463da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -169,6 +169,7 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
       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.
diff --git a/man/deb-src-files.man b/man/deb-src-files.man
index 39269aacd..cc8abda52 100644
--- a/man/deb-src-files.man
+++ b/man/deb-src-files.man
@@ -33,6 +33,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,6 +46,10 @@ 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.
 .
 .SH NOTES
 This file is not intended to be modified directly, please use one of
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/t/Dpkg_Dist_Files.t b/scripts/t/Dpkg_Dist_Files.t
index 44d42d058..e7d6a5da6 100644
--- a/scripts/t/Dpkg_Dist_Files.t
+++ b/scripts/t/Dpkg_Dist_Files.t
@@ -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
-- 
cgit v1.2.3


From 5eec3d31ff0ad5a22ced343969dda99b9e2af442 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 18 Sep 2018 23:34:41 +0200
Subject: scripts: Track automatic packages using the new file attribute

This should make it possible to ignore the warning w/o hardcoding any
distribution specific package name pattern on the code.
---
 debian/changelog           |  3 +++
 man/deb-src-files.man      |  2 ++
 scripts/dpkg-genchanges.pl | 14 +++++++++-----
 scripts/dpkg-gencontrol.pl |  5 ++++-
 4 files changed, 18 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 5b00463da..6e18c2587 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -95,6 +95,9 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     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$»).
   * Architecture support:
     - Add support for riscv64 CPU. Closes: #822914
       Thanks to Manuel A. Fernandez Montecelo <mafm@debian.org>
diff --git a/man/deb-src-files.man b/man/deb-src-files.man
index cc8abda52..4908cea89 100644
--- a/man/deb-src-files.man
+++ b/man/deb-src-files.man
@@ -50,6 +50,8 @@ The allowed values are specific to each distribution archive.
 .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
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 4f4b33608..13ab8a453 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);
 
@@ -423,10 +423,14 @@ if ($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;
     }
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 1c92e66dd..960043fa2 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -406,7 +406,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
-- 
cgit v1.2.3


From a7901786002cf4bd9f1dfbf3e4d844fc27478a8b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 18 Sep 2018 23:34:59 +0200
Subject: dpkg-parsechangelog: Add new --reverse option

This option will make the output be in reverse order.
---
 debian/changelog                | 2 ++
 man/dpkg-parsechangelog.man     | 6 +++++-
 scripts/Dpkg/Changelog.pm       | 9 +++++----
 scripts/Dpkg/Changelog/Parse.pm | 2 +-
 scripts/dpkg-parsechangelog.pl  | 3 +++
 scripts/t/Dpkg_Changelog.t      | 6 +++++-
 6 files changed, 21 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 6e18c2587..10d681f61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -98,6 +98,8 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
   * 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>
diff --git a/man/dpkg-parsechangelog.man b/man/dpkg-parsechangelog.man
index fd73fc8db..0a46394f8 100644
--- a/man/dpkg-parsechangelog.man
+++ b/man/dpkg-parsechangelog.man
@@ -74,7 +74,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 +122,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
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index 35e48ef02..39353fb5c 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -332,11 +332,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;
     }
 }
 
diff --git a/scripts/Dpkg/Changelog/Parse.pm b/scripts/Dpkg/Changelog/Parse.pm
index 28bb6892a..91da43ab2 100644
--- a/scripts/Dpkg/Changelog/Parse.pm
+++ b/scripts/Dpkg/Changelog/Parse.pm
@@ -152,7 +152,7 @@ sub _changelog_parse {
     $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;
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/t/Dpkg_Changelog.t b/scripts/t/Dpkg_Changelog.t
index ed9f8a965..8aa1bfc45 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 => 96;
 use Test::Dpkg qw(:paths);
 
 use File::Basename;
@@ -81,6 +81,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 => [
-- 
cgit v1.2.3


From 2848db123e1452d2c71840b7c00ca198c3626d4e Mon Sep 17 00:00:00 2001
From: Josh Triplett <josh@joshtriplett.org>
Date: Sat, 15 Sep 2018 16:10:29 -0700
Subject: perl: Replace all calls to Cwd::cwd with Cwd::getcwd

The former calls /bin/pwd, while the latter uses the getcwd() syscall
directly.

Signed-off-by: Guillem Jover <guillem@debian.org>
---
 debian/changelog              | 4 ++++
 doc/lcov-inject.pl            | 2 +-
 lib/dpkg/t/t-tarextract.t     | 2 +-
 lib/dpkg/t/t-treewalk.t       | 2 +-
 scripts/Dpkg/Vendor/Debian.pm | 2 +-
 scripts/dpkg-genbuildinfo.pl  | 2 +-
 scripts/dpkg-source.pl        | 2 +-
 scripts/t/Dpkg_Shlibs.t       | 2 +-
 8 files changed, 11 insertions(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 10d681f61..3f8de197d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -296,6 +296,10 @@ dpkg (1.19.1) UNRELEASED; urgency=medium
     - Delete fixup lines from i18nspector output instead of emptying them.
     - Add new codespell author test.
 
+  [ 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).
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/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-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/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 4bcf120e0..7d4b6d802 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -210,7 +210,7 @@ sub _add_build_flags {
         $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
diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
index 96b06093a..fe296506e 100755
--- a/scripts/dpkg-genbuildinfo.pl
+++ b/scripts/dpkg-genbuildinfo.pl
@@ -423,7 +423,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 {
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 107408d79..6a4825d22 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -118,7 +118,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
diff --git a/scripts/t/Dpkg_Shlibs.t b/scripts/t/Dpkg_Shlibs.t
index 4dc98bb3f..a2b892d74 100644
--- a/scripts/t/Dpkg_Shlibs.t
+++ b/scripts/t/Dpkg_Shlibs.t
@@ -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);
-- 
cgit v1.2.3


From 0955b9811116f054c9bacb8d6327036e381130b1 Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Wed, 19 Sep 2018 20:30:50 +0200
Subject: Update German scripts translation

Update to 602t.
---
 scripts/po/de.po | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/po/de.po b/scripts/po/de.po
index b65d5c7af..98b4eac97 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-08-30 07:12+0200\n"
-"PO-Revision-Date: 2018-08-30 08:34+0200\n"
+"POT-Creation-Date: 2018-09-19 19:45+0200\n"
+"PO-Revision-Date: 2018-09-19 20:30+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -1379,6 +1379,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"
@@ -1396,6 +1397,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"
-- 
cgit v1.2.3


From a6c7f3cbc6d193026099f7db87da25046a2107dc Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 26 Sep 2018 05:54:48 +0200
Subject: build: Perform Dpkg module substitution during CPAN module building

We had an empty do_perl_subst variable in the dist-cpan autotools
target that resulted in copying an empty file, but that was shadowed by
a subsequent copy of the original. So we were ending up with a pristine
non-substituted file.

We actually need to substitute the install paths during the CPAN module
building to preserve system and user settings at that point. Otherwise
the dpkg autotools configure settings might be completely out of touch
with the settings from the system where the CPAN module gets built.
---
 cpan.am             |  7 ++-----
 scripts/Build.PL.in | 37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/cpan.am b/cpan.am
index 2ff9192ac..b472826fc 100644
--- a/cpan.am
+++ b/cpan.am
@@ -13,11 +13,8 @@ dist-cpan:
 	         $(top_srcdir)/scripts/t/Dpkg* \
 	         $(top_srcdir)/scripts/t/origins \
 	         $(CPAN_DIST)/t
-	$(do_perl_subst) <$(top_srcdir)/scripts/Dpkg.pm \
-	                 >$(CPAN_DIST)/lib/Dpkg.pm
-	cp -fpR $(top_srcdir)/scripts/Dpkg.pm \
-	         $(top_srcdir)/scripts/Dpkg \
-	         $(CPAN_DIST)/lib/
+	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)
 
diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
index 198c53780..35a64d9be 100644
--- a/scripts/Build.PL.in
+++ b/scripts/Build.PL.in
@@ -22,6 +22,36 @@ my $class = Module::Build->subclass(
             $ENV{DPKG_DATADIR} = 'data';
             $ENV{DPKG_ORIGINS_DIR} = 't/origins';
         }
+
+        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');
+        }
     },
 );
 
@@ -71,6 +101,13 @@ my $build = $class->new(
     requires => {
         'perl'                  => '@PERL_MIN_VERSION@',
     },
+
+    install_path => {
+        conf => '/etc/dpkg',
+        data => '/usr/share/dpkg',
+        admin => '/var/lib/dpkg',
+        libexec => '/usr/lib/dpkg',
+    },
 );
 
 $build->create_build_script();
-- 
cgit v1.2.3


From 66f18c3b3695fb2b9cea847aaa419b588c676f7e Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 26 Sep 2018 05:56:11 +0200
Subject: build: Distribute the data files from the CPAN Build.PL script

When building the CPAN package, we need to also distribute the data
files, otherwise the modules will not work correctly once installed.
---
 scripts/Build.PL.in | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'scripts')

diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
index 35a64d9be..15a53e90e 100644
--- a/scripts/Build.PL.in
+++ b/scripts/Build.PL.in
@@ -102,6 +102,9 @@ my $build = $class->new(
         'perl'                  => '@PERL_MIN_VERSION@',
     },
 
+    data_files => {
+        map { $_ => $_ } glob 'data/*'
+    },
     install_path => {
         conf => '/etc/dpkg',
         data => '/usr/share/dpkg',
@@ -110,6 +113,7 @@ my $build = $class->new(
     },
 );
 
+$build->add_build_element('data');
 $build->create_build_script();
 
 1;
-- 
cgit v1.2.3


From a71a4bceba236e4dcd511c24e7b43851180ab4a5 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 26 Sep 2018 15:10:51 +0200
Subject: test: Make po checks cope with missing po files in CPAN distribution

We do not distribute the PO files yet for CPAN, so the checks should not
fail when they are missing, even when testing with AUTHOR_TESTING=1.
---
 scripts/Test/Dpkg.pm | 2 +-
 t/po.t               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/Test/Dpkg.pm b/scripts/Test/Dpkg.pm
index c59296858..937f333ba 100644
--- a/scripts/Test/Dpkg.pm
+++ b/scripts/Test/Dpkg.pm
@@ -102,7 +102,7 @@ sub test_get_temp_path
 sub test_get_po_dirs
 {
     if ($test_mode eq 'cpan') {
-        return qw(po);
+        return qw();
     } else {
         return qw(po scripts/po dselect/po man/po);
     }
diff --git a/t/po.t b/t/po.t
index 8f2b7a8b7..ce48395eb 100644
--- a/t/po.t
+++ b/t/po.t
@@ -25,6 +25,7 @@ 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 {
-- 
cgit v1.2.3


From 99ac7e5b2fa390835265473cb266de86d24f6f15 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 26 Sep 2018 04:35:23 +0200
Subject: po: Regenerate .pot files and merge .po files with them

---
 dselect/po/bs.po        |  10 +-
 dselect/po/ca.po        |  22 +-
 dselect/po/cs.po        |  22 +-
 dselect/po/da.po        |  22 +-
 dselect/po/de.po        |  22 +-
 dselect/po/dselect.pot  |  12 +-
 dselect/po/el.po        |  22 +-
 dselect/po/es.po        |  39 +--
 dselect/po/et.po        |  22 +-
 dselect/po/eu.po        |  22 +-
 dselect/po/fr.po        |  22 +-
 dselect/po/gl.po        |  22 +-
 dselect/po/hu.po        |  10 +-
 dselect/po/id.po        |  22 +-
 dselect/po/it.po        |  22 +-
 dselect/po/ja.po        |  22 +-
 dselect/po/ko.po        |  22 +-
 dselect/po/nb.po        |  22 +-
 dselect/po/nl.po        |  22 +-
 dselect/po/nn.po        |  22 +-
 dselect/po/pl.po        |  22 +-
 dselect/po/pt.po        |  22 +-
 dselect/po/pt_BR.po     |  22 +-
 dselect/po/ro.po        |  22 +-
 dselect/po/ru.po        |  22 +-
 dselect/po/sk.po        |  22 +-
 dselect/po/sv.po        |  22 +-
 dselect/po/tl.po        |  22 +-
 dselect/po/vi.po        |  22 +-
 dselect/po/zh_CN.po     |  22 +-
 dselect/po/zh_TW.po     |  22 +-
 man/po/de.po            |  35 ++-
 man/po/dpkg-man.pot     | 468 +++++++++++++++++++++++--------
 man/po/es.po            | 552 +++++++++++++++++++++++++++++--------
 man/po/fr.po            | 568 ++++++++++++++++++++++++++++++--------
 man/po/hu.po            | 426 ++++++++++++++++++++++-------
 man/po/it.po            | 512 ++++++++++++++++++++++++++--------
 man/po/ja.po            | 543 ++++++++++++++++++++++++++++--------
 man/po/nl.po            | 102 ++++++-
 man/po/pl.po            | 557 +++++++++++++++++++++++++++++--------
 man/po/pt_BR.po         | 437 ++++++++++++++++++++++-------
 man/po/ru.po            | 454 +++++++++++++++++++++++--------
 man/po/sv.po            | 560 ++++++++++++++++++++++++++++++--------
 man/po/zh_CN.po         | 432 ++++++++++++++++++++++-------
 po/ast.po               | 676 ++++++++++++++++++++++++---------------------
 po/bs.po                | 603 +++++++++++++++++++++-------------------
 po/ca.po                | 644 +++++++++++++++++++++++++------------------
 po/cs.po                | 620 +++++++++++++++++++++++------------------
 po/da.po                | 636 +++++++++++++++++++++++++------------------
 po/de.po                |   2 +-
 po/dpkg.pot             | 495 +++++++++++++++++----------------
 po/dz.po                | 618 ++++++++++++++++++++++-------------------
 po/el.po                | 642 ++++++++++++++++++++++++-------------------
 po/eo.po                | 635 ++++++++++++++++++++++++------------------
 po/es.po                | 687 +++++++++++++++++++++++++++-------------------
 po/et.po                | 595 ++++++++++++++++++++++------------------
 po/eu.po                | 665 +++++++++++++++++++++++++-------------------
 po/fr.po                | 688 ++++++++++++++++++++++++++--------------------
 po/gl.po                | 640 ++++++++++++++++++++++++-------------------
 po/hu.po                | 610 ++++++++++++++++++++++-------------------
 po/id.po                | 650 ++++++++++++++++++++++++-------------------
 po/it.po                | 647 +++++++++++++++++++++++++------------------
 po/ja.po                | 642 +++++++++++++++++++++++++------------------
 po/km.po                | 618 ++++++++++++++++++++++-------------------
 po/ko.po                | 650 ++++++++++++++++++++++++-------------------
 po/ku.po                | 536 +++++++++++++++++++-----------------
 po/lt.po                | 617 ++++++++++++++++++++++-------------------
 po/mr.po                | 619 ++++++++++++++++++++++-------------------
 po/nb.po                | 647 ++++++++++++++++++++++++-------------------
 po/ne.po                | 616 ++++++++++++++++++++++-------------------
 po/nl.po                | 670 +++++++++++++++++++++++++--------------------
 po/nn.po                | 609 ++++++++++++++++++++++-------------------
 po/pa.po                | 554 ++++++++++++++++++++-----------------
 po/pl.po                | 711 +++++++++++++++++++++++++++---------------------
 po/pt.po                | 638 +++++++++++++++++++++++++------------------
 po/pt_BR.po             | 637 ++++++++++++++++++++++++-------------------
 po/ro.po                | 702 ++++++++++++++++++++++++++---------------------
 po/ru.po                | 649 ++++++++++++++++++++++++-------------------
 po/sk.po                | 649 ++++++++++++++++++++++++-------------------
 po/sv.po                | 641 +++++++++++++++++++++++++------------------
 po/th.po                | 635 ++++++++++++++++++++++++------------------
 po/tl.po                | 657 ++++++++++++++++++++++++--------------------
 po/tr.po                | 620 +++++++++++++++++++++++------------------
 po/vi.po                | 639 +++++++++++++++++++++++++------------------
 po/zh_CN.po             | 612 +++++++++++++++++++++++------------------
 po/zh_TW.po             | 644 +++++++++++++++++++++++++------------------
 scripts/po/ca.po        | 266 ++++++++++++++----
 scripts/po/de.po        |   2 +-
 scripts/po/dpkg-dev.pot | 110 +++++---
 scripts/po/es.po        | 148 ++++++----
 scripts/po/fr.po        | 205 ++++++++++----
 scripts/po/pl.po        | 143 ++++++----
 scripts/po/ru.po        | 143 ++++++----
 scripts/po/sv.po        | 143 ++++++----
 94 files changed, 20176 insertions(+), 13260 deletions(-)

(limited to 'scripts')

diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index fa9341bc6..992a1cab6 100644
--- a/dselect/po/bs.po
+++ b/dselect/po/bs.po
@@ -7,7 +7,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: 2018-09-26 04:22+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"
@@ -812,14 +812,6 @@ msgstr ""
 msgid "No explanation available."
 msgstr ""
 
-#: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-
 #: dselect/method.cc
 msgid ""
 "\n"
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index 4f66df9ac..d3d519a53 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 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: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2017-04-28 04:22+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1038,17 +1038,6 @@ msgstr "Explicació"
 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"
@@ -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..40b5e0edb 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: 2018-09-26 04:22+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"
@@ -1017,17 +1017,6 @@ msgstr "Vysvětlení"
 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"
@@ -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..7687b032e 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: 2018-09-26 04:22+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"
@@ -1043,17 +1043,6 @@ msgstr "Forklaring"
 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"
@@ -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..95c157b43 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: 2018-09-26 04:22+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"
@@ -1059,17 +1059,6 @@ msgstr "Beschreibung"
 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"
@@ -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..cbc1b5500 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.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: 2018-09-26 04:22+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"
@@ -805,14 +805,6 @@ msgstr ""
 msgid "No explanation available."
 msgstr ""
 
-#: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-
 #: dselect/method.cc
 msgid ""
 "\n"
diff --git a/dselect/po/el.po b/dselect/po/el.po
index 6fa6f3960..5010a650e 100644
--- a/dselect/po/el.po
+++ b/dselect/po/el.po
@@ -11,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: 2018-09-26 04:22+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"
@@ -1048,17 +1048,6 @@ msgstr "εξήγηση του "
 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"
@@ -1688,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..53c7d0cb9 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: 2018-09-26 04:22+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..b8b7d0c7f 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: 2018-09-26 04:22+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"
@@ -957,17 +957,6 @@ msgstr "Selgitus"
 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"
@@ -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 bd48bb742..e45443d54 100644
--- a/dselect/po/eu.po
+++ b/dselect/po/eu.po
@@ -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: 2018-09-26 04:22+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"
@@ -1087,17 +1087,6 @@ msgstr "Azalpena"
 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"
@@ -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..a5a6dcd70 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: 2018-09-26 04:22+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"
@@ -1106,17 +1106,6 @@ msgstr "Explication"
 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"
@@ -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..2f094c603 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: 2018-09-26 04:22+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"
@@ -1096,17 +1096,6 @@ msgstr "Explicación"
 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"
@@ -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..87b3283d6 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: 2018-09-26 04:22+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"
@@ -882,14 +882,6 @@ msgstr ""
 msgid "No explanation available."
 msgstr ""
 
-#: dselect/method.cc
-#, c-format
-msgid ""
-"\n"
-"\n"
-"%s: %s\n"
-msgstr ""
-
 #: dselect/method.cc
 msgid ""
 "\n"
diff --git a/dselect/po/id.po b/dselect/po/id.po
index 563973e10..e93f504cc 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: 2018-09-26 04:22+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"
@@ -1100,17 +1100,6 @@ msgstr "penjelasan dari"
 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"
@@ -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..6d57afa99 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: 2018-09-26 04:22+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"
@@ -1118,17 +1118,6 @@ msgstr "spiegazioni su "
 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"
@@ -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..e5d24c89d 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: 2018-09-26 04:22+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"
@@ -1026,17 +1026,6 @@ msgstr "説明"
 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"
@@ -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..145f4f03b 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: 2018-09-26 04:22+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"
@@ -1070,17 +1070,6 @@ msgstr "설명"
 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"
@@ -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..6b4b971ea 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: 2018-09-26 04:22+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"
@@ -1046,17 +1046,6 @@ msgstr "Forklaring"
 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"
@@ -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 f35ed25e1..ced1da9b8 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -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: 2018-09-26 04:22+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"
@@ -1044,17 +1044,6 @@ msgstr "Verklaring"
 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"
@@ -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..866883969 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: 2018-09-26 04:22+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"
@@ -1022,17 +1022,6 @@ msgstr "forklaring på "
 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"
@@ -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..9644cfa15 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: 2018-09-26 04:22+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"
@@ -1059,17 +1059,6 @@ msgstr "Wyjaśnienie"
 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"
@@ -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..a89b2ebf7 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: 2018-09-26 04:22+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"
@@ -1045,17 +1045,6 @@ msgstr "Explicação de "
 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"
@@ -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..5c2aa3df3 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: 2018-09-26 04:22+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."
@@ -1097,17 +1097,6 @@ msgstr "Explicação de"
 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"
@@ -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 0d5fecf5b..272393cf6 100644
--- a/dselect/po/ro.po
+++ b/dselect/po/ro.po
@@ -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: 2018-09-26 04:22+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"
@@ -1117,17 +1117,6 @@ msgstr "Explicație"
 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"
@@ -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..c000c147b 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: 2018-09-26 04:22+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"
@@ -1069,17 +1069,6 @@ msgstr "Описание метода"
 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"
@@ -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..ea0192d67 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: 2018-09-26 04:22+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"
@@ -1096,17 +1096,6 @@ msgstr "Vysvetlenie"
 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"
@@ -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..eb07d587a 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: 2018-09-26 04:22+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"
@@ -1046,17 +1046,6 @@ msgstr "Förklaring"
 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"
@@ -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..4866f34a4 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: 2018-09-26 04:22+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"
@@ -1071,17 +1071,6 @@ msgstr "paliwanag ng "
 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"
@@ -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..e782f0e52 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: 2018-09-26 04:22+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"
@@ -1034,17 +1034,6 @@ msgstr "Giải thích"
 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"
@@ -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 5865c720e..040242d07 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.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: 2018-09-26 04:22+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"
@@ -1034,17 +1034,6 @@ msgstr "后面安装手段的说明"
 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"
@@ -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 eae929e07..b11fbbe10 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -6,7 +6,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: 2018-09-26 04:22+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"
@@ -1047,17 +1047,6 @@ msgstr "說明"
 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"
@@ -1679,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/man/po/de.po b/man/po/de.po
index ae091dfe4..0f77b7dd9 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-19 19:45+0200\n"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2018-09-19 20:42+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -12002,8 +12002,7 @@ msgstr ""
 "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."
+"Dies führt dazu, dass der Baupfad aus allen erstellten Dateien entfernt wird."
 
 #. type: Plain text
 #: dpkg-buildflags.man
@@ -25057,16 +25056,37 @@ 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<pid-file>."
+msgstr "Überprüfe, ob ein Prozess die Datei I<pid-Datei> angelegt hat."
+
+#. 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 ""
 "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."
 
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> Using this match option alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -27868,9 +27888,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..f44ef0125 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.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 02:06+0200\n"
+"POT-Creation-Date: 2018-09-26 04:22+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"
@@ -1486,7 +1486,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 ""
@@ -2360,6 +2360,26 @@ msgid ""
 "\"Gain Root API\" in I<rootless-builds.txt>.)"
 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
@@ -2788,8 +2808,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 +2874,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 +2890,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
@@ -3084,11 +3112,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 ""
@@ -4690,9 +4714,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 +4753,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 +4808,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
@@ -4905,12 +4958,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,12 +4968,6 @@ 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 ""
@@ -6381,7 +6422,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 ""
@@ -6887,7 +6928,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 +6942,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 +6971,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
@@ -7007,29 +7051,41 @@ msgid "The program B<dpkg> will execute when starting a new interactive shell."
 msgstr ""
 
 #. type: TP
-#: dpkg.man dpkg-query.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<COLUMNS>"
+msgid "B<DPKG_COLORS>"
 msgstr ""
 
 #. type: Plain text
-#: 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-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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"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-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
@@ -8431,7 +8487,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 +8536,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."
@@ -9138,7 +9218,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 +9494,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
@@ -9546,6 +9631,29 @@ msgid ""
 "macros are used."
 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
@@ -10458,6 +10566,19 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -10467,9 +10588,10 @@ 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 +10602,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
@@ -10496,6 +10620,19 @@ msgid ""
 "after the package has been built (long option since dpkg 1.18.8)."
 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
@@ -10782,7 +10919,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 +10943,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 +11134,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 +11903,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 ""
 
@@ -12076,7 +12228,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 +12241,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
@@ -12199,7 +12355,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
@@ -12285,7 +12460,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 +13258,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.man dpkg-gensymbols.man
+#: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<c++>"
 msgstr ""
@@ -13096,7 +13271,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.man dpkg-gensymbols.man
+#: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<symver>"
 msgstr ""
@@ -13109,7 +13284,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-gensymbols.man dpkg-gensymbols.man
+#: dpkg-gensymbols.man
 #, no-wrap
 msgid "B<regex>"
 msgstr ""
@@ -13503,6 +13678,28 @@ msgid ""
 "B<-e>)."
 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
@@ -13895,7 +14092,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:"
@@ -14101,6 +14298,13 @@ msgid ""
 "case the environment is not sufficient."
 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)."
@@ -14494,7 +14698,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
@@ -14609,6 +14814,19 @@ msgid ""
 "for each changelog entry so that all metadata for each entry is preserved."
 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
@@ -14954,16 +15172,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
@@ -15070,16 +15290,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
@@ -15212,6 +15433,17 @@ msgid ""
 "architecture."
 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
@@ -15220,7 +15452,7 @@ 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
@@ -15334,13 +15566,6 @@ msgid ""
 "B<--control-show> were such errors are fatal)."
 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."
-msgstr ""
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -15729,7 +15954,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 +16082,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 +16089,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 +16947,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 +16965,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 +17013,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-source.man dpkg-source.man
+#: dpkg-source.man
 #, no-wrap
 msgid "B<-sp>"
 msgstr ""
@@ -16867,7 +17077,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-source.man dpkg-source.man
+#: dpkg-source.man
 #, no-wrap
 msgid "B<--abort-on-upstream-changes>"
 msgstr ""
@@ -16920,7 +17130,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg-source.man dpkg-source.man
+#: dpkg-source.man
 #, no-wrap
 msgid "B<--skip-debianization>"
 msgstr ""
@@ -17150,7 +17360,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 +17604,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."
@@ -18367,8 +18577,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
@@ -19525,12 +19736,27 @@ msgstr ""
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 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 alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
 msgstr ""
 
 #. type: TP
@@ -19895,7 +20121,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: start-stop-daemon.man start-stop-daemon.man
+#: start-stop-daemon.man
 #, no-wrap
 msgid "B<3>"
 msgstr ""
@@ -20584,7 +20810,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..67181069f 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -38,7 +38,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2016-12-17 16:41+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1752,7 +1752,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 ""
@@ -3000,6 +3000,34 @@ 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< 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
@@ -3593,8 +3621,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 +3731,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 +3759,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
@@ -6084,9 +6122,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 +6131,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 +6177,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: "
@@ -6140,6 +6186,29 @@ msgstr ""
 "paquetes con disparador en un estado «triggers-awaited». Se debe utilizar "
 "cuando la funcionalidad ofrecida por el disparador no es crucial."
 
+#. 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 ""
@@ -6210,6 +6279,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
@@ -6387,13 +6467,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,13 +6477,6 @@ 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 ""
@@ -8344,7 +8410,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 ""
@@ -9060,8 +9126,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
@@ -9147,36 +9216,43 @@ 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>"
+#: 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
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
+#: 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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 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
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
-msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. 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
@@ -11068,6 +11144,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."
@@ -11896,7 +11997,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 +12377,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
@@ -12457,6 +12564,45 @@ msgid ""
 "macros are used."
 msgstr ""
 
+#. type: TP
+#: 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
@@ -13622,6 +13768,20 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -13636,9 +13796,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 +13815,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
@@ -13677,6 +13840,20 @@ msgstr ""
 "Limpia el árbol de fuentes (usando I<orden-para-obtener-root> B<debian/rules "
 "clean>) después de la creación del paquete."
 
+#. 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
@@ -14290,11 +14467,26 @@ msgstr ""
 "variable que ofrece una salida mediante su opción B<-s> se integra en el "
 "entorno de construcción."
 
+#. 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
@@ -15779,8 +15971,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 +15984,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
@@ -15922,13 +16118,37 @@ 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
@@ -17843,6 +18063,35 @@ msgstr ""
 "para emparejar varias bibliotecas con un único argumento (de otra forma, "
 "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
@@ -18766,6 +19015,13 @@ msgid ""
 "case the environment is not sufficient."
 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
@@ -19319,7 +19575,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 "
@@ -19454,6 +19711,20 @@ msgstr ""
 "un párrafo por cada entrada en el registro de cambios, de forma que se "
 "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
@@ -19943,17 +20214,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 "
@@ -20111,17 +20391,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 "
@@ -20328,17 +20616,29 @@ 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
@@ -20472,15 +20772,6 @@ msgid ""
 "control-show> were such errors are fatal)."
 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."
-msgstr ""
-"Esta opción influencia la salida de B<--list> al modificar el ancho de la "
-"salida."
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -21216,13 +21507,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 +21520,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
@@ -25062,8 +25337,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 +27034,36 @@ 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 alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -28461,6 +28758,33 @@ 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 "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..a376b49dd 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -11,7 +11,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2016-12-17 16:41+0100\n"
 "Last-Translator: Sébastien Poher <sbphr@volted.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1734,7 +1734,7 @@ 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 ""
@@ -2998,6 +2998,34 @@ 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< liste-de-paquets>"
+
+#. 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< liste-de-paquets>"
+
+#. 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 ""
+"Ces champs sont décrits dans la page de manuel de B<deb-control>(5), car ils "
+"sont copiés littéralement dans le fichier « control » du paquet binaire."
+
 #. type: TP
 #: deb-src-control.man dsc.man
 #, no-wrap
@@ -3585,8 +3613,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"
@@ -3695,8 +3723,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<paquet> I<priorité> I<section> [I<responsable>]"
 
 #. type: Plain text
 #: deb-src-files.man
@@ -3722,6 +3752,14 @@ msgstr ""
 "contrôle présents dans le fichier .deb. Les valeurs autorisées sont définies "
 "dans la Charte 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
@@ -6077,9 +6115,7 @@ msgstr "B<interest-noawait> I<nom-action-différée>"
 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 "
@@ -6089,6 +6125,18 @@ msgstr ""
 "attendues). 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
+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
@@ -6122,9 +6170,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 ""
 "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 "
@@ -6135,6 +6181,30 @@ msgstr ""
 "attendues). 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
+#, 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 ""
+"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é "
+"fournie par l'action différée n'est pas critique."
+
 #. type: Plain text
 #: deb-triggers.man
 msgid ""
@@ -6222,6 +6292,17 @@ msgstr ""
 "conseillé d'utiliser « Pre-Depends: dpkg(E<gt>= 1.17.21) » pour chaque "
 "paquet qui a besoin de se servir de telles directives."
 
+#. 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
@@ -6400,13 +6481,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< liste-de-paquets>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -6417,13 +6491,6 @@ 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< liste-de-paquets>"
-
 #. type: Plain text
 #: dsc.man
 msgid ""
@@ -8376,7 +8443,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 ""
@@ -9116,8 +9183,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
@@ -9204,36 +9274,43 @@ msgstr ""
 "commandes."
 
 #. type: TP
-#: dpkg.man dpkg-query.man
-#, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+#: 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
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
+#: 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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 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."
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
-msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. 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
@@ -11001,6 +11078,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."
@@ -11819,7 +11921,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
@@ -12203,16 +12305,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
@@ -12391,6 +12499,40 @@ msgstr ""
 "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>"
+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 ""
+"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."
+
+#. 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
@@ -13612,6 +13754,20 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -13626,9 +13782,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 ""
 "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)."
@@ -13646,7 +13803,9 @@ msgstr "B<-p>I<paquet>"
 #| 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)."
@@ -13671,6 +13830,26 @@ 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."
 
+#. 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 ""
+"Cette option a l'effet inverse de B<--no-await>. C'est actuellement le "
+"comportement par défaut."
+
 #. type: TP
 #: dpkg-buildpackage.man
 #, fuzzy, no-wrap
@@ -14344,11 +14523,26 @@ msgstr ""
 "variable retournée par l'option B<-s> est intégrée dans l'environnement de "
 "construction."
 
+#. 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
@@ -15823,8 +16017,10 @@ 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 ""
 
 #. type: TP
 #: dpkg-divert.man
@@ -15834,8 +16030,10 @@ 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 ""
 
 #. type: TP
 #: dpkg-divert.man
@@ -15963,13 +16161,37 @@ 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 ""
 "Met en fait le fichier de côté. Quand le fichier de destination existe, "
 "B<dpkg-divert> interrompt l'opération."
 
+#. 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
@@ -17809,6 +18031,40 @@ msgstr ""
 "bibliothèque> pour établir une correspondance avec plusieurs bibliothèques "
 "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
+#, 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 ""
+"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 "
+"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é 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-gensymbols.man
 #, no-wrap
@@ -18625,6 +18881,13 @@ msgstr ""
 "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 ""
+
 #. type: Plain text
 #: dpkg-maintscript-helper.man
 msgid "B<dh_installdeb>(1)."
@@ -19164,7 +19427,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 ""
 "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 "
@@ -19300,6 +19564,20 @@ msgstr ""
 "paragraphe distinct pour chaque entrée du changelog afin que toutes les "
 "métadonnées de chaque entrée soit préservées."
 
+#. 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
@@ -19785,17 +20063,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<nom-du-paquet> ..."
 
 #. 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 ""
 "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 "
@@ -19963,17 +20250,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<nom-du-paquet>..."
 
 #. 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 ""
 "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 "
@@ -20184,6 +20479,20 @@ msgstr ""
 "présent uniquement si le champ B<Multi-Arch> du paquet a la valeur B<same>. "
 "Le nom du paquet est ainsi non ambigu."
 
+#. 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 "Il contient la description courte du paquet (depuis dpkg 1.16.2)."
+
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
@@ -20192,8 +20501,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 ""
 
 #. type: TP
 #: dpkg-query.man
@@ -20332,15 +20641,6 @@ msgid ""
 "control-show> were such errors are fatal)."
 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."
-msgstr ""
-"Ce réglage influence la sortie de l'option B<--list> en modifiant la largeur "
-"d'affichage."
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -21070,12 +21370,6 @@ 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
@@ -21090,20 +21384,6 @@ msgstr ""
 "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
@@ -24781,8 +25061,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 ""
 "Cette option a l'effet inverse de B<--no-await>. C'est actuellement le "
 "comportement par défaut."
@@ -26475,16 +26756,38 @@ 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 ""
+"Cherche les processus dont les identifiants sont précisés dans I<pid-file>."
+
+#. 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 ""
 "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>."
 
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> Using this match option alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -28195,6 +28498,34 @@ msgstr "B<update-alternatives --auto vi>"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, le standard pour l'organisation du système de fichiers."
 
+#~ 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 ""
+#~ "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."
+
+#~ msgid "Add a diversion for I<file>."
+#~ msgstr "Ajoute un détournement pour le I<fichier>."
+
+#~ msgid "Remove a diversion for I<file>."
+#~ msgstr "Supprime un détournement pour le I<fichier>."
+
+#~ msgid ""
+#~ "This setting influences the output of the B<--list> option by changing "
+#~ "the width of its output."
+#~ msgstr ""
+#~ "Ce réglage influence la sortie de l'option B<--list> en modifiant la "
+#~ "largeur d'affichage."
+
 #, fuzzy
 #~| msgid ""
 #~| "These fields declare relationships between packages. They are discussed "
@@ -29414,11 +29745,6 @@ msgstr "B<ln>(1), FHS, le standard pour l'organisation du système de fichiers."
 #~ "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>)."
diff --git a/man/po/hu.po b/man/po/hu.po
index 98bcd3d8c..5db200c24 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -1569,7 +1569,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 ""
@@ -2679,6 +2679,28 @@ msgid ""
 "\"Gain Root API\" in I<rootless-builds.txt>.)"
 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
@@ -3144,8 +3166,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"
@@ -3216,7 +3238,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
@@ -3232,6 +3254,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
@@ -5092,8 +5122,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 ""
 
@@ -5121,9 +5161,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 +5216,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
@@ -5323,13 +5382,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 ""
@@ -5340,13 +5392,6 @@ 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 ""
@@ -6819,7 +6864,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 ""
@@ -7366,8 +7411,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
@@ -7443,29 +7491,42 @@ msgid "The program B<dpkg> will execute when starting a new interactive shell."
 msgstr ""
 
 #. type: TP
-#: dpkg.man dpkg-query.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<COLUMNS>"
+msgid "B<DPKG_COLORS>"
 msgstr ""
 
 #. type: Plain text
-#: 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-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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"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-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
@@ -8937,6 +8998,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."
@@ -9609,7 +9695,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
@@ -9884,16 +9970,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
@@ -10015,6 +10107,29 @@ msgid ""
 "macros are used."
 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
@@ -10941,6 +11056,19 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -10950,9 +11078,10 @@ 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
@@ -10963,7 +11092,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
@@ -10979,6 +11110,19 @@ msgid ""
 "after the package has been built (long option since dpkg 1.18.8)."
 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
@@ -11480,11 +11624,26 @@ msgid ""
 "the build environment."
 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
@@ -12719,7 +12878,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
@@ -12730,7 +12891,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
@@ -12843,7 +13006,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
@@ -14154,6 +14336,28 @@ msgid ""
 "e>)."
 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
@@ -14758,6 +14962,13 @@ msgid ""
 "case the environment is not sufficient."
 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
@@ -15156,7 +15367,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 +15483,19 @@ msgid ""
 "for each changelog entry so that all metadata for each entry is preserved."
 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
@@ -15617,16 +15842,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
@@ -15733,16 +15960,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
@@ -15875,6 +16103,18 @@ msgid ""
 "architecture."
 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
@@ -15883,7 +16123,7 @@ 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
@@ -15995,13 +16235,6 @@ msgid ""
 "control-show> were such errors are fatal)."
 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."
-msgstr ""
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -16524,12 +16757,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 ""
@@ -16537,15 +16764,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
@@ -19037,8 +19255,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
@@ -20212,12 +20431,27 @@ msgstr ""
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 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 alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
 msgstr ""
 
 #. type: TP
diff --git a/man/po/it.po b/man/po/it.po
index 85e3bb31b..1c73f7e7a 100644
--- a/man/po/it.po
+++ b/man/po/it.po
@@ -9,7 +9,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1742,7 +1742,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 ""
@@ -3021,6 +3021,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 +3673,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 +3785,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 +3812,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
@@ -6029,8 +6069,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 +6108,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 +6185,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
@@ -6311,13 +6380,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,13 +6390,6 @@ 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 ""
@@ -8294,7 +8349,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 ""
@@ -9035,8 +9090,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
@@ -9120,36 +9178,43 @@ msgid "The program B<dpkg> will execute when starting a new interactive 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>"
+#: 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
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
+#: 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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 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
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
-msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. 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
@@ -10946,6 +11011,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."
@@ -11643,7 +11733,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 +12011,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
@@ -12055,6 +12151,30 @@ msgid ""
 "macros are used."
 msgstr ""
 
+#. type: TP
+#: 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
@@ -13215,6 +13335,20 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -13229,9 +13363,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 +13384,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)."
@@ -13274,6 +13411,26 @@ msgstr ""
 "Pulisce l'albero dei sorgenti (usando I<comando-per-diventare-root> B<debian/"
 "rules clean>) dopo che il pacchetto è stato creato."
 
+#. 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
@@ -13940,11 +14097,26 @@ msgstr ""
 "Qualsiasi variabile che è prodotta in output dalla sua opzione B<-s> viene "
 "integrata nell'ambiente di compilazione."
 
+#. 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
@@ -15377,7 +15549,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 +15562,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
@@ -15503,7 +15679,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
@@ -16914,6 +17110,34 @@ msgstr ""
 "singolo argomento a più librerie (altrimenti sono necessari più argomenti B<-"
 "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
@@ -17684,6 +17908,13 @@ msgstr ""
 "richiesta dallo script sono presenti e considera un fallimento se l'ambiente "
 "non è sufficiente."
 
+#. 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)."
@@ -18193,7 +18424,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 "
@@ -18327,6 +18559,20 @@ msgstr ""
 "separato per ciascuna voce nel changelog, in modo che vengano preservati "
 "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
@@ -18814,17 +19060,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ù "
@@ -18987,17 +19242,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 "
@@ -19207,6 +19470,21 @@ msgstr ""
 "di architettura sarà presente solo se il pacchetto ha un campo B<Multi-Arch> "
 "con un valore di B<same>. Ciò rende il nome di pacchetto non ambiguo."
 
+#. 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
@@ -19215,9 +19493,8 @@ 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
@@ -19356,15 +19633,6 @@ msgid ""
 "control-show> were such errors are fatal)."
 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."
-msgstr ""
-"Questa impostazione influenza l'output dell'opzione B<--list> modificando la "
-"larghezza del suo output."
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -20023,12 +20291,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 +20304,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
@@ -23360,8 +23613,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 +25329,37 @@ 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 alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -26795,6 +27070,27 @@ 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 "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..576caa484 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: TAKAHASHI Motonobu <monyo@monyo.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1709,7 +1709,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 ""
@@ -2941,6 +2941,34 @@ 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< パッケージのリスト>"
+
+#. 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
@@ -3526,8 +3554,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 +3664,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 +3690,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
@@ -5956,9 +5994,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 +6002,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 +6048,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(競合状態"
@@ -6011,6 +6057,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 ""
@@ -6078,6 +6146,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
@@ -6254,13 +6333,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,13 +6343,6 @@ 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 ""
@@ -8183,7 +8248,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 ""
@@ -8886,8 +8951,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
@@ -8971,36 +9039,43 @@ msgid "The program B<dpkg> will execute when starting a new interactive shell."
 msgstr "B<dpkg> が新しいシェルを起動するときに、実際に起動するプログラム。"
 
 #. type: TP
-#: dpkg.man dpkg-query.man
-#, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+#: 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
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
+#: 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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 msgstr ""
-"B<dpkg> が整形済テキストを表示する時に使用するコラム数。現在は -l オプション"
-"でのみ参照されている。"
 
 #. type: TP
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
-msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. 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
@@ -10873,6 +10948,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."
@@ -11680,7 +11780,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 +12155,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
@@ -12234,6 +12340,43 @@ msgid ""
 "macros are used."
 msgstr ""
 
+#. type: TP
+#: 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
@@ -13380,6 +13523,20 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -13394,9 +13551,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 +13570,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
@@ -13435,6 +13595,20 @@ msgstr ""
 "パッケージのビルド後にソースツリーを消去する (I<gain-root-command> B<debian/"
 "rules clean> が用いられる)。"
 
+#. 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
@@ -14045,11 +14219,26 @@ msgstr ""
 "B<dpkg-architecture> は B<-a> および B<-t> を引数として呼び出される。このコマ"
 "ンドの B<-s> オプションによって設定された変数はビルド環境にマージされる。"
 
+#. 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
@@ -15500,8 +15689,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 +15702,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
@@ -15641,13 +15834,37 @@ 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
@@ -17495,6 +17712,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
@@ -18391,6 +18635,13 @@ msgid ""
 "case the environment is not sufficient."
 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
@@ -18924,7 +19175,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> は従来からの (このオプションが存在する前からの) 出力形式であり、"
@@ -19055,6 +19307,20 @@ msgstr ""
 "B<rfc822> 形式でも同じフィールドが用いられるが、出力については、changelog の"
 "エントリ毎に別の段落に分割され、各エントリのメタデータが保持される。"
 
+#. 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
@@ -19532,17 +19798,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> が複数指定された場合、各"
@@ -19698,17 +19973,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> のエントリは、引数のリストで指定"
@@ -19909,17 +20192,29 @@ 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
@@ -20053,13 +20348,6 @@ msgid ""
 "control-show> were such errors are fatal)."
 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."
-msgstr "この設定により、B<--list> オプションによる出力の横幅が設定される。"
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -20767,13 +21055,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 +21066,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
@@ -24501,8 +24773,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 +26392,37 @@ 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 alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -27789,6 +28083,31 @@ 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 "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 248d25756..032f475ac 100644
--- a/man/po/nl.po
+++ b/man/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.19.0.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-08-31 07:25+0200\n"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2018-08-31 10:28+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -3748,7 +3748,9 @@ msgstr ""
 
 #. type: Plain text
 #: deb-src-files.man
-msgid "I<filename> I<section> I<priority>"
+#, fuzzy
+#| msgid "I<filename> I<section> I<priority>"
+msgid "I<filename> I<section> I<priority> [ I<keyword=value\\&...\\&> ]"
 msgstr "I<bestandsnaam> I<sectie> I<prioriteit>"
 
 #. type: Plain text
@@ -3767,6 +3769,14 @@ 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 ""
+
 #. type: SH
 #: deb-src-files.man deb-version.man dpkg-architecture.man
 #: dpkg-buildpackage.man dpkg-deb.man dpkg-divert.man dpkg-parsechangelog.man
@@ -12109,6 +12119,43 @@ msgstr ""
 "B<CPPFLAGS>. Dit leidt tot waarschuwingen als de macros B<__TIME__>, "
 "B<__DATE__> en B<__TIMESTAMP__> gebruikt worden."
 
+#. type: TP
+#: dpkg-buildflags.man
+#, fuzzy, no-wrap
+#| msgid "B<fixdebugpath>"
+msgid "B<fixfilepath>"
+msgstr "B<fixdebugpath>"
+
+#. type: Plain text
+#: dpkg-buildflags.man
+#, fuzzy
+#| 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>, 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 debug symbols."
+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 geactiveerd) voegt B<-fdebug-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 debug-"
+"symbolen."
+
+#. 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
@@ -18622,12 +18669,20 @@ msgstr "B<--format>I< uitvoerindeling>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
+#, fuzzy
+#| 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:"
 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 ""
 "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 "
@@ -18773,6 +18828,20 @@ msgstr ""
 "gebruikt in de uitvoer een aparte paragraaf voor elk changelog-item, zodat "
 "alle metadata van elk item behouden blijven."
 
+#. 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
@@ -25303,16 +25372,37 @@ 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 ""
+
+#. 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 ""
 "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."
 
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"B<Warning:> Using this match option alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
diff --git a/man/po/pl.po b/man/po/pl.po
index 5d4de879d..8176c2499 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -9,7 +9,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -1727,7 +1727,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 ""
@@ -2976,6 +2976,34 @@ 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< 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
@@ -3567,8 +3595,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 +3705,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 +3731,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
@@ -6032,9 +6070,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 +6078,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 +6124,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, "
@@ -6087,6 +6133,28 @@ msgstr ""
 "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
+#, 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 ""
@@ -6155,6 +6223,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
@@ -6331,13 +6410,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,13 +6420,6 @@ 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 ""
@@ -8342,7 +8407,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 ""
@@ -9065,8 +9130,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
@@ -9153,37 +9221,43 @@ 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>"
+#: 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
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
+#: 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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 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
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
-msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. 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
@@ -11087,6 +11161,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."
@@ -11904,7 +12003,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 +12385,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
@@ -12466,6 +12571,45 @@ msgid ""
 "macros are used."
 msgstr ""
 
+#. type: TP
+#: 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
@@ -13625,6 +13769,20 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -13639,9 +13797,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 +13816,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
@@ -13680,6 +13841,20 @@ msgstr ""
 "Po zbudowaniu pakietu czyści katalog ze źródłami (używając I<gain-root-"
 "command> B<debian/rules clean>)."
 
+#. 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
@@ -14298,11 +14473,26 @@ msgstr ""
 "B<-t>. Wszystkie zmienne uzyskane na wyjściu dzięki jego opcji B<-s> są "
 "dołączane do środowiska budowania."
 
+#. 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
@@ -15796,8 +15986,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 +15999,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
@@ -15938,13 +16132,37 @@ 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
@@ -17833,6 +18051,35 @@ msgstr ""
 "więcej) w I<pliku-biblioteki>, aby dopasować wiele bibiotek za pomocą "
 "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
@@ -18746,6 +18993,13 @@ msgid ""
 "case the environment is not sufficient."
 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
@@ -19291,7 +19545,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 "
@@ -19426,6 +19681,20 @@ msgstr ""
 "każdego użytego wpisu z dziennika zmian tak, że zachowane są wszystkie "
 "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
@@ -19918,17 +20187,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 "
@@ -20087,17 +20365,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-"
@@ -20300,17 +20586,29 @@ 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
@@ -20445,14 +20743,6 @@ msgid ""
 "control-show> were such errors are fatal)."
 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."
-msgstr ""
-"Zmienna ta wpływa na wyjście polecenia B<--list>, zmieniając jego szerokość."
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -21183,13 +21473,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 +21486,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
@@ -25033,8 +25307,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 +27041,39 @@ 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 alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -28484,6 +28781,34 @@ 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 "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 "
@@ -29618,10 +29943,6 @@ msgstr "B<ln>(1), FHS - standard hierarchii systemu plików."
 #~ "Podręcznik napisali Juho Vuori E<lt>javuori@cc.helsinki.fiE<gt>, Josip "
 #~ "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 "
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index 75d2d8010..75144183e 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Andre Luis Lopes  <andrelop@debian.org>\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1490,7 +1490,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 ""
@@ -2379,6 +2379,26 @@ msgid ""
 "\"Gain Root API\" in I<rootless-builds.txt>.)"
 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
@@ -2807,8 +2827,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"
@@ -2878,7 +2898,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
@@ -2894,6 +2914,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
@@ -4761,8 +4789,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 ""
 
@@ -4790,9 +4828,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
@@ -4837,6 +4883,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
@@ -4979,12 +5036,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 ""
@@ -4995,12 +5046,6 @@ 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 ""
@@ -6708,7 +6753,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 ""
@@ -7296,8 +7341,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
@@ -7380,33 +7428,43 @@ 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-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
+#: 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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 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
@@ -8922,6 +8980,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."
@@ -9585,7 +9668,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
@@ -9862,16 +9945,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
@@ -9993,6 +10082,29 @@ msgid ""
 "macros are used."
 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
@@ -10919,6 +11031,19 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -10928,9 +11053,10 @@ 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
@@ -10942,7 +11068,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
@@ -10958,6 +11086,19 @@ msgid ""
 "after the package has been built (long option since dpkg 1.18.8)."
 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
@@ -11461,11 +11602,26 @@ msgid ""
 "the build environment."
 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
@@ -12565,7 +12721,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
@@ -12576,7 +12734,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
@@ -12689,7 +12849,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
@@ -14005,6 +14184,28 @@ msgid ""
 "e>)."
 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
@@ -14610,6 +14811,13 @@ msgid ""
 "case the environment is not sufficient."
 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
@@ -15011,7 +15219,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 +15335,19 @@ msgid ""
 "for each changelog entry so that all metadata for each entry is preserved."
 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
@@ -15473,16 +15695,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
@@ -15589,16 +15813,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
@@ -15734,15 +15959,26 @@ 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
@@ -15854,13 +16090,6 @@ msgid ""
 "control-show> were such errors are fatal)."
 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."
-msgstr ""
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -16384,12 +16613,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 ""
@@ -16397,15 +16620,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
@@ -18897,8 +19111,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
@@ -20073,12 +20288,27 @@ msgstr ""
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 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 ""
-"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 alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
 msgstr ""
 
 #. type: TP
@@ -21526,6 +21756,17 @@ msgstr "update-alternatives --auto vi"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, o Padrão da Hierarquia do Sistema de Arquivos."
 
+#~ 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..b2940f422 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -7,7 +7,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1567,7 +1567,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 ""
@@ -2664,6 +2664,28 @@ msgid ""
 "\"Gain Root API\" in I<rootless-builds.txt>.)"
 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
@@ -3117,8 +3139,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 +3210,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 +3226,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
@@ -5092,8 +5122,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 +5161,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 +5216,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
@@ -5323,13 +5382,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,13 +5392,6 @@ 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 ""
@@ -7120,7 +7165,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 ""
@@ -7711,8 +7756,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
@@ -7793,37 +7841,43 @@ msgid "The program B<dpkg> will execute when starting a new interactive shell."
 msgstr "Программа, которую запустит B<dpkg> при старте новой оболочки."
 
 #. type: TP
-#: dpkg.man dpkg-query.man
-#, no-wrap
-msgid "B<COLUMNS>"
-msgstr "B<COLUMNS>"
+#: 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 ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
+#: 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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 msgstr ""
-"Задаёт количество колонок текста, используемых программой B<dpkg> при "
-"форматировании текста. В настоящий момент используется только с параметром "
-"B<-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
@@ -9351,6 +9405,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."
@@ -10014,7 +10093,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 +10370,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
@@ -10422,6 +10507,29 @@ msgid ""
 "macros are used."
 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
@@ -11350,6 +11458,19 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -11359,9 +11480,10 @@ 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 +11495,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
@@ -11389,6 +11513,19 @@ msgid ""
 "after the package has been built (long option since dpkg 1.18.8)."
 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
@@ -11893,11 +12030,26 @@ msgid ""
 "the build environment."
 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
@@ -13016,7 +13168,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 +13181,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
@@ -13140,7 +13296,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
@@ -14452,6 +14627,28 @@ msgid ""
 "e>)."
 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
@@ -15056,6 +15253,13 @@ msgid ""
 "case the environment is not sufficient."
 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
@@ -15455,7 +15659,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
@@ -15570,6 +15775,19 @@ msgid ""
 "for each changelog entry so that all metadata for each entry is preserved."
 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
@@ -15917,16 +16135,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
@@ -16033,16 +16253,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
@@ -16175,6 +16396,18 @@ msgid ""
 "architecture."
 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
@@ -16183,9 +16416,8 @@ 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
@@ -16297,13 +16529,6 @@ msgid ""
 "control-show> were such errors are fatal)."
 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."
-msgstr ""
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -16823,12 +17048,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 +17055,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
@@ -19334,8 +19544,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
@@ -20545,12 +20756,27 @@ msgstr ""
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 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 alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
 msgstr ""
 
 #. type: TP
@@ -21894,6 +22120,21 @@ msgstr ""
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr ""
 
+#~ 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 +22471,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..943a2becc 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -6,7 +6,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\n"
@@ -1711,7 +1711,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 ""
@@ -2952,6 +2952,34 @@ 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< 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
@@ -3528,8 +3556,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 +3666,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 +3692,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
@@ -5983,9 +6021,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 +6029,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 +6074,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: "
@@ -6038,6 +6084,28 @@ msgstr ""
 "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
+#, 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 ""
@@ -6120,6 +6188,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
@@ -6295,13 +6374,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,13 +6384,6 @@ 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 ""
@@ -8229,7 +8294,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 ""
@@ -8951,8 +9016,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
@@ -9036,36 +9104,43 @@ msgid "The program B<dpkg> will execute when starting a new interactive 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>"
+#: 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
-#, fuzzy
-#| msgid ""
-#| "Sets the number of columns B<dpkg> should use when displaying formatted "
-#| "text. Currently only used by -l."
+#: 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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"Sets the color mode (since dpkg 1.18.5).  The currently accepted values are: "
+"B<auto> (default), B<always> and B<never>."
 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
 #, fuzzy, no-wrap
 #| msgid "B<DPKG_CONFFILE_OLD>"
-msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FRONTEND_LOCKED>"
 msgstr "B<DPKG_CONFFILE_OLD>"
 
 #. 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
@@ -10801,6 +10876,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."
@@ -11603,7 +11703,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 +12072,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
@@ -12155,6 +12261,40 @@ msgstr ""
 "B<CPPFLAGS>. Detta ger varningar när makrona B<__TIME__>, B<__DATE__> eller "
 "B<__TIMESTAMP__> används."
 
+#. type: TP
+#: 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
@@ -13358,6 +13498,20 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -13372,9 +13526,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 +13547,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
@@ -13415,6 +13572,26 @@ msgstr ""
 "Städa källkodsträdet (använder I<få-root-kommando> B<debian/rules clean>) "
 "efter att paketet har byggts."
 
+#. 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
@@ -14071,11 +14248,26 @@ msgstr ""
 "B<dpkg-architecture> anropas med flaggorna B<-a> och B<-t> vidaresända. "
 "Variabler som skrivs ut via dess B<-s>-flagga integreras i byggmiljön."
 
+#. 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
@@ -15520,8 +15712,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 +15725,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
@@ -15656,13 +15852,37 @@ 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
@@ -17446,6 +17666,39 @@ msgstr ""
 "träffa multipla bibliotek med ett enda argument (annars behöver du flera B<-"
 "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
@@ -18229,6 +18482,13 @@ msgstr ""
 "av skriptet är närvarande, och kommer anse det som ett fel om "
 "miljövariablerna inte är tillräckliga."
 
+#. 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)."
@@ -18761,7 +19021,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 "
@@ -18893,6 +19154,20 @@ msgstr ""
 "B<rfc822>-formatet använder samma fält, men ger ett separat stycke för varje "
 "ä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
@@ -19367,17 +19642,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 "
@@ -19538,17 +19822,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 "
@@ -19752,6 +20044,20 @@ msgstr ""
 "att vara närvarande om paketet har ett B<Multi-Arch>-fält med värdet "
 "B<same>. Detta gör paketnamnen entydiga."
 
+#. 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
@@ -19760,8 +20066,8 @@ 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
@@ -19891,15 +20197,6 @@ msgid ""
 "control-show> were such errors are fatal)."
 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."
-msgstr ""
-"Inställningen påverkar utdata från kommandot B<--list> genom att ändra "
-"bredden på dess utdata."
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -20605,12 +20902,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 +20916,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
@@ -24206,8 +24484,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 +26158,36 @@ 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 alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
+msgstr ""
+
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
@@ -27558,6 +27858,33 @@ msgstr "B<update-alternatives --auto vi>"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, Filesystem Hierarchy Standard."
 
+#~ 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 +29075,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 acfaeeee7..cf4c87050 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -8,7 +8,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -1537,7 +1537,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 ""
@@ -2430,6 +2430,26 @@ msgid ""
 "\"Gain Root API\" in I<rootless-builds.txt>.)"
 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
@@ -2858,8 +2878,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 +2951,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 +2969,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
@@ -4798,8 +4826,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 +4865,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 +4920,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
@@ -5021,12 +5078,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,12 +5088,6 @@ 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 ""
@@ -6815,7 +6860,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 ""
@@ -7404,8 +7449,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
@@ -7481,29 +7529,41 @@ msgid "The program B<dpkg> will execute when starting a new interactive shell."
 msgstr ""
 
 #. type: TP
-#: dpkg.man dpkg-query.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<COLUMNS>"
+msgid "B<DPKG_COLORS>"
 msgstr ""
 
 #. type: Plain text
-#: 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-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 number of columns B<dpkg> should use when displaying formatted "
-"text.  Currently only used by B<--list>."
+"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-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
@@ -8967,6 +9027,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."
@@ -9629,7 +9713,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 +9990,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
@@ -10037,6 +10127,30 @@ msgid ""
 "macros are used."
 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
@@ -10965,6 +11079,19 @@ msgid ""
 "required in a build environment, the so called Build-Essential package set."
 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
@@ -10975,9 +11102,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 +11117,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
@@ -11006,6 +11136,20 @@ msgid ""
 "after the package has been built (long option since dpkg 1.18.8)."
 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
@@ -11519,7 +11663,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
@@ -12605,7 +12764,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 +12777,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
@@ -12729,7 +12892,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
@@ -14037,6 +14220,28 @@ msgid ""
 "e>)."
 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
@@ -14636,6 +14841,13 @@ msgid ""
 "case the environment is not sufficient."
 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)."
@@ -15031,7 +15243,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
@@ -15146,6 +15359,20 @@ msgid ""
 "for each changelog entry so that all metadata for each entry is preserved."
 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
@@ -15500,17 +15727,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
@@ -15616,17 +15846,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
@@ -15759,6 +15991,20 @@ msgid ""
 "architecture."
 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
@@ -15767,7 +16013,7 @@ 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
@@ -15881,13 +16127,6 @@ msgid ""
 "control-show> were such errors are fatal)."
 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."
-msgstr ""
-
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -16404,12 +16643,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 +16650,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
@@ -18901,8 +19125,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
@@ -20072,12 +20297,27 @@ msgstr ""
 msgid "B<-p>, B<--pidfile> I<pid-file>"
 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 alone with a daemon that writes the "
+"pidfile as an unprivileged user is a security risk, because 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."
 msgstr ""
 
 #. type: TP
diff --git a/po/ast.po b/po/ast.po
index 085b4e842..995d78452 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: 2018-09-26 04:22+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'"
@@ -378,6 +379,13 @@ msgstr "nun puede tornase al entamu de %.250s dempués del rellenu"
 msgid "unable to open lock file %s for testing"
 msgstr "nun pue abrise un ficheru temporal pa vsnprintf"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr ""
+"nun puede abrise/criase'l ficheru de bloquéu de la base de datos d'estáu"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
@@ -387,6 +395,10 @@ msgstr ""
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "nun tien permisu pa bloquiar la base de datos d'estáu de dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -441,6 +453,210 @@ 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
+#, 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"
+
+#: 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
+#, 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"
+
+#: 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"
@@ -608,25 +824,29 @@ msgid "invalid package name (%.250s)"
 msgstr "nome de paquete inválidu (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "insuficiente númberu de valores nel campu de detalles de ficheru `%s'\n"
 "(comparáu con otros)"
@@ -838,6 +1058,30 @@ msgstr "nun pue camudase'l propietariu del nuevu ficheru conf dist `%.250s'"
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -863,9 +1107,8 @@ msgstr "nun se puede desbloquear %s: %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/log.c
 #, fuzzy, c-format
@@ -888,13 +1131,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"
@@ -1314,11 +1557,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 +1573,11 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "falta'l nome alternativu"
 
+#: 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)"
@@ -1686,11 +1929,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'"
@@ -2255,6 +2493,10 @@ msgstr "error de llectura na entrada estándar nel prompt del ficheru conf"
 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,6 +2902,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2704,6 +2947,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"
@@ -2838,6 +3087,13 @@ msgstr "Amestando `%s'"
 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"
@@ -2886,19 +3142,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"
@@ -3208,139 +3451,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "avisu, saltando'l problema por tar activao --force: "
 
-#: 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 ""
-"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"
-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"
-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"
-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/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/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 ""
-"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'"
-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/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/filesdb.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."
-
-#: 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/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 ""
-"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/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.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'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Lleendo la base de datos ... "
-
-#: 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 ficheros y direutorios instalaos actualmente.)\n"
-msgstr[1] "%d ficheros y direutorios instalaos actualmente.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "non instaláu"
@@ -3402,42 +3512,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"
@@ -4210,6 +4284,12 @@ msgstr "nome paquete"
 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"
@@ -4248,6 +4328,16 @@ msgid "package '%s' is not installed and no information is available"
 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"
@@ -4275,9 +4365,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 +4418,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 ""
@@ -4779,72 +4872,6 @@ 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
-#, 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'"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Escriba dpkg-trigger --help pa obtener aida d'esta ferramienta."
@@ -5105,6 +5132,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"
@@ -5669,17 +5702,19 @@ msgstr ""
 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>"
@@ -7170,6 +7205,50 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s', please use '--%s' instead."
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
@@ -7253,9 +7332,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 +7624,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"
 
@@ -7581,11 +7652,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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'"
diff --git a/po/bs.po b/po/bs.po
index f3e642ecc..b0574e33f 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2018-09-26 04:22+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 ""
@@ -374,6 +375,16 @@ msgstr ""
 msgid "unable to open lock file %s for testing"
 msgstr ""
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Configuration file `%s'"
+msgid "unable to open/create frontend lockfile"
+msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
@@ -382,6 +393,10 @@ msgstr ""
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr ""
@@ -433,6 +448,205 @@ 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 user '%s' in statoverride file"
+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 group '%s' in statoverride file"
+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"
@@ -568,22 +782,22 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
+msgid "empty archive details field '%s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "file details field '%s' not allowed in status file"
+msgid "archive details field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -761,6 +975,31 @@ msgstr ""
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -782,7 +1021,7 @@ msgid "unable to lock %s"
 msgstr ""
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
+msgid "pager to show file"
 msgstr ""
 
 #: lib/dpkg/log.c
@@ -805,12 +1044,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
@@ -1196,11 +1435,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 +1448,11 @@ msgstr ""
 msgid "missing closing brace"
 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 ""
@@ -1529,11 +1768,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'"
@@ -2003,6 +2237,10 @@ msgstr ""
 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,6 +2576,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2355,6 +2594,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'"
@@ -2475,6 +2720,13 @@ msgstr ""
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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"
@@ -2514,19 +2766,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"
@@ -2777,144 +3016,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr ""
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-#| msgid ""
-#| "\n"
-#| "Configuration file `%s'"
-msgid "control file '%s' for package '%s' is missing value"
-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"
-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"
-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'"
-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'"
-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"
-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'"
-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'"
-msgstr ""
-"\n"
-"Konfiguracijska datoteka `%s'"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] ""
-msgstr[1] ""
-
 #: src/help.c
 msgid "not installed"
 msgstr ""
@@ -2972,45 +3073,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"
@@ -3583,6 +3645,10 @@ msgstr ""
 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"
@@ -3617,6 +3683,10 @@ msgstr ""
 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"
@@ -3644,8 +3714,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 +3762,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 ""
@@ -4050,65 +4119,6 @@ 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
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr ""
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4294,6 +4304,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"
@@ -4780,15 +4800,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
@@ -5962,6 +5983,24 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| msgid ""
+#~| "\n"
+#~| "Configuration file `%s'"
+#~ 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'"
+
 #, fuzzy
 #~| msgid ""
 #~| "\n"
diff --git a/po/ca.po b/po/ca.po
index d2c04d0d1..4ee37fd1b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 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: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2017-04-29 16:21+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -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»"
@@ -352,6 +353,13 @@ msgstr "no es pot tornar al principi de %.250s després del farciment"
 msgid "unable to open lock file %s for testing"
 msgstr "no es pot obrir el fitxer de blocatge %s per comprovar"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr ""
+"no es pot obrir/crear el fitxer de blocatge de la base de dades d'estat"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
@@ -361,6 +369,10 @@ msgstr ""
 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"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "base de dades d'estat del dpkg"
@@ -413,6 +425,190 @@ 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
+#, fuzzy, c-format
+#| msgid "cannot read control file '%s' for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "no es pot llegir 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» sobre el 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
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr ""
+"s'ha produït un error en tancar el fitxer de la llista de fitxers del 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 ""
+"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» sobre el 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 user '%s' in statoverride file"
+msgstr "l'usuari «%s» és desconegut al fitxer statoverride"
+
+#: 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 group '%s' in statoverride file"
+msgstr "el grup «%s» és desconegut al fitxer statoverride"
+
+#: 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"
@@ -553,24 +749,28 @@ msgid "invalid package name (%.250s)"
 msgstr "el nom del paquet no és vàlid (%.250s)"
 
 #: 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 field '%s'"
 msgstr "camp de detalls «%s» del fitxer buit"
 
 #: 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 field '%s' not allowed in status file"
 msgstr "camp de detalls del fitxer «%s» no permès al fitxer d'estat"
 
 #: 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 field '%s' (compared to others)"
 msgstr ""
 "massa valors en el camp de detalls del fitxer «%s» (comparat amb d'altres)"
 
 #: 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 field '%s' (compared to others)"
 msgstr ""
 "nom de valors insuficient en el camp dels detalls de fitxer «%s» (comparat "
 "amb d'altres)"
@@ -769,6 +969,30 @@ msgstr "no es pot canviar el propietari del fitxer destí «%.250s»"
 msgid "unable to set mode of target file '%.250s'"
 msgstr "no es pot establir el mode del fitxer destí «%.250s»"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat file '%s'"
+msgid "cannot stat %s"
+msgstr "no es pot fer «stat» sobre el fitxer «%s»"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "archive '%s' is not a regular file"
+msgid "%s is not a regular file"
+msgstr "l'arxiu «%s» no és un fitxer regular"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot read %s"
+msgstr "no es pot afegir a «%s»"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "no es pot afegir a «%s»"
+
 #: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
@@ -790,8 +1014,10 @@ 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"
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "no es pot fer «flush» sobre el fitxer «%s»"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -813,13 +1039,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"
@@ -1212,11 +1438,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 +1451,11 @@ msgstr "l'amplada del camp és fora de rang"
 msgid "missing closing brace"
 msgstr "manca la clau de tancament"
 
+#: 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)"
@@ -1570,11 +1796,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'"
@@ -2090,6 +2311,10 @@ msgstr "final del fitxer en l'entrada estàndard al preguntar sobre conffiles"
 msgid "conffile difference visualizer"
 msgstr "visualitzador de diferencies de conffile"
 
+#: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
 #: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Escriviu «exit» quan acabeu.\n"
@@ -2450,7 +2675,21 @@ msgstr ""
 
 # Move the file aside (or back) ? -- Jordà
 #: 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 "
@@ -2459,6 +2698,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2494,6 +2734,12 @@ 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 ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2613,6 +2859,13 @@ msgstr ""
 "S'està ignorant la petició de canviar el nom del fitxer «%s» que pertany al "
 "paquet «%s» que desvia\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"
@@ -2660,19 +2913,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"
@@ -2972,120 +3212,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "no es tindrà en compte el problema per estar activa una opció --force:"
 
-#: 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/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/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/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/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/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/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/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/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/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/filesdb.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"
-
-#: 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/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/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/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr ""
-"s'ha produït un error en tancar el fitxer de la llista de fitxers del paquet "
-"«%.250s»"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(S'està llegint la base de dades… "
-
-#: src/filesdb.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"
-
 #: src/help.c
 msgid "not installed"
 msgstr "no instal·lat"
@@ -3149,42 +3275,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"
@@ -3925,6 +4015,12 @@ msgstr "Arquitectura"
 msgid "Description"
 msgstr "Descripció"
 
+#: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "s'està mostrant el fitxer en el paginador"
+
 #: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
@@ -3959,6 +4055,16 @@ msgstr "no s'ha trobat cap paquet que correspongui amb %s"
 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
+#, 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 ""
+"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"
+
 #: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
@@ -3985,9 +4091,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "desviat per %s cap 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 ""
 "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"
@@ -4030,19 +4139,33 @@ msgstr ""
 "%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 ""
@@ -4471,65 +4594,6 @@ 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
-#, 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»"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4749,6 +4813,12 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "S'està desconfigurant %s (%s)…\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "el fitxer de statoverride 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"
@@ -5278,17 +5348,19 @@ msgstr "no es pot tancar el conducte de descompressió"
 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"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "s'ha trobat un EOF inesperat en el nom del paquet en la línia %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "no s'ha pogut canviar al directori"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6656,6 +6728,41 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Es requereix autenticació per a executar update-alternatives"
 
+#~ 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "l'opció «--%s» és obsoleta, empreu  «--%s» en el seu lloc"
 
@@ -6725,9 +6832,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..eeec85922 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: 2018-09-26 04:22+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“"
@@ -346,6 +347,12 @@ msgstr "nelze se přesunout na začátek %.250s"
 msgid "unable to open lock file %s for testing"
 msgstr "nelze otevřít zámkový soubor %s pro test"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "zámek stavové databáze nelze otevřít nebo vytvořit"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "zámek stavové databáze nelze otevřít nebo vytvořit"
@@ -354,6 +361,10 @@ msgstr "zámek stavové databáze nelze otevřít nebo vytvořit"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "nemáte právo k uzamčení stavové databáze dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "stavová databáze dpkg"
@@ -405,6 +416,182 @@ 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 user '%s' in statoverride file"
+msgstr "neznámý uživatel „%s“ v souboru statoverride"
+
+#: 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 group '%s' in statoverride file"
+msgstr "neznámá skupina „%s“ v souboru statoverride"
+
+#: 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"
@@ -540,23 +727,27 @@ msgid "invalid package name (%.250s)"
 msgstr "chybné jméno balíku (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "příliš málo hodnot v položce „%s“ (vzhledem k ostatním)"
 
 #: lib/dpkg/fields.c
@@ -743,6 +934,30 @@ msgstr "nelze změnit vlastníka cílového souboru „%.250s“"
 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"
@@ -764,8 +979,10 @@ 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
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "nelze vyprázdnit soubor „%s“"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -787,13 +1004,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"
@@ -1176,11 +1393,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 +1406,11 @@ msgstr "šířka položky je mimo rozsah"
 msgid "missing closing brace"
 msgstr "chybí uzavírací závorka"
 
+#: 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)"
@@ -1522,11 +1739,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'"
@@ -2016,6 +2228,10 @@ msgstr "konec souboru na stdin při otázce na konfigurační soubory"
 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 +2587,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,6 +2610,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2414,6 +2645,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'"
@@ -2533,6 +2770,13 @@ msgstr ""
 "Ignoruje se požadavek na přejmenování souboru „%s“ vlastněného odkláněným "
 "balíkem „%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"
@@ -2578,19 +2822,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"
@@ -2881,107 +3112,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "potlačuje se problém, protože je nastaveno --force:"
 
-#: 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/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/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/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/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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "seznam souborů balíku „%.250s“ nelze otevřít"
-
-#: src/filesdb.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."
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "čte se seznam souborů balíku „%.250s“"
-
-#: src/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.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“"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Načítá se databáze … "
-
-#: src/filesdb.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"
-
 #: src/help.c
 msgid "not installed"
 msgstr "nenainstalován"
@@ -3048,42 +3178,6 @@ 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"
@@ -3776,6 +3870,12 @@ msgstr "Architektura"
 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"
@@ -3810,6 +3910,16 @@ msgstr "vzoru %s nevyhovuje žádná cesta"
 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"
@@ -3836,9 +3946,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 +3992,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 ""
@@ -4281,65 +4408,6 @@ 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/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Pro zobrazení nápovědy napište dpkg-trigger --help."
@@ -4550,6 +4618,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"
@@ -5051,17 +5125,19 @@ msgstr "nelze zavřít dekompresní rouru"
 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>"
@@ -6380,6 +6456,33 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "zastaralá volba „--%s“, použijte místo ní „--%s“"
 
@@ -6449,9 +6552,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 +6787,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 +6811,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“"
 
diff --git a/po/da.po b/po/da.po
index 772b7dc43..dde9b98c4 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: 2018-09-26 04:22+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'"
@@ -360,6 +361,12 @@ msgstr "kunne ikke søge til starten af %.250s efter efterfyldningen"
 msgid "unable to open lock file %s for testing"
 msgstr "kan ikke åbne låsefil %s til test"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "kunne ikke åbne/oprette statusdatabasens låsefil"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "kunne ikke åbne/oprette statusdatabasens låsefil"
@@ -368,6 +375,10 @@ msgstr "kunne ikke åbne/oprette statusdatabasens låsefil"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "du har ikke rettigheder til at låse dpkg's statusdatabase"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "dpkg's statusdatabase"
@@ -419,6 +430,186 @@ 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 user '%s' in statoverride file"
+msgstr "ukendt bruger '%s' i statoverride-fil"
+
+#: 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 group '%s' in statoverride file"
+msgstr "ukendt gruppe '%s' i statoverride-fil"
+
+#: 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"
@@ -574,23 +765,27 @@ msgid "invalid package name (%.250s)"
 msgstr "ugyldigt pakkenavn (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "for få værdier i fildetaljefelt '%s' (sammenlignet med andre)"
 
 #: lib/dpkg/fields.c
@@ -782,6 +977,30 @@ msgstr "kan ikke ændre ejerskab af målfilen '%.250s'"
 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"
@@ -802,9 +1021,12 @@ msgstr "%s er låst af en anden proces"
 msgid "unable to lock %s"
 msgstr "kan ikke låse %s"
 
+# bemærk at flush normalt dækker over at tømme en buffer (her til en fil)
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "viser fil på tekstsøger"
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "kan ikke tømme til filen '%s'"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -826,13 +1048,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"
@@ -1228,11 +1450,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 +1463,11 @@ msgstr "feltbredde er uden for interval"
 msgid "missing closing brace"
 msgstr "manglende slutkantparentes"
 
+#: 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)"
@@ -1578,11 +1800,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'"
@@ -2085,6 +2302,10 @@ msgstr "læsefejl på standard-ind ved konfigurationsfil-prompt"
 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 +2659,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,6 +2682,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2480,6 +2716,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'"
@@ -2598,6 +2840,13 @@ msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 msgstr ""
 "Ignorerer ønsket om at omdøbe filen '%s', ejet af omdirigeret pakke '%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"
@@ -2643,19 +2892,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"
@@ -2961,113 +3197,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "undertrykker problemet, fordi --force er givet:"
 
-#: 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/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/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/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/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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "kunne ikke åbne fillistefil for pakken '%.250s'"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "kan ikke tilgå fillistefil for pakken '%.250s'"
-
-#: 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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "læser filliste for pakken '%.250s'"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "fillistefilen for pakken '%.250s' mangler afsluttende linjeskift"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "fillistefilen for pakken '%.250s' indeholder tomt filnavn"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "fejl under lukning af fillistefil for pakken '%.250s'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Læser database ... "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "ikke installeret"
@@ -3129,42 +3258,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"
@@ -3938,6 +4031,12 @@ msgstr "Arkitektur"
 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"
@@ -3973,6 +4072,16 @@ msgid "package '%s' is not installed and no information is available"
 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"
@@ -3999,9 +4108,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 +4156,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 ""
@@ -4461,68 +4587,6 @@ 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
-#, 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'"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Skriv dpkg-tigger --help for at få hjælp om dette værktøj."
@@ -4736,6 +4800,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"
@@ -5252,17 +5322,19 @@ msgstr "kan ikke lukke udpakningsdatakanal"
 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>"
@@ -6607,6 +6679,41 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "forældet tilvalg '--%s'; brug venligst '--%s' i stedet"
 
@@ -6676,9 +6783,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 d1784886c..2720911cc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.1~\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-08-30 19:09+0200\n"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2018-08-30 19:19+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
diff --git a/po/dpkg.pot b/po/dpkg.pot
index cf53dc504..43e3d17d6 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.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: 2018-09-26 04:22+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 ""
@@ -340,6 +341,10 @@ msgstr ""
 msgid "unable to open lock file %s for testing"
 msgstr ""
 
+#: lib/dpkg/dbmodify.c
+msgid "unable to open/create frontend lockfile"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
@@ -348,6 +353,10 @@ msgstr ""
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr ""
@@ -399,6 +408,175 @@ 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 user '%s' in statoverride file"
+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 group '%s' in statoverride file"
+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 ""
@@ -529,22 +707,22 @@ msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
+msgid "empty archive details field '%s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "file details field '%s' not allowed in status file"
+msgid "archive details field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -722,6 +900,26 @@ msgstr ""
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -743,7 +941,7 @@ msgid "unable to lock %s"
 msgstr ""
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
+msgid "pager to show file"
 msgstr ""
 
 #: lib/dpkg/log.c
@@ -766,12 +964,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
@@ -1141,11 +1339,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 +1352,11 @@ msgstr ""
 msgid "missing closing brace"
 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 ""
@@ -1469,11 +1667,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'"
@@ -1933,6 +2126,10 @@ msgstr ""
 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,6 +2459,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2279,6 +2477,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'"
@@ -2394,6 +2598,13 @@ msgstr ""
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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"
@@ -2433,19 +2644,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"
@@ -2696,104 +2894,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr ""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr ""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr ""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr ""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr ""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr ""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr ""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr ""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "%d file or directory currently installed.)\n"
-msgid_plural "%d files and directories currently installed.)\n"
-msgstr[0] ""
-msgstr[1] ""
-
 #: src/help.c
 msgid "not installed"
 msgstr ""
@@ -2851,40 +2951,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"
@@ -3457,6 +3523,10 @@ msgstr ""
 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"
@@ -3491,6 +3561,10 @@ msgstr ""
 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"
@@ -3518,8 +3592,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 +3634,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 ""
@@ -3906,65 +3979,6 @@ 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
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr ""
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4150,6 +4164,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"
@@ -4627,15 +4645,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
diff --git a/po/dz.po b/po/dz.po
index 89c3792c1..8a9466e74 100644
--- a/po/dz.po
+++ b/po/dz.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: 2018-09-26 04:22+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"
@@ -150,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' རྩ་བསྐྲད་གཏང་མི་ཚུགས།"
@@ -379,6 +380,12 @@ msgstr "%.250s འདི་བར་ཤབས་ཀྱི་ཤུལ་ལས
 msgid "unable to open lock file %s for testing"
 msgstr "vsnprintf གི་དོན་ལུ་ ཊི་ཨེམ་པི་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "གནས་ཚད་གནད་སྡུད་ཀྱི་གཞི་རྟེན་ལྡེ་མིག་ཡིག་སྣོད་ ཁ་ཕྱེ་/གསར་བསྐྲུན་འབད་མ་ཚུགས།"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "གནས་ཚད་གནད་སྡུད་ཀྱི་གཞི་རྟེན་ལྡེ་མིག་ཡིག་སྣོད་ ཁ་ཕྱེ་/གསར་བསྐྲུན་འབད་མ་ཚུགས།"
@@ -387,6 +394,10 @@ msgstr "གནས་ཚད་གནད་སྡུད་ཀྱི་གཞི་
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "ཁྱོད་ལུ་ཌི་པི་ཀེ་ཇི་གནས་ཚད་གནད་སྡུད་གཞི་རྟེན་ལྡེ་མིག་རྐྱབས་ནིའི་གནང་བ་མེད།"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -441,6 +452,189 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "གྲལ་ཐིག་ %d གུ་ལུ་ཐུམ་སྒྲིལ་མིང་ནང་ལུ་རེ་བ་མེད་པའི་གྲལ་ཐིག་གི་མཇུག"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+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"
@@ -592,23 +786,27 @@ msgid "invalid package name (%.250s)"
 msgstr "ནུས་མེད་ཐུམ་སྒྲིལ་མིང་ (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "ཡིག་སྣོད་རྒྱས་བཤད་ཀྱི་ས་སྒོ་ `%s' ནང་ལུ་གནས་གོང་ཉུང་སུ་(གཞན་མི་ཚུ་ལུ་ག་བསྡུར་རྐྱབས་ད)"
 
 #: lib/dpkg/fields.c
@@ -815,6 +1013,29 @@ msgstr "གྱང་ཚད་རིམ་སྒྲིག་ཡིག་སྣོ
 msgid "unable to set mode of target file '%.250s'"
 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 "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"
@@ -839,8 +1060,9 @@ msgid "unable to lock %s"
 msgstr "ཁ་བསྡམ་མ་ཚུགས་ %s: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "vsnprintf ནང་ ངོས་སྙོམ་མ་ཚུགས།"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -864,13 +1086,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"
@@ -1269,11 +1491,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"
@@ -1290,6 +1507,11 @@ msgstr ""
 msgid "missing closing brace"
 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 "(འགྲེལ་བཤད་འཐོབ་ཚུགསཔ་མེད་)"
@@ -1610,11 +1832,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'"
@@ -2158,6 +2375,10 @@ msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་ནུས་ས
 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"
@@ -2537,6 +2758,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2580,6 +2802,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 +2939,13 @@ 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"
@@ -2760,19 +2995,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"
@@ -3080,112 +3302,6 @@ msgstr ""
 "ནུག:\n"
 " "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-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"
-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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-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'"
-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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr ""
-"dpkg: འཚུབ་ཅན་ཉེན་བརྡ་: ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་བརླག་སྟོར་ཞུགས་"
-"ནུག་ ཐུམ་སྒྲིལ་ལུ་ད་ལྟོ་གཞི་བཙུགས་འབད་མི་ཡིག་སྣོད་ཚུ་མེདཔ་སྦེ་ཚོད་དཔག་སྟེ།\n"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་ཕྱེ་མ་ཚུགས།"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་སྣོད་ཀྱི་ནང་ན་ཡིག་སྣོད་མིང་སྟོངམ་འདུག"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "ཐུམ་སྒྲིལ་ `%.250s' གི་དོན་ལུ་ཡིག་སྣོད་ཚུའི་ཐོ་ཡིག་ཡིག་སྣོད་ཁ་བསྡམ་ད་འཛོལ་བ།"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-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 ཡིག་སྣོད་ཚུ་དང་སྣོད་ཐོ་ཚུ་ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད།)\n"
-msgstr[1] "%d ཡིག་སྣོད་ཚུ་དང་སྣོད་ཐོ་ཚུ་ད་ལྟོ་གཞི་བཙུགས་འབད་ཡོད།)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "གཞི་བཙུགས་མ་འབད་བས།"
@@ -3248,42 +3364,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"
@@ -3982,6 +4062,10 @@ msgstr "(ཐུམ་སྒྲིལ:"
 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"
@@ -4018,6 +4102,18 @@ msgstr "%s ལུ་མཐུན་མི་ཐུམ་སྒྲིལ་ཚུ
 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"
@@ -4045,9 +4141,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"
@@ -4097,16 +4196,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 ""
@@ -4536,71 +4635,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ `%.250s'"
-
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4835,6 +4869,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"
@@ -5386,17 +5426,19 @@ msgstr ""
 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
@@ -6791,6 +6833,43 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "ཉེན་བརྡ་:ཕན་མེད་གདམ་ཁ་ `--%s'\n"
@@ -6875,9 +6954,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 +7253,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ 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"
@@ -7208,11 +7279,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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'"
diff --git a/po/el.po b/po/el.po
index 9773c0967..fc0322ce3 100644
--- a/po/el.po
+++ b/po/el.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: 2018-09-26 04:22+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'"
@@ -382,6 +383,12 @@ msgstr "αδύνατο να ψάξω την αρχή του %.250s μετά το
 msgid "unable to open lock file %s for testing"
 msgstr "αδύνατο το άνοιγμα του tmpfile για vsnprintf"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "αδύνατη το άνοιγμα ή η δημιουργία του κλειδώματος της βάσης κατάστασης"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "αδύνατη το άνοιγμα ή η δημιουργία του κλειδώματος της βάσης κατάστασης"
@@ -391,6 +398,10 @@ msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 "δεν έχετε την άδεια για να ξεκλειδώσετε τη βάση δεδομένων κατάστασης dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -447,6 +458,198 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "απρόσμενο τέλος της γραμμής στο όνομα πακέτου στη γραμμή %d"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
+
+#: 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"
@@ -596,25 +799,29 @@ msgid "invalid package name (%.250s)"
 msgstr "μη έγκυρο όνομα πακέτου (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "πολύ λίγες τιμές στο πεδίο `%s' αρχείου λεπτομερειών (σε σύγκριση με άλλα)"
 
@@ -824,6 +1031,29 @@ msgstr "αδύνατη η αλλαγή ιδιοκτησίας του νέου α
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -849,8 +1079,9 @@ msgid "unable to lock %s"
 msgstr "αδύνατο το ξεκλείδωμα του %s: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "αδύνατη η εκκένωση στο vnsprintf"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -873,13 +1104,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"
@@ -1287,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"
@@ -1308,6 +1534,11 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "λείπει altname"
 
+#: 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 "(χωρίς διαθέσιμη περιγραφή)"
@@ -1655,11 +1886,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'"
@@ -2238,6 +2464,10 @@ msgstr "σφάλμα ανάγνωσης της stdin κατά την προτρ
 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,6 +2858,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2674,6 +2905,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 +3047,13 @@ msgstr ""
 "έχει \n"
 " εγκατασταθεί.\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"
@@ -2860,19 +3104,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"
@@ -3187,123 +3418,6 @@ msgstr ""
 "dpkg - προειδοποίηση, το πρόβλημα παρακάμπτεται λόγω του --force enabled:\n"
 " "
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-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"
-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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-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'"
-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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "αδύνατο το άνοιγμα της λίστας αρχείων για το πακέτο `%.250s'"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "λίστα αρχείων για το πακέτο `%.250s'"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr ""
-"το αρχείο λίστας αρχείων για το πακέτο `%.250s' περιέχει κενό όνομα αρχείου"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "σφάλμα κλεισίματος αρχείου λίστας αρχείων για το πακέτο `%.250s'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-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 αρχεία και κατάλογοι.)\n"
-msgstr[1] "προς το παρόν εγκαταστάθηκαν %d αρχεία και κατάλογοι.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "δεν είναι εγκατεστημένο"
@@ -3365,42 +3479,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"
@@ -4189,6 +4267,10 @@ msgstr ""
 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"
@@ -4228,6 +4310,18 @@ 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"
@@ -4255,9 +4349,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 +4404,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 ""
@@ -4765,71 +4862,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "αρχείο statoverride `%.250s'"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -5095,6 +5127,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"
@@ -5660,17 +5698,19 @@ msgstr ""
 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
@@ -7137,6 +7177,47 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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 "απέτυχε η αλλαγή καταλόγου (chdir) μετά τη δημιουργία του"
+
 #, fuzzy
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n"
@@ -7222,9 +7303,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"
 
@@ -7519,11 +7597,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ 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"
@@ -7550,11 +7623,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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'"
diff --git a/po/eo.po b/po/eo.po
index 37b1e1e43..a64e4db2d 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: 2018-09-26 04:22+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'"
@@ -344,6 +345,12 @@ msgstr "ne eblas retroiri al la komenco de %.250s post ŝtopado"
 msgid "unable to open lock file %s for testing"
 msgstr "ne eblas malfermi ŝlos-dosieron %s por testado"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "ne eblas malfermi/krei ŝlosdosieron de stato-datumbazo"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "ne eblas malfermi/krei ŝlosdosieron de stato-datumbazo"
@@ -352,6 +359,10 @@ msgstr "ne eblas malfermi/krei ŝlosdosieron de stato-datumbazo"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "vi ne havas permeson por malŝlosi la stato-datumbazon de dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "stato-datumbazo de dpkg"
@@ -403,6 +414,186 @@ 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 user '%s' in statoverride file"
+msgstr "nekonata uzanto '%s' en dosiero 'statoverride'"
+
+#: 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 group '%s' in statoverride file"
+msgstr "nekonata grupo '%s' en dosiero 'statoverride'"
+
+#: 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"
@@ -558,23 +749,27 @@ msgid "invalid package name (%.250s)"
 msgstr "malvalida pak-nomo (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "tro malmultaj valoroj en kampo de dosier-detaloj '%s' (kompare al aliaj)"
 
@@ -765,6 +960,30 @@ msgstr "ne eblas ŝanĝi posedon de cel-dosiero '%.250s'"
 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"
@@ -786,8 +1005,10 @@ 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
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "ne eblas elbufrigi dosieron '%s'"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -809,13 +1030,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"
@@ -1207,11 +1428,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 +1441,11 @@ msgstr "kampo laĝeco estas for de intervalo"
 msgid "missing closing brace"
 msgstr "mankas ferma kuniga krampo"
 
+#: 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)"
@@ -1559,11 +1780,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'"
@@ -2064,6 +2280,10 @@ msgstr "leg-eraro en stdin ĉe komandinvito de conffile"
 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 +2637,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,6 +2660,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2460,6 +2695,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'"
@@ -2579,6 +2820,13 @@ msgstr ""
 "ni preteratentas peton renomigi dosieron '%s', posedata de deturna pako "
 "'%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"
@@ -2624,19 +2872,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"
@@ -2936,114 +3171,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "preterpaso de problemo ĉar --force ebligis:"
 
-#: 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/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/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/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/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/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/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/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/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/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/filesdb.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"
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "legado de dosier-listo por pako '%.250s'"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr ""
-"dosier-lista dosiero por la pako '%.250s' enhavas malplenan dosiernomon"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "eraro dum fermo de dosier-lista dosiero por la pako '%.250s'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Legado de datumbazo ... "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "ne instalita"
@@ -3107,41 +3234,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"
@@ -3892,6 +3984,12 @@ msgstr "Arkitekturo"
 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"
@@ -3926,6 +4024,16 @@ msgstr "neniu pako kongruanta al la ŝablono %s"
 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"
@@ -3952,9 +4060,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 +4106,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 ""
@@ -4417,68 +4542,6 @@ 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
-#, 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'"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Tajpu dpkg-trigger --help por helpo pri tiu ĉi utilaĵo."
@@ -4692,6 +4755,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"
@@ -5207,17 +5276,19 @@ msgstr "ne eblas fermi malkompaktilan dukton"
 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>"
@@ -6568,6 +6639,41 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "malaktuala elekteblo '--%s'; bonvolu uzi '--%s' anstataŭe"
 
@@ -6637,9 +6743,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 04b0f1066..b97f2e9ce 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: 2018-09-26 04:22+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'"
@@ -420,6 +421,13 @@ msgstr "no se puede volver al comienzo de %.250s después del relleno"
 msgid "unable to open lock file %s for testing"
 msgstr "no se puede abrir el fichero de bloqueo %s para hacer pruebas"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+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"
 msgstr ""
@@ -429,6 +437,10 @@ msgstr ""
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "no tiene permiso para bloquear la base de datos de estado de dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "base de datos de estado de dpkg"
@@ -481,6 +493,191 @@ 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 user '%s' in statoverride file"
+msgstr "usuario desconocido `%s' en el archivo statoverride"
+
+#: 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 group '%s' in statoverride file"
+msgstr "grupo desconocido `%s' en el fichero statoverride"
+
+#: 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"
@@ -617,25 +814,29 @@ msgid "invalid package name (%.250s)"
 msgstr "nombre de paquete inválido (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "insuficiente número de valores en el campo de detalles de fichero `%s'\n"
 "(comparado con otros)"
@@ -833,6 +1034,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 +1080,10 @@ 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
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "no se puede volcar el fichero `%s'"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -875,16 +1103,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"
@@ -1287,11 +1515,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 +1528,11 @@ msgstr "el ancho del cambio está fuera de rango"
 msgid "missing closing brace"
 msgstr "falta el caracter de cierre"
 
+#: 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)"
@@ -1647,11 +1875,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'"
@@ -2178,6 +2401,10 @@ msgstr "fin de fichero en la entrada estándar al preguntar sobre conffiles"
 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 +2766,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,6 +2789,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2585,6 +2827,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
@@ -2705,6 +2953,13 @@ msgstr ""
 "no se tendrá en cuenta la petición de renombrar el fichero '%s' que "
 "pertenece al paquete desviado '%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"
@@ -2752,19 +3007,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"
@@ -3071,117 +3313,6 @@ msgstr ""
 "sobreseyendo el problema porque está activa la opción --force:\n"
 " "
 
-#: src/filesdb-hash.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' "
-
-#: 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/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/filesdb-hash.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"
-
-#: 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/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-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/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/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/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/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-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'"
-
-#: 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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "leyendo la lista de ficheros para el paquete '%.250s'"
-
-#: src/filesdb.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' "
-
-#: src/filesdb.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"
-
-#: src/filesdb.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'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Leyendo la base de datos ... "
-
-#: 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 fichero o directorio instalado actualmente.)\n"
-msgstr[1] "%d ficheros o directorios instalados actualmente.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "no instalado"
@@ -3245,42 +3376,6 @@ 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"
@@ -4021,6 +4116,12 @@ msgstr "Arquitectura"
 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"
@@ -4057,6 +4158,16 @@ msgid "package '%s' is not installed and no information is available"
 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"
@@ -4083,9 +4194,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 +4243,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 ""
@@ -4436,7 +4564,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
@@ -4574,66 +4704,6 @@ 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/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Escriba dpkg-trigger --help para obtener ayuda de esta herramienta."
@@ -4852,6 +4922,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"
@@ -5273,7 +5349,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"
@@ -5378,17 +5455,19 @@ msgstr "no se puede cerrar la tubería del descompresor:"
 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 +5654,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"
@@ -6741,12 +6828,48 @@ 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 "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"
+
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "opción obsoleta '--%s', utilice '--%s' en su lugar"
 
@@ -6818,9 +6941,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 +7216,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 +7240,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'"
 
diff --git a/po/et.po b/po/et.po
index 3ddde1515..7b13846f5 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: 2018-09-26 04:22+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"
@@ -373,6 +374,11 @@ msgstr ""
 msgid "unable to open lock file %s for testing"
 msgstr "tõrge tmpfile avamisel funktsioonis vsnprintf"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+msgid "unable to open/create frontend lockfile"
+msgstr "lähtefaili `%.250s' pole võimalik avada"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
@@ -381,6 +387,10 @@ msgstr ""
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "sul pole õigust dpkg olekuandmebaasi lukustada"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -434,6 +444,184 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "viga seadistusfaili `%.255s' lugemisel"
+
+#: 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
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr "viga seadistusfaili `%.255s' lugemisel"
+
+#: 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"
@@ -580,23 +768,25 @@ msgid "invalid package name (%.250s)"
 msgstr "vigane pakinimi (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -777,6 +967,29 @@ msgstr "`%.250s' uuendatud olekut pole võimalik kirjutada"
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -801,8 +1014,9 @@ msgid "unable to lock %s"
 msgstr "luku %s vabastamine pole võimalik: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "tõrge puhvrite tühjendamisel funktsioonis vsnprintf"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -826,12 +1040,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
@@ -1225,11 +1439,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 +1453,11 @@ msgstr ""
 msgid "missing closing brace"
 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)"
@@ -1561,11 +1775,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'"
@@ -2090,6 +2299,10 @@ msgstr ""
 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,6 +2667,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2471,6 +2685,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"
@@ -2598,6 +2818,13 @@ msgstr ""
 "dpkg - hoiatus: paki %.250s eemaldamise päringut eiratakse kuna see pakk "
 "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"
@@ -2641,19 +2868,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"
@@ -2932,111 +3146,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 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/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/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/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/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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "paki `%.250s' failide nimekirja pole võimalik avada"
-
-#: src/filesdb.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"
-
-#: 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/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/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "paki `%.250s' failide nimekiri"
-
-#: 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/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "paki `%.250s' failide nimekiri sisaldab tühja failinime"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "viga paki `%.250s' failide nimekirja sulgemisel"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Andmebaasi lugemine ... "
-
-#: 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] "hetkel on paigaldatud %d faili ja kataloogi.)\n"
-msgstr[1] "hetkel on paigaldatud %d faili ja kataloogi.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr ""
@@ -3094,41 +3203,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"
@@ -3756,6 +3830,10 @@ msgstr " (pakk: "
 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"
@@ -3792,6 +3870,16 @@ msgstr "Mustrile %s ei vasta ühtegi pakki.\n"
 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"
@@ -3819,9 +3907,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 +3960,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 ""
@@ -4279,68 +4370,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "lähtefaili `%.250s' pole võimalik avada"
-
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4551,6 +4580,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"
@@ -5078,17 +5113,19 @@ msgstr ""
 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
@@ -6361,6 +6398,43 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "Hoiatus: aegunud võti `--%s'\n"
@@ -6434,9 +6508,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"
 
@@ -6671,11 +6742,6 @@ msgstr ""
 #~ "Autoriõigused (C) 1995 Ian Jackson.\n"
 #~ "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"
@@ -6702,11 +6768,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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..b29df7877 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: 2018-09-26 04:22+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"
@@ -347,6 +348,12 @@ msgstr "ezin da joan %.250s(r)en hasierara bete ondoren"
 msgid "unable to open lock file %s for testing"
 msgstr "ezin da blokeoaren %s fitxategia ireki probatzeko"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "ezin da ireki/sortu egoeraren datu-basea blokeatzeko fitxategia"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "ezin da ireki/sortu egoeraren datu-basea blokeatzeko fitxategia"
@@ -355,6 +362,10 @@ msgstr "ezin da ireki/sortu egoeraren datu-basea blokeatzeko fitxategia"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "ez duzu baimenik dpkg egoeraren datu-basea blokeatzeko"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "dpkg egoeraren datu-basea"
@@ -406,6 +417,193 @@ 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 user '%s' in statoverride file"
+msgstr "'%s' erabiltzaile ezezaguna statoverride fitxategian"
+
+#: 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 group '%s' in statoverride file"
+msgstr "'%s' talde ezezaguna statoverride fitxategian"
+
+#: 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"
@@ -563,25 +761,29 @@ msgid "invalid package name (%.250s)"
 msgstr "paketearen izena baliogabea (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "fitxategiaren xehetasunen '%s' eremuan balio gutxiegi (beste batzuen aldean)"
 
@@ -778,6 +980,30 @@ msgstr "ezin da helburuko '%.250s' fitxategiaren jabetza aldatu"
 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"
@@ -799,8 +1025,10 @@ msgid "unable to lock %s"
 msgstr "ezin da '%s' blokeatu"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "fitxategia orrikatzailean erakusten"
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "ezin da '%s' fitxategia garbitu"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -822,13 +1050,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"
@@ -1226,13 +1454,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 +1467,13 @@ msgstr "eremuaren zabalera barrutitik kanpo"
 msgid "missing closing brace"
 msgstr "itxierako giltza falta da"
 
+#: 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)"
@@ -1587,11 +1815,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'"
@@ -2100,6 +2323,10 @@ msgstr "irakurketa errorea stdin-en konfigurazioko fitxategiaren gonbitean"
 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 +2685,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,6 +2708,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2505,6 +2747,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'"
@@ -2624,6 +2872,13 @@ msgstr ""
 "Desbideratutako '%2$s' paketearen '%1$s' fitxategia izenez aldatzeko "
 "eskaerari ez ikusi egingo zaio\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"
@@ -2669,19 +2924,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"
@@ -2985,122 +3227,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "gainidazteko arazoa --force gaituta dagoelako:"
 
-#: src/filesdb-hash.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"
-
-#: 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 ""
-"'%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 separator"
-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"
-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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "ezin dira '%.250s' paketearen fitxategi-zerrendaren fitxategiak ireki"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr ""
-"ezin da '%.250s' paketearen fitxategi-zerrendaren fitxategiaren egoera "
-"eskuratu"
-
-#: 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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "'%.250s' paketearen fitxategi-zerrenda irakurtzen"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr ""
-"'%.250s' paketearen fitxategi-zerrendak amaierako lerro-jauzia falta du"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr ""
-"'%.250s' paketearen fitxategi-zerrendaren fitxategiak fitxategiek izen hutsa "
-"daukate"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "errorea '%.250s' paketearen fitxategi-zerrendaren fitxategiak ixtean"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Datu-basea irakurtzen ... "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "instalatu gabe"
@@ -3166,42 +3292,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"
@@ -3969,6 +4059,12 @@ msgstr "Arkitektura"
 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"
@@ -4003,6 +4099,16 @@ msgstr "ez da %s ereduarekin bat datorren biderik aurkitu"
 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"
@@ -4029,9 +4135,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 +4181,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 ""
@@ -4506,68 +4629,6 @@ 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
-#, 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"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Idatzi dpkg-trigger --help lanabes honen laguntza lortzeko."
@@ -4785,6 +4846,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"
@@ -5319,17 +5386,19 @@ msgstr "ezin da deskonprimitzailearen kanalizazioa itxi"
 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>"
@@ -6706,6 +6775,45 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "'--%s' aukera zaharkitua, '--%s' erabili horren ordez"
 
@@ -6775,9 +6883,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 +7145,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 +7169,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..68005e9c3 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: 2018-09-26 04:22+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 »"
@@ -367,6 +368,13 @@ msgstr "déplacement impossible au début de %.250s après la mise en forme"
 msgid "unable to open lock file %s for testing"
 msgstr "impossible d'ouvrir le fichier de verrou %s pour tests"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+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"
 msgstr ""
@@ -378,6 +386,10 @@ msgstr ""
 "vous n'avez pas la permission de verrouiller la base de données d'état de "
 "dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "base de données d'état de dpkg"
@@ -431,6 +443,203 @@ 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 user '%s' in statoverride file"
+msgstr ""
+"utilisateur « %s » inconnu dans le fichier des permissions (« statoverride »)"
+
+#: 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 group '%s' in statoverride file"
+msgstr ""
+"groupe « %s » inconnu dans le fichier des permissions (« statoverride »)"
+
+#: 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"
@@ -591,24 +800,28 @@ msgid "invalid package name (%.250s)"
 msgstr "nom de paquet incorrect (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "trop peu de valeurs dans le champ du fichier « %s » (par rapport aux autres)"
 
@@ -806,6 +1019,30 @@ msgstr "impossible de changer le propriétaire du fichier cible « %.250s »"
 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"
@@ -827,8 +1064,10 @@ 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
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "impossible de supprimer le fichier « %s »"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -850,13 +1089,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"
@@ -1260,11 +1499,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 +1512,11 @@ msgstr "largeur de champ hors limites"
 msgid "missing closing brace"
 msgstr "accolade fermante manquante"
 
+#: 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)"
@@ -1638,11 +1877,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'"
@@ -2164,6 +2398,10 @@ msgstr "fin de fichier sur l'entrée standard à l'invite de configuration"
 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 +2767,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,6 +2790,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2577,6 +2830,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'"
@@ -2696,6 +2955,13 @@ msgstr ""
 "requête ignorée de renommage du fichier « %s » qui est une diversion du "
 "paquet « %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"
@@ -2741,19 +3007,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"
@@ -3066,136 +3319,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "problème contourné par utilisation de --force :"
 
-#: src/filesdb-hash.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"
-
-#: 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/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/filesdb-hash.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"
-
-#: 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 ""
-"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'"
-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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr ""
-"impossible d'ouvrir le fichier contenant la liste des fichiers du paquet "
-"« %.250s »"
-
-#: src/filesdb.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é"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr ""
-"impossible d'ouvrir le fichier contenant la liste des fichiers du paquet "
-"« %.250s »"
-
-#: src/filesdb.c
-#, c-format
-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"
-
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "lecture de la liste des fichiers du paquet « %.250s »"
-
-#: src/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-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/filesdb.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"
-
 #: src/help.c
 msgid "not installed"
 msgstr "non installé"
@@ -3260,43 +3383,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"
@@ -4090,6 +4176,12 @@ msgstr "Architecture"
 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"
@@ -4126,6 +4218,17 @@ msgid "package '%s' is not installed and no information is available"
 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"
@@ -4152,9 +4255,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 +4304,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 ""
@@ -4640,69 +4760,6 @@ 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/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Taper « dpkg-trigger --help » pour obtenir de l'aide."
@@ -4930,6 +4987,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"
@@ -5475,17 +5538,19 @@ msgstr "impossible de fermer le tuyau du décompresseur"
 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>"
@@ -6904,6 +6969,50 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "option obsolète « --%s » ; veuillez utiliser « --%s » à la place"
 
@@ -6979,9 +7088,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..737ddbeb5 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: 2018-09-26 04:22+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\""
@@ -379,6 +380,13 @@ msgstr "non se pode ir ao comezo de %.250s despois do recheo"
 msgid "unable to open lock file %s for testing"
 msgstr "non se pode abrir o ficheiro temporal para vsnprintf"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr ""
+"non se pode abrir/crear o ficheiro de bloqueo da base de datos de estado"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
@@ -388,6 +396,10 @@ msgstr ""
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "non ten permisos para bloquear a base de datos de estado de dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -442,6 +454,197 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "non se puido abrir o ficheiro \"statoverride\""
+
+#: 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
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr "non se puido abrir o ficheiro \"statoverride\""
+
+#: 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"
@@ -602,26 +805,30 @@ msgid "invalid package name (%.250s)"
 msgstr "nome de paquete non válido (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "hai valores de menos no campo de detalles de ficheiro \"%s\" (comparado con "
 "outros)"
@@ -837,6 +1044,29 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr ""
 "non se pode establecer o modo do novo ficheiro de configuración \"%.250s\""
 
+#: 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"
@@ -861,8 +1091,9 @@ msgid "unable to lock %s"
 msgstr "non se pode desbloquear %s: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "non se pode baleirar o buffer en vsnprintf"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -885,13 +1116,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"
@@ -1304,11 +1535,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 +1551,11 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "falla o nome alternativo"
 
+#: 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)"
@@ -1675,11 +1906,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'"
@@ -2246,6 +2472,10 @@ msgstr ""
 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,6 +2863,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2674,6 +2905,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"
@@ -2809,6 +3046,13 @@ msgstr ""
 "dpkg - aviso: ignórase a petición de eliminar %.250s, que non 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"
@@ -2858,19 +3102,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"
@@ -3183,122 +3414,6 @@ 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"
-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"
-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"
-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"
-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/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/filesdb-hash.c
-#, fuzzy, c-format
-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"
-
-#: 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 ""
-"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/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/filesdb.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"
-
-#: 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/filesdb.c
-#, fuzzy, c-format
-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"
-
-#: 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/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "erro ao pechar a lista de ficheiros do paquete \"%.250s\""
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(A ler a base de datos ... "
-
-#: 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] "hai %d ficheiros e directorios instalados actualmente.)\n"
-msgstr[1] "hai %d ficheiros e directorios instalados actualmente.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "sen instalar"
@@ -3360,42 +3475,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"
@@ -4166,6 +4245,10 @@ msgstr ""
 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"
@@ -4204,6 +4287,17 @@ msgid "package '%s' is not installed and no information is available"
 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"
@@ -4231,9 +4325,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 +4379,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 ""
@@ -4728,71 +4825,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "ficheiro \"statoverride\" \"%.250s\""
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Escriba dpkg-trigger --help para obter axuda sobre esta utilidade."
@@ -5051,6 +5083,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"
@@ -5629,17 +5667,19 @@ msgstr ""
 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
@@ -7095,6 +7135,47 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "Aviso: opción \"--%s\" obsoleta\n"
@@ -7182,9 +7263,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"
 
@@ -7491,11 +7569,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ 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"
@@ -7522,11 +7595,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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'"
diff --git a/po/hu.po b/po/hu.po
index ddf0f756b..fcd4d33ea 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: 2018-09-26 04:22+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'"
@@ -375,6 +376,12 @@ msgstr "nem tudok %.250s elejére menni a behúzás után"
 msgid "unable to open lock file %s for testing"
 msgstr "nem nyitható tmpfile a vsnprintf-hez"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "a dpkg állapot adatbázis lezáró fájl kinyitása/lezárása sikertelen"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "a dpkg állapot adatbázis lezáró fájl kinyitása/lezárása sikertelen"
@@ -383,6 +390,10 @@ msgstr "a dpkg állapot adatbázis lezáró fájl kinyitása/lezárása sikertel
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "nincs jogod lezárni a dpkg állapot adatbázist"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -436,6 +447,188 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "nem sikerült megnyitni a statoverride fájlt"
+
+#: 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
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr "nem sikerült megnyitni a statoverride fájlt"
+
+#: 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"
@@ -586,23 +779,27 @@ msgid "invalid package name (%.250s)"
 msgstr "hibás csomagnév (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (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
@@ -806,6 +1003,29 @@ msgstr "`%.250s' új terjesztői beállítófájl tulajdonosa nem módosítható
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -830,8 +1050,9 @@ msgid "unable to lock %s"
 msgstr "nem tudom kioldani %s-t: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "nem lehet kiüríteni a vsnprintf-ben"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -855,12 +1076,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
@@ -1259,11 +1480,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 +1496,11 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "hiányzó altname"
 
+#: 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)"
@@ -1599,11 +1820,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'"
@@ -2142,6 +2358,10 @@ msgstr ""
 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,6 +2737,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2549,6 +2770,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"
@@ -2680,6 +2907,13 @@ msgstr ""
 "dpkg - figyelem: átugrom a(z) %.250s csomag törlését, hisz' nincs "
 "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"
@@ -2729,19 +2963,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"
@@ -3045,110 +3266,6 @@ 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/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/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/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/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/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/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/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/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/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/filesdb.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"
-
-#: 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/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/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/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/filesdb.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"
-
-#: src/filesdb.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'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Adatbázis olvasása ... "
-
-#: src/filesdb.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"
-
 #: src/help.c
 msgid "not installed"
 msgstr "nem telepített"
@@ -3211,42 +3328,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"
@@ -3943,6 +4024,10 @@ msgstr " (csomag: "
 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"
@@ -3979,6 +4064,16 @@ msgstr "Nincs ilyen csomag: %s.\n"
 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"
@@ -4006,9 +4101,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 +4154,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 ""
@@ -4489,72 +4587,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "statoverride fájl: `%.250s'"
-
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4783,6 +4815,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"
@@ -5327,17 +5365,19 @@ msgstr ""
 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
@@ -6679,6 +6719,43 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "Figyelem: elavult lehetőség `--%s'\n"
@@ -6761,9 +6838,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"
 
@@ -7045,11 +7119,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ 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"
@@ -7076,11 +7145,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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'"
diff --git a/po/id.po b/po/id.po
index 9e091cfdd..0c73ed43b 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: 2018-09-26 04:22+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'"
@@ -380,6 +381,12 @@ msgstr "Gagal mencoba memulai %.250s setelah padding"
 msgid "unable to open lock file %s for testing"
 msgstr "Gagal membuka berkas pengunci %s untuk ujicoba"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "gagal membuka/membuat berkas kunci(lock) basis data status"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "gagal membuka/membuat berkas kunci(lock) basis data status"
@@ -388,6 +395,10 @@ msgstr "gagal membuka/membuat berkas kunci(lock) basis data status"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "Anda tidak memiliki izin untuk mengunci basis data status dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -441,6 +452,194 @@ 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
+#, 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'"
+
+#: 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
+#, 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'"
+
+#: 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"
@@ -606,24 +805,28 @@ msgid "invalid package name (%.250s)"
 msgstr "nama paket (%.250s) tidak sah."
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "terlalu sedikit nilai dalam ruas 'file details' '%s' (dibandingkan lainnya)"
 
@@ -832,6 +1035,30 @@ msgstr "gagal mengubah kepemilikan berkas target '%.250s'"
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -857,9 +1084,9 @@ msgstr "gagal menutup %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/log.c
 #, fuzzy, c-format
@@ -882,13 +1109,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"
@@ -1292,11 +1519,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 +1533,11 @@ msgstr ""
 msgid "missing closing brace"
 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)"
@@ -1652,11 +1879,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'"
@@ -2223,6 +2445,10 @@ msgstr "ada kesalahan pada stdin di prompt 'conffile'"
 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 +2822,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,6 +2845,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2639,6 +2880,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'"
@@ -2762,6 +3009,13 @@ msgstr "Menambah '%s'\n"
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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"
@@ -2808,19 +3062,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"
@@ -3131,119 +3372,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "ada masalah penimpaan karena --force dihidupkan:"
 
-#: 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/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/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/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/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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "gagal membuka berkas daftar berkas untuk paket '%.250s'"
-
-#: src/filesdb.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."
-
-#: 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/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/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/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/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "berkas daftar berkas untuk paket '%.250s' berisi nama berkas kosong"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "ada kesalahan saat menutup berkas daftar berkas untuk paket '%.250s'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Sedang membaca basis data ... "
-
-#: 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 berkas atau direktori telah terpasang.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "tak dipasang"
@@ -3315,43 +3443,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"
@@ -4135,6 +4226,12 @@ msgstr "nama paket"
 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"
@@ -4171,6 +4268,16 @@ msgstr "Tidak ada paket yang cocok dengan %s. \n"
 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"
@@ -4198,9 +4305,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 +4369,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 ""
@@ -4722,71 +4832,6 @@ 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
-#, 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'"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Ketik 'dpkg-trigger --help' untuk panduan tentang perkakas ini."
@@ -5043,6 +5088,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"
@@ -5602,17 +5653,19 @@ msgstr ""
 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>"
@@ -7099,6 +7152,48 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s', please use '--%s' instead."
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
@@ -7182,9 +7277,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 +7522,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 +7546,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 918b5fe7b..4dd78aed4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2017-11-29 14:28+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -156,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\""
@@ -365,6 +366,12 @@ msgstr "impossibile spostarsi all'inizio di %.250s dopo il riempimento"
 msgid "unable to open lock file %s for testing"
 msgstr "impossibile aprire il file di blocco %s per la verifica"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "impossibile aprire/creare il file di blocco per il database di stato"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "impossibile aprire/creare il file di blocco per il database di stato"
@@ -373,6 +380,10 @@ msgstr "impossibile aprire/creare il file di blocco per il database di stato"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "permessi insufficienti per bloccare il database di stato di dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "database di stato di dpkg"
@@ -426,6 +437,192 @@ 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
+#, fuzzy, c-format
+#| msgid "cannot read control file '%s' for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr ""
+"impossibile leggere il 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
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr ""
+"errore nel chiudere il file con l'elenco dei file del pacchetto \"%.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 ""
+"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 user '%s' in statoverride file"
+msgstr "utente \"%s\" sconosciuto nel file statoverride"
+
+#: 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 group '%s' in statoverride file"
+msgstr "gruppo \"%s\" sconosciuto nel file statoverride"
+
+#: 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
 msgid "format version with too big major component"
 msgstr "versione del formato con componente major troppo grande"
@@ -560,25 +757,29 @@ msgid "invalid package name (%.250s)"
 msgstr "nome del pacchetto non valido (%.250s)"
 
 #: 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 field '%s'"
 msgstr "il campo dei dettagli \"%s\" del file è vuoto"
 
 #: 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 field '%s' not allowed in status file"
 msgstr ""
 "il campo dei dettagli \"%s\" del file 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 file details field '%s' (compared to others)"
+msgid "too many values in archive details field '%s' (compared to others)"
 msgstr ""
 "troppi valori nel campo dei dettagli \"%s\" del file (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 file details field '%s' (compared to others)"
+msgid "too few values in archive details field '%s' (compared to others)"
 msgstr ""
 "troppo pochi valori nel campo dei dettagli \"%s\" del file (rispetto agli "
 "altri)"
@@ -776,6 +977,30 @@ msgstr "impossibile modificare il proprietario del file \"%.250s\""
 msgid "unable to set mode of target file '%.250s'"
 msgstr "impossibile impostare la modalità del file \"%.250s\""
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat file '%s'"
+msgid "cannot stat %s"
+msgstr "impossibile eseguire stat sul file \"%s\""
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "archive '%s' is not a regular file"
+msgid "%s is not a regular file"
+msgstr "l'archivio \"%s\" non è un file normale"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot read %s"
+msgstr "impossibile aggiungere a \"%s\""
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "impossibile aggiungere a \"%s\""
+
 #: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
@@ -797,8 +1022,10 @@ 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"
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "impossibile eseguire il flush del file \"%s\""
 
 #: lib/dpkg/log.c
 #, c-format
@@ -820,13 +1047,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"
@@ -1213,11 +1440,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"
@@ -1231,6 +1453,11 @@ msgstr "larghezza del campo oltre l'intervallo"
 msgid "missing closing brace"
 msgstr "parentesi di chiusura mancante"
 
+#: 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)"
@@ -1568,11 +1795,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'"
@@ -2098,6 +2320,10 @@ msgstr "fine file da stdin al prompt per il file di configurazione"
 msgid "conffile difference visualizer"
 msgstr "visualizzatore differenze file di configurazione"
 
+#: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
 #: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Digitare \"exit\" una volta terminato.\n"
@@ -2462,7 +2688,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 "
@@ -2471,6 +2711,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2508,6 +2749,12 @@ 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 ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2628,6 +2875,13 @@ msgstr ""
 "Viene ignorata la richiesta di rinominare il file \"%s\" di proprietà del "
 "pacchetto che diverge \"%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"
@@ -2674,19 +2928,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"
@@ -2991,125 +3232,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "viene ignorato il problema poiché è usata l'opzione --force:"
 
-#: src/filesdb-hash.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"
-
-#: src/filesdb-hash.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"
-
-#: src/filesdb-hash.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"
-
-#: 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/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "impossibile aprire il file di controllo \"%s\" per il pacchetto \"%s\""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr ""
-"impossibile eseguire stat sul file di controllo \"%s\" per il pacchetto \"%s"
-"\""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr ""
-"il file di controllo \"%s\" per il pacchetto \"%s\" non è un file regolare"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr ""
-"impossibile leggere il file di controllo \"%s\" per il pacchetto \"%s\""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-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'"
-msgstr ""
-"impossibile aprire il file con l'elenco dei file del pacchetto \"%.250s\""
-
-#: src/filesdb.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"
-
-#: 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/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr ""
-"il file con l'elenco dei file del pacchetto \"%.250s\" non è un file regolare"
-
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "elenco dei file per il pacchetto \"%.250s\""
-
-#: src/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-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/filesdb.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"
-
 #: src/help.c
 msgid "not installed"
 msgstr "non installato"
@@ -3179,42 +3301,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"
@@ -3952,6 +4038,12 @@ msgstr "Architettura"
 msgid "Description"
 msgstr "Descrizione"
 
+#: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "viene mostrato il file sul pager"
+
 #: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
@@ -3987,6 +4079,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr ""
 "il pacchetto \"%s\" non è installato e non è disponibile alcuna informazione"
 
+#: 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 ""
+"Usare \"dpkg --info\" (= \"dpkg-deb --info\") per esaminare gli archivi e\n"
+"\"dpkg --contents\" (= \"dpkg-deb --contents\") per elencarne il contenuto.\n"
+
 #: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
@@ -4013,9 +4115,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "diverge da %s in: %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 ""
 "Usare \"dpkg --info\" (= \"dpkg-deb --info\") per esaminare gli archivi e\n"
 "\"dpkg --contents\" (= \"dpkg-deb --contents\") per elencarne il contenuto.\n"
@@ -4058,19 +4163,33 @@ msgstr ""
 "%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 ""
@@ -4493,65 +4612,6 @@ msgstr "nessun override presente"
 msgid "--update is useless for --remove"
 msgstr "--update è inutile per --remove"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "uid statoverride %s non valido"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "gid statoverride %s non valido"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "modalità statoverride %s non valida"
-
-#: 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
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "presenti molteplici statoverride per il file \"%.250s\""
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Usare \"dpkg-trigger --help\" per l'aiuto riguardo a questa utilità."
@@ -4767,6 +4827,12 @@ 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
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "il file statoverride contiene una riga vuota"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -5305,17 +5371,18 @@ msgstr "impossibile chiudere la pipe di estrazione"
 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 ""
+
+#: 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
@@ -6676,3 +6743,39 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "È richiesto autenticarsi per eseguire update-alternatives"
 
+#~ msgid "cannot open control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "impossibile aprire il file di controllo \"%s\" per il pacchetto \"%s\""
+
+#~ msgid "cannot stat control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "impossibile eseguire stat sul file di controllo \"%s\" per il pacchetto "
+#~ "\"%s\""
+
+#~ msgid "control file '%s' for package '%s' is not a regular file"
+#~ msgstr ""
+#~ "il file di controllo \"%s\" per il pacchetto \"%s\" non è un file regolare"
+
+#~ msgid "cannot close control file '%s' for package '%s'"
+#~ msgstr ""
+#~ "impossibile chiudere il file di controllo \"%s\" per il pacchetto \"%s\""
+
+#~ msgid "unable to open files list file for package '%.250s'"
+#~ msgstr ""
+#~ "impossibile aprire il file con l'elenco dei file del pacchetto \"%.250s\""
+
+#~ msgid "unable to stat files list file for package '%.250s'"
+#~ msgstr ""
+#~ "impossibile eseguire stat sul file con l'elenco dei file del pacchetto "
+#~ "\"%.250s\""
+
+#~ msgid "files list for package '%.250s' is not a regular file"
+#~ msgstr ""
+#~ "il file con l'elenco dei file del pacchetto \"%.250s\" non è un file "
+#~ "regolare"
+
+#~ msgid "reading files list for package '%.250s'"
+#~ msgstr "elenco dei file per il pacchetto \"%.250s\""
+
+#~ msgid "failed to chdir to directory after creating it"
+#~ msgstr "esecuzione di chdir sulla directory dopo averla creata non riuscita"
diff --git a/po/ja.po b/po/ja.po
index 0f7faf809..765561ee5 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: 2018-09-26 04:22+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' を削除できません"
@@ -358,6 +359,12 @@ msgstr "文字の補充後に %.250s の最初に戻れません"
 msgid "unable to open lock file %s for testing"
 msgstr "テストのためのロックファイル %s をオープンできません"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "ステータスデータベースのロックファイルをオープン/作成できません。"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "ステータスデータベースのロックファイルをオープン/作成できません。"
@@ -366,6 +373,10 @@ msgstr "ステータスデータベースのロックファイルをオープン
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "あなたには dpkg ステータスデータベースをロックする権限がありません"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "dpkg ステータスデータベース"
@@ -417,6 +428,189 @@ 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 user '%s' in statoverride file"
+msgstr "statoverride ファイルに未知のユーザ '%s' があります"
+
+#: 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 group '%s' in statoverride file"
+msgstr "statoverride ファイルに未知のグループ '%s' があります"
+
+#: 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"
@@ -575,24 +769,28 @@ msgid "invalid package name (%.250s)"
 msgstr "無効なパッケージ名 (%.250s) です"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "ファイル記述フィールド `%s' の値が (ほかのフィールドに比べて) 少なすぎます"
 
@@ -788,6 +986,30 @@ msgstr "ターゲットファイル '%.250s' の所有者を変更できませ
 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"
@@ -809,8 +1031,10 @@ msgid "unable to lock %s"
 msgstr "%s をロックできません"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "ファイルをページャで表示しています"
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "ファイル '%s' をフラッシュできません"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -832,13 +1056,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"
@@ -1230,11 +1454,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 +1467,11 @@ msgstr "フィールド幅が範囲外です"
 msgid "missing closing brace"
 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) がありません)"
@@ -1581,11 +1805,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'"
@@ -2096,6 +2315,10 @@ msgstr "conffile プロンプトでの標準入力にファイル終端があり
 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 +2676,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,6 +2699,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2497,6 +2735,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'"
@@ -2616,6 +2860,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"
@@ -2661,19 +2912,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"
@@ -2979,119 +3217,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "--force が有効なので、問題を無視します:"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-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"
-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 separator"
-msgstr ""
-"パッケージ '%2$s' のコントロールファイル '%1$s' に最後の改行がありません"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "パッケージ `%.250s' のファイル一覧ファイルをオープンできません"
-
-#: src/filesdb.c
-#, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr ""
-"パッケージ '%.250s' のファイル一覧ファイルがありません。このパッケージには、"
-"現在インストールされているファイルがないものとします"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "パッケージ '%.250s' のファイル一覧ファイルの状態を取得できません"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "パッケージ '%.250s' のファイル一覧ファイルが通常ファイルではありません"
-
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "パッケージ '%.250s' のファイル一覧を読み込んでいます"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "パッケージ '%.250s' のファイル一覧ファイルに最後の改行がありません"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr ""
-"パッケージ `%.250s' のファイル一覧ファイルが空のファイル名を含んでいます"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr ""
-"パッケージ `%.250s' のファイル一覧ファイルのクローズ中にエラーが発生しました"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(データベースを読み込んでいます ... "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "未導入"
@@ -3153,42 +3278,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"
@@ -3938,6 +4027,12 @@ msgstr "アーキテクチャ"
 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"
@@ -3972,6 +4067,17 @@ msgstr "パターン %s に一致するパスが見つかりません"
 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"
@@ -3998,9 +4104,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 +4151,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 ""
@@ -4461,65 +4584,6 @@ 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/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4736,6 +4800,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"
@@ -5257,17 +5327,18 @@ msgstr "伸張パイプをクローズできません"
 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>"
@@ -6628,6 +6699,45 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "failed to chdir to directory after creating it"
+#~ msgstr "ディレクトリ作成後、そのディレクトリに移動できません"
+
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "オプション '--%s' は時代遅れです。'--%s' を代わりに使ってください"
 
diff --git a/po/km.po b/po/km.po
index c9d5a959e..7412a8156 100644
--- a/po/km.po
+++ b/po/km.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: 2018-09-26 04:22+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' ចេញ"
@@ -371,6 +372,12 @@ msgstr "មិន​អាច​ស្វែងរក​ដើម្បី​ច
 msgid "unable to open lock file %s for testing"
 msgstr "មិន​អាច​បើក tmpfile សម្រាប់ vsnprintf"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "មិន​អាច​បើក/បង្កើត​ឯកសារ​ជាប់សោ​មូលដ្ឋាន​ទិន្នន័យ​ស្ថានភាព"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "មិន​អាច​បើក/បង្កើត​ឯកសារ​ជាប់សោ​មូលដ្ឋាន​ទិន្នន័យ​ស្ថានភាព"
@@ -379,6 +386,10 @@ msgstr "មិន​អាច​បើក/បង្កើត​ឯកសារ
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "អ្នក​គ្មាន​សិទ្ធិ​ដើម្បី​ចាក់សោ​មូលដ្ឋាន​ទិន្នន័យ​ស្ថានភាព​របស់ dpkg បាន​ទេ"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -432,6 +443,190 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "ចុង​បន្ទាត់​ដែល​មិន​រំពឹង​​ទុកក្នុង​ឈ្មោះ​កញ្ចប់​នៅ​បន្ទាត់ %d"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
+
+#: 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"
@@ -583,23 +778,27 @@ msgid "invalid package name (%.250s)"
 msgstr "ឈ្មោះ​កញ្ចប់​មិន​ត្រឹមត្រូវ (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "មាន​តម្លៃ​មួយ​ចំនួន​នៅ​ក្នុង​វាល​លម្អិត​ឯកសារ `%s' (បាន​ប្រៀបធៀប​នឹងអា​ផ្សេង​ទៀត)"
 
 #: lib/dpkg/fields.c
@@ -803,6 +1002,29 @@ msgstr "មិនអាច​ផ្លាស់ប្ដូរ​ភាព​ជ
 msgid "unable to set mode of target file '%.250s'"
 msgstr "មិនអាច​កំណទ់​របៀប​របស់ dist conffile ថ្មី `%.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 "ការព្រមាន 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"
@@ -827,8 +1049,9 @@ msgid "unable to lock %s"
 msgstr "មិន​អាច​ដោះសោ %s ៖ %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "មិន​អាច​បង្ហូរ​ចូល​ក្នុងឯកសារ​ vsnprintf"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -852,13 +1075,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"
@@ -1256,11 +1479,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 +1495,11 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "បាត់ altname"
 
+#: 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 "(គ្មាន​សេច​ក្តីពិពណ៌នា)"
@@ -1596,11 +1819,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'"
@@ -2133,6 +2351,10 @@ msgstr "អាន​កំហុស​នៅលើ​ stdin នៅ​ប្រ
 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,6 +2730,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2548,6 +2771,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"
@@ -2677,6 +2906,13 @@ msgstr "បន្ថែម​ `%s'"
 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"
@@ -2724,19 +2960,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"
@@ -3033,112 +3256,6 @@ 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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-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"
-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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-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'"
-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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr ""
-"dpkg ៖ ការ​ព្រមាន​ដ៏ធ្ងន់ធ្ងរ ៖ ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​បាត់ សន្មត់​ថា​កញ្ចប់​"
-"គ្មាន​ឯកសារ​ដែល​បាន​ដំឡើង​ថ្មីៗ ។\n"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "មិន​អាច​បើក​ឯកសារ ដែល​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "រាយ​កញ្ចប់​​ឯកសារ​ `%.250s'"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s' ដែល​មាន​ឈ្មោះ​ឯកសារ​ទទេ"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "កំហុស​ក្នុង​ការ​បិទ​ឯកសារ​រាយ​ឯកសារ​សម្រាប់​កញ្ចប់ `%.250s'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-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 ឯកសារ និង​ថត​បាន​ដំឡើង​ថ្មីៗ ។)\n"
-msgstr[1] "%d ឯកសារ និង​ថត​បាន​ដំឡើង​ថ្មីៗ ។)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "មិនបានដំឡើង"
@@ -3201,42 +3318,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"
@@ -3920,6 +4001,10 @@ msgstr " (កញ្ចប់ ៖ "
 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"
@@ -3956,6 +4041,16 @@ msgstr "រក​មិន​ឃើញ​កញ្ចប់​ដែល​ផ្
 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"
@@ -3983,9 +4078,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 +4131,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 ""
@@ -4464,72 +4562,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "ឯកសារ statoverride `%.250s'"
-
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4763,6 +4795,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"
@@ -5299,17 +5337,19 @@ msgstr ""
 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
@@ -6674,6 +6714,43 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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 "បាន​បរាជ័យ chdir ទៅ​ថត បន្ទាប់​ពី​បង្កើត​វា"
+
 #, fuzzy
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "ព្រមាន ៖ ជម្រើសលែងប្រើ `--%s'\n"
@@ -6761,9 +6838,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"
 
@@ -7050,11 +7124,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ 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"
@@ -7081,11 +7150,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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'"
diff --git a/po/ko.po b/po/ko.po
index 73fb7ffe5..3bef4b23b 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: 2018-09-26 04:22+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'을(를) 지울 수 없습니다"
@@ -376,6 +377,12 @@ msgstr "채운 뒤에 %.250s 파일의 시작으로 이동할 수 없습니다"
 msgid "unable to open lock file %s for testing"
 msgstr "테스트를 위해 %s 잠금 파일을 열 수 없습니다"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "상태 데이터베이스의 잠금 파일의 열기/만들기를 할 수 없습니다"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "상태 데이터베이스의 잠금 파일의 열기/만들기를 할 수 없습니다"
@@ -384,6 +391,10 @@ msgstr "상태 데이터베이스의 잠금 파일의 열기/만들기를 할 
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "dpkg 상태 데이터베이스를 잠글 수 있는 권한이 없습니다"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -437,6 +448,195 @@ 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
+#, fuzzy, c-format
+#| msgid "syntax error: unknown user '%s' in statoverride file"
+msgid "unknown user '%s' in statoverride file"
+msgstr "문법 오류: statoverride 파일에서 알 수 없는 사용자 '%s'"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "statoverride 파일에서 갑작스레 줄이 끝났습니다"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "syntax error: unknown group '%s' in statoverride file"
+msgid "unknown group '%s' in statoverride file"
+msgstr "문법 오류: statoverride 파일에서 알 수 없는 그룹 '%s'"
+
+#: 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"
@@ -604,23 +804,27 @@ msgid "invalid package name (%.250s)"
 msgstr "패키지 이름이 잘못되었습니다 (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "파일 상세 필드 `%s'에 너무 값이 적습니다 (다른 필드에 비해)"
 
 #: lib/dpkg/fields.c
@@ -829,6 +1033,30 @@ msgstr "대상 파일 '%.250s'의 소유를 바꿀 수 없습니다"
 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 "'%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"
@@ -854,9 +1082,9 @@ 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/log.c
 #, fuzzy, c-format
@@ -879,13 +1107,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"
@@ -1293,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"
@@ -1312,6 +1535,11 @@ msgstr ""
 msgid "missing closing brace"
 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 "(설명 없음)"
@@ -1651,11 +1879,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'"
@@ -2226,6 +2449,10 @@ msgstr "설정 파일 프롬프트에서 표준입력에 읽기 오류가 발생
 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 +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 "
@@ -2606,6 +2847,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2638,6 +2880,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'"
@@ -2761,6 +3009,13 @@ msgstr "'%s' 추가하는 중\n"
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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"
@@ -2807,20 +3062,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"
@@ -3126,119 +3367,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "--force 옵션이 켜져 있으므로 문제를 무시합니다:"
 
-#: 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/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/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/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/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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "`%.250s' 패키지에 대한 파일 목록을 열 수 없습니다"
-
-#: src/filesdb.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' 패키지의 파일 목록 파일이 없습니다, 패키지에 설치된 파일이 하나도 없"
-"다고 가정합니다."
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "'%.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"
-msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "`%.250s' 패키지의 파일 목록"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "'%.250s' 패키지의 파일 목록 파일에 마지막 줄 바꿈이 빠졌습니다"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "`%.250s' 패키지의 파일 목록에 빈 파일 이름이 있습니다"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "`%.250s' 패키지의 파일 목록 파일을 닫는데 오류가 발생했습니다."
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(데이터베이스 읽는중 ..."
-
-#: 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/help.c
 msgid "not installed"
 msgstr "설치하지 않았습니다"
@@ -3309,43 +3437,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"
@@ -4133,6 +4224,12 @@ msgstr "패키지 이름"
 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"
@@ -4169,6 +4266,17 @@ msgstr "%s에 맞는 패키지가 없습니다.\n"
 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"
@@ -4196,9 +4304,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 +4369,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 ""
@@ -4724,71 +4835,6 @@ 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
-#, 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 파일이 여러 개 있습니다"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "이 프로그램의 도움말을 보려면 dpkg-trigger --help를 실행하십시오."
@@ -5046,6 +5092,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"
@@ -5608,17 +5660,19 @@ msgstr ""
 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>"
@@ -7115,6 +7169,45 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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 "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 "obsolete option '--%s', please use '--%s' instead."
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
@@ -7198,9 +7291,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 +7536,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 +7560,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 5a05ab1c7..03e3835fd 100644
--- a/po/ku.po
+++ b/po/ku.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: 2018-09-26 04:22+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"
@@ -347,6 +348,11 @@ msgstr ""
 msgid "unable to open lock file %s for testing"
 msgstr "tmpfile bo vsnpritif nayê vekirin"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+msgid "unable to open/create frontend lockfile"
+msgstr "%s nayê xebitandin"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
@@ -355,6 +361,10 @@ msgstr ""
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -408,6 +418,176 @@ 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 user '%s' in statoverride file"
+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 group '%s' in statoverride file"
+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"
@@ -544,22 +724,22 @@ msgstr "navê pakêtê yê nederbasdar (%.250s)"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
+msgid "empty archive details field '%s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "file details field '%s' not allowed in status file"
+msgid "archive details field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -738,6 +918,26 @@ msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -760,8 +960,9 @@ msgid "unable to lock %s"
 msgstr "%s nayê xebitandin"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "%s nayê xebitandin"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -784,12 +985,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
@@ -1174,11 +1375,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 +1388,11 @@ msgstr ""
 msgid "missing closing brace"
 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)"
@@ -1506,11 +1707,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'"
@@ -2019,6 +2215,10 @@ msgstr ""
 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,6 +2559,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2376,6 +2577,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'"
@@ -2500,6 +2707,13 @@ msgstr "`%s' tê lêzêdekirin"
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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"
@@ -2540,19 +2754,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"
@@ -2812,105 +3013,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-
-#: 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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "di xwendina %s de çewtî"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-
-#: 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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "di xwendina %s de çewtî"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "di xwendina %s de çewtî"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-
-#: 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/filesdb.c
-#, fuzzy, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "nikarî `%.250s' wekî `%.250s' saz bike"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Danegeh tê xwendin ... "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "ne sazkirî"
@@ -2968,40 +3070,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"
@@ -3586,6 +3654,10 @@ msgstr " (pakêt: "
 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"
@@ -3622,6 +3694,10 @@ msgstr "Pakêtên ku bi %s li hev tê nehatin dîtin.\n"
 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"
@@ -3650,8 +3726,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 +3769,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 ""
@@ -4059,65 +4134,6 @@ 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
-#, c-format
-msgid "unknown group '%s' in statoverride file"
-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 +4339,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"
@@ -4811,16 +4832,17 @@ msgstr ""
 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
@@ -6001,6 +6023,30 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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"
 #~ msgstr "di xwendina %s de çewtî"
@@ -6122,14 +6168,6 @@ msgstr ""
 #~ msgid "Copyright (C) 1994-1996 Ian Jackson.\n"
 #~ 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..559446fa6 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: 2018-09-26 04:22+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“"
@@ -367,6 +368,12 @@ msgstr "po užpildymo nepavyko sugrįžti į %.250s pradžią"
 msgid "unable to open lock file %s for testing"
 msgstr "nepavyko atverti laikino failo programai vsnprintf"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "nepavyko sukurti/atverti būsenos duomenų bazės užrakinimo failo"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "nepavyko sukurti/atverti būsenos duomenų bazės užrakinimo failo"
@@ -375,6 +382,10 @@ msgstr "nepavyko sukurti/atverti būsenos duomenų bazės užrakinimo failo"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "jūs neturite teisių dpkg būsenos duomenų bazei užrakinti"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -428,6 +439,188 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "nepavyko atverti statoverride failo"
+
+#: 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
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr "nepavyko atverti statoverride failo"
+
+#: 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"
@@ -574,23 +767,27 @@ msgid "invalid package name (%.250s)"
 msgstr "klaidingas paketo pavadinimas (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "per mažai reikšmių failo detalių laukelyje `%s' (palyginus su kitais)"
 
 #: lib/dpkg/fields.c
@@ -797,6 +994,30 @@ msgstr "nepavyko pakeisti savininko naujam konfigūracijos failui „%.250s“"
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -821,8 +1042,9 @@ msgid "unable to lock %s"
 msgstr "nepavyko užverti %s: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "neįmanoma išvalyti vsnprintf"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -846,13 +1068,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"
@@ -1257,11 +1479,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 +1493,11 @@ msgstr ""
 msgid "missing closing brace"
 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)"
@@ -1593,11 +1815,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'"
@@ -2134,6 +2351,10 @@ msgstr "klaida nuskaitant įvestį, atrasta prieš konfigūracinio failo užklau
 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,6 +2725,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2521,6 +2743,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"
@@ -2651,6 +2879,13 @@ msgstr ""
 "dpkg: įspėjimas: prašymas pašalinti %.250s ignoruojamas, nes jis nėra "
 "įdiegtas.\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"
@@ -2693,19 +2928,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"
@@ -3009,112 +3231,6 @@ 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/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/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/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/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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "nepavyko atverti paketo „%.250s“ failų sarašo failo"
-
-#: src/filesdb.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"
-
-#: 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/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/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/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/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "klaida uždarant paketo `%.250s' failo sąrašo failą"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Skaitoma duomenų bazė ... "
-
-#: 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] "šiuo metu įdiegta %d failų ir aplankų.)\n"
-msgstr[1] "šiuo metu įdiegta %d failų ir aplankų.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "neįdiegtas"
@@ -3178,42 +3294,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"
@@ -3919,6 +3999,10 @@ msgstr ""
 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"
@@ -3957,6 +4041,18 @@ msgstr "Nerasta paketų kurie atitiktu %s kriterijų.\n"
 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"
@@ -3984,9 +4080,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 +4135,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 ""
@@ -4455,70 +4554,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "nepavyko pakartotinai atverti `%.250s' dalinio failo"
-
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4734,6 +4769,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"
@@ -5286,17 +5327,19 @@ msgstr ""
 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
@@ -6525,6 +6568,43 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "Įspėjimas: parametras „--%s“ nebenaudotinas\n"
@@ -6611,9 +6691,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"
 
@@ -6840,11 +6917,6 @@ msgstr ""
 #~ msgid "error installing new statoverride"
 #~ 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"
@@ -6863,11 +6935,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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..757a55fd7 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: 2018-09-26 04:22+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 काढणे अशक्य"
@@ -368,6 +369,12 @@ msgstr "पँडिंगनंतर %.250s च्या सुरूवात
 msgid "unable to open lock file %s for testing"
 msgstr "व्हीएसएनप्रिंटएफ़ साठी टीएमपीफाईल उघडता येत नाही"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "डीपीकेजी सद्यस्थिती डेटाबेस लोॅकफ़ाईल उघडता/बनवता येत नाही"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "डीपीकेजी सद्यस्थिती डेटाबेस लोॅकफ़ाईल उघडता/बनवता येत नाही"
@@ -376,6 +383,10 @@ msgstr "डीपीकेजी सद्यस्थिती डेटाब
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "आपणांस डीपीकेजी सद्यस्थिती डेटाबेसला टाळे लावण्याची परवानगी नाही"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -429,6 +440,190 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "%d ओळीवर पॅकेजच्या नावामध्ये अनपेक्षित उद्भवलेला ओळीचा शेवट/एण्ड ऑफ लाइन"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+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"
@@ -579,23 +774,27 @@ msgid "invalid package name (%.250s)"
 msgstr "पॅकेजचे नाव अयोग्य (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "फाइल विवरण क्षेत्र `%s' मधे खुपच कमी मूल्ये (इतरांच्या तुलनेत)"
 
 #: lib/dpkg/fields.c
@@ -795,6 +994,29 @@ msgstr "नवीन डिस्ट कॉनफाइल `%.250s'चा मा
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -819,8 +1041,9 @@ msgid "unable to lock %s"
 msgstr "%s चे टाळे उघडता येत नाही: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "व्हीएसएनप्रिंटएफ़मधे फ़्लश? करणे जमत नाही"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -844,13 +1067,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"
@@ -1248,11 +1471,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 +1487,11 @@ msgstr ""
 msgid "missing closing brace"
 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 "(वर्णन उपलब्ध नाही)"
@@ -1587,11 +1810,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'"
@@ -2126,6 +2344,10 @@ msgstr "कॉनफाइल प्रॉम्प्टच्या एसट
 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,6 +2726,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2544,6 +2767,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"
@@ -2673,6 +2902,13 @@ msgstr ""
 "डिपिकेजी - ताकिद: %.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"
@@ -2722,19 +2958,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"
@@ -3037,112 +3260,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "डिपिकेजी - ताकिद, समस्येवर दुर्लक्ष करित आहे कारण --फोर्स कार्यक्षम करतो:\n"
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-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"
-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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-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'"
-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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr ""
-"डिपिकेजी: गंभीर ताकिद: पॅकेज `%.250s'साठी फाइल्सची सुची असलेली फाइल हरवली आहे, असे "
-"गृहित धरुया कि पॅकेजमध्ये स्थापन केलेली कोणतीही फाइल नाही.\n"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "`%.250s'पॅकेजची फाइल्सची सुची असलेली फाइल उघडण्यास असमर्थ"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "पॅकेज `%.250s'साठी असलेली फाइलची सुची"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "पॅकेज `%.250s'साठी फाइलची सुची असलेल्या फाइलचे फाइलनेम रिकामे आहे"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "दोषामुळे पॅकेज `%.250s'साठी फाइलची सुची असलेली फाइल बंद होत आहे"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-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 फाइल्स आणि डिरेक्टरीज यांची सध्या स्थापना झालेली आहे.)\n"
-msgstr[1] "%d फाइल्स आणि डिरेक्टरीज यांची सध्या स्थापना झालेली आहे.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "स्थापना झाली नाही"
@@ -3205,42 +3322,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"
@@ -3928,6 +4009,10 @@ msgstr "(पॅकेज: "
 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"
@@ -3964,6 +4049,17 @@ msgstr "%sशी जुळणारी पॅकेजेस मिळाली
 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"
@@ -3991,9 +4087,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 +4141,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 ""
@@ -4475,72 +4574,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "स्टॅटओवरराइड फाइल `%.250s'"
-
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4758,6 +4791,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"
@@ -5301,17 +5340,19 @@ msgstr ""
 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
@@ -6647,6 +6688,43 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "ताकिद: अप्रचलित पर्याय `--%s'\n"
@@ -6734,9 +6812,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 ओळीवर पॅकेजच्या नावानंतर अनपेक्षित उद्भवलेले इओएफ"
 
@@ -7020,11 +7095,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ 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"
@@ -7051,11 +7121,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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'"
diff --git a/po/nb.po b/po/nb.po
index 22acc86ab..bb6343547 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: 2018-09-26 04:22+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»"
@@ -381,6 +382,12 @@ msgstr "klarte ikke søke til starten av %.250s etter etterfylling"
 msgid "unable to open lock file %s for testing"
 msgstr "klarte ikke åpne låsefila %s for testing"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "klarte ikke åpne/opprette låsefila til statusdatabasen"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "klarte ikke åpne/opprette låsefila til statusdatabasen"
@@ -389,6 +396,10 @@ msgstr "klarte ikke åpne/opprette låsefila til statusdatabasen"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "du har ikke tillatelse til å låse dpkg-statusdatabasen"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -442,6 +453,194 @@ 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
+#, 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"
+
+#: 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
+#, 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"
+
+#: 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"
@@ -607,23 +806,27 @@ msgid "invalid package name (%.250s)"
 msgstr "ugyldig pakkenavn (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "for få verdier i fildetaljfeltet «%s» (sammenliknet med andre)"
 
 #: lib/dpkg/fields.c
@@ -829,6 +1032,30 @@ msgstr "klarte ikke endre eierskap på målfila «%.250s»"
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -854,9 +1081,9 @@ msgstr "klarte ikke fjerne lås på %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/log.c
 #, fuzzy, c-format
@@ -879,13 +1106,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"
@@ -1295,11 +1522,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 +1538,11 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "mangler alternativt navn"
 
+#: 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)"
@@ -1652,11 +1879,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'"
@@ -2221,6 +2443,10 @@ msgstr "lesefeil på standard-inn ved oppsettsfilprompt"
 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 +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 "
@@ -2600,6 +2840,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2633,6 +2874,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'"
@@ -2756,6 +3003,13 @@ msgstr "Legger til «%s»\n"
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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"
@@ -2802,20 +3056,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"
@@ -3126,120 +3366,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "overstyrer problemet fordi --force er slått på:"
 
-#: 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/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/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/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/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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "klarte ikke åpne fillistefila for pakken «%.250s»"
-
-#: src/filesdb.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."
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "klarte ikke finne fillistefila for pakken «%.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"
-msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
-
-#: 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/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "fillistefila for pakken «%.250s» mangler avsluttende linjeskift"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "fillistefila for pakken «%.250s» inneholder et tomt filnavn"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Leser database ... "
-
-#: 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 kataloger er for øyeblikket installert.)\n"
-msgstr[1] "%d filer og kataloger er for øyeblikket installerte.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "ikke installert"
@@ -3312,43 +3438,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"
@@ -4139,6 +4228,12 @@ msgstr "pakkenavn"
 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"
@@ -4176,6 +4271,16 @@ msgid "package '%s' is not installed and no information is available"
 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"
@@ -4203,9 +4308,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 +4372,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 ""
@@ -4726,69 +4834,6 @@ 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
-#, 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»"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Skriv «dpkg-trigger --help» for hjelp om dette programmet."
@@ -5045,6 +5090,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"
@@ -5601,17 +5652,19 @@ msgstr ""
 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>"
@@ -7099,6 +7152,45 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s', please use '--%s' instead."
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
@@ -7181,9 +7273,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 +7532,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 +7556,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'"
diff --git a/po/ne.po b/po/ne.po
index 6d8cc5483..2b950e29b 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: 2018-09-26 04:22+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' हटाउन सक्दैन"
@@ -374,6 +375,12 @@ msgstr "गद्दा पछि %.250s को सुरू खोज्न अ
 msgid "unable to open lock file %s for testing"
 msgstr "vsnprintf का लागि tmpfile (अस्थाइ फाइल) खोल्न अक्षम"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "वस्तुस्थिति डेटावेश ताल्चा मारेको फाइल खोल्न/सिर्जना गर्न अक्षम"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "वस्तुस्थिति डेटावेश ताल्चा मारेको फाइल खोल्न/सिर्जना गर्न अक्षम"
@@ -382,6 +389,10 @@ msgstr "वस्तुस्थिति डेटावेश ताल्च
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "dpkg वस्तुस्थिति डेटावेश ताल्चा लगाउन तपाईँसंग अनुमति छैन"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -435,6 +446,189 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "statoverride फाइल खोल्न असफल"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy
+msgid "unexpected end of line in statoverride file"
+msgstr "लाइन %d को प्याकेजमा अप्रत्यासित लाइनको समाप्ती"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr "statoverride फाइल खोल्न असफल"
+
+#: 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"
@@ -586,23 +780,27 @@ msgid "invalid package name (%.250s)"
 msgstr "अवैध प्याकेज नाम (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "फाइल विवरण फाँटमा धेरै थोरै मानहरू `%s' (अन्यसंग दाजेमा)"
 
 #: lib/dpkg/fields.c
@@ -806,6 +1004,29 @@ msgstr "नयाँ वितरण कन्फफाइल `%.250s'को स
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -830,8 +1051,9 @@ msgid "unable to lock %s"
 msgstr "%s ताल्चा खोल्न अक्षम: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "vsnprintf मा फ्लस गर्न अक्षम"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -855,13 +1077,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"
@@ -1260,11 +1482,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 +1498,11 @@ msgstr ""
 msgid "missing closing brace"
 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 "(कुनै वर्णन उपलब्ध छैन)"
@@ -1599,11 +1821,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'"
@@ -2139,6 +2356,10 @@ msgstr "कन्फफाइल प्रोम्टको stdin मा त्
 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,6 +2733,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2552,6 +2774,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 +2909,13 @@ msgstr "`%s' थप्दा"
 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"
@@ -2728,19 +2963,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"
@@ -3043,112 +3265,6 @@ 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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-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"
-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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-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'"
-msgstr "कन्फिग फाइल डाइरेक्टरी `%.250s' (from `%.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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr ""
-"dpkg: गम्भिर चेतावनी: प्याकेज`%.250s'का लगि फाइलको सूची फाइल हराइरहेको छ, मानिएको "
-"प्याकेज सँग हालमा स्थापित फाइलहरू छैन ।\n"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल खोल्न अक्षम"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "रित्तो फाइलनाम समाहित गर्ने प्याकेज `%.250s' का लागि फाइलको सूची फाइल"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "प्याकेज `%.250s' का लागि फाइलको सूची फाइल बन्द गर्दा त्रुटि"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-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 फाइलहरू र डाइरेक्टरीहरू हालैमा स्थापना भयो ।)\n"
-msgstr[1] "%d फाइलहरू र डाइरेक्टरीहरू हालैमा स्थापना भयो ।)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "स्थापना नगरिएको"
@@ -3211,42 +3327,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"
@@ -3953,6 +4033,10 @@ msgstr " (प्याकेज: "
 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"
@@ -3989,6 +4073,16 @@ msgstr " %s संग मिल्ने कुनै पनि प्याक
 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"
@@ -4016,9 +4110,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 +4163,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 ""
@@ -4499,71 +4596,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "statoverride फाइल `%.250s'"
-
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4799,6 +4831,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"
@@ -5339,17 +5377,19 @@ msgstr ""
 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
@@ -6728,6 +6768,43 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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 "डाइरेक्टरी सिर्जना गरे पछि डाइरेक्टरीलाई chdir गर्न असफल"
+
 #, fuzzy
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "चेतावनी: अप्रचलित विकल्प `--%s'\n"
@@ -6815,9 +6892,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"
 
@@ -7107,11 +7181,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ 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"
@@ -7138,11 +7207,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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'"
diff --git a/po/nl.po b/po/nl.po
index 96883e0b8..3ee1bdf51 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.0.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-18 01:51+0200\n"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2017-10-22 13:03+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -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"
@@ -346,6 +347,13 @@ msgstr "kan niet naar het begin van %.250s gaan na opvulling"
 msgid "unable to open lock file %s for testing"
 msgstr "kan het vergrendelingsbestand %s niet openen om te testen"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr ""
+"kan het vergrendelingsbestand van de statusdatabase niet openen/aanmaken"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
@@ -357,6 +365,10 @@ msgstr ""
 "u heeft niet de benodigde rechten om de statusdatabase van dpkg te "
 "vergrendelen"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "statusdatabase van dpkg"
@@ -410,6 +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
+#, fuzzy, c-format
+#| msgid "cannot read control file '%s' for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "kan controlebestand '%s' voor pakket '%s' niet lezen"
+
+#: 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
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr ""
+"fout bij sluiten van bestand met de lijst bestanden van pakket '%.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 ""
+"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 uid %s in overstijging van bestandsstatus (statoverride)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride gid %s"
+msgstr "ongeldige gid %s in overstijging van bestandsstatus (statoverride)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "invalid statoverride mode %s"
+msgstr "ongeldige modus %s in overstijging van bestandsstatus (statoverride)"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to open statoverride file"
+msgstr "kan statoverride-bestand (bestand met overstijgingsinfo) niet openen"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "failed to fstat statoverride file"
+msgstr ""
+"kan de status van het statoverride-bestand (bestand met overstijgingsinfo) "
+"niet opvragen"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "reading statoverride file '%.250s'"
+msgstr ""
+"statoverride-bestand (bestand met overstijgingsinfo) '%.250s' wordt gelezen"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file is missing final newline"
+msgstr ""
+"het afsluitende regeleinde ontbreekt in het statoverride-bestand (bestand "
+"met overstijgingsinfo)"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "statoverride file contains empty line"
+msgstr ""
+"statoverride-bestand (bestand met overstijgingsinfo) bevat een lege regel"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "syntax error in statoverride file"
+msgstr ""
+"syntaxisfout in het statoverride-bestand (bestand met overstijgingsinfo)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr ""
+"onbekende gebruiker '%s' in het statoverride-bestand (bestand met "
+"overstijgingsinfo)"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr ""
+"onverwacht regeleinde in het statoverride-bestand (bestand met "
+"overstijgingsinfo)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr ""
+"onbekende groep '%s' in het statoverride-bestand (bestand met "
+"overstijgingsinfo)"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr ""
+"er zijn meerdere statoverrides (overstijgingen van de status) voor bestand "
+"'%.250s'"
+
 #: lib/dpkg/deb-version.c
 msgid "format version with too big major component"
 msgstr "formaat van het versienummer bevat een te hoge hoofdversiecomponent"
@@ -542,24 +751,28 @@ msgid "invalid package name (%.250s)"
 msgstr "ongeldige pakketnaam (%.250s)"
 
 #: 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 field '%s'"
 msgstr "leeg veld '%s' voor bestandsdetails"
 
 #: 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 field '%s' not allowed in status file"
 msgstr "veld '%s' voor bestandsdetails niet toegestaan in statusbestand"
 
 #: 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 field '%s' (compared to others)"
 msgstr ""
 "te veel waarden in veld '%s' voor bestandsdetails (vergeleken met andere)"
 
 #: 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 field '%s' (compared to others)"
 msgstr ""
 "te weinig waarden in het veld '%s' voor bestandsdetails (vergeleken met "
 "andere)"
@@ -754,6 +967,28 @@ msgstr "kan de eigenaar van doelbestand '%.250s' niet veranderen"
 msgid "unable to set mode of target file '%.250s'"
 msgstr "kan de modus van het doelbestand '%.250s' niet instellen"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot stat %s"
+msgstr "kan de status van de oude naam '%s' niet opvragen: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "archive '%s' is not a regular file"
+msgid "%s is not a regular file"
+msgstr "archief '%s' is geen gewoon bestand"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+msgid "cannot read %s"
+msgstr "kan %s niet verwijderen: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "kan niets toevoegen aan '%s'"
+
 #: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
@@ -775,8 +1010,10 @@ 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"
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "kan bestand '%s' niet doorspoelen"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -798,13 +1035,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"
@@ -1200,11 +1437,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"
@@ -1218,6 +1450,11 @@ msgstr "veldgrootte valt buiten het bereik"
 msgid "missing closing brace"
 msgstr "afsluitende accolade ontbreekt"
 
+#: 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)"
@@ -1548,11 +1785,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'"
@@ -2067,6 +2299,10 @@ msgstr "bestandseinde op stdin bij de prompt i.v.m. configuratiebestand"
 msgid "conffile difference visualizer"
 msgstr "hulpmiddel voor het weergeven van verschillen in configuratiebestanden"
 
+#: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
 #: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Typ 'exit' als u klaar bent.\n"
@@ -2428,7 +2664,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 "
@@ -2437,6 +2687,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2474,6 +2725,12 @@ 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 ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2593,6 +2850,13 @@ msgstr ""
 "Verzoek tot het hernoemen van bestand '%s' dat eigendom is van het "
 "omleidende pakket '%s' wordt genegeerd\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"
@@ -2638,19 +2902,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"
@@ -2951,116 +3202,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "probleem wordt genegeerd omdat --force aanstaat:"
 
-#: 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/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/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr ""
-"controlebestand '%s' voor pakket '%s' heeft een ontbrekend "
-"waardescheidingsteken"
-
-#: 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/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "kan controlebestand '%s' voor pakket '%s' niet openen"
-
-#: 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/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/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "kan controlebestand '%s' voor pakket '%s' niet lezen"
-
-#: 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/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/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-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'"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr ""
-"bestand met de lijst bestanden van pakket '%.250s' is geen gewoon bestand"
-
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "bestand met de lijst bestanden van pakket '%.250s' wordt gelezen"
-
-#: src/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr ""
-"fout bij sluiten van bestand met de lijst bestanden van pakket '%.250s'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Database wordt ingelezen ... "
-
-#: 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 bestand of map momenteel geïnstalleerd.)\n"
-msgstr[1] "%d bestanden en mappen momenteel geïnstalleerd.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "niet geïnstalleerd"
@@ -3124,42 +3265,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"
@@ -3875,6 +3980,12 @@ msgstr "Architectuur"
 msgid "Description"
 msgstr "Omschrijving"
 
+#: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "bestand wordt pagina per pagina getoond"
+
 #: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
@@ -3909,6 +4020,16 @@ msgstr "geen pad gevonden dat overeenkomt met %s"
 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
+#, 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 ""
+"Gebruik dpkg --info (= dpkg-deb --info) om archiefbestanden te bekijken,\n"
+"en dpkg --contents (= dpkg-deb --contents) om de inhoud weer te geven.\n"
+
 #: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
@@ -3935,9 +4056,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "omgeleid door %s naar: %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 ""
 "Gebruik dpkg --info (= dpkg-deb --info) om archiefbestanden te bekijken,\n"
 "en dpkg --contents (= dpkg-deb --contents) om de inhoud weer te geven.\n"
@@ -3979,19 +4103,33 @@ msgstr ""
 "Zoekhulpmiddel van het programma voor Debian pakketbeheer %s versie %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 ""
@@ -4403,80 +4541,6 @@ 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
-#, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr ""
-"er zijn meerdere statoverrides (overstijgingen van de status) voor bestand "
-"'%.250s'"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Typ dpkg-trigger --help voor hulp over dit hulpmiddel."
@@ -4692,6 +4756,13 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Bezig met de-configureren van %s (%s) ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr ""
+"statoverride-bestand (bestand met overstijgingsinfo) bevat een lege regel"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -5208,17 +5279,19 @@ msgstr "kan de pijp van het decompressieprogramma niet sluiten"
 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"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "onverwacht bestandseinde in pakketnaam op regel %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "chdir naar de map is mislukt"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6558,6 +6631,36 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Authenticatie is nodig voor het uitvoeren van update-alternatives"
 
+#~ 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr ""
 #~ "verouderde optie '--%s'; gelieve in plaats ervan '--%s' te gebruiken"
@@ -6632,9 +6735,6 @@ msgstr "Authenticatie is nodig voor het uitvoeren van update-alternatives"
 #~ 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"
 
@@ -6918,10 +7018,6 @@ msgstr "Authenticatie is nodig voor het uitvoeren van update-alternatives"
 #~ msgid "it is a slave of %s"
 #~ 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"
@@ -6946,10 +7042,6 @@ msgstr "Authenticatie is nodig voor het uitvoeren van update-alternatives"
 #~ msgid "unable to close %s: %s"
 #~ 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..780d08ca6 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: 2018-09-26 04:22+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»"
@@ -371,6 +372,12 @@ msgstr "klarte ikkje søkja til starten av %.250s etter etterfyllinga"
 msgid "unable to open lock file %s for testing"
 msgstr "klarte ikkje opna mellombels fil for vsnprintf"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "klarte ikkje åpna/oppretta låsefila til statusdatabasen"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "klarte ikkje åpna/oppretta låsefila til statusdatabasen"
@@ -379,6 +386,10 @@ msgstr "klarte ikkje åpna/oppretta låsefila til statusdatabasen"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "du har ikkje løyve til å låsa dpkg-statusdatabasen"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -432,6 +443,188 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "klarte ikkje opna «statoverride»-fila"
+
+#: 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
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr "klarte ikkje opna «statoverride»-fila"
+
+#: 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"
@@ -580,23 +773,27 @@ msgid "invalid package name (%.250s)"
 msgstr "ugyldig pakkenamn (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "for få verdiar i fildetaljfeltet «%s» (samanlikna med andre)"
 
 #: lib/dpkg/fields.c
@@ -801,6 +998,26 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr ""
 "klarte ikkje setja modusen til den nye distribusjonsoppsettsfila «%.250s»"
 
+#: 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"
@@ -823,8 +1040,9 @@ msgid "unable to lock %s"
 msgstr "klarte ikkje køyra %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "klarte ikkje tømma i vsnprintf"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -848,13 +1066,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"
@@ -1258,11 +1476,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 +1491,11 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "manglar %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 ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(inga skildring tilgjengeleg)"
@@ -1596,11 +1814,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'"
@@ -2143,6 +2356,10 @@ msgstr "lesefeil på standard-inn ved oppsettsfilprompt"
 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,6 +2738,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2538,6 +2756,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'"
@@ -2659,6 +2883,13 @@ msgstr ""
 "dpkg - åtvaring: Ignorerer ønsket om å fjerna %.250s som ikkje er "
 "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"
@@ -2702,20 +2933,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"
@@ -3022,112 +3239,6 @@ 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/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/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/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/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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
-
-#: 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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "klarte ikkje opna fillistefila for pakken «%.250s»"
-
-#: src/filesdb.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"
-
-#: 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/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/filesdb.c
-#, fuzzy, c-format
-#| msgid "files list for package `%.250s'"
-msgid "reading files list for package '%.250s'"
-msgstr "filliste for pakken «%.250s»"
-
-#: 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/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "fillistefila for pakken «%.250s» inneheld eit tomt filnamn"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "feil ved lukking av fillistefila for pakken «%.250s»"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Les database ... "
-
-#: 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 filer og katalogar er installerte.)\n"
-msgstr[1] "%d filer og katalogar er installerte.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "ikkje installert"
@@ -3190,42 +3301,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"
@@ -3916,6 +3991,10 @@ msgstr " (pakke: "
 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"
@@ -3953,6 +4032,16 @@ msgid "package '%s' is not installed and no information is available"
 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"
@@ -3980,9 +4069,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 +4121,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 ""
@@ -4444,69 +4536,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "«statoverride»-fil «%.250s»"
-
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4719,6 +4748,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"
@@ -5265,17 +5300,19 @@ msgstr ""
 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
@@ -6554,6 +6591,43 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "Åtvaring: Forelda val «%s»\n"
@@ -6637,9 +6711,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"
 
@@ -6881,10 +6952,6 @@ msgstr ""
 #~ msgid "--build takes at most two arguments"
 #~ 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"
@@ -6910,10 +6977,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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 5aa040b11..613acf07a 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,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: 2018-09-26 04:22+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"
@@ -139,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' ਹਟਾਈ ਨਹੀਂ ਜਾ ਸਕਦੀ"
@@ -354,6 +355,11 @@ msgstr ""
 msgid "unable to open lock file %s for testing"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+msgid "unable to open/create frontend lockfile"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
@@ -362,6 +368,10 @@ msgstr ""
 msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr ""
@@ -413,6 +423,178 @@ 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 user '%s' in statoverride file"
+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 group '%s' in statoverride file"
+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"
@@ -558,22 +740,22 @@ msgstr "ਗਲਤ ਪੈਕੇਜ ਨਾਂ (%.250s)"
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "empty file details field '%s'"
+msgid "empty archive details field '%s'"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "file details field '%s' not allowed in status file"
+msgid "archive details field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 
 #: lib/dpkg/fields.c
@@ -752,6 +934,29 @@ msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾ
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -775,8 +980,9 @@ msgid "unable to lock %s"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "%s ਚਲਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -799,12 +1005,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
@@ -1189,11 +1395,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"
@@ -1209,6 +1410,11 @@ msgstr ""
 msgid "missing closing brace"
 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 ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(ਕੋਈ ਵੇਰਵਾ ਉਪਲੱਬਧ ਨਹੀਂ)"
@@ -1523,11 +1729,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'"
@@ -2004,6 +2205,10 @@ msgstr ""
 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 ""
@@ -2341,6 +2546,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2383,6 +2589,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"
@@ -2511,6 +2723,13 @@ msgstr "`%s' ਜੋੜਿਆ ਜਾ ਰਿਹਾ ਹੈ"
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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"
@@ -2551,19 +2770,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"
@@ -2825,108 +3031,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: 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/filesdb-hash.c
-#, fuzzy, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/filesdb-hash.c
-#, fuzzy, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr ""
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr ""
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-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 ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
-msgstr[1] "%d ਫਾਇਲਾਂ ਅਤੇ ਡਾਇਰੈਕਟਰੀਆਂ ਇਸ ਸਮੇਂ ਇੰਸਟਾਲ ਹਨ।)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ"
@@ -2984,41 +3088,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"
@@ -3670,6 +3739,10 @@ msgstr " (ਪੈਕੇਜ: "
 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"
@@ -3705,6 +3778,10 @@ msgstr ""
 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"
@@ -3733,8 +3810,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
@@ -3778,16 +3854,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 ""
@@ -4174,65 +4250,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4468,6 +4485,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"
@@ -4974,17 +4996,18 @@ msgstr ""
 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
@@ -6316,6 +6339,35 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
@@ -6512,11 +6564,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ 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"
@@ -6524,11 +6571,6 @@ msgstr ""
 #~ msgid "unable to read %s: %s"
 #~ 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 649c0704d..1849622d6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2018-08-03 03:46+0200\n"
 "Last-Translator: Łukasz Dulny <BartekChom@poczta.onet.pl>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -23,8 +23,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "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"
+"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 2.0\n"
 
 #: lib/dpkg/ar.c
@@ -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\""
@@ -354,6 +355,12 @@ msgstr "nie można przewinąć na początek pliku %.250s po jego wypełnieniu"
 msgid "unable to open lock file %s for testing"
 msgstr "%s: nie można otworzyć pliku blokady $s do sprawdzenia"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "nie można otworzyć/utworzyć pliku blokującego bazę danych stanu dpkg"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "nie można otworzyć/utworzyć pliku blokującego bazę danych stanu dpkg"
@@ -362,6 +369,10 @@ msgstr "nie można otworzyć/utworzyć pliku blokującego bazę danych stanu dpk
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "brak praw do zablokowania bazy danych stanu dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "baza danych stanu dpkg"
@@ -413,6 +424,184 @@ 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
+#, fuzzy, c-format
+#| msgid "cannot read control file '%s' for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "nie można wypakować 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
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "nie można zamknąć 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 user '%s' in statoverride file"
+msgstr "nieznany użytkownik \"%s\" w pliku statoverride"
+
+#: 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 group '%s' in statoverride file"
+msgstr "nieznana grupa \"%s\" w pliku statoverride"
+
+#: 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
 msgid "format version with too big major component"
 msgstr "wersja formatu ze zbyt dużą główną częścią składową"
@@ -547,23 +736,27 @@ msgid "invalid package name (%.250s)"
 msgstr "niepoprawna nazwa pakietu (%.250s)"
 
 #: 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 field '%s'"
 msgstr "puste pole opisu pliku \"%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 field '%s' not allowed in status file"
 msgstr "pole opisu pliku \"%s\" jest niedozwolone w pliku statusu"
 
 #: 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 field '%s' (compared to others)"
 msgstr "za dużo danych w polu opisu pliku \"%s\" (w porównaniu z innymi)"
 
 #: 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 field '%s' (compared to others)"
 msgstr "za mało danych w polu opisu pliku \"%s\" (w porównaniu z innymi)"
 
 #: lib/dpkg/fields.c
@@ -758,6 +951,30 @@ msgstr "nie można zmienić właściciela pliku docelowego \"%.250s\""
 msgid "unable to set mode of target file '%.250s'"
 msgstr "nie można ustawić uprawnień pliku docelowego \"%.250s\""
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "nie można ustalić stanu starego pliku \"%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 "archiwum \"%s\" nie jest zwykłym plikiem"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "nie można zapisać %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "nie można dopisać do \"%s\""
+
 #: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
@@ -779,8 +996,10 @@ 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
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "nie można opróżnić pliku \"%s\""
 
 #: lib/dpkg/log.c
 #, c-format
@@ -802,13 +1021,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"
@@ -1196,12 +1415,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"
@@ -1215,6 +1428,12 @@ msgstr "szerokość pola jest poza zakresem"
 msgid "missing closing brace"
 msgstr "brakująca kwadratowy nawias zamykający"
 
+#: 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)"
@@ -1549,11 +1768,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'"
@@ -2058,6 +2272,10 @@ msgstr "koniec pliku standardowego wejścia wykryty po znaku zachęty"
 msgid "conffile difference visualizer"
 msgstr "Wizualizacja różnic w plikach konfiguracyjnych"
 
+#: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
 #: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Należy wpisać \"exit\" po zakończeniu pracy.\n"
@@ -2417,7 +2635,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,6 +2658,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2460,6 +2693,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 ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2579,6 +2818,13 @@ msgstr ""
 "Ignorowanie żądania zmiany nazwy pliku \"%s\", którego właścicielem jest "
 "omijany pakiet \"%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"
@@ -2624,19 +2870,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"
@@ -2938,109 +3171,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "problem zignorowany po użyciu opcji --force:"
 
-#: src/filesdb-hash.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"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "w pliku kontrolnym \"%s\" dla pakietu \"%s\" brakuje wartości"
-
-#: src/filesdb-hash.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"
-
-#: 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/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "nie można otworzyć pliku kontrolnego \"%s\" dla pakietu \"%s\""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "nie można ustalić stanu pliku kontrolnego \"%s\" dla pakietu \"%s\""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "plik kontrolny \"%s\" dla pakietu \"%s\" nie jest zwykłym plikiem"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "nie można wypakować pliku kontrolnego \"%s\" dla pakietu \"%s\""
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "nie można zamknąć pliku kontrolnego \"%s\" dla pakietu \"%s\""
-
-#: 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/filesdb.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"
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "odczytywanie listy plików pakietu \"%.250s\""
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "lista plików pakietu \"%.250s\" zawiera pustą nazwę pliku"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "nie można zamknąć listy plików pakietu \"%.250s\""
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Odczytywanie bazy danych ... "
-
-#: 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 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"
-
 #: src/help.c
 msgid "not installed"
 msgstr "nie zainstalowany"
@@ -3108,42 +3238,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"
@@ -3202,8 +3296,8 @@ msgstr ""
 "  --get-selections [<wzorzec> ...]  Wyświetlenie zaznaczeń pakietów na "
 "stdout.\n"
 "  --set-selections                  Pobranie zaznaczeń pakietów z stdin.\n"
-"  --clear-selections                Odznaczenie pakietów innych niż"
-" niezbędne.\n"
+"  --clear-selections                Odznaczenie pakietów innych niż "
+"niezbędne.\n"
 "  --update-avail <plik Packages>    Podmiana info o dostępnych pakietach.\n"
 "  --merge-avail <plik Packages>     Dodanie info o dostępnych pakietach.\n"
 "  --clear-avail                     Usuwanie info o dostępnych pakietach.\n"
@@ -3215,8 +3309,8 @@ msgstr ""
 "  -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"
+"  --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"
@@ -3247,8 +3341,8 @@ msgid ""
 "  multi-conrep, multi-arch, versioned-provides.\n"
 "\n"
 msgstr ""
-"Funkcje z możliwym do założenia wsparciem: support-predepends, working-epoch,"
-" long-filenames,\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"
 
@@ -3271,7 +3365,8 @@ msgid ""
 "\n"
 msgstr ""
 "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"
+"  -f, --field, -x, --extract, -X, --vextract, --ctrl-tarfile, --fsys-"
+"tarfile\n"
 "na archiwach (patrz %s --help).\n"
 "\n"
 
@@ -3859,6 +3954,12 @@ msgstr "Architektura"
 msgid "Description"
 msgstr "Opis"
 
+#: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "pokazywanie pliku za pomocą programu stronicującego"
+
 #: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
@@ -3894,6 +3995,16 @@ msgid "package '%s' is not installed and no information is available"
 msgstr ""
 "pakiet \"%s\" nie jest zainstalowany i informacje o nim nie są dostępne"
 
+#: 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 ""
+"Użyj dpkg --info (= dpkg-deb --info), aby zobaczyć informacje o pakiecie,\n"
+"oraz dpkg --contents (= dpkg-deb --contents), aby sprawdzić jego zawartość.\n"
+
 #: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
@@ -3920,9 +4031,12 @@ msgid "diverted by %s to: %s\n"
 msgstr "ominięty przez %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 ""
 "Użyj dpkg --info (= dpkg-deb --info), aby zobaczyć informacje o pakiecie,\n"
 "oraz dpkg --contents (= dpkg-deb --contents), aby sprawdzić jego zawartość.\n"
@@ -3965,19 +4079,33 @@ msgstr ""
 "Debiana.\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 ""
@@ -4131,8 +4259,7 @@ 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ąć starego pliku konfiguracyjnego \"%.250s\" (= \"%.250s"
-"\")"
+"nie można usunąć starego pliku konfiguracyjnego \"%.250s\" (= \"%.250s\")"
 
 #: src/remove.c
 #, c-format
@@ -4144,8 +4271,8 @@ msgstr ""
 #, c-format
 msgid "cannot remove old backup config file '%.250s' (of '%.250s')"
 msgstr ""
-"nie można usunąć kopii starego pliku konfiguracyjnego \"%.250s\" (od \""
-"%.250s\")"
+"nie można usunąć kopii starego pliku konfiguracyjnego \"%.250s\" (od \"%.250s"
+"\")"
 
 #: src/remove.c
 msgid "cannot remove old files list"
@@ -4256,8 +4383,8 @@ msgstr "nieprawidłowa nazwa pakietu w linii %d: %.250s"
 #, c-format
 msgid "package not in status nor available database at line %d: %.250s"
 msgstr ""
-"pakietu nie znajduje się w statusie ani dostępnej bazie danych, w wierszu %d:"
-" %.250s"
+"pakietu nie znajduje się w statusie ani dostępnej bazie danych, w wierszu "
+"%d: %.250s"
 
 #: src/select.c
 #, c-format
@@ -4385,65 +4512,6 @@ msgstr "brak nadpisania"
 msgid "--update is useless for --remove"
 msgstr "--update jest bezużyteczne w połączeniu z --remove"
 
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride uid %s"
-msgstr "nieprawidłowe statoverride uid %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride gid %s"
-msgstr "nieprawidłowe statoverride gid %s"
-
-#: src/statdb.c
-#, c-format
-msgid "invalid statoverride mode %s"
-msgstr "nieprawidłowe statoverride mode %s"
-
-#: 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\""
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Proszę wpisać dpkg-trigger --help, aby otrzymać pomoc."
@@ -4662,6 +4730,12 @@ msgstr ""
 msgid "De-configuring %s (%s) ...\n"
 msgstr "Dekonfigurowanie pakietu %s (%s) ...\n"
 
+#: src/unpack.c
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "plik statoverride zawiera pustą linię"
+
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
 msgid "conffile name '%s' is too long, or missing final newline"
@@ -4733,8 +4807,7 @@ msgstr ""
 #, c-format
 msgid "could not stat old file '%.250s' so not deleting it: %s"
 msgstr ""
-"nie można ustalić stanu starego 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
@@ -4745,8 +4818,8 @@ msgstr "nie można usunąć starego katalogu \"%.250s\": %s"
 #, c-format
 msgid "old conffile '%.250s' was an empty directory (and has now been deleted)"
 msgstr ""
-"stary 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
@@ -4854,8 +4927,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
@@ -5174,17 +5247,19 @@ msgstr "nie można zamknąć potoku dekompresyjnego"
 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"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "niespodziewany EOF w nazwie pakietu w linii %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "nie można zmienić katalogu bieżącego"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -5374,14 +5449,15 @@ msgstr ""
 "(tworzenie\n"
 "                               niepoprawnych pakietów).\n"
 "      --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"
+"      --[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, none.\n"
-"  -S<strategia>              Ustawienie strategii kompresji w czasie"
-" budowania.\n"
+"  -S<strategia>              Ustawienie strategii kompresji w czasie "
+"budowania.\n"
 "                               Dozwolone wartości: none; extreme (xz);\n"
 "                               filtered, huffman, rle, fixed (gzip).\n"
 "\n"
@@ -5950,8 +6026,8 @@ msgid ""
 "  --list <name>            display all targets of the <name> group.\n"
 "  --get-selections         list master alternative names and their status.\n"
 "  --set-selections         read alternative status from standard input.\n"
-"  --config <name>          show alternatives for the <name> group and ask"
-" the\n"
+"  --config <name>          show alternatives for the <name> group and ask "
+"the\n"
 "                           user to select which one to use.\n"
 "  --set <name> <path>      set <path> as alternative for <name>.\n"
 "  --all                    call --config on all alternatives.\n"
@@ -5963,17 +6039,18 @@ msgstr ""
 "                             dodaje grupę alternatyw do systemu.\n"
 "  --remove <nazwa> <ścieżka> usuwa <ścieżkę> z grupy alternatyw <nazwa>.\n"
 "  --remove-all <nazwa>       usuwa grupę <nazwa> z systemu alternatyw.\n"
-"  --auto <nazwa>             zmienia główne dowiązanie <nazwa> na tryb"
-" automat.\n"
+"  --auto <nazwa>             zmienia główne dowiązanie <nazwa> na tryb "
+"automat.\n"
 "  --display <nazwa>          wyświetla informację o grupie <nazwa>.\n"
 "  --query <nazwa>            parsowalna wersja --display <nazwa>.\n"
 "  --list <nazwa>             wyświetla wszystkie cele grupy <nazwa>.\n"
 "  --get-selections           wyświetla główne nazwy alternatyw i ich stan.\n"
-"  --set-selections           wyświetla stan alternatyw ze standardowego"
-" wejścia.\n"
+"  --set-selections           wyświetla stan alternatyw ze standardowego "
+"wejścia.\n"
 "  --config <nazwa>           pokazuje alternatywy grupy <nazwa> i pyta\n"
 "                             użytkownika, która ma być używana.\n"
-"  --set <nazwa> <ścieżka>    ustawia <ścieżkę> jako alternatywę dla <nazwy>.\n"
+"  --set <nazwa> <ścieżka>    ustawia <ścieżkę> jako alternatywę dla "
+"<nazwy>.\n"
 "  --all                      wywołuje --config dla wszystkich alternatyw.\n"
 "\n"
 
@@ -5997,8 +6074,8 @@ msgstr ""
 "  (np. pager)\n"
 "<ścieżka> jest położeniem jednego z docelowych plików alternatyw.\n"
 "  (np. /usr/bin/less)\n"
-"<priorytet> jest liczbą całkowitą, opcja z większym numerem ma wyższy"
-" priorytet\n"
+"<priorytet> jest liczbą całkowitą, opcja z większym numerem ma wyższy "
+"priorytet\n"
 "  w trybie automatycznym.\n"
 "\n"
 
@@ -6133,8 +6210,8 @@ msgid ""
 "alternative %s (part of link group %s) doesn't exist; removing from list of "
 "alternatives"
 msgstr ""
-"alternatywa %s (zawarta w grupie dowiązań %s) nie istnieje - usuwanie jej z"
-" listy alternatyw"
+"alternatywa %s (zawarta w grupie dowiązań %s) nie istnieje - usuwanie jej z "
+"listy alternatyw"
 
 #: utils/update-alternatives.c
 msgid "priority"
@@ -6242,8 +6319,8 @@ msgstr "Status"
 #, 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"
-" numer: "
+"Proszę wcisnąć <enter>, aby pozostawić bieżący wybór[*]; albo wpisać wybrany "
+"numer: "
 
 #: utils/update-alternatives.c
 #, c-format
@@ -6521,6 +6598,33 @@ msgstr "Urucham update-alternatives, aby zmienić wybór alternatyw w systemie"
 msgid "Authentication is required to run update-alternatives"
 msgstr "Uruchomienie update-alternatives wymaga uwierzytelnienia"
 
+#~ 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr ""
 #~ "niewykorzystywana już opcja \"--%s\", zamiast niej proszę używać \"--%s\""
@@ -6591,9 +6695,6 @@ msgstr "Uruchomienie update-alternatives wymaga uwierzytelnienia"
 #~ 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"
 
@@ -6860,10 +6961,6 @@ msgstr "Uruchomienie update-alternatives wymaga uwierzytelnienia"
 #~ 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"
 
@@ -6890,10 +6987,6 @@ msgstr "Uruchomienie update-alternatives wymaga uwierzytelnienia"
 #~ 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\""
 
diff --git a/po/pt.po b/po/pt.po
index c8074aa73..19eda9d02 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2017-07-01 14:55+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -136,7 +136,8 @@ 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'"
@@ -345,6 +346,12 @@ msgstr "não foi possível executar seek para o inicio de %.250s após enchiment
 msgid "unable to open lock file %s for testing"
 msgstr "não foi bloquear ficheiro %s para teste"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "não foi possível abrir/criar lockfile de status da base de dados"
+
 #: 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"
@@ -353,6 +360,10 @@ msgstr "não foi possível abrir/criar lockfile de status da base de dados"
 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"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "base de dados de estado do dpkg"
@@ -405,6 +416,187 @@ msgstr "não foi possível fechar o status actualizado de `%.250s'"
 msgid "unable to install updated status of '%.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
+#, fuzzy, c-format
+#| msgid "cannot read control file '%s' for package '%s'"
+msgid "loading control file '%s' for package '%s'"
+msgstr "não pode ler 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
+#, fuzzy, c-format
+#| msgid "error closing files list file for package '%.250s'"
+msgid "loading files list file for package '%s'"
+msgstr "erro ao fechar o ficheiro de lista de ficheiros para o pacote `%.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 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 user '%s' in statoverride file"
+msgstr "utilizador desconhecido '%s' no ficheiro statoverride"
+
+#: 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 group '%s' in statoverride file"
+msgstr "grupo '%s' desconhecido no statoverride"
+
+#: 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"
@@ -541,25 +733,29 @@ msgid "invalid package name (%.250s)"
 msgstr "nome de pacote inválido (%.250s)"
 
 #: 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 field '%s'"
 msgstr "campo de detalhes de ficheiro vazio `%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 field '%s' not allowed in status file"
 msgstr "campo `%s' de detalhes de ficheiro não é permitido no ficheiro 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 field '%s' (compared to others)"
 msgstr ""
 "demasiados valores no campo de detalhes `%s' do ficheiro (comparado com "
 "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 field '%s' (compared to others)"
 msgstr ""
 "valores a menos no campo `%s' de detalhes de ficheiro (comparado com outros)"
 
@@ -751,6 +947,30 @@ msgstr "não foi possível mudar o dono do ficheiro de destino '%.250s'"
 msgid "unable to set mode of target file '%.250s'"
 msgstr "não foi possível definir o modo do ficheiro de destino '%.250s'"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot stat %s: %s"
+msgid "cannot stat %s"
+msgstr "Não pode fazer stat %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 "o arquivo '%s' não é um ficheiro normal"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot write %s: %s"
+msgid "cannot read %s"
+msgstr "não foi possível escrever %s: %s"
+
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open %s"
+msgstr "não pode acrescentar a '%s'"
+
 #: lib/dpkg/file.c
 #, c-format
 msgid "unable to unlock %s"
@@ -772,8 +992,10 @@ 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"
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "não foi possível fazer flush ao ficheiro '%s'"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -795,13 +1017,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"
@@ -1187,11 +1409,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 +1422,11 @@ msgstr "comprimento do campo está fora de alcance"
 msgid "missing closing brace"
 msgstr "falta colchete de fecho"
 
+#: 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)"
@@ -1541,11 +1763,6 @@ msgstr "erro ao criar pipe `%.255s'"
 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'"
-
 #: src/archives.c utils/update-alternatives.c
 #, c-format
 msgid "error creating symbolic link '%.255s'"
@@ -2049,6 +2266,10 @@ msgstr "fim de ficheiro em stdin na prompt do ficheiro de configuração"
 msgid "conffile difference visualizer"
 msgstr "visualizador de diferenças de conffile"
 
+#: src/configure.c
+msgid "Useful environment variables:\n"
+msgstr ""
+
 #: src/configure.c
 msgid "Type 'exit' when you're done.\n"
 msgstr "Escreva `exit' quando tiver terminado.\n"
@@ -2406,7 +2627,21 @@ msgstr ""
 " --truename <ficheiro>     retornar o ficheiro desviado.\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 "
@@ -2415,6 +2650,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2449,6 +2685,12 @@ 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 ""
+
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
 msgid "cannot stat file '%s'"
@@ -2568,6 +2810,13 @@ msgstr ""
 "Ignorar pedido para renomear o ficheiro '%s' que pertence ao pacote desviado "
 "'%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"
@@ -2613,19 +2862,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"
@@ -2923,116 +3159,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "a ultrapassar problema porque --force está activo: "
 
-#: 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/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/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/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/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/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/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/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/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/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/filesdb.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"
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "a ler lista de ficheiros para o pacote '%.250s'"
-
-#: src/filesdb.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'"
-
-#: src/filesdb.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"
-
-#: src/filesdb.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'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(A ler a base de dados ... "
-
-#: 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 ficheiro(s) e directório(s) actualmente instalados.)\n"
-msgstr[1] "%d ficheiros e directórios actualmente instalados.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "não instalado"
@@ -3096,42 +3222,6 @@ 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"
@@ -3848,6 +3938,12 @@ msgstr "Arquitectura"
 msgid "Description"
 msgstr "Descrição"
 
+#: src/querycmd.c
+#, fuzzy
+#| msgid "showing file on pager"
+msgid "showing package list on pager"
+msgstr "a mostrar ficheiro no pager"
+
 #: src/querycmd.c
 #, c-format
 msgid "diversion by %s from: %s\n"
@@ -3883,6 +3979,16 @@ msgstr "não foi encontrado caminho coincidindo com o padrão %s"
 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
+#, 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 ""
+"Utilize dpkg --info (= dpkg-deb --info) para examinar ficheiros de arquivo,\n"
+"e dpkg --contents (= dpkg-deb --contents) para listar o seu conteúdo.\n"
+
 #: src/querycmd.c
 #, c-format
 msgid "package '%s' is not available"
@@ -3909,9 +4015,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 ""
 "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"
@@ -3953,19 +4062,33 @@ msgstr ""
 "Ferramenta de consulta de programa de gestão de pacotes %s versão %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 ""
@@ -4383,65 +4506,6 @@ 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
-#, 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'"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Escreva dpkg-trigger --help para ajuda acerca deste utilitário."
@@ -4657,6 +4721,12 @@ 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
+#, fuzzy
+#| msgid "statoverride file contains empty line"
+msgid "conffile file contains an empty line"
+msgstr "ficheiro statoverride 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"
@@ -5182,17 +5252,19 @@ msgstr "não pode fechar o pipe do descompressor"
 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"
+#, fuzzy, c-format
+#| msgid "unexpected eof in package name at line %d"
+msgid "unexpected pre-existing pathname %s"
+msgstr "eof inesperado no nome do pacote na linha %d"
+
+#: dpkg-deb/extract.c
+msgid "failed to chdir to directory"
+msgstr "falhou o chdir para o directório"
 
 #: dpkg-deb/extract.c
 msgid "<decompress>"
@@ -6545,6 +6617,37 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "opção obsoleta '--%s'; por favor utilize antes '--%s'"
 
@@ -6614,9 +6717,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 +6999,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 +7023,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"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 42122dc93..23766263e 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: 2018-09-26 04:22+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'"
@@ -382,6 +383,13 @@ msgstr "impossível executar \"seek\" no começo de %.250s após enchimento"
 msgid "unable to open lock file %s for testing"
 msgstr "impossível abrir tmpfile para vsnprintf"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr ""
+"impossível abrir/criar arquivo de bloqueio do banco de dados de estados"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr ""
@@ -392,6 +400,10 @@ msgid "you do not have permission to lock the dpkg status database"
 msgstr ""
 "você não tem permissão para bloquear o banco de dados de estados do dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -445,6 +457,196 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "falhou ao abrir arquivo \"statoverride\""
+
+#: 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
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr "falhou ao abrir arquivo \"statoverride\""
+
+#: 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"
@@ -608,24 +810,28 @@ msgid "invalid package name (%.250s)"
 msgstr "nome de pacote inválido (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "poucos valores no campo de detalhes de arquivo '%s' (comparado a outros)"
 
@@ -841,6 +1047,29 @@ msgstr ""
 "impossível definir o modo do novo arquivo de configuração (\"conffile\") "
 "\"dist\" '%.250s'"
 
+#: 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"
@@ -865,8 +1094,9 @@ msgid "unable to lock %s"
 msgstr "impossível desbloquear %s: %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "impossível efetuar \"flush\" em vsnprintf "
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -889,13 +1119,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"
@@ -1308,11 +1538,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 +1554,11 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "\"altname\" faltando"
 
+#: 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)"
@@ -1667,12 +1897,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'"
@@ -2237,6 +2461,10 @@ msgstr ""
 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,6 +2852,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2666,6 +2895,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"
@@ -2800,6 +3035,13 @@ msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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"
@@ -2848,19 +3090,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"
@@ -3172,122 +3401,6 @@ 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"
-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"
-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"
-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"
-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/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/filesdb-hash.c
-#, fuzzy, c-format
-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"
-
-#: 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 ""
-"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/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/filesdb.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"
-
-#: 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/filesdb.c
-#, fuzzy, c-format
-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"
-
-#: 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/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "erro fechando arquivo com lista de arquivos do pacote '%.250s'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Lendo banco de dados ... "
-
-#: 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 arquivos e diretórios atualmente instalados).\n"
-msgstr[1] "%d arquivos e diretórios atualmente instalados).\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "não instalado"
@@ -3350,42 +3463,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"
@@ -4156,6 +4233,10 @@ msgstr " (pacote: "
 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"
@@ -4193,6 +4274,16 @@ msgstr "Nenhum pacote encontrado casando com %s.\n"
 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"
@@ -4220,9 +4311,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 +4364,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 ""
@@ -4716,69 +4810,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "arquivo \"statoverride\" '%.250s'"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Digite dpkg-trigger --help para ajuda sobre este utilitário."
@@ -5040,6 +5071,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"
@@ -5614,17 +5651,19 @@ msgstr ""
 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
@@ -7064,6 +7103,47 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "Aviso: opção obsoleta '--%s'\n"
@@ -7147,9 +7227,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"
 
@@ -7444,11 +7521,6 @@ msgstr ""
 #~ msgid "it is a slave of %s"
 #~ 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"
@@ -7475,11 +7547,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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'"
diff --git a/po/ro.po b/po/ro.po
index 39d0d59a7..f36d14d1d 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -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: 2018-09-26 04:22+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”"
@@ -401,6 +402,12 @@ msgstr "nu se poate căuta începutul lui %.250s după completarea cu spații"
 msgid "unable to open lock file %s for testing"
 msgstr "nu se poate deschide fișierul de blocare %s pentru testare"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+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"
 msgstr "nu se poate deschide/crea fișierul de blocare a bazei de date"
@@ -409,6 +416,10 @@ msgstr "nu se poate deschide/crea fișierul de blocare a bazei de date"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "nu aveți drepturi de blocare a bazei de date dpkg status"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -462,6 +473,211 @@ 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
+#, 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"
+
+#: 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
+#, 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"
+
+#: 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"
@@ -630,24 +846,28 @@ msgid "invalid package name (%.250s)"
 msgstr "nume nevalid de pachet (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "prea puține valori în câmpul detaliilor fișier „%s” (comparativ cu altele)"
 
@@ -860,6 +1080,30 @@ msgstr "nu se poate schimba apartenența fișierului țintă „%.250s”"
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -885,9 +1129,9 @@ msgstr "nu se poate închide %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/log.c
 #, fuzzy, c-format
@@ -910,13 +1154,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"
@@ -1344,11 +1588,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 +1602,11 @@ msgstr ""
 msgid "missing closing brace"
 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ă)"
@@ -1709,14 +1953,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'"
@@ -2291,6 +2527,10 @@ msgstr "eroare de citire de la stdin la promptul despre fișierul conffile"
 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 +2904,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,6 +2927,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2709,6 +2964,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'"
@@ -2832,6 +3093,13 @@ msgstr "Se adaugă „%s”\n"
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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"
@@ -2878,19 +3146,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"
@@ -3207,142 +3462,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "problemă la forțare datorită activării lui --force: "
 
-#: 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 ""
-"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"
-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"
-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"
-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'"
-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'"
-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"
-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'"
-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'"
-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'"
-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."
-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."
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-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"
-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/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-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/filesdb.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"
-
 #: src/help.c
 msgid "not installed"
 msgstr "neinstalat"
@@ -3417,43 +3536,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"
@@ -4257,6 +4339,12 @@ msgstr "numele pachetului"
 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"
@@ -4294,6 +4382,16 @@ msgid "package '%s' is not installed and no information is available"
 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"
@@ -4321,9 +4419,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 +4485,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 ""
@@ -4860,71 +4961,6 @@ 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
-#, 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”"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Tastați dpkg-trigger --help pentru ajutor despre acest utilitar."
@@ -5183,6 +5219,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"
@@ -5755,17 +5797,19 @@ msgstr ""
 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>"
@@ -7289,6 +7333,57 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s', please use '--%s' instead."
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
@@ -7370,9 +7465,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 +7728,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 +7752,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..648fa89a8 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: 2018-09-26 04:22+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»"
@@ -347,6 +348,12 @@ msgstr "не удалось перейти к началу %.250s после в
 msgid "unable to open lock file %s for testing"
 msgstr "не удалось открыть файл блокировки %s для тестирования"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "не удалось открыть/создать файл блокировки базы данных состояний"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "не удалось открыть/создать файл блокировки базы данных состояний"
@@ -355,6 +362,10 @@ msgstr "не удалось открыть/создать файл блокир
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "у вас нет прав на блокирование базы данных состояний dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "база данных состояния dpkg"
@@ -406,6 +417,188 @@ 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 user '%s' in statoverride file"
+msgstr "неизвестный пользователь «%s» в файле statoverride"
+
+#: 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 group '%s' in statoverride file"
+msgstr "неизвестная группа «%s» в файле statoverride"
+
+#: 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"
@@ -564,25 +757,29 @@ msgid "invalid package name (%.250s)"
 msgstr "недопустимое имя пакета (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "в информационном поле «%s» слишком мало значений (по сравнению с остальными)"
 
@@ -775,6 +972,30 @@ msgstr "не удалось изменить владельца файла на
 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"
@@ -796,8 +1017,10 @@ msgid "unable to lock %s"
 msgstr "не удалось заблокировать %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "показывает файл в пейджере"
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "не удалось сбросить на диск файл «%s»"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -819,13 +1042,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"
@@ -1229,12 +1452,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 +1465,12 @@ msgstr "ширина поля вне допустимого диапазона"
 msgid "missing closing brace"
 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 "(описание недоступно)"
@@ -1584,11 +1807,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'"
@@ -2094,6 +2312,10 @@ msgstr "ошибка чтения ответа на запрос из поток
 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 +2678,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,6 +2701,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2500,6 +2737,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'"
@@ -2619,6 +2862,13 @@ 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 ""
+
 #: src/divertcmd.c
 #, c-format
 msgid "No diversion '%s', none removed.\n"
@@ -2664,19 +2914,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"
@@ -2987,115 +3224,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "проблема игнорируется, поскольку задан параметр --force:"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "в конце управляющего файла «%s» пакетом «%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"
-msgstr "в конце управляющего файла «%s» пакетом «%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 separator"
-msgstr "в конце управляющего файла «%s» пакетом «%s» нет символа новой строки"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "в управляющем файле «%s» пакета «%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 "не удалось открыть управляющий файл «%s» пакета «%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'"
-msgstr "не удалось выполнить stat для управляющего файла «%s» пакета «%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 "файл «%s» пакета «%s» не является обычным файлом"
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "не удалось открыть список файлов пакета «%.250s»"
-
-#: src/filesdb.c
-#, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr ""
-"список файлов пакета «%.250s» отсутствует; предполагаем, что на данный "
-"момент у пакета нет установленных файлов"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "не удалось открыть список файлов пакета «%.250s»"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "список файлов пакета «%.250s» не является обычным файлом"
-
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "чтение списка файлов пакета «%.250s»"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr ""
-"в списке файлов пакета «%.250s» отсутствует завершающий символ новой строки"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "список файлов пакета «%.250s» содержит пустое имя файла"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "ошибка при закрытии списка файлов пакета «%.250s»"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Чтение базы данных … "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "не установлен"
@@ -3164,42 +3292,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"
@@ -3976,6 +4068,12 @@ msgstr "Архитектура"
 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"
@@ -4012,6 +4110,18 @@ msgstr "не найден путь, подходящий под шаблон %s"
 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"
@@ -4038,9 +4148,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 +4196,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 ""
@@ -4513,68 +4640,6 @@ 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
-#, 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"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Чтобы получить справку, введите dpkg-trigger --help."
@@ -4791,6 +4856,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"
@@ -5325,17 +5396,19 @@ msgstr "невозможно закрыть канал разжимающего
 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>"
@@ -6712,6 +6785,41 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "устаревший параметр «--%s»; вместо него используйте «--%s»."
 
@@ -6783,9 +6891,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 +7147,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 +7171,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/sk.po b/po/sk.po
index 5cd12619c..f4d299ad2 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: 2018-09-26 04:22+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“"
@@ -349,6 +350,12 @@ msgstr "po naplnení nie je možné presunúť sa na začiatok %.250s"
 msgid "unable to open lock file %s for testing"
 msgstr "nie je možné otvoriť súbor zámku %s na testovanie"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "nie je možné otvoriť/vytvoriť zamykací súbor stavovej databázy"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "nie je možné otvoriť/vytvoriť zamykací súbor stavovej databázy"
@@ -357,6 +364,10 @@ msgstr "nie je možné otvoriť/vytvoriť zamykací súbor stavovej databázy"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "nemáte oprávnenie na uzamknutie stavovej databázy dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "stavová databáza dpkg"
@@ -408,6 +419,192 @@ 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
+#, 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"
+
+#: 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
+#, 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"
+
+#: 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"
@@ -563,25 +760,29 @@ msgid "invalid package name (%.250s)"
 msgstr "chybné meno balíka (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "príliš málo hodnôt v poli s podrobnosťami súboru „%s“ (v porovnaní ostatnými)"
 
@@ -786,6 +987,30 @@ msgstr "nie je možné zmeniť vlastníctvo cieľového súboru „%.250s“"
 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"
@@ -807,8 +1032,10 @@ 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
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "nie je možné vyprázdniť (flush) súbor „%s“"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -830,13 +1057,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"
@@ -1237,12 +1464,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 +1477,12 @@ msgstr "pole šírka je mimo platného rozsahu"
 msgid "missing closing brace"
 msgstr "chýba pravá zložená zátvorka"
 
+#: 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)"
@@ -1588,11 +1815,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'"
@@ -2132,6 +2354,10 @@ msgstr ""
 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 +2718,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,6 +2741,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2535,6 +2776,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'"
@@ -2656,6 +2903,13 @@ msgstr ""
 "Ignoruje sa požiadavka na premenovanie súboru „%s“, ktorý vlastneného "
 "odklonením balíka „%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"
@@ -2701,19 +2955,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"
@@ -3027,116 +3268,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "prekonáva sa problém, pretože je nastavené --force: "
 
-#: 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/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/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/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/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/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/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/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/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/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/filesdb.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"
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "číta sa zoznam súborov balíka „%.250s“"
-
-#: src/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "chyba pri zatváraní zoznamu súborov balíka „%.250s“"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Číta sa databáza ... "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "nenainštalovaný"
@@ -3206,43 +3337,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"
@@ -4043,6 +4137,12 @@ msgstr "Architektúra"
 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"
@@ -4078,6 +4178,16 @@ msgid "package '%s' is not installed and no information is available"
 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"
@@ -4104,9 +4214,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 +4260,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 ""
@@ -4591,70 +4718,6 @@ 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
-#, 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"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Pomocníka k tomuto nástroju zobrazíte napísaním dpkg-trigger --help"
@@ -4888,6 +4951,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"
@@ -5410,17 +5479,19 @@ msgstr "nie je možné zatvoriť rúru dekompresora"
 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>"
@@ -6786,6 +6857,41 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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í"
+
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "zastaraná voľba „--%s“. Prosím, použite namiesto nej „--%s“"
 
@@ -6859,9 +6965,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..f7d435691 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: 2018-09-26 04:22+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\""
@@ -345,6 +346,12 @@ msgstr "kunde inte söka till början av %.250s efter utfyllnad"
 msgid "unable to open lock file %s for testing"
 msgstr "kunde inte låsa filen %s för test"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "kunde inte öppna/skapa låsfil för statusdatabas"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "kunde inte öppna/skapa låsfil för statusdatabas"
@@ -353,6 +360,10 @@ msgstr "kunde inte öppna/skapa låsfil för statusdatabas"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "du har inte rättigheter att låsa dpkgs statusdatabas"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "dpkg-statusdatabas"
@@ -404,6 +415,186 @@ 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 user '%s' in statoverride file"
+msgstr "användaren \"%s\" i statoverride-filen är okänd"
+
+#: 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 group '%s' in statoverride file"
+msgstr "gruppen \"%s\" i statoverride-filen är okänd"
+
+#: 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"
@@ -559,23 +750,27 @@ msgid "invalid package name (%.250s)"
 msgstr "ogiltigt paketnamn (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "för få värden i fildetaljsfältet \"%s\" (jämfört med andra)"
 
 #: lib/dpkg/fields.c
@@ -767,6 +962,30 @@ msgstr "kunde inte ändra ägandeskap på målfilen \"%.250s\""
 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"
@@ -788,8 +1007,10 @@ 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
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "kunde inte tömma (flush) filen \"%s\""
 
 #: lib/dpkg/log.c
 #, c-format
@@ -811,13 +1032,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"
@@ -1209,11 +1430,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 +1443,11 @@ msgstr "fältbredden är utanför tillåtet område"
 msgid "missing closing brace"
 msgstr "avslutande klammerparentes saknas"
 
+#: 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)"
@@ -1558,11 +1779,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'"
@@ -2070,6 +2286,10 @@ msgstr "läsfel på stdin vid konfigurationsfilsfrågan"
 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 +2645,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,6 +2668,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2468,6 +2703,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'"
@@ -2587,6 +2828,13 @@ msgstr ""
 "Ignorerar begäran att byta namn på filen \"%s\" som ägs av det omdirigerande "
 "paketet \"%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"
@@ -2632,19 +2880,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"
@@ -2943,113 +3178,6 @@ msgstr "Paketet %s kvarhålles, rör det inte. --force-hold ignorerar.\n"
 msgid "overriding problem because --force enabled:"
 msgstr "ignorerar problem då --force använts:"
 
-#: 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/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/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/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/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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "kunde inte öppna fillistan för paketet \"%.250s\""
-
-#: src/filesdb.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"
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "läser fillista för paketet \"%.250s\""
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "fillistfilen för paketet \"%.250s\" saknar avslutande radbrytning"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "fillistfilen för paketet \"%.250s\" innehåller tomt filnamn"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "fel vid stängning av fillistfilen för paketet \"%.250s\""
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Läser databasen ... "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "ej installerat"
@@ -3112,42 +3240,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"
@@ -3883,6 +3975,12 @@ msgstr "Arkitektur"
 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"
@@ -3917,6 +4015,16 @@ msgstr "hittade ingen sökväg som motsvarar mönstret %s"
 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"
@@ -3943,9 +4051,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 +4097,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 ""
@@ -4406,68 +4531,6 @@ 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
-#, 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\""
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Skriv dpkg-trigger --help för hjälp om detta verktyg."
@@ -4679,6 +4742,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"
@@ -5200,17 +5269,19 @@ msgstr "kan inte stänga uppackarens rör"
 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>"
@@ -6548,6 +6619,41 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "föråldrad flagga \"--%s\", använd \"--%s\" istället"
 
@@ -6617,9 +6723,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 +6979,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 +7003,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"
diff --git a/po/th.po b/po/th.po
index 3cfda2185..32f6856be 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: 2018-09-26 04:22+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'"
@@ -339,6 +340,12 @@ msgstr "ไม่สามารถเลื่อนไปยังต้นแ
 msgid "unable to open lock file %s for testing"
 msgstr "ไม่สามารถเปิดแฟ้มล็อค %s เพื่อทดสอบ"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "ไม่สามารถเปิด/สร้างแฟ้มล็อคสำหรับฐานข้อมูลสถานะ"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "ไม่สามารถเปิด/สร้างแฟ้มล็อคสำหรับฐานข้อมูลสถานะ"
@@ -347,6 +354,10 @@ msgstr "ไม่สามารถเปิด/สร้างแฟ้มล
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "คุณไม่มีสิทธิ์ล็อคฐานข้อมูลสถานะของ dpkg"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "ฐานข้อมูลสถานะของ dpkg"
@@ -398,6 +409,182 @@ 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 user '%s' in statoverride file"
+msgstr "พบผู้ใช้ '%s' ที่ไม่รู้จักอยู่ในแฟ้ม statoverride"
+
+#: 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 group '%s' in statoverride file"
+msgstr "พบกลุ่ม '%s' ที่ไม่รู้จักอยู่ในแฟ้ม statoverride"
+
+#: 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"
@@ -553,23 +740,27 @@ msgid "invalid package name (%.250s)"
 msgstr "ชื่อแพกเกจใช้ไม่ได้ (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "มีข้อมูลจำนวนน้อยเกินไปในเขตข้อมูลรายละเอียดแฟ้ม `%s' (เมื่อเทียบกับข้อมูลอื่น)"
 
 #: lib/dpkg/fields.c
@@ -755,6 +946,30 @@ msgstr "ไม่สามารถเปลี่ยนเจ้าของแ
 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"
@@ -775,10 +990,11 @@ 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
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "ไม่สามารถ flush แฟ้ม '%s'"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -800,13 +1016,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"
@@ -1195,11 +1411,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 +1424,11 @@ msgstr "ความกว้างเขตข้อมูลอยู่นอ
 msgid "missing closing brace"
 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 "(ไม่มีคำบรรยาย)"
@@ -1539,11 +1755,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'"
@@ -2029,6 +2240,10 @@ msgstr "เกิดข้อผิดพลาดในการอ่าน st
 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 +2594,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,6 +2617,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2419,6 +2649,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'"
@@ -2536,6 +2772,13 @@ msgstr "กำลังเพิ่ม '%s'\n"
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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 ""
+
 #: src/divertcmd.c
 #, c-format
 msgid "No diversion '%s', none removed.\n"
@@ -2581,19 +2824,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"
@@ -2891,110 +3121,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "จะข้ามปัญหาไปเพราะมีการเปิดตัวเลือก --force:"
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%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"
-msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%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 separator"
-msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "แฟ้มควบคุม '%s' ของแพกเกจ '%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 "ไม่สามารถเปิดแฟ้มควบคุม '%s' ของแพกเกจ '%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'"
-msgstr "ไม่สามารถ stat แฟ้มควบคุม '%s' ของแพกเกจ '%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 "แฟ้ม '%s' ของแพกเกจ '%s' ไม่ใช่แฟ้มธรรมดา"
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "ไม่สามารถเปิดแฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s'"
-
-#: src/filesdb.c
-#, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s' ขาดหายไป จะถือว่าแพกเกจไม่ได้ติดตั้งแฟ้มใดในระบบ"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "ไม่สามารถ stat แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s'"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s' ไม่ใช่แฟ้มธรรมดา"
-
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "เกิดปัญหาขณะอ่านรายชื่อแฟ้มของแพกเกจ '%.250s'"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ '%.250s' ขาดอักขระขึ้นบรรทัดใหม่ที่ท้ายบรรทัด"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "แฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s' มีรายการชื่อแฟ้มที่ว่างเปล่า"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "เกิดข้อผิดพลาดขณะปิดแฟ้มรายชื่อแฟ้มของแพกเกจ `%.250s'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(กำลังอ่านฐานข้อมูล ... "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "ไม่ได้ติดตั้ง"
@@ -3053,41 +3179,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"
@@ -3815,6 +3906,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"
@@ -3849,6 +3947,16 @@ msgstr "ไม่พบพาธที่ตรงกับแพตเทิร
 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"
@@ -3875,9 +3983,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 +4029,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 ""
@@ -4330,68 +4455,6 @@ 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
-#, 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'"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "พิมพ์ dpkg-trigger --help เพื่อดูวิธีใช้โปรแกรมนี้"
@@ -4600,6 +4663,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"
@@ -5098,17 +5167,19 @@ msgstr "ไม่สามารถปิดไปป์ของเครื่
 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>"
@@ -6428,6 +6499,41 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "ตัวเลือก '--%s' เลิกใช้แล้ว กรุณาใช้ '--%s' แทน"
 
@@ -6497,9 +6603,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 +6798,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 +6822,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 ไบต์)"
 
diff --git a/po/tl.po b/po/tl.po
index b18860fc5..7bde401aa 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: 2018-09-26 04:22+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'"
@@ -368,6 +369,12 @@ msgstr "di makapag-seek sa umpisa ng %.250s matapos mag-pad"
 msgid "unable to open lock file %s for testing"
 msgstr "hindi mabuksan ang tmpfile para sa vsnprintf"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "hindi mabuksan/malikha ang status database lockfile"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "hindi mabuksan/malikha ang status database lockfile"
@@ -376,6 +383,10 @@ msgstr "hindi mabuksan/malikha ang status database lockfile"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "wala kayong pahintulot na ialdaba ang dpkg status database"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 #, fuzzy
 #| msgid "unable to lock dpkg status database"
@@ -431,6 +442,201 @@ 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
+#, fuzzy, c-format
+msgid "unknown user '%s' in statoverride file"
+msgstr "bigo sa pagbukas ng talaksang statoverride"
+
+#: 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
+#, fuzzy, c-format
+msgid "unknown group '%s' in statoverride file"
+msgstr "bigo sa pagbukas ng talaksang statoverride"
+
+#: 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"
@@ -581,26 +787,30 @@ msgid "invalid package name (%.250s)"
 msgstr "di tanggap na pangalan ng pakete (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "labis na kakaunti ang halaga sa saklaw ng detalyeng talaksan `%s' (hinambing "
 "sa iba)"
@@ -809,6 +1019,26 @@ msgstr "hindi mapalitan ang pagmamayari ng bagong dist conffile `%.250s'"
 msgid "unable to set mode of target file '%.250s'"
 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"
@@ -831,8 +1061,9 @@ msgid "unable to lock %s"
 msgstr "hindi ma-execute ang %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr ""
+#, fuzzy
+msgid "pager to show file"
+msgstr "hindi maka-flush sa vsnprintf"
 
 #: lib/dpkg/log.c
 #, fuzzy, c-format
@@ -856,13 +1087,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"
@@ -1265,11 +1496,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 +1511,11 @@ msgstr ""
 msgid "missing closing brace"
 msgstr "kulang na %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 ""
+
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
 msgstr "(walang paglalarawan)"
@@ -1603,11 +1834,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'"
@@ -2165,6 +2391,10 @@ msgstr "error sa pagbasa ng stdin sa prompt ng conffile"
 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,6 +2772,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2559,6 +2790,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'"
@@ -2680,6 +2917,13 @@ msgstr ""
 "dpkg - babala: hindi pinapansin ang hiling na tanggalin ang %.250s na hindi\n"
 " 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"
@@ -2723,19 +2967,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"
@@ -3054,135 +3285,6 @@ 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"
-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"
-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"
-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"
-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'"
-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'"
-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"
-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/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 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'"
-msgstr ""
-"hindi mabuksan ang talaksan ng listahan ng talaksan para sa paketeng `%.250s'"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, fuzzy, c-format
-msgid "unable to stat files list file for package '%.250s'"
-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"
-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/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr ""
-"error sa pagsara ng talaksang listahan ng mga talaksan ng pakete `%.250s'"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Binabasa ang database ... "
-
-#: 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 na talaksan at directory ay kasalukuyang nakaluklok.)\n"
-msgstr[1] "%d na talaksan at directory ay kasalukuyang nakaluklok.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "hindi nakaluklok"
@@ -3246,42 +3348,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"
@@ -3999,6 +4065,10 @@ msgstr " (pakete: "
 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"
@@ -4038,6 +4108,16 @@ msgstr "Walang paketeng tugma sa %s.\n"
 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"
@@ -4065,9 +4145,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 +4199,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 ""
@@ -4547,69 +4630,6 @@ 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
-#, fuzzy, c-format
-msgid "multiple statoverrides present for file '%.250s'"
-msgstr "talaksang statoverride `%.250s'"
-
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4825,6 +4845,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"
@@ -5388,17 +5414,19 @@ msgstr ""
 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
@@ -6702,6 +6730,56 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "Babala: laos na opsyon `--%s'\n"
@@ -6785,9 +6863,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"
 
@@ -7035,10 +7110,6 @@ msgstr ""
 #~ msgid "--build takes at most two arguments"
 #~ 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"
@@ -7064,10 +7135,6 @@ msgstr ""
 #~ msgid "unable to close %s: %s"
 #~ 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 702939f41..8ef757ced 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ 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"
+"POT-Creation-Date: 2018-09-26 04:22+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"
@@ -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ı"
@@ -346,6 +347,12 @@ msgstr "dolgu yapıldıktan sonra %.250s dosyasının başına gidilemedi"
 msgid "unable to open lock file %s for testing"
 msgstr "kilit dosyası %s denetim amaçlı açılamadı"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "durum veritabanı kilit dosyası açılamadı/oluşturulamadı"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "durum veritabanı kilit dosyası açılamadı/oluşturulamadı"
@@ -354,6 +361,10 @@ msgstr "durum veritabanı kilit dosyası açılamadı/oluşturulamadı"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "dpkg durum veritabanını kilitlemek için gerekli izine sahip değilsiniz"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "dpkg durum veritabanı"
@@ -405,6 +416,186 @@ 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 user '%s' in statoverride file"
+msgstr "'statoverride' dosyasında bilinmeyen '%s' kullanıcısı"
+
+#: 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 group '%s' in statoverride file"
+msgstr "'statoverride' dosyasında bilinmeyen '%s' grubu"
+
+#: 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
 msgid "format version with too big major component"
 msgstr "biçim sürümünün ana bileşeni çok büyük"
@@ -538,24 +729,28 @@ msgid "invalid package name (%.250s)"
 msgstr "geçersiz paket adı (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr ""
 "dosya ayrıntıları alanı (%s) diğer alanlara kıyasla çok az değer içeriyor"
 
@@ -747,6 +942,30 @@ msgstr "hedef dosyanın (%.250s) sahibi değiştirilemedi"
 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"
@@ -768,8 +987,10 @@ 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
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "'%s' dosyasına flush çağrısı yapılamadı"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -791,13 +1012,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"
@@ -1191,11 +1412,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"
@@ -1209,6 +1425,11 @@ msgstr "alan genişliği aralığın dışında"
 msgid "missing closing brace"
 msgstr "kapatma parantezi eksik"
 
+#: 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)"
@@ -1533,11 +1754,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'"
@@ -2050,6 +2266,10 @@ msgstr ""
 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"
@@ -2406,7 +2626,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 "
@@ -2415,6 +2649,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2451,6 +2686,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'"
@@ -2570,6 +2811,13 @@ msgstr ""
 "yönlendiren paketin (%2$s) sahip olduğu '%1$s' paketinin yönlendirilme "
 "isteği gözardı ediliyor\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"
@@ -2615,19 +2863,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"
@@ -2924,112 +3159,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "--force seçeneği kullanımda olduğu için sorunlar gözardı ediliyor:"
 
-#: src/filesdb-hash.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"
-
-#: 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/filesdb-hash.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"
-
-#: 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/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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "'%.250s' paketinin dosyalarını listeleyen dosya açılamadı"
-
-#: src/filesdb.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"
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "'%.250s' paketinin dosya listesi okunuyor"
-
-#: src/filesdb.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"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "'%.250s' paketinin dosya listesi dosyası boş satır içeriyor"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "'%.250s' paketinin dosya listesi dosyası kapatılamadı"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Veritabanı okunuyor ... "
-
-#: 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 dosya veya dizin kurulu durumda.)\n"
-msgstr[1] "%d dosya veya dizin kurulu durumda.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "kurulu değil"
@@ -3096,42 +3225,6 @@ 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"
@@ -3850,6 +3943,12 @@ msgstr "Mimari"
 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"
@@ -3886,6 +3985,16 @@ msgstr "%s örüntüsüne uyan bir konum bulunamadı"
 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"
@@ -3912,9 +4021,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"
@@ -3955,19 +4067,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 ""
@@ -4375,65 +4501,6 @@ 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/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4649,6 +4716,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"
@@ -5158,17 +5231,18 @@ msgstr "sıkıştırmayı açma borusu kapatılamıyor"
 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>"
@@ -6517,6 +6591,34 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 "update-alternatives komutunu çalıştırmak için kimlik doğrulama gerekmektedir"
 
+#~ 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 "failed to chdir to directory after creating it"
+#~ msgstr "dizin oluşturulduktan sonra dizine geçilemedi"
+
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr ""
 #~ "'--%s' seçeneği kullanımdan kalkmıştır; lütfen bunun yerine '--%s' "
diff --git a/po/vi.po b/po/vi.po
index 8ef4e3253..e963ad79f 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: 2018-09-26 04:22+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”"
@@ -348,6 +349,12 @@ msgstr "không thể tìm vị trí tới đầu của %.250s sau khi đệm ló
 msgid "unable to open lock file %s for testing"
 msgstr "không thể mở tập tin khóa %s để thử"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+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 "unable to open/create status database lockfile"
 msgstr "không thể mở/tạo tập tin khóa của cơ sở dữ liệu trạng thái"
@@ -356,6 +363,10 @@ msgstr "không thể mở/tạo tập tin khóa của cơ sở dữ liệu trạ
 msgid "you do not have permission to lock the dpkg status database"
 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 frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "cơ sở dữ liệu trạng thái dpkg"
@@ -407,6 +418,186 @@ 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 user '%s' in statoverride file"
+msgstr "gặp người dùng chưa biết “%s” trong tập tin stateoverride"
+
+#: 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 group '%s' in statoverride file"
+msgstr " nhóm chưa biết “%s” trong tập tin stateoverride"
+
+#: 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"
@@ -562,24 +753,28 @@ msgid "invalid package name (%.250s)"
 msgstr "tên gói không hợp lệ (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (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)"
 
@@ -769,6 +964,30 @@ msgstr "không thể thay đổi quyền sở hữu tập tin đích “%.250s
 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"
@@ -790,8 +1009,10 @@ 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
+#| 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/log.c
 #, c-format
@@ -813,13 +1034,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"
@@ -1212,11 +1433,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 +1446,11 @@ 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-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ả)"
@@ -1560,11 +1781,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'"
@@ -2069,6 +2285,10 @@ msgstr ""
 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 +2645,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,6 +2668,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2469,6 +2704,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'"
@@ -2588,6 +2829,13 @@ msgstr ""
 "Lờ đi các yêu cầu đổi tên tập tin “%s” được sở hữu bởi gói làm trệch hướng "
 "“%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"
@@ -2633,19 +2881,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"
@@ -2959,116 +3194,6 @@ 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"
-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"
-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"
-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/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/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/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/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/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/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/filesdb.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"
-
-#: 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/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/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "đọc danh sách tập tin từ gói “%.250s”"
-
-#: src/filesdb.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"
-
-#: src/filesdb.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"
-
-#: src/filesdb.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”"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(Đang đọc cơ sở dữ liệu … "
-
-#: 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 tập tin và thư mục hiện đã được cài đặt.)\n"
-
 #: src/help.c
 msgid "not installed"
 msgstr "chưa cài đặt"
@@ -3132,42 +3257,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"
@@ -3940,6 +4029,12 @@ msgstr "Kiến trúc"
 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"
@@ -3974,6 +4069,20 @@ msgstr "không có đường dẫn nào khớp với mẫu “%s”"
 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"
@@ -4000,9 +4109,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 +4159,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 ""
@@ -4466,65 +4592,6 @@ 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/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Gõ “dpkg-trigger --help” để xem trợ giúp về tiện ích này."
@@ -4736,6 +4803,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"
@@ -5247,17 +5320,19 @@ msgstr "không thể đóng ống dẫn giải nén"
 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>"
@@ -6625,6 +6700,41 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "tùy chọn “--%s” đã lạc hậu; hãy dùng “--%s” để thay thế"
 
@@ -6697,9 +6807,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 d6505ce71..0fb80b185 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "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"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2018-08-12 13:18+0200\n"
 "Last-Translator: Mo Zhou <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -148,7 +148,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"
@@ -353,6 +354,12 @@ msgstr "补齐后无法找到 %.250s 的起始位置"
 msgid "unable to open lock file %s for testing"
 msgstr "无法打开锁文件 %s 以进行测试"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "无法打开或创建状态数据库的锁文件"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "无法打开或创建状态数据库的锁文件"
@@ -361,6 +368,10 @@ msgstr "无法打开或创建状态数据库的锁文件"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "您没有锁定 dpkg 的状态数据库的权限"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "dpkg 状态数据库"
@@ -412,6 +423,178 @@ 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 "信息数据库格式(%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
+#, fuzzy, c-format
+#| msgid "cannot read control file '%s' 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 "无法打开转移文件"
+
+#: 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
+#, 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 user '%s' in statoverride file"
+msgstr "在 statoverride 文件中有未知用户 '%s'"
+
+#: 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 group '%s' in statoverride file"
+msgstr "statoverride 文件有无效组 %s "
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "存在多个 statoverride 用于文件  %.250s"
+
 #: lib/dpkg/deb-version.c
 msgid "format version with too big major component"
 msgstr "格式版本的主版本部分过大"
@@ -543,23 +726,27 @@ msgid "invalid package name (%.250s)"
 msgstr "软件包名称无效 (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "文件详情字段 %s 的值过少(和其他的相比)"
 
 #: lib/dpkg/fields.c
@@ -745,6 +932,30 @@ msgstr "无法改变目标文件 %.250s 的所有者"
 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 "无法获取 %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 "归档 '%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"
@@ -766,8 +977,10 @@ msgid "unable to lock %s"
 msgstr "无法锁定 %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "在分页器中显示文件内容"
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "无法清空文件 %s"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -789,13 +1002,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"
@@ -1170,11 +1383,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"
@@ -1188,6 +1396,11 @@ msgstr "字段宽度超出范围"
 msgid "missing closing brace"
 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 "(无描述)"
@@ -1499,11 +1712,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'"
@@ -1981,6 +2189,10 @@ msgstr "在 conffile 提示时读取标准输入时遭遇 EOF"
 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"
@@ -2331,7 +2543,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 "
@@ -2340,6 +2566,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2372,6 +2599,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'"
@@ -2489,6 +2722,13 @@ msgstr "正在添加 %s\n"
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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 ""
+
 #: src/divertcmd.c
 #, c-format
 msgid "No diversion '%s', none removed.\n"
@@ -2534,19 +2774,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,105 +3061,6 @@ msgstr ""
 msgid "overriding problem because --force enabled:"
 msgstr "由于开启了 --force 选项，以下问题被忽略："
 
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing final newline"
-msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少结尾换行符"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value"
-msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少值"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is missing value separator"
-msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少值分隔符"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' contains empty filename"
-msgstr "软件包 '%2$s' 的控制文件 '%1$s' 含有空文件名"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot open control file '%s' for package '%s'"
-msgstr "无法打开软件包 %2$s 的 %1$s 控制文件"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot stat control file '%s' for package '%s'"
-msgstr "无法取得软件包 %2$s 的 %1$s 控制文件状态"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "control file '%s' for package '%s' is not a regular file"
-msgstr "软件包 '%2$s' 的 '%1$s' 控制文件文件不是常规文件"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot read control file '%s' for package '%s'"
-msgstr "无法读取软件包 '%2$s' 的 '%1$s' 控制文件"
-
-#: src/filesdb-hash.c
-#, c-format
-msgid "cannot close control file '%s' for package '%s'"
-msgstr "无法关闭软件包 '%2$s' 的 '%1$s' 控制文件"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "无法打开软件包 %.250s 的文件名列表文件"
-
-#: src/filesdb.c
-#, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr ""
-"无法找到软件包 %.250s 的文件名列表文件，现假定该软件包目前没有任何文件被安装"
-"在系统里。"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "无法取得软件包 %.250s 的文件名列表文件"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "软件包 %.250s 的文件名列表文件不是一个常规文件"
-
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "正在读取软件包 %.250s 的文件列表"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "软件包 %.250s 的文件名列表文件缺少最后结尾的换行符"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "软件包 %.250s 的文件名列表文件含有空的文件名"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "关闭软件包 %.250s 的文件名列表文件时出错"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "(正在读取数据库 ... "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "未安装"
@@ -2992,40 +3120,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"
@@ -3709,6 +3803,12 @@ msgstr "体系结构"
 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"
@@ -3743,6 +3843,16 @@ msgstr "没有找到与 %s 相匹配的路径"
 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"
@@ -3769,9 +3879,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"
@@ -3812,19 +3925,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 ""
@@ -4208,65 +4335,6 @@ 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/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "输入 'dpkg-trigger --help' 以获取此功能的帮助信息。"
@@ -4475,6 +4543,12 @@ msgstr "正在反配置 %s (%s)，以允许删除 %s (%s) ...\n"
 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"
@@ -4955,17 +5029,19 @@ msgstr "无法关闭解压管道"
 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
 msgid "<decompress>"
@@ -6240,6 +6316,33 @@ msgstr "运行 update-alternatives 工具以修改系统可选项的选择情况
 msgid "Authentication is required to run update-alternatives"
 msgstr "需要认证后才能执行 update-alternatives"
 
+#~ 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 "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "废弃的选项 --%s，请使用 --%s 代替"
 
@@ -6309,9 +6412,6 @@ msgstr "需要认证后才能执行 update-alternatives"
 #~ 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 行的软件包名后发现文件结束符，这出乎我们的意料"
 
@@ -6556,9 +6656,6 @@ msgstr "需要认证后才能执行 update-alternatives"
 #~ 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"
 
@@ -6583,9 +6680,6 @@ msgstr "需要认证后才能执行 update-alternatives"
 #~ 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 f06570340..faa14881d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2017-10-17 01:57+0200\n"
+"POT-Creation-Date: 2018-09-26 04:22+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"
@@ -137,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'"
@@ -304,8 +305,7 @@ msgstr "壓縮方式不明"
 msgid ""
 "updates directory contains file '%.250s' whose name is too long (length=%d, "
 "max=%d)"
-msgstr ""
-"updates 目錄中的「%.250s」檔案名稱太長了（長度為 %d，最長能允許 %d）"
+msgstr "updates 目錄中的「%.250s」檔案名稱太長了（長度為 %d，最長能允許 %d）"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
@@ -343,6 +343,12 @@ msgstr "在填充後無法搜尋到 %.250s 的起始位置"
 msgid "unable to open lock file %s for testing"
 msgstr "無法開啟鎖定檔 %s 測試"
 
+#: lib/dpkg/dbmodify.c
+#, fuzzy
+#| msgid "unable to open/create status database lockfile"
+msgid "unable to open/create frontend lockfile"
+msgstr "無法開啟／建立狀態資料庫的鎖定檔"
+
 #: lib/dpkg/dbmodify.c
 msgid "unable to open/create status database lockfile"
 msgstr "無法開啟／建立狀態資料庫的鎖定檔"
@@ -351,6 +357,10 @@ msgstr "無法開啟／建立狀態資料庫的鎖定檔"
 msgid "you do not have permission to lock the dpkg status database"
 msgstr "您沒有鎖定 dpkg 的狀態資料庫的權限"
 
+#: lib/dpkg/dbmodify.c
+msgid "dpkg frontend"
+msgstr ""
+
 #: lib/dpkg/dbmodify.c
 msgid "dpkg status database"
 msgstr "無法鎖定 dpkg 的狀態資料庫"
@@ -402,6 +412,186 @@ 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
+#, fuzzy, c-format
+#| msgid "syntax error: unknown user '%s' in statoverride file"
+msgid "unknown user '%s' in statoverride file"
+msgstr "語法錯誤：statoverride 的使用者 '%s' 不明"
+
+#: lib/dpkg/db-fsys-override.c
+msgid "unexpected end of line in statoverride file"
+msgstr "statoverride 檔行尾意外中斷"
+
+#: lib/dpkg/db-fsys-override.c
+#, fuzzy, c-format
+#| msgid "syntax error: unknown group '%s' in statoverride file"
+msgid "unknown group '%s' in statoverride file"
+msgstr "語法錯誤：statoverride 檔中未知的 '%s' 群組"
+
+#: lib/dpkg/db-fsys-override.c
+#, c-format
+msgid "multiple statoverrides present for file '%.250s'"
+msgstr "檔案 '%.250s' 有好幾個 statoverride 檔"
+
 #: lib/dpkg/deb-version.c
 msgid "format version with too big major component"
 msgstr "格式版本中的主版本號太大"
@@ -531,23 +721,27 @@ msgid "invalid package name (%.250s)"
 msgstr "無效的套件名稱 (%.250s)"
 
 #: 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 field '%s'"
 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 field '%s' 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 field '%s' (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 field '%s' (compared to others)"
 msgstr "檔案說明欄位 `%s' 中的值太少（和其他的相比）"
 
 #: lib/dpkg/fields.c
@@ -733,6 +927,30 @@ msgstr "無法改變目標檔案 '%.250s' 的所有者"
 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"
@@ -754,8 +972,10 @@ msgid "unable to lock %s"
 msgstr "無法鎖定 %s"
 
 #: lib/dpkg/file.c
-msgid "showing file on pager"
-msgstr "以可換頁的瀏覽程式瀏覽檔案"
+#, fuzzy
+#| msgid "unable to flush file '%s'"
+msgid "pager to show file"
+msgstr "無法清除檔案 '%s' 的寫入緩衝"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -777,13 +997,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"
@@ -1158,11 +1378,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"
@@ -1176,6 +1391,11 @@ msgstr "欄位寬度超出範圍"
 msgid "missing closing brace"
 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 "（無相關介紹）"
@@ -1386,7 +1606,8 @@ msgstr ""
 msgid ""
 "triggers ci file '%.250s' contains illegal trigger syntax in trigger name "
 "'%.250s': %.250s"
-msgstr "觸發程式 ci 檔 `%.250s' 的觸發程式名稱 `%.250s' 不合於觸發程式的語法：%.250s"
+msgstr ""
+"觸發程式 ci 檔 `%.250s' 的觸發程式名稱 `%.250s' 不合於觸發程式的語法：%.250s"
 
 #: lib/dpkg/triglib.c
 #, c-format
@@ -1494,11 +1715,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'"
@@ -1551,7 +1767,8 @@ msgstr "無法取得（反引用）已存在的符號連結 `%.250s' 的檔案
 msgid ""
 "failed to stat (dereference) proposed new symlink target '%.250s' for "
 "symlink '%.250s'"
-msgstr "無法取得（反引用）將要指向新符號連結 `%.250s' 的符號連結 `%.250s' 的檔案資訊"
+msgstr ""
+"無法取得（反引用）將要指向新符號連結 `%.250s' 的符號連結 `%.250s' 的檔案資訊"
 
 #: src/archives.c
 #, fuzzy, c-format
@@ -1983,6 +2200,10 @@ msgstr "在 conffile 提示輸入時，發現讀取 stdin 錯誤"
 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"
@@ -2337,7 +2558,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 "
@@ -2346,6 +2581,7 @@ 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"
 "  --test                   don't do anything, just demonstrate.\n"
 "  --quiet                  quiet operation, minimal output.\n"
@@ -2377,6 +2613,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'"
@@ -2496,6 +2738,13 @@ msgstr "增加 '%s'\n"
 msgid "Ignoring request to rename file '%s' owned by diverting package '%s'\n"
 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"
@@ -2541,19 +2790,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"
@@ -2843,112 +3079,6 @@ msgstr "套件 %s 目前保留，不會去變動。用 --force-hold 來忽略該
 msgid "overriding problem because --force enabled:"
 msgstr "使用了 --force 選項，忽略問題："
 
-#: 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/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/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/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/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/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/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/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/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/filesdb.c
-#, c-format
-msgid "unable to open files list file for package '%.250s'"
-msgstr "無法開啟套件 `%.250s' 的檔案清單"
-
-#: src/filesdb.c
-#, c-format
-msgid ""
-"files list file for package '%.250s' missing; assuming package has no files "
-"currently installed"
-msgstr "找不到套件 '%.250s' 的檔案清單，假設該套件目前安裝任何檔案"
-
-#: src/filesdb.c
-#, c-format
-msgid "unable to stat files list file for package '%.250s'"
-msgstr "無法取得套件 '%.250s' 檔案清單的檔案資訊"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list for package '%.250s' is not a regular file"
-msgstr "套件 '%.250s' 的檔案清單，不是普通檔案"
-
-#: src/filesdb.c
-#, c-format
-msgid "reading files list for package '%.250s'"
-msgstr "讀取套件 '%.250s' 的檔案清單"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' is missing final newline"
-msgstr "套件 '%.250s' 的檔案清單，檔尾沒有換行"
-
-#: src/filesdb.c
-#, c-format
-msgid "files list file for package '%.250s' contains empty filename"
-msgstr "套件 `%.250s' 的檔案清單，內有空檔名"
-
-#: src/filesdb.c
-#, c-format
-msgid "error closing files list file for package '%.250s'"
-msgstr "關閉套件 `%.250s' 的檔案清單時，發生錯誤"
-
-#: src/filesdb.c
-msgid "(Reading database ... "
-msgstr "（讀取資料庫 ... "
-
-#: 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/help.c
 msgid "not installed"
 msgstr "未安裝"
@@ -3007,41 +3137,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"
@@ -3726,6 +3821,12 @@ msgstr "硬體平台"
 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"
@@ -3760,6 +3861,16 @@ msgstr "找不到符合 %s 的路徑"
 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"
@@ -3786,9 +3897,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"
@@ -3829,19 +3943,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 ""
@@ -4239,70 +4367,6 @@ 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
-#, 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 檔"
-
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "輸入 dpkg-trigger --help 以取得這個工具的說明。"
@@ -4517,6 +4581,12 @@ msgstr "正在解除設定 %s (%s)，以便移除 %s (%s)……\n"
 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
 #, fuzzy, c-format
 #| msgid "conffile name '%.50s...' is too long, or missing final newline"
@@ -5011,17 +5081,19 @@ msgstr "無法關閉解壓縮的輸出轉向"
 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>"
@@ -6297,6 +6369,41 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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 "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 "建立目錄後，無法切換到該目錄"
+
 #~ msgid "obsolete option '--%s'; please use '--%s' instead"
 #~ msgstr "已作廢選項 '--%s' ；請改用 '--%s'"
 
@@ -6370,9 +6477,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/scripts/po/ca.po b/scripts/po/ca.po
index 57918dd91..2f85a0ffd 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -8,7 +8,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: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2017-05-07 16:26+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -263,32 +263,101 @@ msgid "Usage: %s [<option>...]"
 msgstr "Forma d'ús: %s [<opció>…]"
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| "      --build=<type>[,...]    specify the build <type>: full, source, "
+#| "binary,\n"
+#| "                                any, all (default is 'full').\n"
+#| "  -F                          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"
+#| "  -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 "
+#| "(default).\n"
+#| "  -d                          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 "
+#| "active.\n"
+#| "  -R, --rules-file=<rules>    rules file to execute (default is debian/"
+#| "rules).\n"
+#| "  -T, --rules-target=<target> call debian/rules <target>.\n"
+#| "      --as-root               ensure -T calls the target with root "
+#| "rights.\n"
+#| "  -j, --jobs[=<number>|auto]  jobs to run simultaneously (passed to "
+#| "<rules>),\n"
+#| "                                forced mode.\n"
+#| "  -J, --jobs-try[=<number>|auto]\n"
+#| "                              jobs to run simultaneously (passed to "
+#| "<rules>),\n"
+#| "                                opt-in mode (default is auto).\n"
+#| "  -r, --root-command=<command>\n"
+#| "                              command to gain root rights (default is "
+#| "fakeroot).\n"
+#| "      --check-command=<command>\n"
+#| "                              command to check the .changes file (no "
+#| "default).\n"
+#| "      --check-option=<opt>    pass <opt> to check <command>.\n"
+#| "      --hook-<name>=<command> set <command> as the hook <name>, known "
+#| "hooks:\n"
+#| "                                init preclean source build binary "
+#| "buildinfo\n"
+#| "                                changes postclean check sign done\n"
+#| "      --buildinfo-option=<opt>\n"
+#| "                              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"
+#| "  -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"
+#| "  -ui, --unsigned-buildinfo   unsigned .buildinfo file.\n"
+#| "  -uc, --unsigned-changes     unsigned .buildinfo and .changes file.\n"
+#| "      --no-sign               do not sign any file.\n"
+#| "      --force-sign            force signing the resulting files.\n"
+#| "      --admindir=<directory>  change the administrative directory.\n"
+#| "  -?, --help                  show this help message.\n"
+#| "      --version               show the version."
 msgid ""
 "Options:\n"
 "      --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"
@@ -492,23 +561,6 @@ msgstr "-E i -W són obsolets, no tenen efecte"
 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"
@@ -591,6 +643,23 @@ msgstr ""
 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"
@@ -622,6 +691,16 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "la substitució %% és desconeguda en el lligam: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"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
@@ -1138,8 +1217,45 @@ msgid "cannot install output control file '%s'"
 msgstr "no s'ha pogut instal·lar el fitxer de control de sortida «%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"
@@ -1423,10 +1539,32 @@ msgstr ""
 "      --version            mostra la versió."
 
 #: 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"
@@ -1894,7 +2032,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"
@@ -2328,8 +2467,9 @@ msgid "you can only specify one of 'to' and 'until', using 'until'"
 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"
+#, fuzzy, perl-format
+#| msgid "'%s' option specifies non-existing version"
+msgid "'%s' option specifies non-existing version '%s'"
 msgstr "l'opció «%s» especifica una versió inexistent"
 
 #: scripts/Dpkg/Changelog.pm
@@ -2345,16 +2485,21 @@ msgid "use oldest entry that is later than the one specified"
 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"
+#, fuzzy, perl-format
+#| msgid "no such entry found, ignoring '%s' parameter"
+msgid "no such entry found, ignoring '%s' parameter '%s'"
 msgstr "no s'ha trobat l'entrada, s'ignorarà el paràmetre «%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 "l'opció «since» especifica la versió més recent, s'ignorarà"
 
 #: 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'opció «until» especifica la versió més antiga, s'ignorarà"
 
 #: scripts/Dpkg/Changelog/Debian.pm
@@ -2469,14 +2614,10 @@ msgid "the trailer doesn't match the expected regex"
 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"
+#, fuzzy, perl-format
+#| msgid "cannot stat file %s"
+msgid "cannot seek into file %s"
+msgstr "no es pot fer «stat» al fitxer «%s»"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
@@ -2830,6 +2971,12 @@ 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 ""
+
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "unknown executable format in file '%s'"
@@ -3638,6 +3785,12 @@ msgstr "la versió del paquet no nadiu no conté una revisió"
 msgid "can't create symlink %s"
 msgstr "no es pot crear l'enllaç simbòlic %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'estan emprant opcions de %s: %s"
+
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
 #, perl-format
 msgid "unsupported version of the quilt metadata: %s"
@@ -3922,13 +4075,15 @@ msgid "obsolete substitution variable ${%s}"
 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"
+#, fuzzy, perl-format
+#| msgid "unused substitution variable ${%s}"
+msgid "substitution variable ${%s} used, but is not defined"
+msgstr "la variable de substitució ${%s} no s'utilitza"
 
 #: 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 substitució ${%s} no s'utilitza"
 
 #: scripts/Dpkg/Vars.pm
@@ -3997,6 +4152,15 @@ 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 "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 98b4eac97..1d1c65133 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-19 19:45+0200\n"
+"POT-Creation-Date: 2018-09-26 04:22+0200\n"
 "PO-Revision-Date: 2018-09-19 20:30+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 31a0a9275..70a43da9c 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.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: 2018-09-26 04:22+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"
@@ -301,21 +303,6 @@ msgstr ""
 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"
@@ -395,6 +382,21 @@ msgstr ""
 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"
@@ -425,6 +427,16 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr ""
 
+#: scripts/dpkg-buildpackage.pl
+msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"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
@@ -806,6 +818,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 +1041,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"
@@ -1382,7 +1397,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 ""
@@ -1738,7 +1754,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 +1771,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
@@ -1879,12 +1897,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 +2241,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'"
@@ -2992,6 +3011,11 @@ msgstr ""
 msgid "can't create symlink %s"
 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"
@@ -3267,12 +3291,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..0fd5a1ea7 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: 2018-09-26 04:22+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"
@@ -568,25 +570,6 @@ msgstr "«-E» y «-W» están obsoletas y no tienen efecto"
 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"
@@ -675,6 +658,25 @@ msgstr ""
 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"
@@ -706,6 +708,16 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "variable de sustitución %% desconocida en gancho: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"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
@@ -1312,6 +1324,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 +1667,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"
@@ -2189,7 +2204,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»"
@@ -2668,8 +2684,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 +2702,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
@@ -2820,14 +2842,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 +3232,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"
@@ -4077,6 +4100,12 @@ msgstr "no contiene un repositorio bzr"
 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"
@@ -4372,13 +4401,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 +4484,17 @@ 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»"
 
+#, 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..cc4ca8dc1 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: 2018-09-26 04:22+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"
@@ -557,26 +559,6 @@ msgstr "La gestion de -E et -W est obsolète (ces paramètres sont sans effet)"
 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"
@@ -661,6 +643,26 @@ msgstr ""
 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"
@@ -693,6 +695,16 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "substitution %% inconnue dans le point d'ancrage: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"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
@@ -1224,8 +1236,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 +1584,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"
@@ -2045,7 +2116,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"
@@ -2531,8 +2603,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 +2621,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
@@ -2676,14 +2754,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 +3123,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"
@@ -3895,6 +3975,12 @@ msgstr "la version du paquet non natif ne contient pas de numéro de révision"
 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"
@@ -4195,13 +4281,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 +4366,15 @@ 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 "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..e1b23f1d6 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: 2018-09-26 04:22+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"
@@ -526,23 +528,6 @@ msgstr "-E i -W są przestarzałe, nie mają żadnego efektu"
 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"
@@ -627,6 +612,23 @@ msgstr "nie podpisywane wydanie UNRELEASED - użyj --force-sign, aby nadpisać"
 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"
@@ -659,6 +661,16 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "nieznane podstawienie %% w hooku: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"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
@@ -1230,6 +1242,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 +1573,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"
@@ -2060,7 +2075,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"
@@ -2525,8 +2541,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 +2559,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
@@ -2671,14 +2693,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 +3062,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"
@@ -3877,6 +3901,12 @@ msgstr "nienatywna wersja pakietu nie zawiera rewizji"
 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"
@@ -4167,13 +4197,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 +4279,15 @@ 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 "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..7dc26605d 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: 2018-09-26 04:22+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"
@@ -531,23 +533,6 @@ msgstr "-E и -W устарели, они ничего не изменят"
 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"
@@ -633,6 +618,23 @@ msgstr ""
 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"
@@ -664,6 +666,16 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "неизвестная подстановка %% в ловушке: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"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
@@ -1242,6 +1254,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 +1586,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"
@@ -2073,7 +2088,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"
@@ -2547,8 +2563,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 +2581,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
@@ -2693,14 +2715,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 +3088,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"
@@ -3915,6 +3939,12 @@ msgstr "в версии неродного пакета отсутствует 
 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"
@@ -4203,13 +4233,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 +4316,15 @@ msgstr "номер версии содержит недопустимый сим
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "часть эпохи в номере версии не является числом: «%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..31a23ec8f 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: 2018-09-26 04:22+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"
@@ -517,23 +519,6 @@ msgstr "-E och -W rekommenderas ej, de har ingen effekt"
 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"
@@ -619,6 +604,23 @@ msgstr ""
 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"
@@ -651,6 +653,16 @@ msgstr ""
 msgid "unknown %% substitution in hook: %%%s"
 msgstr "okänd %%-substituering i krok: %%%s"
 
+#: scripts/dpkg-buildpackage.pl
+msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+msgstr ""
+
+#: scripts/dpkg-buildpackage.pl
+msgid ""
+"long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
+"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
@@ -1212,6 +1224,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 +1552,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"
@@ -2028,7 +2043,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"
@@ -2493,8 +2509,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 +2527,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
@@ -2639,14 +2661,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 +3028,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"
@@ -3830,6 +3854,12 @@ msgstr "icke-Debianegen paketversion saknar debianuppdateringsversion"
 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"
@@ -4116,13 +4146,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 +4229,15 @@ 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 "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"
 
-- 
cgit v1.2.3


From 1e618ad140e24441a7ebdbfe0c4822aa0e06118c Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 28 Sep 2018 01:48:32 +0200
Subject: build: Generalize PACKAGE_CPAN_SIGN by setting
 PACKAGE_DIST_IS_RELEASE instead

Set the more generic name from within DPKG_DIST_IS_RELEASE, and use that
directly in the Build.PL.in file.
---
 configure.ac        | 1 -
 debian/changelog    | 1 +
 m4/dpkg-build.m4    | 6 +++++-
 scripts/Build.PL.in | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/configure.ac b/configure.ac
index 121c7665a..9ba198104 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,6 @@ 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_SUBST([PACKAGE_CPAN_SIGN], [$dpkg_dist_is_release])
 AC_CONFIG_SRCDIR([lib/dpkg/dpkg.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
diff --git a/debian/changelog b/debian/changelog
index 64f85b002..a01776335 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium
   * 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.
 
   [ Updated programs translations ]
   * Polish (Łukasz Dulny).
diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4
index 5b98849c3..bd8a2e68f 100644
--- a/m4/dpkg-build.m4
+++ b/m4/dpkg-build.m4
@@ -86,7 +86,8 @@ AC_DEFUN([DPKG_DEB_COMPRESSOR], [
 
 # DPKG_DIST_IS_RELEASE()
 # --------------------
-# Check whether we are preparing a distribution tarball for a 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], [
   dpkg_dist_version=$srcdir/.dist-version
   AS_IF([test -f $dpkg_dist_version && grep -q -v '[-]' $dpkg_dist_version], [
@@ -95,6 +96,9 @@ AC_DEFUN([DPKG_DIST_IS_RELEASE], [
     dpkg_dist_is_release=0
   ])
   unset dpkg_dist_version
+  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)
diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
index 15a53e90e..b720d23ab 100644
--- a/scripts/Build.PL.in
+++ b/scripts/Build.PL.in
@@ -80,7 +80,7 @@ my $build = $class->new(
         keywords => [ qw(dpkg debian perl) ],
     },
 
-    sign            => @PACKAGE_CPAN_SIGN@,
+    sign            => @PACKAGE_DIST_IS_RELEASE@,
     dynamic_config  => 0,
 
     configure_requires => {
-- 
cgit v1.2.3


From 7155d3f97d49149b739d0e8e6358122fa5b5e84b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 28 Sep 2018 01:50:00 +0200
Subject: build: Add a release_status key to the CPAN metadata

This will enable the -TRIAL versioning that CPAN uses to avoid indexing
such releases.
---
 cpan.am             | 5 ++++-
 debian/changelog    | 1 +
 scripts/Build.PL.in | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/cpan.am b/cpan.am
index 4be971f5c..7c30f1f3f 100644
--- a/cpan.am
+++ b/cpan.am
@@ -1,6 +1,9 @@
 CPAN_DIST_NAME = $(PACKAGE_CPAN_NAME)
 CPAN_DIST_VERSION = $(PACKAGE_VERSION)
-CPAN_DIST = $(CPAN_DIST_NAME)-$(CPAN_DIST_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:
diff --git a/debian/changelog b/debian/changelog
index a01776335..d9c0f4ce0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium
     - 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.
 
   [ Updated programs translations ]
   * Polish (Łukasz Dulny).
diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
index b720d23ab..66d8b4a2b 100644
--- a/scripts/Build.PL.in
+++ b/scripts/Build.PL.in
@@ -62,6 +62,8 @@ my $build = $class->new(
     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@',
 
-- 
cgit v1.2.3


From ca81310a8ab4ae8ab2f6b054f6b6bed5fd1002ba Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 28 Sep 2018 01:50:33 +0200
Subject: build: Fix typo in CPAN recommends key

---
 debian/changelog    | 1 +
 scripts/Build.PL.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d9c0f4ce0..75b4ea7eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium
     - 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.
 
   [ Updated programs translations ]
   * Polish (Łukasz Dulny).
diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
index 66d8b4a2b..97da25645 100644
--- a/scripts/Build.PL.in
+++ b/scripts/Build.PL.in
@@ -94,7 +94,7 @@ my $build = $class->new(
         'Test::Pod'             => 0,
         'Test::Strict'          => 0,
     },
-    recommands => {
+    recommends => {
         'Algorithm::Merge'      => 0,
         'File::FcntlLock'       => 0,
         'Locale::gettext'       => 0,
-- 
cgit v1.2.3


From 0c730ce6028932e695e4d183ca31a09451a3dfca Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 28 Sep 2018 01:50:57 +0200
Subject: build: Improve test and author CPAN dependencies

Split the test recommends from the requires and add develop recommends
into a prereqs metadata hierarchy.
---
 debian/changelog    |  1 +
 scripts/Build.PL.in | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 75b4ea7eb..ed36c2dff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium
     - 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.
 
   [ Updated programs translations ]
   * Polish (Łukasz Dulny).
diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
index 97da25645..376c04ceb 100644
--- a/scripts/Build.PL.in
+++ b/scripts/Build.PL.in
@@ -68,6 +68,26 @@ my $build = $class->new(
     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 => {
@@ -91,8 +111,6 @@ my $build = $class->new(
     test_requires => {
         'TAP::Harness'          => 0,
         'Test::More'            => 0,
-        'Test::Pod'             => 0,
-        'Test::Strict'          => 0,
     },
     recommends => {
         'Algorithm::Merge'      => 0,
-- 
cgit v1.2.3


From 60ff714ca5001bdc56f9dfb1e6f5f6b0d3fef3ad Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 7 Oct 2018 04:41:27 +0200
Subject: test: Skip version checks involving «dpkg --compare-versions» if not
 available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For the CPAN distribution or a non-dpkg-based distribution we cannot
assume that dpkg will be installed, or even available at build time.
Skip these tests if the tools is missing.
---
 debian/changelog         |  3 +++
 scripts/t/Dpkg_Version.t | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index ed36c2dff..c2f1af073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,9 @@ dpkg (1.19.2) UNRELEASED; urgency=medium
     - Add a release_status key to the CPAN metadata.
     - Fix typo in CPAN recommends key.
     - Improve test and author CPAN dependencies.
+  * 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).
diff --git a/scripts/t/Dpkg_Version.t b/scripts/t/Dpkg_Version.t
index 17e9b4b9e..34ab1772f 100644
--- a/scripts/t/Dpkg_Version.t
+++ b/scripts/t/Dpkg_Version.t
@@ -20,6 +20,7 @@ use Test::More;
 
 use Dpkg::ErrorHandling;
 use Dpkg::IPC;
+use Dpkg::Path qw(find_command);
 use Dpkg::Version;
 
 report_options(quiet_warnings => 1);
@@ -33,6 +34,8 @@ my @ops = ('<', '<<', 'lt',
 
 plan tests => scalar(@tests) * (3 * scalar(@ops) + 4) + 27;
 
+my $have_dpkg = find_command('dpkg');
+
 sub dpkg_vercmp {
      my ($a, $cmp, $b) = @_;
      my $stderr;
@@ -149,11 +152,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");
+            }
 	}
     }
 }
-- 
cgit v1.2.3


From 2d3a3fd28050ca76be4322e2d44b13627c0c5f72 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 29 Sep 2018 23:32:34 +0200
Subject: Dpkg::OpenPGP: Ignore Version field in enarmored output

This will contain different data depending on the program used. We do
not really care about that, later versions of GnuPG have stopped
emitting it, and it makes the test suite fail when using GnuPG 1.x.

Fixes: https://rt.cpan.org/Public/Bug/Display.html?id=127217
---
 debian/changelog        | 3 +++
 scripts/Dpkg/OpenPGP.pm | 1 +
 2 files changed, 4 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 7406d5bde..1f33be708 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 dpkg (1.19.2) UNRELEASED; urgency=medium
 
   [ Guillem Jover ]
+  * Perl modules:
+    - Dpkg::OpenPGP: Ignore Version field in enarmored output.
+      Fixes CPAN#127217.
   * Documentation:
     - dpkg-buildpackage(1): Clarify --build=source explanation.
     - dsc(5): Clarify what “flattened” means in Testsuite-Triggers.
diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm
index 8d85e845d..210a36f23 100644
--- a/scripts/Dpkg/OpenPGP.pm
+++ b/scripts/Dpkg/OpenPGP.pm
@@ -61,6 +61,7 @@ sub openpgp_sig_to_asc
         open my $fh_gpg, '-|', 'gpg', '-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/;
-- 
cgit v1.2.3


From f6c46ce78c7e3f5504ce5d18a16c5482597716e3 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 29 Sep 2018 23:34:32 +0200
Subject: Dpkg::OpenPGP: Do not read the gpg user configuration file

---
 debian/changelog        | 1 +
 scripts/Dpkg/OpenPGP.pm | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 1f33be708..0ed0de87a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium
   * Perl modules:
     - Dpkg::OpenPGP: Ignore Version field in enarmored output.
       Fixes CPAN#127217.
+    - Dpkg::OpenPGP: Do not read the gpg user configuration file.
   * Documentation:
     - dpkg-buildpackage(1): Clarify --build=source explanation.
     - dsc(5): Clarify what “flattened” means in Testsuite-Triggers.
diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm
index 210a36f23..f719e6e4e 100644
--- a/scripts/Dpkg/OpenPGP.pm
+++ b/scripts/Dpkg/OpenPGP.pm
@@ -56,9 +56,11 @@ sub openpgp_sig_to_asc
             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: /;
-- 
cgit v1.2.3


From b89c8fd35c09df0df61f3424a630241bf4d79111 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 27 Sep 2018 04:56:37 +0200
Subject: Dpkg: Add documentation about the module hierarchy and API

---
 debian/changelog |   1 +
 scripts/Dpkg.pm  | 165 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 166 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 0ed0de87a..4d7e8f1ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium
     - 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.
   * Build system:
     - Distribute a LICENSE file on CPAN.
     - Do not make the Build.PL script executable.
diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm
index 7f06b15e6..fd9259ecb 100644
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -24,6 +24,8 @@ 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;
@@ -119,6 +121,169 @@ 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::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 1.03 (dpkg 1.18.24)
-- 
cgit v1.2.3


From ffe3d7aeed7e7eb9a1c22d45fd0e5c2af2c8bcad Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 16 Sep 2018 23:42:08 +0200
Subject: Dpkg::Source::Functions: Reimplement is_binary() w/o using diff(1)

The check is very simple, and can be done w/o requiring calling diff(1)
for each input file.

This makes the code shorter, more portable, and should be faster in the
non-binary cases.
---
 debian/changelog                 |  1 +
 scripts/Dpkg/Source/Functions.pm | 31 ++++++++-----------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 4d7e8f1ab..fd83782c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium
     - 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).
   * Documentation:
     - dpkg-buildpackage(1): Clarify --build=source explanation.
     - dsc(5): Clarify what “flattened” means in Testsuite-Triggers.
diff --git a/scripts/Dpkg/Source/Functions.pm b/scripts/Dpkg/Source/Functions.pm
index 262b80ad1..3435f6c5a 100644
--- a/scripts/Dpkg/Source/Functions.pm
+++ b/scripts/Dpkg/Source/Functions.pm
@@ -110,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;
-- 
cgit v1.2.3


From 837ecfdac680369ce71d96748a8a4762a414f654 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 16 Sep 2018 23:47:10 +0200
Subject: Dpkg::Source::Package::V2: Split BinaryFiles module into its own file

---
 debian/changelog                   |   2 +
 scripts/Dpkg/Source/BinaryFiles.pm | 108 +++++++++++++++++++++++++++++++++++++
 scripts/Dpkg/Source/Package/V2.pm  |  87 ++----------------------------
 scripts/Makefile.am                |   1 +
 scripts/po/POTFILES.in             |   1 +
 5 files changed, 115 insertions(+), 84 deletions(-)
 create mode 100644 scripts/Dpkg/Source/BinaryFiles.pm

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index fd83782c3..139a287f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dpkg (1.19.2) UNRELEASED; urgency=medium
       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).
   * Documentation:
     - dpkg-buildpackage(1): Clarify --build=source explanation.
     - dsc(5): Clarify what “flattened” means in Testsuite-Triggers.
diff --git a/scripts/Dpkg/Source/BinaryFiles.pm b/scripts/Dpkg/Source/BinaryFiles.pm
new file mode 100644
index 000000000..c503e42b6
--- /dev/null
+++ b/scripts/Dpkg/Source/BinaryFiles.pm
@@ -0,0 +1,108 @@
+# 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 File::Path qw(make_path);
+use File::Spec;
+
+use Dpkg::ErrorHandling;
+use Dpkg::Gettext;
+
+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/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 2c8529bc1..8be647d7b 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -37,6 +37,7 @@ 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 chmod_if_needed is_binary fs_time);
 use Dpkg::Vendor qw(run_vendor_hook);
@@ -517,7 +518,7 @@ 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 $binaryfiles = Dpkg::Source::BinaryFiles->new($dir);
     my $unwanted_binaries = 0;
     my $check_binary = sub {
         if (-f and is_binary($_)) {
@@ -714,7 +715,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);
@@ -757,86 +758,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/Makefile.am b/scripts/Makefile.am
index d8160749b..d7bd8d2f7 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -104,6 +104,7 @@ nobase_dist_perllib_DATA = \
 	Dpkg/Shlibs/SymbolFile.pm \
 	Dpkg/Shlibs/Cppfilt.pm \
 	Dpkg/Source/Archive.pm \
+	Dpkg/Source/BinaryFiles.pm \
 	Dpkg/Source/Functions.pm \
 	Dpkg/Source/Package.pm \
 	Dpkg/Source/Package/V1.pm \
diff --git a/scripts/po/POTFILES.in b/scripts/po/POTFILES.in
index 638fd8b97..a486b593d 100644
--- a/scripts/po/POTFILES.in
+++ b/scripts/po/POTFILES.in
@@ -72,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
-- 
cgit v1.2.3


From 76b05dce1342834fec1b3d9b6ff3fc33a33c1fb2 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 17 Sep 2018 00:12:56 +0200
Subject: Dpkg::Source::Package::V2: Move binary file detection to BinaryFiles
 module

This makes it possible to reuse the code by other modules.
---
 debian/changelog                   |  2 ++
 scripts/Dpkg/Source/BinaryFiles.pm | 53 ++++++++++++++++++++++++++++++++++++++
 scripts/Dpkg/Source/Package/V2.pm  | 50 +++++------------------------------
 3 files changed, 61 insertions(+), 44 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 139a287f6..73d76a09c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.19.2) UNRELEASED; urgency=medium
     - 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.
diff --git a/scripts/Dpkg/Source/BinaryFiles.pm b/scripts/Dpkg/Source/BinaryFiles.pm
index c503e42b6..48c84c8fc 100644
--- a/scripts/Dpkg/Source/BinaryFiles.pm
+++ b/scripts/Dpkg/Source/BinaryFiles.pm
@@ -21,11 +21,14 @@ 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) = @_;
@@ -105,4 +108,54 @@ sub get_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/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 8be647d7b..fe9a1727d 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -39,7 +39,7 @@ 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 chmod_if_needed 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;
@@ -519,49 +519,11 @@ sub do_build {
 
     # Check if the debian directory contains unwanted binary files
     my $binaryfiles = Dpkg::Source::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;
+
+    $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 {
-- 
cgit v1.2.3


From 903836642b50ae81775fc5f26c809d712a16784a Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 8 Oct 2018 11:40:26 +0200
Subject: po: Regenerate .pot files and merge .po files with them

---
 dselect/po/bs.po        |   2 +-
 dselect/po/ca.po        |   2 +-
 dselect/po/cs.po        |   2 +-
 dselect/po/da.po        |   2 +-
 dselect/po/de.po        |   2 +-
 dselect/po/dselect.pot  |   4 +-
 dselect/po/el.po        |   2 +-
 dselect/po/es.po        |   2 +-
 dselect/po/et.po        |   2 +-
 dselect/po/eu.po        |   2 +-
 dselect/po/fr.po        |   2 +-
 dselect/po/gl.po        |   2 +-
 dselect/po/hu.po        |   2 +-
 dselect/po/id.po        |   2 +-
 dselect/po/it.po        |   2 +-
 dselect/po/ja.po        |   2 +-
 dselect/po/ko.po        |   2 +-
 dselect/po/nb.po        |   2 +-
 dselect/po/nl.po        |   2 +-
 dselect/po/nn.po        |   2 +-
 dselect/po/pl.po        |   2 +-
 dselect/po/pt.po        |   2 +-
 dselect/po/pt_BR.po     |   2 +-
 dselect/po/ro.po        |   2 +-
 dselect/po/ru.po        |   2 +-
 dselect/po/sk.po        |   2 +-
 dselect/po/sv.po        |   2 +-
 dselect/po/tl.po        |   2 +-
 dselect/po/vi.po        |   2 +-
 dselect/po/zh_CN.po     |   2 +-
 dselect/po/zh_TW.po     |   2 +-
 man/po/de.po            | 402 ++++++++++++++++++++++++++++++++++++++++-------
 man/po/dpkg-man.pot     | 270 ++++++++++++++++++++++++++------
 man/po/es.po            | 312 ++++++++++++++++++++++++++++++-------
 man/po/fr.po            | 337 +++++++++++++++++++++++++++++++++-------
 man/po/hu.po            | 268 ++++++++++++++++++++++++++------
 man/po/it.po            | 335 ++++++++++++++++++++++++++++++++-------
 man/po/ja.po            | 312 ++++++++++++++++++++++++++++++-------
 man/po/nl.po            | 406 +++++++++++++++++++++++++++++++++++++++++-------
 man/po/pl.po            | 314 ++++++++++++++++++++++++++++++-------
 man/po/pt_BR.po         | 288 +++++++++++++++++++++++++++-------
 man/po/ru.po            | 292 +++++++++++++++++++++++++++-------
 man/po/sv.po            | 333 ++++++++++++++++++++++++++++++++-------
 man/po/zh_CN.po         | 277 +++++++++++++++++++++++++++------
 po/ast.po               |  23 ++-
 po/bs.po                |  22 ++-
 po/ca.po                |  35 ++++-
 po/cs.po                |  35 ++++-
 po/da.po                |  35 ++++-
 po/de.po                |  53 ++++++-
 po/dpkg.pot             |  24 ++-
 po/dz.po                |  23 ++-
 po/el.po                |  23 ++-
 po/eo.po                |  35 ++++-
 po/es.po                |  35 ++++-
 po/et.po                |  23 ++-
 po/eu.po                |  35 ++++-
 po/fr.po                |  35 ++++-
 po/gl.po                |  23 ++-
 po/hu.po                |  23 ++-
 po/id.po                |  24 ++-
 po/it.po                |  35 ++++-
 po/ja.po                |  35 ++++-
 po/km.po                |  23 ++-
 po/ko.po                |  24 ++-
 po/ku.po                |  22 ++-
 po/lt.po                |  23 ++-
 po/mr.po                |  23 ++-
 po/nb.po                |  24 ++-
 po/ne.po                |  23 ++-
 po/nl.po                |  35 ++++-
 po/nn.po                |  22 ++-
 po/pa.po                |  23 ++-
 po/pl.po                |  56 ++++++-
 po/pt.po                |  35 ++++-
 po/pt_BR.po             |  22 ++-
 po/ro.po                |  24 ++-
 po/ru.po                |  35 ++++-
 po/sk.po                |  24 ++-
 po/sv.po                |  35 ++++-
 po/th.po                |  35 ++++-
 po/tl.po                |  22 ++-
 po/tr.po                |  35 ++++-
 po/vi.po                |  35 ++++-
 po/zh_CN.po             |  35 ++++-
 po/zh_TW.po             |  35 ++++-
 scripts/po/ca.po        |  69 ++++----
 scripts/po/de.po        |  72 +++++----
 scripts/po/dpkg-dev.pot |  62 ++++----
 scripts/po/es.po        |  69 ++++----
 scripts/po/fr.po        |  71 +++++----
 scripts/po/pl.po        |  75 +++++----
 scripts/po/ru.po        |  75 +++++----
 scripts/po/sv.po        |  69 ++++----
 94 files changed, 4980 insertions(+), 1038 deletions(-)

(limited to 'scripts')

diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index 992a1cab6..2de5fcd94 100644
--- a/dselect/po/bs.po
+++ b/dselect/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index d3d519a53..6db557c2c 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2017-04-28 04:22+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
diff --git a/dselect/po/cs.po b/dselect/po/cs.po
index 40b5e0edb..d11617814 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/da.po b/dselect/po/da.po
index 7687b032e..a29f44a00 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/de.po b/dselect/po/de.po
index 95c157b43..9e9060113 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index cbc1b5500..11b686046 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.1\n"
+"Project-Id-Version: dpkg 1.19.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/el.po b/dselect/po/el.po
index 5010a650e..0be7c25a4 100644
--- a/dselect/po/el.po
+++ b/dselect/po/el.po
@@ -11,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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/es.po b/dselect/po/es.po
index 53c7d0cb9..b5f3af1f7 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/et.po b/dselect/po/et.po
index b8b7d0c7f..d27e6afdd 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/eu.po b/dselect/po/eu.po
index e45443d54..4127b0da2 100644
--- a/dselect/po/eu.po
+++ b/dselect/po/eu.po
@@ -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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index a5a6dcd70..5e231215b 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/gl.po b/dselect/po/gl.po
index 2f094c603..72cd05ca3 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/hu.po b/dselect/po/hu.po
index 87b3283d6..1e9be03b5 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/id.po b/dselect/po/id.po
index e93f504cc..eca2e680b 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/it.po b/dselect/po/it.po
index 6d57afa99..7209c7fc0 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index e5d24c89d..734366e49 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/ko.po b/dselect/po/ko.po
index 145f4f03b..40e5f9c54 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index 6b4b971ea..2f3cae5e3 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index ced1da9b8..f4ab36d4b 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index 866883969..e3439a64f 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/pl.po b/dselect/po/pl.po
index 9644cfa15..21ecd6cda 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index a89b2ebf7..e51133fcb 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po
index 5c2aa3df3..71d0a79df 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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."
diff --git a/dselect/po/ro.po b/dselect/po/ro.po
index 272393cf6..7f33599af 100644
--- a/dselect/po/ro.po
+++ b/dselect/po/ro.po
@@ -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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/ru.po b/dselect/po/ru.po
index c000c147b..71e49c338 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/sk.po b/dselect/po/sk.po
index ea0192d67..b92860297 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/sv.po b/dselect/po/sv.po
index eb07d587a..10586487a 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index 4866f34a4..e0d906704 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index e782f0e52..1b0a66720 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 040242d07..ecb6398b2 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index b11fbbe10..0ff89f28c 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
diff --git a/man/po/de.po b/man/po/de.po
index 0770e624a..211367bd8 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2018-09-26 21:26+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1846,8 +1846,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"
@@ -2640,6 +2640,33 @@ msgstr ""
 "I<debian/control> auftauchen. Die einzige derzeit verwandte Begründung ist "
 "B<debug-symbols>."
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+#| msgid "B<Build-Date:> I<build-date>"
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Build-Date:> I<Baudatum>"
+
+#. type: Plain text
+#: deb-control.man
+#, fuzzy
+#| msgid ""
+#| "This field specifies a whitespace separated list of build profiles that "
+#| "this upload was built with."
+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 Bauprofilen an, unter "
+"denen dieser Upload gebaut wurde."
+
+#. 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
@@ -2694,6 +2721,14 @@ msgstr ""
 " (Reguläre Ausdrücke, die Rückreferenzierungen enthalten, werden allerdings\n"
 " langsamer laufen.)\n"
 
+#. 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
 msgid ""
@@ -6135,9 +6170,15 @@ msgstr ""
 
 #. type: Plain text
 #: dsc.man
+#, fuzzy
+#| 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)>."
 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 "
@@ -6272,8 +6313,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 "Dieses Feld verkündigt die Vereinigung aller Testabhängigkeiten (Felder "
 "B<Depends> in der Datei I<debian/tests/control>) mit allen Einschränkungen "
@@ -7935,30 +7977,47 @@ 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>: Verwandle alle Abhängigkeitsprobleme in Warnungen."
 
 #. 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>: Ignoriere Versionen bei der Prüfung von Abhängigkeiten."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<breaks>: Install, even if this would break another package (since dpkg "
+#| "1.14.6)."
 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)."
 
 #. 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>: Installiere, selbst wenn es mit einem anderen Paket in "
 "Konflikt steht. Dies ist gefährlich, da dies gewöhnlich dazu führt, dass "
@@ -8160,9 +8219,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 ""
 "Ignoriere Abhängigkeitsüberprüfungen für bestimmte Pakete (tatsächlich wird "
 "die Überprüfung durchgeführt, aber nur Warnungen über Konflikte werden "
@@ -8241,10 +8305,15 @@ msgstr "B<--admindir=>I<Verz>"
 
 #. 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 ""
 "Ändere das voreingestellte administrative Verzeichnis (standardmäßig »I<"
 "%ADMINDIR%>«), in dem viele Dateien liegen, die Informationen über den "
@@ -8258,11 +8327,17 @@ msgstr "B<--instdir=>I<Verz>"
 
 #. 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 ""
 "Ändere das voreingestellte Installationsverzeichnis. Dieses Verzeichnis gibt "
 "an, wo Pakete installiert werden. B<instdir> (standardmäßig »I</>«) ist auch "
@@ -8278,9 +8353,14 @@ msgstr "B<-root=>I<Verz>"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to "
+#| "«I<dir>B<%ADMINDIR%>»."
 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."
@@ -8681,6 +8761,21 @@ msgstr ""
 "Für Conffile-Änderungen, wobei I<Entscheidung> entweder B<install> oder "
 "B<keep> ist."
 
+#. 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 "Der Debian-Systemname der Host-Maschine. (Seit Dpkg 1.13.2)."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -8799,7 +8894,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"
@@ -8853,29 +8948,44 @@ msgstr ""
 "temporäre Dateien und Verzeichnisse erstellt werden."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+#, 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 ""
-"Das Programm, das B<dpkg> ausführen wird, wenn es die Conffiles anzeigt."
+"Das Programm, das B<dpkg> ausführen wird, wenn es eine neue interaktive "
+"Shell startet."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+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
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+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 ""
-"Das Programm, das B<dpkg> ausführen wird, wenn es eine neue interaktive "
-"Shell startet."
 
 #. type: TP
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -8921,13 +9031,29 @@ msgstr ""
 "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 ""
+
+#. 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 "B<DPKG_ROOT>"
@@ -12685,11 +12811,18 @@ msgstr "B<source>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
+#, fuzzy
+#| 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."
 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 "
@@ -15232,12 +15365,53 @@ msgstr "B<--admindir>I< Verzeichnis>"
 
 #. 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 ""
 "Setze das B<dpkg>-Datenverzeichnis auf I<Verzeichnis> (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< Verzeichnis>"
+
+#. type: Plain text
+#: dpkg-divert.man
+#, fuzzy
+#| msgid ""
+#| "If set, it will be used as the B<dpkg> data directory, where the "
+#| "architecture tables are located (since dpkg 1.14.17).  Defaults to "
+#| "«%PKGDATADIR%»."
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+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%«."
+
+#. 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< 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 ""
+
 #. type: TP
 #: dpkg-divert.man
 #, no-wrap
@@ -15354,10 +15528,27 @@ 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
+#, 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 ""
+"Falls gesetzt und die Option B<--admindir> nicht angegeben wurde, wird dies "
+"als Basis-Administrationsverzeichnis verwandt."
+
+#. 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> 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 ""
 "Falls gesetzt und die Option B<--admindir> nicht verwandt wurde, wird dies "
 "als Datenverzeichnis von B<dpkg> verwandt."
@@ -19560,6 +19751,44 @@ msgstr ""
 "Datei oder kein Paket gefunden wurde (außer für B<--control-path>, B<--"
 "control-list> und B<--control-show>, bei denen solche Fehler fatal sind)."
 
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Sets the output format for the B<--verify> command (since dpkg 1.17.2)."
+msgid ""
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr "Setzt das Ausgabeformat für den Befehl B<--verify> (seit Dpkg 1.17.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 ""
+
+#. 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 ""
+
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -21775,12 +22004,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 "
@@ -22718,6 +22966,13 @@ msgstr ""
 "header> wird dem erstellen Quellpaket nicht hinzugefügt, B<patch-header> "
 "dagegen schon."
 
+#. 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
@@ -22726,13 +22981,26 @@ 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 ‘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)."
 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 ""
@@ -23341,13 +23609,32 @@ msgstr ""
 
 #. 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 ""
 "Wechsle das I<Verzeichnis> der B<dpkg>-Datenbank, wo auch die statoverride-"
 "Datei gelagert ist. Der Standard ist I<%ADMINDIR%>."
 
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set, it will be used as the B<dpkg> data directory, where the "
+#| "architecture tables are located (since dpkg 1.14.17).  Defaults to "
+#| "«%PKGDATADIR%»."
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+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%«."
+
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -25066,10 +25353,9 @@ msgid ""
 "be acted on, if the old process terminated without being able to remove the "
 "I<pid-file>."
 msgstr ""
-"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
@@ -26690,6 +26976,10 @@ msgstr ""
 "B<ln>(1), FHS, der Dateisystem Hierarchie-Standard (Filesystem Hierarchy "
 "Standard)."
 
+#~ 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>"
 
diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index f44ef0125..9a93cde8e 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.1\n"
+"Project-Id-Version: dpkg-man 1.19.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1476,8 +1476,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 ""
@@ -2085,6 +2085,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
@@ -2118,6 +2137,14 @@ msgid ""
 " will run more slowly, however).\n"
 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
 msgid "B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
@@ -4870,7 +4897,8 @@ msgstr ""
 #: 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
@@ -4973,8 +5001,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -6308,26 +6337,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
@@ -6469,7 +6503,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
@@ -6532,9 +6567,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
@@ -6546,10 +6581,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
@@ -6561,7 +6596,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 ""
 
@@ -6878,6 +6914,17 @@ msgstr ""
 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
@@ -6983,7 +7030,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 ""
@@ -7029,25 +7076,37 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
+msgid "B<SHELL>"
 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 starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
+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 starting a new interactive shell."
+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
@@ -7089,13 +7148,29 @@ msgid ""
 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 ""
@@ -10204,9 +10279,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
@@ -12290,7 +12366,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
@@ -12389,10 +12494,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
@@ -15566,6 +15678,39 @@ msgid ""
 "B<--control-show> were such errors are fatal)."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"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
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -17225,16 +17370,23 @@ 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
@@ -17934,6 +18086,12 @@ msgid ""
 "generated source package while B<patch-header> is."
 msgstr ""
 
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
@@ -17945,10 +18103,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 ""
@@ -18418,8 +18579,15 @@ 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%>."
+"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: TP
diff --git a/man/po/es.po b/man/po/es.po
index 67181069f..c4d82398c 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:41+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -1742,8 +1742,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"
@@ -2608,6 +2608,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
@@ -2660,6 +2681,14 @@ msgstr ""
 " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
 " will run more slowly, however.)\n"
 
+#. 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
@@ -6368,7 +6397,8 @@ msgstr ""
 #: 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
@@ -6482,8 +6512,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -8220,13 +8251,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."
@@ -8237,14 +8276,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."
@@ -8465,9 +8509,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 "
@@ -8556,9 +8605,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 "
@@ -8579,10 +8628,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 "
@@ -8603,8 +8652,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>."
@@ -9014,6 +9064,21 @@ msgstr ""
 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
@@ -9138,7 +9203,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 ""
@@ -9189,31 +9254,42 @@ msgstr ""
 "directorios temporales."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+#, 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, or "
+"when spawning a command via a shell."
 msgstr ""
-"El programa que B<dpkg> ejecutará al mostrar los ficheros de configuración "
-"«conffiles»."
+"El programa que B<dpkg> ejecutará al iniciar un nuevo intérprete de órdenes."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+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 "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 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 ""
-"El programa que B<dpkg> ejecutará al iniciar un nuevo intérprete de órdenes."
 
 #. type: TP
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -9256,13 +9332,29 @@ msgid ""
 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>"
@@ -13289,9 +13381,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
@@ -16044,11 +16137,41 @@ 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
@@ -16162,14 +16285,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."
@@ -20772,6 +20908,47 @@ msgid ""
 "control-show> were such errors are fatal)."
 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 "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 ""
+
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -23354,11 +23531,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 "
@@ -24474,6 +24658,13 @@ msgstr ""
 "header> no se incluye en las fuentes generadas, mientras que B<patch-header> "
 "sí."
 
+#. 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
@@ -24495,10 +24686,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 ""
@@ -25128,13 +25322,20 @@ 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 ""
 "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: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -28758,6 +28959,11 @@ 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>"
 
diff --git a/man/po/fr.po b/man/po/fr.po
index a376b49dd..5b3f49ffd 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:41+0100\n"
 "Last-Translator: Sébastien Poher <sbphr@volted.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1724,8 +1724,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 "BOGUES"
@@ -2599,6 +2599,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
@@ -2655,6 +2676,14 @@ msgstr ""
 " (Des expressions rationnelles contenant des références circulaires\n"
 " ralentissent cependant le programme.)\n"
 
+#. 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
@@ -6382,7 +6411,8 @@ msgstr ""
 #: 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
@@ -6496,8 +6526,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -8251,14 +8282,22 @@ 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> : Change tous les problèmes de dépendance en avertissements."
 
 #. 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> : Ignore les versions dans les questions de dépendance."
 
@@ -8268,16 +8307,21 @@ 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> : Force l'installation, même si cela risque de casser un autre "
 "paquet."
 
 #. 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> : Installe un paquet, même s'il est en conflit avec un autre "
 "paquet. C'est dangereux car habituellement cela produit le remplacement de "
@@ -8498,9 +8542,14 @@ msgstr "B<--ignore-depends>=I<paquet>,..."
 
 #. 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 ""
 "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 "
@@ -8589,9 +8638,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 ""
 "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 "
@@ -8612,10 +8661,10 @@ msgstr "B<--instdir=>I<repertoire>"
 #| "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é à "
@@ -8636,8 +8685,9 @@ msgstr "B<--root=>I<répertoire>"
 #| "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%>."
@@ -9071,6 +9121,21 @@ msgstr ""
 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 "Nom du système Debian de la machine hôte (depuis dpkg 1.13.2)."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -9195,7 +9260,7 @@ 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 ""
@@ -9246,32 +9311,43 @@ msgstr ""
 "créer les fichiers et répertoire temporaires."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+#, 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, or "
+"when spawning a command via a shell."
 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 lance un nouvel interpréteur de "
+"commandes."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+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 "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 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 ""
-"Le programme exécuté par B<dpkg> quand il lance un nouvel interpréteur de "
-"commandes."
 
 #. type: TP
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -9314,13 +9390,29 @@ msgid ""
 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>"
@@ -13260,9 +13352,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
@@ -16086,12 +16179,45 @@ msgstr "B<--admindir>I< répertoire>"
 
 #. 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 ""
 "Définit le répertoire de données de B<dpkg> comme I<répertoire> (par défaut "
 "c'est 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< 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 ""
+
+#. 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< 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 ""
+
 #. type: TP
 #: dpkg-divert.man
 #, no-wrap
@@ -16204,10 +16330,28 @@ 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
+#, 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 ""
+"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 base pour "
+"l'administration."
+
+#. 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 ""
 "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 "
@@ -20641,6 +20785,44 @@ msgid ""
 "control-show> were such errors are fatal)."
 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 "Définit le format de sortie de la commande 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 ""
+"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 ""
+
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -23156,12 +23338,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 "
@@ -24206,6 +24407,13 @@ msgstr ""
 "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
+#, fuzzy, no-wrap
+#| msgid "debian/patches/series"
+msgid "debian/patches/I<vendor>.series"
+msgstr "debian/patches/series"
+
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
@@ -24227,10 +24435,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 ""
@@ -24852,13 +25063,24 @@ msgstr ""
 
 #. 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 ""
 "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%>."
 
+#. 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: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -28498,6 +28720,11 @@ msgstr "B<update-alternatives --auto vi>"
 msgid "B<ln>(1), FHS, the Filesystem Hierarchy Standard."
 msgstr "B<ln>(1), FHS, le standard pour l'organisation du système de fichiers."
 
+#~ msgid "The program B<dpkg> will execute when displaying the conffiles."
+#~ msgstr ""
+#~ "Cette option indique le programme exécuté par B<dpkg> quand il affiche "
+#~ "les fichiers de configuration."
+
 #~ msgid "B<COLUMNS>"
 #~ msgstr "B<COLUMNS>"
 
diff --git a/man/po/hu.po b/man/po/hu.po
index 5db200c24..81ca00c92 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -1559,8 +1559,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"
@@ -2354,6 +2354,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
@@ -2406,6 +2426,14 @@ msgstr ""
 " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
 " will run more slowly, however.)\n"
 
+#. 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
@@ -5290,7 +5318,8 @@ msgstr ""
 #: 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
@@ -5397,8 +5426,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -6747,27 +6777,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
@@ -6912,7 +6946,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
@@ -6975,9 +7010,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
@@ -6989,10 +7024,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
@@ -7004,8 +7039,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
@@ -7318,6 +7354,18 @@ msgstr ""
 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
@@ -7423,7 +7471,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 ""
@@ -7469,25 +7517,37 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg.man
-#, fuzzy, no-wrap
-msgid "B<PAGER>"
-msgstr "B<--new>"
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<SHELL>"
+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 starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr ""
 
 #. type: TP
-#: dpkg.man
-#, no-wrap
-msgid "B<SHELL>"
-msgstr ""
+#: 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 starting a new interactive shell."
+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
@@ -7530,13 +7590,29 @@ msgid ""
 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 ""
@@ -10692,9 +10768,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
@@ -12941,7 +13018,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
@@ -13040,10 +13145,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
@@ -16235,6 +16347,39 @@ msgid ""
 "control-show> were such errors are fatal)."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"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
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -17891,11 +18036,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 "
@@ -18603,6 +18755,12 @@ msgid ""
 "generated source package while B<patch-header> is."
 msgstr ""
 
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
@@ -18614,10 +18772,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 ""
@@ -19094,8 +19255,15 @@ 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%>."
+"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: TP
diff --git a/man/po/it.po b/man/po/it.po
index 1c73f7e7a..f1c128f77 100644
--- a/man/po/it.po
+++ b/man/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.16.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -1732,8 +1732,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"
@@ -2622,6 +2622,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
@@ -2675,6 +2696,14 @@ msgstr ""
 " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
 " will run more slowly, however).\n"
 
+#. 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
@@ -6276,7 +6305,8 @@ msgstr ""
 #: 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
@@ -6395,8 +6425,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -8159,13 +8190,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."
@@ -8176,14 +8215,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 "
@@ -8405,9 +8449,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 "
@@ -8497,9 +8546,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 "
@@ -8520,10 +8569,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 "
@@ -8544,8 +8593,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>."
@@ -8978,6 +9028,22 @@ msgstr ""
 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
@@ -9102,7 +9168,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 ""
@@ -9153,29 +9219,41 @@ msgstr ""
 "directory temporanee."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 #. 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."
+#, 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, 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.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+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 "The program B<dpkg> will execute when starting a new shell."
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
-msgstr "Il programma che B<dpkg> eseguirà per avviare una nuova shell."
+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-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -9218,13 +9296,29 @@ msgid ""
 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>"
@@ -12838,9 +12932,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
@@ -15611,12 +15706,45 @@ 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
@@ -15716,10 +15844,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>."
@@ -19633,6 +19778,43 @@ msgid ""
 "control-show> were such errors are fatal)."
 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 ""
+"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
 #, no-wrap
@@ -21832,12 +22014,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 "
@@ -22786,6 +22987,13 @@ msgid ""
 "generated source package while B<patch-header> is."
 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
@@ -22807,10 +23015,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 ""
@@ -23430,13 +23641,24 @@ msgstr ""
 
 #. 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: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -27070,6 +27292,11 @@ 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>"
 
diff --git a/man/po/ja.po b/man/po/ja.po
index 576caa484..920a03c12 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: TAKAHASHI Motonobu <monyo@monyo.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -1699,8 +1699,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 "バグ"
@@ -2554,6 +2554,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
@@ -2607,6 +2628,14 @@ msgstr ""
 " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
 " will run more slowly, however).\n"
 
+#. 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
@@ -6234,7 +6263,8 @@ msgstr ""
 #: 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
@@ -6348,8 +6378,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -8064,13 +8095,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
@@ -8079,15 +8118,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>: 他のパッケージと競合してもインストールする。たいていはいくつか"
 "ファイルを上書きすることになるため、危険である。"
@@ -8301,9 +8345,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 ""
 "指定したパッケージに関する依存関係の確認を行わない (実際は、依存関係の確認は"
 "行われるが、競合が発生しても警告メッセージのみで処理を続行する)。"
@@ -8391,9 +8440,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%>)。管理ディ"
 "レクトリには、パッケージのインストール状況に関する情報が格納された多種多様な"
@@ -8414,10 +8463,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> は、パッケージ"
@@ -8438,8 +8487,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%> に変更される。"
@@ -8840,6 +8890,21 @@ msgstr ""
 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
@@ -8963,7 +9028,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 ""
@@ -9014,29 +9079,41 @@ msgstr ""
 "成するディレクトリとして使用する。"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
-msgstr ""
-"B<dpkg> が設定ファイルの内容を表示するときに、実際に起動するプログラム。"
+#, 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, or "
+"when spawning a command via a shell."
+msgstr "B<dpkg> が新しいシェルを起動するときに、実際に起動するプログラム。"
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+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 "The program B<dpkg> will execute when starting a new shell."
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
-msgstr "B<dpkg> が新しいシェルを起動するときに、実際に起動するプログラム。"
+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-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -9079,13 +9156,29 @@ msgid ""
 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>"
@@ -13053,9 +13146,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
@@ -15762,11 +15856,41 @@ 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
@@ -15878,14 +16002,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 データディレクトリとして用いられる。"
@@ -20348,6 +20485,47 @@ msgid ""
 "control-show> were such errors are fatal)."
 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 ""
+"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
 #, no-wrap
@@ -22847,11 +23025,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 "
@@ -23935,6 +24120,13 @@ msgstr ""
 "る、フリーフォーマットのテキスト。B<local-patch-header> は生成されたソース"
 "パッケージに含まれないが、B<patch-header> は含まれる。"
 
+#. 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
@@ -23956,10 +24148,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 ""
@@ -24571,12 +24766,19 @@ 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 ""
 "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: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -28083,6 +28285,10 @@ 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>"
 
diff --git a/man/po/nl.po b/man/po/nl.po
index 032f475ac..ad1e99afa 100644
--- a/man/po/nl.po
+++ b/man/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.19.0.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2018-08-31 10:28+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1873,8 +1873,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"
@@ -2679,6 +2679,33 @@ msgstr ""
 "hoofdcontrolebestand I<debian/control> van de broncode. De enige reden die "
 "momenteel gebruikt wordt, is B<debug-symbols>."
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+#| msgid "B<Build-Date:> I<build-date>"
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<Build-Date:> I<bouwdatum>"
+
+#. type: Plain text
+#: deb-control.man
+#, fuzzy
+#| msgid ""
+#| "This field specifies a whitespace separated list of build profiles that "
+#| "this upload was built with."
+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 somt een lijst van door een spatie van elkaar gescheiden "
+"bouwprofielen op waarmee deze upload gebouwd werd."
+
+#. 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
@@ -2732,6 +2759,14 @@ msgstr ""
 " gewoonlijk vele malen sneller dan Unix grep of egrep. (Maar reguliere\n"
 " expressies met terugverwijzingen zullen trager zijn.\n"
 
+#. 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
 msgid ""
@@ -6210,9 +6245,15 @@ msgstr ""
 
 #. type: Plain text
 #: dsc.man
+#, fuzzy
+#| 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)>."
 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)>, "
@@ -6346,11 +6387,19 @@ msgstr ""
 
 #. 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@>."
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 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 "
@@ -8037,30 +8086,47 @@ 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>: Verander alle vereistenproblemen in waarschuwingen."
 
 #. 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>: Bekommer u niet om versies bij het toetsen van vereisten."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<breaks>: Install, even if this would break another package (since dpkg "
+#| "1.14.6)."
 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)."
 
 #. 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>: Installeer, zelfs als er een tegenstelling is met een ander "
 "pakket. Dit is gevaarlijk, want gewoonlijk zal dit het overschrijven van "
@@ -8268,9 +8334,14 @@ msgstr "B<--ignore-depends>=I<pakket>,..."
 
 #. 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 ""
 "Negeer het toetsen van afhankelijkheden voor de opgegeven pakketten "
 "(eigenlijk wordt de controle wel uitgevoerd, maar er worden enkel "
@@ -8348,10 +8419,15 @@ msgstr "B<--admindir=>I<map>"
 
 #. 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 ""
 "Wijzig de standaard administratieve map waarin veel bestanden zitten met "
 "informatie over de status van geïnstalleerde of gede-installeerde pakketten, "
@@ -8365,11 +8441,17 @@ msgstr "B<--instdir=>I<map>"
 
 #. 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 ""
 "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 "
@@ -8385,9 +8467,14 @@ msgstr "B<--root=>I<map>"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to "
+#| "«I<dir>B<%ADMINDIR%>»."
 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%>»."
@@ -8798,6 +8885,21 @@ msgstr ""
 "Voor conffile-wijzigingen (wijzigingen aan een configuratiebestand) waarbij "
 "I<beslissing> ofwel B<install> ofwel B<keep> is."
 
+#. 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 "De Debian systeemnaam van de hostmachine (sinds dpkg 1.13.2)."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -8918,7 +9020,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"
@@ -8972,30 +9074,44 @@ msgstr ""
 "waarin tijdelijke bestanden en mappen kunnen aangemaakt worden."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+#, 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 ""
-"Het programma dat door B<dpkg> zal uitgevoerd worden bij het tonen van de "
-"conffiles (configuratiebestanden)."
+"Het programma dat B<dpkg> zal uitvoeren bij het starten van een nieuwe "
+"interactieve shell."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+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
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+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 ""
-"Het programma dat B<dpkg> zal uitvoeren bij het starten van een nieuwe "
-"interactieve shell."
 
 #. type: TP
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -9038,13 +9154,29 @@ msgid ""
 msgstr ""
 
 #. 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 ""
+
+#. 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 "B<DPKG_ROOT>"
@@ -12835,11 +12967,18 @@ msgstr "B<source>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
+#, fuzzy
+#| 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."
 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 "
@@ -15408,10 +15547,51 @@ msgstr "B<--admindir> I<map>"
 
 #. 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 "Stel de datamap van B<dpkg> in op I<map> (standaard: 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<map>"
+
+#. type: Plain text
+#: dpkg-divert.man
+#, fuzzy
+#| msgid ""
+#| "If set, it will be used as the B<dpkg> data directory, where the "
+#| "architecture tables are located (since dpkg 1.14.17).  Defaults to "
+#| "«%PKGDATADIR%»."
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+"Indien deze variabele een waarde heeft, zal ze gebruikt worden als de data-"
+"map van B<dpkg> waarin zich de architectuurtabellen bevinden (sinds dpkg "
+"1.14.17). Staat standaard ingesteld op «%PKGDATADIR%»."
+
+#. 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< 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 ""
+
 #. type: TP
 #: dpkg-divert.man
 #, no-wrap
@@ -15525,10 +15705,27 @@ msgstr ""
 "demonstratie."
 
 #. 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 ""
+"Indien dit ingesteld is en de optie B<--admindir> niet opgegeven werd, zal "
+"dit gebruikt worden als de hoofdmap voor beheersdoeleinden."
+
+#. 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 ""
 "Indien dit ingesteld werd en de optie B<--admindir> niet gebruikt werd, zal "
 "dit gebruikt worden als de datamap voor B<dpkg>."
@@ -19814,6 +20011,46 @@ msgstr ""
 "control-path>, B<--control-list> en B<--control-show> waarvoor dit soort "
 "fouten fataal is)."
 
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid ""
+#| "Sets the output format for the B<--verify> command (since dpkg 1.17.2)."
+msgid ""
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr ""
+"Stelt de indeling in van de uitvoer van het commando B<--verify> (sinds dpkg "
+"1.17.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 ""
+
+#. 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 ""
+
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -22067,12 +22304,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 "
@@ -23017,6 +23273,13 @@ msgstr ""
 "header> wordt niet toegevoegd aan het gegenereerde broncodepakket, terwijl "
 "dat met B<patch-header> wel het geval is."
 
+#. 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
@@ -23025,13 +23288,26 @@ 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 ‘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)."
 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 ""
@@ -23645,13 +23921,32 @@ msgstr ""
 
 #. 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 ""
 "Wijzig de I<map> voor de B<dpkg>-database waar ook het bestand met "
 "statusaanpassingen opgeslagen wordt. Standaard is dat I<%ADMINDIR%>."
 
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| msgid ""
+#| "If set, it will be used as the B<dpkg> data directory, where the "
+#| "architecture tables are located (since dpkg 1.14.17).  Defaults to "
+#| "«%PKGDATADIR%»."
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
+msgstr ""
+"Indien deze variabele een waarde heeft, zal ze gebruikt worden als de data-"
+"map van B<dpkg> waarin zich de architectuurtabellen bevinden (sinds dpkg "
+"1.14.17). Staat standaard ingesteld op «%PKGDATADIR%»."
+
 #. type: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -27026,6 +27321,11 @@ 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>"
 
diff --git a/man/po/pl.po b/man/po/pl.po
index 8176c2499..ffc2da975 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -1717,8 +1717,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"
@@ -2582,6 +2582,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
@@ -2635,6 +2656,14 @@ msgstr ""
 " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
 " will run more slowly, however).\n"
 
+#. 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
@@ -6312,7 +6341,8 @@ msgstr ""
 #: 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
@@ -6425,8 +6455,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -8213,15 +8244,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."
@@ -8232,15 +8271,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 "
@@ -8464,9 +8508,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 "
@@ -8558,9 +8607,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 "
@@ -8582,10 +8631,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 "
@@ -8606,8 +8655,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%>."
@@ -9018,6 +9068,21 @@ msgstr ""
 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
@@ -9142,7 +9207,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 ""
@@ -9193,32 +9258,43 @@ msgstr ""
 "plików i katalogów tymczasowych."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
+#
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+#, 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, or "
+"when spawning a command via a shell."
 msgstr ""
-"Program uruchamiany przez B<dpkg> do wyświetlania plików konfiguracyjnych "
-"(conffiles)."
+"Program uruchamiany przez B<dpkg>, gdy trzeba uruchomić nową sesję powłoki."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+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 "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 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 ""
-"Program uruchamiany przez B<dpkg>, gdy trzeba uruchomić nową sesję powłoki."
 
 #. type: TP
 #: dpkg.man dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -9261,13 +9337,29 @@ msgid ""
 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>"
@@ -13294,9 +13386,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
@@ -16059,10 +16152,40 @@ 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
@@ -16177,14 +16300,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."
@@ -20743,6 +20879,47 @@ msgid ""
 "control-show> were such errors are fatal)."
 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 ""
+"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
 #, no-wrap
@@ -23314,11 +23491,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 "
@@ -24425,6 +24609,13 @@ msgstr ""
 "patch-header> nie jest dołączone w generowanym pakiecie źródłowym, natomiast "
 "B<patch-header> jest."
 
+#. 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
@@ -24446,10 +24637,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 ""
@@ -25103,12 +25297,19 @@ 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: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -28781,6 +28982,11 @@ 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>"
 
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index 75144183e..1572921d8 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Andre Luis Lopes  <andrelop@debian.org>\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -1480,8 +1480,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"
@@ -2093,6 +2093,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
@@ -2126,6 +2146,14 @@ msgid ""
 " will run more slowly, however).\n"
 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
@@ -4948,7 +4976,8 @@ msgstr ""
 #: 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
@@ -5051,8 +5080,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -6604,13 +6634,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."
 
@@ -6618,14 +6656,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."
@@ -6808,7 +6851,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 "
@@ -6890,9 +6934,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
@@ -6905,10 +6949,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 "
@@ -6928,8 +6972,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
@@ -7247,6 +7292,19 @@ msgstr ""
 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
@@ -7353,7 +7411,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 ""
@@ -7401,31 +7459,42 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<-G>"
-msgid "B<PAGER>"
-msgstr "B<-G>"
+#: 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 displaying the conffiles."
+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
-#, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+#: 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 starting a new interactive shell."
+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 dpkg-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -7468,13 +7537,29 @@ msgid ""
 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>"
@@ -10667,9 +10752,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
@@ -12784,7 +12870,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
@@ -12883,10 +12997,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
@@ -16090,6 +16211,39 @@ msgid ""
 "control-show> were such errors are fatal)."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"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
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -17743,11 +17897,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 "
@@ -18459,6 +18620,12 @@ msgid ""
 "generated source package while B<patch-header> is."
 msgstr ""
 
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
@@ -18470,10 +18637,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 ""
@@ -18950,8 +19120,15 @@ 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%>."
+"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: TP
@@ -21756,6 +21933,11 @@ msgstr "update-alternatives --auto vi"
 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>"
 
diff --git a/man/po/ru.po b/man/po/ru.po
index b2940f422..bb70ffd51 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -1557,8 +1557,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 "ОШИБКИ РЕАЛИЗАЦИИ"
@@ -2341,6 +2341,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
@@ -2393,6 +2413,14 @@ msgstr ""
 " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
 " will run more slowly, however).\n"
 
+#. 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
@@ -5290,7 +5318,8 @@ msgstr ""
 #: 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
@@ -5397,8 +5426,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -6997,13 +7027,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>: Не обращать внимание на версии при проверке зависимостей."
 
@@ -7011,14 +7049,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>: Установить, даже если пакет конфликтует с другим пакетом. Это "
 "опасно, так как обычно приводит к перезаписи некоторых файлов."
@@ -7221,9 +7264,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 ""
 "Игнорировать проверку зависимостей для указанных пакетов (на самом деле, "
 "проверка выполняется, но выдаются только предупреждения о конфликтах и "
@@ -7308,9 +7356,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
@@ -7323,10 +7371,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%> и содержит много файлов, в которых даётся информация "
@@ -7346,8 +7394,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
@@ -7663,6 +7712,19 @@ msgstr ""
 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
@@ -7768,7 +7830,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 ""
@@ -7816,29 +7878,41 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg.man
-#, fuzzy, no-wrap
-#| msgid "B<-G>"
-msgid "B<PAGER>"
-msgstr "B<-G>"
+#: 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 displaying the conffiles."
+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
-#, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+#: 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 starting a new interactive shell."
-msgstr "Программа, которую запустит B<dpkg> при старте новой оболочки."
+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-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -7881,13 +7955,29 @@ msgid ""
 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>"
@@ -11093,9 +11183,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
@@ -13231,7 +13322,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
@@ -13330,10 +13449,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
@@ -16529,6 +16655,39 @@ msgid ""
 "control-show> were such errors are fatal)."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"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
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -18176,11 +18335,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 "
@@ -18893,6 +19059,12 @@ msgid ""
 "generated source package while B<patch-header> is."
 msgstr ""
 
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
@@ -18904,10 +19076,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 ""
@@ -19383,8 +19558,15 @@ 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%>."
+"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: TP
@@ -22120,6 +22302,10 @@ msgstr ""
 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>"
 
diff --git a/man/po/sv.po b/man/po/sv.po
index 943a2becc..b250595d6 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.11\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\n"
@@ -1701,8 +1701,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"
@@ -2562,6 +2562,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
@@ -2615,6 +2636,14 @@ msgstr ""
 " than Unix grep or egrep. (Regular expressions containing backreferencing\n"
 " will run more slowly, however.)\n"
 
+#. 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
@@ -6275,7 +6304,8 @@ msgstr ""
 #: 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
@@ -6389,8 +6419,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -8110,13 +8141,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."
 
@@ -8126,14 +8165,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 "
@@ -8348,9 +8392,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)."
@@ -8436,9 +8485,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. "
@@ -8459,10 +8508,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 "
@@ -8482,8 +8531,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%>."
@@ -8904,6 +8954,21 @@ msgstr ""
 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
@@ -9028,7 +9093,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 ""
@@ -9079,29 +9144,41 @@ msgstr ""
 "temporära filer och kataloger."
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
-msgstr "B<PAGER>"
+msgid "B<SHELL>"
+msgstr "B<SHELL>"
 
 #. 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."
+#, 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, 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.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
-msgstr "B<SHELL>"
+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 "The program B<dpkg> will execute when starting a new shell."
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
-msgstr "Programmet B<dpkg> kommer att exekveras när ett nytt skal startas."
+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-architecture.man dpkg-buildflags.man dpkg-buildpackage.man
@@ -9144,13 +9221,29 @@ msgid ""
 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>"
@@ -13009,9 +13102,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
@@ -15780,10 +15874,43 @@ 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
@@ -15896,10 +16023,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<--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> 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 ""
 "Om satt, och flaggan B<--admindir> inte har angivits, används värdet som "
 "datakatalog för B<dpkg>."
@@ -20197,6 +20341,43 @@ msgid ""
 "control-show> were such errors are fatal)."
 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 "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 ""
+
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -22636,12 +22817,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 "
@@ -23658,6 +23858,13 @@ msgstr ""
 "formaten \"2.0\" eller \"3.0 (quilt)\". B<local-patch-header> tas inte med i "
 "det genererade källkodspaketet medan B<patch-header> tas med."
 
+#. 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
@@ -23679,10 +23886,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 ""
@@ -24281,13 +24491,24 @@ msgstr ""
 
 #. 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: TP
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -27858,6 +28079,10 @@ 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>"
 
diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index cf4c87050..1460d2b5b 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.21\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -1527,8 +1527,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 ""
@@ -2144,6 +2144,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
@@ -2177,6 +2198,14 @@ msgid ""
 " will run more slowly, however).\n"
 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
@@ -4987,7 +5016,8 @@ msgstr ""
 #: 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
@@ -5093,8 +5123,9 @@ msgstr ""
 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 "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -6709,13 +6740,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
@@ -6724,14 +6763,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>: 即使与别的软件包冲突也坚持安装。不过这很危险，因为很有可能会导"
 "致一些文件被覆盖。"
@@ -6908,9 +6952,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 ""
 "忽略对指定软件包的依赖检查（实际上进行了检查，只是当且仅当发生冲突时才会发出"
 "警告）。"
@@ -6984,9 +7033,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%>）"
@@ -7006,10 +7055,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</"
@@ -7028,8 +7077,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> 。"
@@ -7343,6 +7393,19 @@ msgstr ""
 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
@@ -7461,7 +7524,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 ""
@@ -7507,25 +7570,37 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
+msgid "B<SHELL>"
 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 starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
+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 starting a new interactive shell."
+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
@@ -7567,13 +7642,29 @@ msgid ""
 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 ""
@@ -10713,9 +10804,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
@@ -12827,7 +12919,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
@@ -12927,10 +13049,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
@@ -16127,6 +16256,39 @@ msgid ""
 "control-show> were such errors are fatal)."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"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
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -17769,11 +17931,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 "
@@ -18479,6 +18648,12 @@ msgid ""
 "generated source package while B<patch-header> is."
 msgstr ""
 
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
@@ -18490,10 +18665,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 ""
@@ -18967,8 +19145,15 @@ 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%>."
+"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: TP
diff --git a/po/ast.po b/po/ast.po
index 995d78452..6d5bac865 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2015-04-07 09:47+0200\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
 "com>\n"
@@ -1105,11 +1105,22 @@ msgstr "l'área de la base de datos d'estáu ta bloquiada por otru procesu"
 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 "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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2904,6 +2915,8 @@ msgid ""
 "  --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"
@@ -4639,6 +4652,12 @@ msgstr "nun se pudieron establecer permisos d'execución en `%.250s'"
 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'"
@@ -4793,6 +4812,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/bs.po b/po/bs.po
index b0574e33f..4677312e3 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1020,10 +1020,20 @@ msgstr ""
 msgid "unable to lock %s"
 msgstr ""
 
+#: lib/dpkg/file.c
+#, 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
 #, c-format
 msgid "could not open log '%s': %s"
@@ -2578,6 +2588,8 @@ msgid ""
 "  --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"
@@ -3915,6 +3927,12 @@ msgstr ""
 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'"
@@ -4054,6 +4072,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/ca.po b/po/ca.po
index 4ee37fd1b..2a34c1ae1 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.18.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2017-04-29 16:21+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1013,12 +1013,24 @@ msgstr "%s està blocada per un altre procés"
 msgid "unable to lock %s"
 msgstr "no es pot desblocar %s"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "no es pot afegir a «%s»"
+
 #: lib/dpkg/file.c
 #, fuzzy
 #| msgid "unable to flush file '%s'"
 msgid "pager to show file"
 msgstr "no es pot fer «flush» sobre el fitxer «%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 es pot desviar el fitxer «%s» cap a ell mateix"
+
 #: lib/dpkg/log.c
 #, c-format
 msgid "could not open log '%s': %s"
@@ -2700,6 +2712,8 @@ msgid ""
 "  --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"
@@ -4360,6 +4374,12 @@ msgstr "no es poden establir els permisos d'execució en «%.250s»"
 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 ""
+
 #: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
@@ -4523,10 +4543,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/cs.po b/po/cs.po
index eeec85922..236836a1b 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -978,12 +978,24 @@ msgstr "%s je uzamčen jiným procesem"
 msgid "unable to lock %s"
 msgstr "nelze zamknout %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2612,6 +2624,8 @@ msgid ""
 "  --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"
@@ -4195,6 +4209,12 @@ msgstr "nelze nastavit spustitelné právo na „%.250s“"
 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'"
@@ -4342,10 +4362,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/da.po b/po/da.po
index dde9b98c4..e4e6eabde 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1021,6 +1021,12 @@ msgstr "%s er låst af en anden proces"
 msgid "unable to lock %s"
 msgstr "kan ikke låse %s"
 
+#: lib/dpkg/file.c
+#, 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
@@ -1028,6 +1034,12 @@ msgstr "kan ikke låse %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
 msgid "could not open log '%s': %s"
@@ -2684,6 +2696,8 @@ msgid ""
 "  --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"
@@ -4363,6 +4377,12 @@ msgstr "kunne ikke sætte eksekveringsrettigheder for '%.250s'"
 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'"
@@ -4517,10 +4537,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/de.po b/po/de.po
index 2720911cc..78dca6cdf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.1~\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2018-08-30 19:19+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -971,10 +971,22 @@ msgstr "%s ist von einem anderen Prozess gesperrt"
 msgid "unable to lock %s"
 msgstr "%s kann nicht gesperrt werden"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot open %s"
+msgid "cannot open file %s"
+msgstr "%s kann nicht geöffnet werden"
+
 #: lib/dpkg/file.c
 msgid "pager to show file"
 msgstr "Pager zum Anzeigen der Datei"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "Datei »%s« kann nicht auf sich selbst umgeleitet werden"
+
 #: lib/dpkg/log.c
 #, c-format
 msgid "could not open log '%s': %s"
@@ -2623,7 +2635,23 @@ 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"
+#| "  --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 "
@@ -2634,6 +2662,8 @@ msgid ""
 "  --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"
@@ -4287,6 +4317,12 @@ msgstr ""
 "Administratives Verzeichnis muss unterhalb des Installationsverzeichnisses "
 "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 ""
+
 #: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
@@ -4439,10 +4475,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/dpkg.pot b/po/dpkg.pot
index 43e3d17d6..2e0c8fee8 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.1\n"
+"Project-Id-Version: dpkg 1.19.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -940,10 +940,20 @@ msgstr ""
 msgid "unable to lock %s"
 msgstr ""
 
+#: lib/dpkg/file.c
+#, 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
 #, c-format
 msgid "could not open log '%s': %s"
@@ -2461,6 +2471,8 @@ msgid ""
 "  --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"
@@ -3785,6 +3797,12 @@ msgstr ""
 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'"
@@ -3924,6 +3942,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/dz.po b/po/dz.po
index 8a9466e74..963c158eb 100644
--- a/po/dz.po
+++ b/po/dz.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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1059,11 +1059,22 @@ msgstr "གནས་ཚད་གནད་སྡུད་གཞི་རྟེན
 msgid "unable to lock %s"
 msgstr "ཁ་བསྡམ་མ་ཚུགས་ %s: %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2760,6 +2771,8 @@ msgid ""
 "  --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"
@@ -4405,6 +4418,12 @@ msgstr "`%.250s' གུ་ལུ་ལག་ལེན་འཐབ་པའི་
 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'"
@@ -4556,6 +4575,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/el.po b/po/el.po
index fc0322ce3..d0c180893 100644
--- a/po/el.po
+++ b/po/el.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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1078,11 +1078,22 @@ msgstr ""
 msgid "unable to lock %s"
 msgstr "αδύνατο το ξεκλείδωμα του %s: %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2860,6 +2871,8 @@ msgid ""
 "  --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"
@@ -4627,6 +4640,12 @@ msgstr "αδύνατος ο ορισμός άδειας εκτέλεσης στ
 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'"
@@ -4780,6 +4799,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/eo.po b/po/eo.po
index a64e4db2d..45dcd37ef 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1004,12 +1004,24 @@ msgstr "%s estas ŝlosita de alia procezo"
 msgid "unable to lock %s"
 msgstr "ne eblas ŝlosi %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2662,6 +2674,8 @@ msgid ""
 "  --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"
@@ -4316,6 +4330,12 @@ msgstr "ne eblas difini plenum-permesojn por '%.250s'"
 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'"
@@ -4470,10 +4490,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/es.po b/po/es.po
index b97f2e9ce..2e07aff89 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1079,12 +1079,24 @@ msgstr "%s está bloqueada por otro proceso"
 msgid "unable to lock %s"
 msgstr "no se puede desbloquear %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2791,6 +2803,8 @@ msgid ""
 "  --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"
@@ -4474,6 +4488,12 @@ msgstr ""
 "«admindir» tiene que estar dentro de «instdir» para que dpkg funcione "
 "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'"
@@ -4630,10 +4650,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.
 #: 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/et.po b/po/et.po
index 7b13846f5..7d83ed288 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1013,11 +1013,22 @@ msgstr "olekuandmebaasi piirkond on teise protsessi poolt lukustatud"
 msgid "unable to lock %s"
 msgstr "luku %s vabastamine pole võimalik: %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2669,6 +2680,8 @@ msgid ""
 "  --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"
@@ -4161,6 +4174,12 @@ msgstr ""
 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'"
@@ -4309,6 +4328,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/eu.po b/po/eu.po
index b29df7877..ad9539095 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1024,12 +1024,24 @@ msgstr "'%s' beste prozesuren batek blokeatuta dauka"
 msgid "unable to lock %s"
 msgstr "ezin da '%s' blokeatu"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2710,6 +2722,8 @@ msgid ""
 "  --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"
@@ -4397,6 +4411,12 @@ msgstr ""
 "administratze-direktorioa instalazio-direktorioaren barruan egon behar du "
 "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'"
@@ -4555,10 +4575,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/fr.po b/po/fr.po
index 68005e9c3..d9bf72a80 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1063,12 +1063,24 @@ msgstr "%s est verrouillé par un autre processus"
 msgid "unable to lock %s"
 msgstr "impossible de déverrouiller %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2792,6 +2804,8 @@ msgid ""
 "  --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"
@@ -4528,6 +4542,12 @@ msgstr ""
 "le répertoire d'administration (admindir) doit être sous le répertoire "
 "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'"
@@ -4688,10 +4708,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/gl.po b/po/gl.po
index 737ddbeb5..72057c0ea 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1090,11 +1090,22 @@ msgstr "a área da base de datos de estado está bloqueada por outro proceso"
 msgid "unable to lock %s"
 msgstr "non se pode desbloquear %s: %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2865,6 +2876,8 @@ msgid ""
 "  --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"
@@ -4593,6 +4606,12 @@ msgstr "non se poden establecer permisos de execución en \"%.250s\""
 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'"
@@ -4746,6 +4765,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/hu.po b/po/hu.po
index fcd4d33ea..fdef50e0b 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1049,11 +1049,22 @@ msgstr "az állapot adatbázis területet más folyamat zárolja"
 msgid "unable to lock %s"
 msgstr "nem tudom kioldani %s-t: %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2739,6 +2750,8 @@ msgid ""
 "  --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"
@@ -4358,6 +4371,12 @@ msgstr "`%.250s' futtatási jogainak beállítása sikertelen"
 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'"
@@ -4509,6 +4528,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/id.po b/po/id.po
index 0c73ed43b..4d9d0b0d8 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1082,12 +1082,24 @@ msgstr "area basis data status dikunci oleh proses lain"
 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 "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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2847,6 +2859,8 @@ msgid ""
 "  --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"
@@ -4580,6 +4594,12 @@ msgstr "gagal menata izin eksekusi untuk '%.250s'"
 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'"
@@ -4756,6 +4776,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/it.po b/po/it.po
index 4dd78aed4..cb331fc4d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2017-11-29 14:28+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1021,12 +1021,24 @@ msgstr "un altro processo detiene il blocco su %s"
 msgid "unable to lock %s"
 msgstr "impossibile bloccare %s"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "impossibile aggiungere a \"%s\""
+
 #: lib/dpkg/file.c
 #, fuzzy
 #| msgid "unable to flush file '%s'"
 msgid "pager to show file"
 msgstr "impossibile eseguire il flush del file \"%s\""
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "impossibile divergere il file \"%s\" a se stesso"
+
 #: lib/dpkg/log.c
 #, c-format
 msgid "could not open log '%s': %s"
@@ -2713,6 +2725,8 @@ msgid ""
 "  --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"
@@ -4391,6 +4405,12 @@ msgstr ""
 "admindir deve essere all'interno di instdir affinché dpkg funzioni "
 "correttamente"
 
+#: 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'"
@@ -4543,10 +4563,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/ja.po b/po/ja.po
index 765561ee5..e1c1abb1a 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1030,12 +1030,24 @@ msgstr "%s が別のプロセスによってロックされています"
 msgid "unable to lock %s"
 msgstr "%s をロックできません"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2701,6 +2713,8 @@ msgid ""
 "  --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"
@@ -4362,6 +4376,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'"
@@ -4516,10 +4536,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/km.po b/po/km.po
index 7412a8156..b3d6eff90 100644
--- a/po/km.po
+++ b/po/km.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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1048,11 +1048,22 @@ msgstr "តំបន់​មូលដ្ឋាន​ទិន្នន័យ​
 msgid "unable to lock %s"
 msgstr "មិន​អាច​ដោះសោ %s ៖ %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2732,6 +2743,8 @@ msgid ""
 "  --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"
@@ -4333,6 +4346,12 @@ msgstr "មិន​អាច​កំណត់​សិទ្ធិ​ប្រ
 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'"
@@ -4484,6 +4503,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/ko.po b/po/ko.po
index 3bef4b23b..0fdbab6af 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1080,12 +1080,24 @@ msgstr "상태 데이터베이스 영역이 다른 프로세스때문에 잠겨
 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 "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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2849,6 +2861,8 @@ msgid ""
 "  --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"
@@ -4582,6 +4596,12 @@ msgstr "`%.250s'에 실행 권한을 설정할 수 없습니다"
 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'"
@@ -4760,6 +4780,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/ku.po b/po/ku.po
index 03e3835fd..3d474fbd0 100644
--- a/po/ku.po
+++ b/po/ku.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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -959,11 +959,21 @@ msgstr "qada danegeha rewşê ji aliyê pêvajoyeke din tê qifilandin"
 msgid "unable to lock %s"
 msgstr "%s nayê xebitandin"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2561,6 +2571,8 @@ msgid ""
 "  --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"
@@ -3936,6 +3948,12 @@ msgstr ""
 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'"
@@ -4079,6 +4097,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/lt.po b/po/lt.po
index 559446fa6..08732b1ef 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1041,11 +1041,22 @@ msgstr "kitas procesas yra užrakinęs būsenos duomenų bazę"
 msgid "unable to lock %s"
 msgstr "nepavyko užverti %s: %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2727,6 +2738,8 @@ msgid ""
 "  --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"
@@ -4346,6 +4359,12 @@ msgstr "nepavyko nustatyti vykdymo teisių „%.250s“"
 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'"
@@ -4497,6 +4516,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/mr.po b/po/mr.po
index 757a55fd7..7baccec44 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1040,11 +1040,22 @@ msgstr "सद्यस्थिती डेटाबेस क्षेत्
 msgid "unable to lock %s"
 msgstr "%s चे टाळे उघडता येत नाही: %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2728,6 +2739,8 @@ msgid ""
 "  --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"
@@ -4344,6 +4357,12 @@ msgstr "`%.250s' वरिल एग्झिक्युट परवानग
 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'"
@@ -4495,6 +4514,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/nb.po b/po/nb.po
index bb6343547..05b4d57fe 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1079,12 +1079,24 @@ msgstr "statusdatabaseområdet er låst av en annen prosess"
 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 "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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2842,6 +2854,8 @@ msgid ""
 "  --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"
@@ -4582,6 +4596,12 @@ msgstr "klarte ikke sette kjøretillatelse på «%.250s»"
 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'"
@@ -4758,6 +4778,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/ne.po b/po/ne.po
index 2b950e29b..470a2966a 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1050,11 +1050,22 @@ msgstr "अन्य प्रक्रियाद्धारा वस्त
 msgid "unable to lock %s"
 msgstr "%s ताल्चा खोल्न अक्षम: %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2735,6 +2746,8 @@ msgid ""
 "  --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"
@@ -4367,6 +4380,12 @@ msgstr "`%.250s' मा कार्यन्वयन अनुमतिहर
 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'"
@@ -4518,6 +4537,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/nl.po b/po/nl.po
index 3ee1bdf51..325b2b28c 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.0.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2017-10-22 13:03+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1009,12 +1009,24 @@ msgstr "%s is vergrendeld door een ander proces"
 msgid "unable to lock %s"
 msgstr "kan %s niet vergrendelen"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "kan niets toevoegen aan '%s'"
+
 #: lib/dpkg/file.c
 #, fuzzy
 #| msgid "unable to flush file '%s'"
 msgid "pager to show file"
 msgstr "kan bestand '%s' niet doorspoelen"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "kan bestand '%s' niet naar zichzelf omleiden"
+
 #: lib/dpkg/log.c
 #, c-format
 msgid "could not open log '%s': %s"
@@ -2689,6 +2701,8 @@ msgid ""
 "  --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"
@@ -4320,6 +4334,12 @@ msgstr ""
 "de beheersmap moet onder de installatiemap 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 ""
+
 #: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
@@ -4472,10 +4492,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/nn.po b/po/nn.po
index 780d08ca6..198ada8ac 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1039,11 +1039,21 @@ msgstr "statusdatabaseområdet er låst av ein annan prosess"
 msgid "unable to lock %s"
 msgstr "klarte ikkje køyra %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2740,6 +2750,8 @@ msgid ""
 "  --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"
@@ -4329,6 +4341,12 @@ msgstr "klarte ikkje setja køyreløyve på «%.250s»"
 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'"
@@ -4480,6 +4498,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/pa.po b/po/pa.po
index 613acf07a..f35f4d217 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -979,11 +979,22 @@ msgstr ""
 msgid "unable to lock %s"
 msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2548,6 +2559,8 @@ msgid ""
 "  --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"
@@ -4036,6 +4049,12 @@ msgstr ""
 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'"
@@ -4178,6 +4197,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/pl.po b/po/pl.po
index 514c94a6a..bfd4701a9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -983,10 +983,22 @@ msgstr "%s jest zablokowane przez inny proces"
 msgid "unable to lock %s"
 msgstr "nie można zablokować %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2621,7 +2633,23 @@ 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"
+#| "  --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 "
@@ -2632,6 +2660,8 @@ msgid ""
 "  --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"
@@ -2646,7 +2676,8 @@ msgstr ""
 "  --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"
+"  --test                   nic nie robi, tylko pokazuje, co byłoby "
+"zrobione.\n"
 "  --quiet                  tryb cichy, komunikaty ograniczone do minimum.\n"
 "  --help                   wyświetla ten komunikat pomocy\n"
 "  --version                wyświetla informacje o wersji.\n"
@@ -4242,6 +4273,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 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'"
@@ -4392,10 +4429,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/pt.po b/po/pt.po
index 19eda9d02..6e3374eb9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2017-07-01 14:55+0100\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -991,12 +991,24 @@ msgstr "%s está bloqueado por outro processo"
 msgid "unable to lock %s"
 msgstr "não foi possível bloquear %s"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot append to '%s'"
+msgid "cannot open file %s"
+msgstr "não pode acrescentar a '%s'"
+
 #: lib/dpkg/file.c
 #, fuzzy
 #| msgid "unable to flush file '%s'"
 msgid "pager to show file"
 msgstr "não foi possível fazer flush ao ficheiro '%s'"
 
+#: lib/dpkg/file.c
+#, fuzzy, c-format
+#| msgid "cannot divert file '%s' to itself"
+msgid "cannot write file %s into the pager"
+msgstr "não é possível desviar o ficheiro '%s' para o próprio"
+
 #: lib/dpkg/log.c
 #, c-format
 msgid "could not open log '%s': %s"
@@ -2652,6 +2664,8 @@ msgid ""
 "  --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"
@@ -4282,6 +4296,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 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 ""
+
 #: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
@@ -4434,10 +4454,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 23766263e..14282502e 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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."
@@ -1093,11 +1093,21 @@ msgstr "área de banco de dados de estados está bloqueada por outro processo"
 msgid "unable to lock %s"
 msgstr "impossível desbloquear %s: %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2854,6 +2864,8 @@ msgid ""
 "  --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"
@@ -4576,6 +4588,12 @@ msgstr "impossível definir permissões de execução em '%.250s'"
 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'"
@@ -4729,6 +4747,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/ro.po b/po/ro.po
index f36d14d1d..de458e284 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1127,12 +1127,24 @@ msgstr "baza de date este blocată de alt proces"
 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 "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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2929,6 +2941,8 @@ msgid ""
 "  --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"
@@ -4707,6 +4721,12 @@ msgstr "nu se pot seta drepturi de execuție pentru „%.250s”"
 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'"
@@ -4884,6 +4904,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/ru.po b/po/ru.po
index 648fa89a8..601d7cf1e 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1016,12 +1016,24 @@ msgstr "%s заблокирована другим процессом"
 msgid "unable to lock %s"
 msgstr "не удалось заблокировать %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2703,6 +2715,8 @@ msgid ""
 "  --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"
@@ -4411,6 +4425,12 @@ msgstr "не удалось сделать файл «%.250s» исполняе
 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'"
@@ -4568,10 +4588,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/sk.po b/po/sk.po
index f4d299ad2..9654e1f23 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1031,12 +1031,24 @@ msgstr "%s je uzamknutý iným procesom"
 msgid "unable to lock %s"
 msgstr "nedá sa zamknúť %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2743,6 +2755,8 @@ msgid ""
 "  --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"
@@ -4479,6 +4493,12 @@ msgstr "nie je možné nastaviť práva na spustenie na „%.250s“"
 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'"
@@ -4650,6 +4670,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/sv.po b/po/sv.po
index f7d435691..179b57e45 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1006,12 +1006,24 @@ msgstr "%s är låst av en annan process"
 msgid "unable to lock %s"
 msgstr "kunde inte låsa %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2670,6 +2682,8 @@ msgid ""
 "  --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"
@@ -4305,6 +4319,12 @@ msgstr ""
 "administrationskatalogen måste vara inuti dpkgs installationsktalog för att "
 "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'"
@@ -4459,10 +4479,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/th.po b/po/th.po
index 32f6856be..3537731ba 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -990,12 +990,24 @@ msgstr "%s ถูกล็อคโดยโพรเซสอื่น"
 msgid "unable to lock %s"
 msgstr "ไม่สามารถล็อค %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2619,6 +2631,8 @@ msgid ""
 "  --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"
@@ -4232,6 +4246,12 @@ msgstr "ไม่สามารถกำหนดสิทธิ์การเ
 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'"
@@ -4385,10 +4405,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/tl.po b/po/tl.po
index 7bde401aa..477699e2f 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1060,11 +1060,21 @@ msgstr "nakaaldaba na ang status database area ng ibang proseso"
 msgid "unable to lock %s"
 msgstr "hindi ma-execute ang %s"
 
+#: lib/dpkg/file.c
+#, 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
 #| msgid "couldn't open log `%s': %s\n"
@@ -2774,6 +2784,8 @@ msgid ""
 "  --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"
@@ -4422,6 +4434,12 @@ msgstr "hindi matakda ang pahintulot ng pag-execute sa `%.250s'"
 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'"
@@ -4574,6 +4592,8 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/tr.po b/po/tr.po
index 8ef757ced..2a4ac422d 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -986,12 +986,24 @@ msgstr "%s dosyası başka bir süreç tarafından kullanılıyor"
 msgid "unable to lock %s"
 msgstr "%s kilitlenemedi"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2651,6 +2663,8 @@ msgid ""
 "  --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"
@@ -4281,6 +4295,12 @@ msgid "admindir must be inside instdir for dpkg to work properly"
 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'"
@@ -4431,10 +4451,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/vi.po b/po/vi.po
index e963ad79f..7c5584aa4 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -1008,12 +1008,24 @@ msgstr "%s bị khóa bởi một tiến trình khác"
 msgid "unable to lock %s"
 msgstr "không thể khóa %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2670,6 +2682,8 @@ msgid ""
 "  --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"
@@ -4368,6 +4382,12 @@ msgstr "không thể đặt quyền thực hiện cho “%.250s”"
 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'"
@@ -4522,10 +4542,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0fb80b185..deaa4c2af 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2018-08-12 13:18+0200\n"
 "Last-Translator: Mo Zhou <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -976,12 +976,24 @@ msgstr "另外一个进程已经为 %s 加锁"
 msgid "unable to lock %s"
 msgstr "无法锁定 %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2568,6 +2580,8 @@ msgid ""
 "  --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"
@@ -4126,6 +4140,12 @@ msgstr "无法设置 %s 的执行权限位"
 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 ""
+
 #: src/script.c
 #, c-format
 msgid "failed to chroot to '%.250s'"
@@ -4269,10 +4289,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index faa14881d..61b5c0e4a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -971,12 +971,24 @@ msgstr "%s 已被另外一個程序鎖定了"
 msgid "unable to lock %s"
 msgstr "無法鎖定 %s"
 
+#: lib/dpkg/file.c
+#, 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
 msgid "could not open log '%s': %s"
@@ -2583,6 +2595,8 @@ msgid ""
 "  --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"
@@ -4147,6 +4161,12 @@ msgstr "無法設定 `%.250s' 的執行權限"
 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'"
@@ -4297,10 +4317,21 @@ 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"
 "  --quiet                  quiet operation, minimal output.\n"
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 2f85a0ffd..147ffc96c 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -8,7 +8,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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2017-05-07 16:26+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -845,8 +845,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"
@@ -1049,8 +1050,8 @@ 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
+#: 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"
@@ -2082,7 +2083,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'"
@@ -3079,6 +3080,37 @@ 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
+#, fuzzy, perl-format
+#| msgid "cannot open file %s"
+msgid "cannot open file %s for binary detection"
+msgstr "no es pot obrir el fitxer %s"
+
+#: 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"
@@ -3526,26 +3558,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"
@@ -3618,11 +3630,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 ""
diff --git a/scripts/po/de.po b/scripts/po/de.po
index 1d1c65133..2e89bb25b 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2018-09-19 20:30+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -747,8 +747,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"
@@ -932,8 +933,8 @@ 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
+#: 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"
@@ -1899,7 +1900,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'"
@@ -2900,6 +2901,37 @@ 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
+#, fuzzy, perl-format
+#| msgid "cannot open upload file %s for reading"
+msgid "cannot open file %s for binary detection"
+msgstr "kann hochzuladene Datei %s nicht zum Lesen ö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"
@@ -3348,26 +3380,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"
@@ -3440,11 +3452,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 ""
@@ -4818,9 +4825,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 70a43da9c..ccabf40ae 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.1\n"
+"Project-Id-Version: dpkg 1.19.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -554,8 +554,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 ""
@@ -682,8 +683,8 @@ 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
+#: 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 ""
@@ -1444,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'"
@@ -2345,6 +2346,32 @@ msgstr ""
 msgid "cannot read timestamp from %s"
 msgstr ""
 
+#: scripts/Dpkg/Source/Functions.pm
+#, perl-format
+msgid "cannot open file %s for binary detection"
+msgstr ""
+
+#: scripts/Dpkg/Source/BinaryFiles.pm
+#, perl-format
+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 "%s is not the name of a file"
@@ -2768,22 +2795,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"
@@ -2852,11 +2863,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 ""
diff --git a/scripts/po/es.po b/scripts/po/es.po
index 0fd5a1ea7..3e3aab9a8 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -885,8 +885,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»"
@@ -1097,8 +1098,8 @@ 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
+#: 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"
@@ -2255,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'"
@@ -3351,6 +3352,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"
@@ -3833,26 +3865,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"
@@ -3925,11 +3937,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 ""
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index cc4ca8dc1..69773a09a 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -857,8 +857,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"
@@ -1064,8 +1065,8 @@ 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
+#: 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"
@@ -2166,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'"
@@ -3233,6 +3234,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"
@@ -3703,27 +3736,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"
@@ -3797,11 +3809,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 ""
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index e1b23f1d6..1673a1bb1 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -829,8 +829,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"
@@ -1024,8 +1025,8 @@ 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
+#: 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"
@@ -2125,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'"
@@ -3170,6 +3171,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"
@@ -3636,29 +3671,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"
@@ -3729,11 +3741,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 ""
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index 7dc26605d..07c8f5203 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -839,8 +839,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"
@@ -1039,8 +1040,8 @@ 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
+#: 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"
@@ -2137,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'"
@@ -3197,6 +3198,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"
@@ -3668,29 +3703,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"
@@ -3763,11 +3775,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 ""
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index 31a23ec8f..3b65a62be 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: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+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"
@@ -820,8 +820,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"
@@ -1011,8 +1012,8 @@ 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
+#: 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"
@@ -2093,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'"
@@ -3136,6 +3137,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"
@@ -3597,26 +3629,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"
@@ -3687,11 +3699,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"
-- 
cgit v1.2.3


From 60ae796b0d716456a2da6416a9c7997f8b42bef2 Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Tue, 9 Oct 2018 08:16:37 +0200
Subject: Update German scripts translation

Update to 603t.
---
 debian/changelog | 3 +++
 scripts/po/de.po | 9 ++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 225de7216..dd22eaab8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
   [ Updated programs translations ]
   * German (Sven Joachim).
 
+  [ Updated scripts translations ]
+  * German (Helge Kreutzmann).
+
  -- Guillem Jover <guillem@debian.org>  Mon, 08 Oct 2018 12:45:07 +0200
 
 dpkg (1.19.2) unstable; urgency=medium
diff --git a/scripts/po/de.po b/scripts/po/de.po
index 2e89bb25b..0b8d642be 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
-"PO-Revision-Date: 2018-09-19 20:30+0200\n"
+"POT-Creation-Date: 2018-10-09 08:09+0200\n"
+"PO-Revision-Date: 2018-10-09 08:14+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -2902,10 +2902,9 @@ msgid "cannot read timestamp from %s"
 msgstr "Zeitstempel für %s kann nicht gelesen werden"
 
 #: scripts/Dpkg/Source/Functions.pm
-#, fuzzy, perl-format
-#| msgid "cannot open upload file %s for reading"
+#, perl-format
 msgid "cannot open file %s for binary detection"
-msgstr "kann hochzuladene Datei %s nicht zum Lesen öffnen"
+msgstr "kann Datei %s nicht zur Binärerkennung öffnen"
 
 #: scripts/Dpkg/Source/BinaryFiles.pm
 #, perl-format
-- 
cgit v1.2.3


From 25a8a2f05282bd5d0cc8568dfd0c7573e90b170a Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 10 Oct 2018 00:04:17 +0200
Subject: dpkg-maintscript-helper: Use explicit escape instead of literal
 backslash

Warned-by: shellcheck
---
 debian/changelog                   | 4 ++++
 scripts/dpkg-maintscript-helper.sh | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index dd22eaab8..e6ab78fd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 dpkg (1.19.3) UNRELEASED; urgency=medium
 
+  [ Guillem Jover ]
   * Packaging:
     - Bump Standards-Version to 4.2.1 (no changes needed).
     - Switch to debhelper compatibility level 11.
+  * Code internals:
+    - dpkg-maintscript-helper: Use an explicit escape instead of a literal
+      backslash.
 
   [ Updated programs translations ]
   * German (Sven Joachim).
diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh
index de6c863c2..d501307e1 100755
--- a/scripts/dpkg-maintscript-helper.sh
+++ b/scripts/dpkg-maintscript-helper.sh
@@ -96,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
@@ -207,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
-- 
cgit v1.2.3


From 8f14ffd71be934539e57e743aba533702ef59b53 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 9 Oct 2018 23:53:14 +0200
Subject: shell: Quote variables

Reported-by: Johannes Schauer <josch@debian.org>
Warned-by: shellcheck
---
 debian/changelog                   | 1 +
 debian/dpkg.cron.daily             | 8 ++++----
 debian/dpkg.postinst               | 6 +++---
 debian/dpkg.postrm                 | 4 ++--
 run-script                         | 2 +-
 scripts/dpkg-maintscript-helper.sh | 4 ++--
 6 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 5f842d5b3..1bb837776 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
   * Code internals:
     - dpkg-maintscript-helper: Use an explicit escape instead of a literal
       backslash.
+    - Quote shell variables. Reported by Johannes Schauer <josch@debian.org>.
   * Build system:
     - get-version: Use a format string with printf.
     - run-script: Use $() instead of deprecated ``.
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.postinst b/debian/dpkg.postinst
index e762b8a2c..5447d99a4 100755
--- a/debian/dpkg.postinst
+++ b/debian/dpkg.postinst
@@ -18,9 +18,9 @@ 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
+    touch "$logfile"
+    chmod 644 "$logfile"
+    chown root:root "$logfile" 2>/dev/null || chown 0:0 "$logfile"
 }
 
 
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/run-script b/run-script
index c62183295..dc13a35a8 100755
--- a/run-script
+++ b/run-script
@@ -16,4 +16,4 @@ export DPKG_DATADIR="$cwd/data"
 script="$1"
 shift 1
 
-exec $PERL "$cwd/$script" "$@"
+exec "$PERL" "$cwd/$script" "$@"
diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh
index d501307e1..2865a63d5 100755
--- a/scripts/dpkg-maintscript-helper.sh
+++ b/scripts/dpkg-maintscript-helper.sh
@@ -424,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
@@ -568,7 +568,7 @@ COLOR_BOLD_WHITE=''
 
 setup_colors()
 {
-	: ${DPKG_COLORS=auto}
+	: "${DPKG_COLORS=auto}"
 
 	case "$DPKG_COLORS" in
 	auto)
-- 
cgit v1.2.3


From 4c6d0e7159a192e82c43cb8ee68cb091cbce301a Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 10 Oct 2018 00:05:31 +0200
Subject: build: Set environment variables only for CPAN tests

All these environment variables are only relevant while running the
test suite. Do not pollute the rest of the environment.
---
 debian/changelog    |  1 +
 scripts/Build.PL.in | 14 ++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index dcf7ca2e4..0773799db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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.
 
   [ Updated programs translations ]
   * German (Sven Joachim).
diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
index 376c04ceb..6418d0d36 100644
--- a/scripts/Build.PL.in
+++ b/scripts/Build.PL.in
@@ -17,12 +17,6 @@ if (-e 'Build.PL.in') {
 my $class = Module::Build->subclass(
     class => 'Module::Build::Dpkg',
     code => q{
-        BEGIN {
-            $ENV{DPKG_TEST_MODE} = 'cpan';
-            $ENV{DPKG_DATADIR} = 'data';
-            $ENV{DPKG_ORIGINS_DIR} = 't/origins';
-        }
-
         sub subst {
             my ($self, $file) = @_;
             my $path = $self->install_path();
@@ -52,6 +46,14 @@ my $class = Module::Build->subclass(
             $self->SUPER::ACTION_build;
             $self->subst('lib/Dpkg.pm');
         }
+        sub ACTION_test {
+            my $self = shift;
+
+            local $ENV{DPKG_TEST_MODE} = 'cpan';
+            local $ENV{DPKG_DATADIR} = 'data';
+            local $ENV{DPKG_ORIGINS_DIR} = 't/origins';
+            $self->SUPER::ACTION_test;
+        }
     },
 );
 
-- 
cgit v1.2.3


From 13afe924a603c2645eb7b886b1e110220248efa4 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 10 Oct 2018 00:06:41 +0200
Subject: build: Set locale for CPAN tests to C

The test suite expects to run under the C locale.

Fixes: https://rt.cpan.org/Ticket/Display.html?id=127314
---
 debian/changelog    | 1 +
 scripts/Build.PL.in | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 0773799db..495949961 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
       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. Foxes CPAN#127314.
 
   [ Updated programs translations ]
   * German (Sven Joachim).
diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in
index 6418d0d36..b8f62d26f 100644
--- a/scripts/Build.PL.in
+++ b/scripts/Build.PL.in
@@ -49,6 +49,8 @@ my $class = Module::Build->subclass(
         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';
-- 
cgit v1.2.3


From 853f59ec0468f72fa29811a8fe48fad91fab6083 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 23 Oct 2018 02:58:56 +0200
Subject: perl: Fix POD for Dpkg::Interface::Storable derived method
 implementations

Document inherited methods. Document the return values. Note which
arguments are optional. Reorder methods by their position in the stack.
---
 debian/changelog                   |  1 +
 scripts/Dpkg/Changelog.pm          | 18 +++++++-----------
 scripts/Dpkg/Conf.pm               | 10 +++++-----
 scripts/Dpkg/Control/HashCore.pm   | 19 +++++++++----------
 scripts/Dpkg/Control/Info.pm       | 15 ++++++++-------
 scripts/Dpkg/Deps/Simple.pm        | 38 ++++++++++++++++++++++++--------------
 scripts/Dpkg/Index.pm              | 25 ++++++++++++-------------
 scripts/Dpkg/Interface/Storable.pm |  4 ++--
 scripts/Dpkg/Substvars.pm          | 24 ++++++++++++------------
 9 files changed, 80 insertions(+), 74 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 7e5ea0e24..1178f6240 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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.
   * Code internals:
     - dpkg-maintscript-helper: Use an explicit escape instead of a literal
       backslash.
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index 39353fb5c..47752b911 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -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
@@ -443,11 +437,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"
 
@@ -476,6 +466,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);
diff --git a/scripts/Dpkg/Conf.pm b/scripts/Dpkg/Conf.pm
index ca98cd3a7..5b98bbd8e 100644
--- a/scripts/Dpkg/Conf.pm
+++ b/scripts/Dpkg/Conf.pm
@@ -221,7 +221,7 @@ sub filter {
                                @{$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 +230,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,6 +245,10 @@ sub output {
     return $ret;
 }
 
+=item $conf->save($file)
+
+Save the options in a file.
+
 =back
 
 =head1 CHANGES
diff --git a/scripts/Dpkg/Control/HashCore.pm b/scripts/Dpkg/Control/HashCore.pm
index e83522729..542069332 100644
--- a/scripts/Dpkg/Control/HashCore.pm
+++ b/scripts/Dpkg/Control/HashCore.pm
@@ -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.
diff --git a/scripts/Dpkg/Control/Info.pm b/scripts/Dpkg/Control/Info.pm
index a5eae8732..9b07eedbe 100644
--- a/scripts/Dpkg/Control/Info.pm
+++ b/scripts/Dpkg/Control/Info.pm
@@ -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/Deps/Simple.pm b/scripts/Dpkg/Deps/Simple.pm
index 0557c7cfc..4fa1ae8d5 100644
--- a/scripts/Dpkg/Deps/Simple.pm
+++ b/scripts/Dpkg/Deps/Simple.pm
@@ -149,20 +149,6 @@ sub reset {
     $self->{restrictions} = undef;
 }
 
-=item $dep->parse($fh, $desc)
-
-Parses a line from a filehandle.
-
-=cut
-
-sub parse {
-    my ($self, $fh, $desc) = @_;
-
-    my $line = <$fh>;
-    chomp $line;
-    return $self->parse_string($line);
-}
-
 =item $dep->parse_string($dep_string)
 
 Parses the dependency string and modifies internal properties to match the
@@ -224,6 +210,24 @@ sub parse_string {
     }
 }
 
+=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"
@@ -257,6 +261,12 @@ sub output {
     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.
diff --git a/scripts/Dpkg/Index.pm b/scripts/Dpkg/Index.pm
index bcee6205b..682f16921 100644
--- a/scripts/Dpkg/Index.pm
+++ b/scripts/Dpkg/Index.pm
@@ -237,11 +237,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 +258,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 +399,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,6 +426,11 @@ 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
diff --git a/scripts/Dpkg/Interface/Storable.pm b/scripts/Dpkg/Interface/Storable.pm
index eb6078d3b..5ed308cf2 100644
--- a/scripts/Dpkg/Interface/Storable.pm
+++ b/scripts/Dpkg/Interface/Storable.pm
@@ -48,13 +48,13 @@ 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/Substvars.pm b/scripts/Dpkg/Substvars.pm
index 650eae7fa..d2060efc5 100644
--- a/scripts/Dpkg/Substvars.pm
+++ b/scripts/Dpkg/Substvars.pm
@@ -183,10 +183,6 @@ sub no_warn {
     $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
@@ -216,6 +212,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
@@ -404,20 +404,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
 
@@ -434,6 +429,11 @@ sub output {
     return $str;
 }
 
+=item $s->save($file)
+
+Store all substitutions variables except the automatic ones in the
+indicated file.
+
 =back
 
 =head1 CHANGES
-- 
cgit v1.2.3


From 1fa3e4360b4ebadef4f0f486fb4a029e6bbdc705 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 13 Oct 2018 10:00:39 +0200
Subject: Dpkg::Deps::Simple: Fix POD signature for new constructor

---
 debian/changelog            | 1 +
 scripts/Dpkg/Deps/Simple.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 1178f6240..14970a692 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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.
diff --git a/scripts/Dpkg/Deps/Simple.pm b/scripts/Dpkg/Deps/Simple.pm
index 4fa1ae8d5..efe635cec 100644
--- a/scripts/Dpkg/Deps/Simple.pm
+++ b/scripts/Dpkg/Deps/Simple.pm
@@ -88,7 +88,7 @@ use Dpkg::Gettext;
 
 use parent qw(Dpkg::Interface::Storable);
 
-=item $dep = Dpkg::Deps::Simple->new(%opts);
+=item $dep = Dpkg::Deps::Simple->new([$dep[, %opts]]);
 
 Creates a new object. Some options can be set through %opts:
 
-- 
cgit v1.2.3


From e326eda15c84d0456aa2e1c22c996e89ef6c40f2 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 9 Dec 2018 23:06:29 +0100
Subject: Dpkg::Changelog::Debian: Preserve modelines at EOF

We should keep these and consider them as pseudo-EOF markers, and stop
processing once seen.

[lamby@debian.org:
 - Initial test cases for dpkg-mergechangelogs functional tests. ]

Closes: #916056
---
 debian/changelog                              |  3 +++
 man/deb-changelog.man                         | 10 +++++-----
 man/dpkg-mergechangelogs.man                  |  4 ++--
 scripts/Dpkg/Changelog/Debian.pm              |  8 ++++++--
 scripts/Makefile.am                           |  1 +
 scripts/t/Dpkg_Changelog.t                    |  8 ++++++--
 scripts/t/Dpkg_Changelog/stop-modeline        | 13 +++++++++++++
 scripts/t/merge_changelogs/ch-a               |  2 ++
 scripts/t/merge_changelogs/ch-b               |  2 ++
 scripts/t/merge_changelogs/ch-merged          |  2 ++
 scripts/t/merge_changelogs/ch-merged-basic    |  2 ++
 scripts/t/merge_changelogs/ch-merged-pr       |  2 ++
 scripts/t/merge_changelogs/ch-merged-pr-basic |  2 ++
 scripts/t/merge_changelogs/ch-old             |  2 ++
 14 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 scripts/t/Dpkg_Changelog/stop-modeline

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 14970a692..9a6e7a47d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 dpkg (1.19.3) UNRELEASED; urgency=medium
 
   [ Guillem Jover ]
+  * Perl modules:
+    - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056
+      Thanks to Chris Lamb <lamby@debian.org> for initial test cases.
   * Documentation:
     - dpkg(1): Clarify --remove action. Closes: #914478
     - dpkg-query(1): Clarify --list option behavior when no arguments are
diff --git a/man/deb-changelog.man b/man/deb-changelog.man
index 6aaa5d2cf..c4485e045 100644
--- a/man/deb-changelog.man
+++ b/man/deb-changelog.man
@@ -142,12 +142,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/dpkg-mergechangelogs.man b/man/dpkg-mergechangelogs.man
index 9cda23ef0..4d6159c02 100644
--- a/man/dpkg-mergechangelogs.man
+++ b/man/dpkg-mergechangelogs.man
@@ -75,8 +75,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/scripts/Dpkg/Changelog/Debian.pm b/scripts/Dpkg/Changelog/Debian.pm
index a44ac666c..937acb5e0 100644
--- a/scripts/Dpkg/Changelog/Debian.pm
+++ b/scripts/Dpkg/Changelog/Debian.pm
@@ -162,9 +162,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/Makefile.am b/scripts/Makefile.am
index d7bd8d2f7..d68560173 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -311,6 +311,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 \
diff --git a/scripts/t/Dpkg_Changelog.t b/scripts/t/Dpkg_Changelog.t
index 8aa1bfc45..f487ff560 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 => 96;
+use Test::More tests => 102;
 use Test::Dpkg qw(:paths);
 
 use File::Basename;
@@ -36,7 +36,7 @@ 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);
@@ -346,6 +346,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/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/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
-- 
cgit v1.2.3


From 39eb793a685273f520b25179bf118f8845ece0f6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 24 Dec 2018 03:05:05 +0100
Subject: Dpkg::File: Make file_slurp() also accept pathnames in addition to
 filehandles

This makes several call sites more clear, as we move the logic inside
the function.
---
 debian/changelog                  |  2 ++
 scripts/Dpkg/File.pm              | 16 +++++++++++++++-
 scripts/Dpkg/Source/Package/V2.pm |  7 ++-----
 scripts/dpkg-genchanges.pl        |  5 +----
 scripts/t/Dpkg_Changelog.t        |  4 +---
 utils/t/update_alternatives.t     |  7 ++-----
 6 files changed, 23 insertions(+), 18 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 9a6e7a47d..64380eb07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
   * 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.
   * Documentation:
     - dpkg(1): Clarify --remove action. Closes: #914478
     - dpkg-query(1): Clarify --list option behavior when no arguments are
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/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index fe9a1727d..e2c1b49fb 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -591,12 +591,8 @@ sub _get_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);
     }
     my $ch_info = changelog_parse(offset => 0, count => 1,
         file => File::Spec->catfile($dir, 'debian', 'changelog'));
@@ -613,6 +609,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---
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 13ab8a453..690a4e59d 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -415,10 +415,7 @@ 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) {
diff --git a/scripts/t/Dpkg_Changelog.t b/scripts/t/Dpkg_Changelog.t
index f487ff560..4d046fec1 100644
--- a/scripts/t/Dpkg_Changelog.t
+++ b/scripts/t/Dpkg_Changelog.t
@@ -41,9 +41,7 @@ foreach my $file ("$datadir/countme", "$datadir/shadow", "$datadir/fields",
     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();
diff --git a/utils/t/update_alternatives.t b/utils/t/update_alternatives.t
index 491fee07d..84e2080da 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} || '.';
@@ -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
-- 
cgit v1.2.3


From 75afd33e320ebb31f0e974b227d714b049a67808 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 8 Dec 2018 00:28:57 +0100
Subject: Dpkg::Vendor::Ubuntu: Fix buildflags override after default setting
 move

The default buildflags got moved from the Dpkg::BuildFlags module to
the Dpkg::Vendor::Debian, but this module was not adapted to match.

Instead of running the Debian hooks after the Ubuntu buildflags are set
up, run them first, and then modify/prepend the bits we need to change.
This fixes compiler optimization on ppc64el, and makes setting it more
future proof.

Fixes: commit d5374bc618310917557daa9c9ac2f4930515a0b2
Closes: #915881
Co-Author: Iain Lane <laney@ubuntu.com>
Co-Author: Adam Conrad <adconrad@ubuntu.com>
---
 debian/changelog                   |  3 ++
 scripts/Dpkg/Vendor/Ubuntu.pm      | 12 ++++----
 scripts/Makefile.am                |  1 +
 scripts/t/Dpkg_BuildFlags_Ubuntu.t | 57 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 68 insertions(+), 5 deletions(-)
 create mode 100644 scripts/t/Dpkg_BuildFlags_Ubuntu.t

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 64380eb07..f5face124 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
       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
   * Documentation:
     - dpkg(1): Clarify --remove action. Closes: #914478
     - dpkg-query(1): Clarify --list option behavior when no arguments are
diff --git a/scripts/Dpkg/Vendor/Ubuntu.pm b/scripts/Dpkg/Vendor/Ubuntu.pm
index eb2dffefe..e6335c204 100644
--- a/scripts/Dpkg/Vendor/Ubuntu.pm
+++ b/scripts/Dpkg/Vendor/Ubuntu.pm
@@ -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/Makefile.am b/scripts/Makefile.am
index d68560173..65867b6b2 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -219,6 +219,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 \
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;
-- 
cgit v1.2.3


From 6b8897bad85394b2737e609419ad3ebd7ee5b008 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 10 Oct 2018 09:40:00 +0200
Subject: Dpkg::Shlibs::Objdump: Remove unused Dpkg::IPC import

The spawn() call was removed but not the matching import.

Fixes: commit 8ae966ae7d3635b8359829085db4262923ceae96
---
 debian/changelog               | 1 +
 scripts/Dpkg/Shlibs/Objdump.pm | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index f5face124..5ef764d80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - dpkg(1): Clarify --remove action. Closes: #914478
     - dpkg-query(1): Clarify --list option behavior when no arguments are
diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
index d0a7b56cb..d3a94113e 100644
--- a/scripts/Dpkg/Shlibs/Objdump.pm
+++ b/scripts/Dpkg/Shlibs/Objdump.pm
@@ -25,7 +25,6 @@ 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';
-- 
cgit v1.2.3


From 50b7e8cc41eb94a184087cc93cab86e401643c90 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 10 Oct 2018 09:41:11 +0200
Subject: Dpkg::Shlibs::Objdump: Only select objdump program when going to use
 it

Running code in the module scope means that anything importing the
module will execute that code, which is undesirable. Move the
initialization into a _select_objdump() sub, which gets assigned into
a state variable on demand.
---
 debian/changelog               |  1 +
 scripts/Dpkg/Shlibs/Objdump.pm | 23 +++++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 5ef764d80..e4d49221e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - dpkg(1): Clarify --remove action. Closes: #914478
     - dpkg-query(1): Clarify --list option behavior when no arguments are
diff --git a/scripts/Dpkg/Shlibs/Objdump.pm b/scripts/Dpkg/Shlibs/Objdump.pm
index d3a94113e..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,16 +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);
-
-# 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;
@@ -243,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;
@@ -280,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) = @_;
@@ -297,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);
-- 
cgit v1.2.3


From a7fb57546f0a7e88a1acd7bdf1c081b43972b01d Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 25 Nov 2018 22:59:03 +0100
Subject: Dpkg::Source::Package: Do not reinitialize fields member in
 constructor

We initialized it already in the new constructor, no point in doing the
same twice.
---
 debian/changelog               | 1 +
 scripts/Dpkg/Source/Package.pm | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index e4d49221e..d43a06258 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - dpkg(1): Clarify --remove action. Closes: #914478
     - dpkg-query(1): Clarify --list option behavior when no arguments are
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index f7851d203..c9f8d5e14 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -262,9 +262,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)) {
-- 
cgit v1.2.3


From a71649166e7dabbce315c8e49501ba68676831ef Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 5 Nov 2018 23:57:52 +0100
Subject: Dpkg::Source::Patch: Do not recommend --include-removal when not
 supported

If the option has not been set, then the source format does not support
it and we should thus not recommend the --include-removal option in the
warning.

Closes: #913012
---
 debian/changelog             | 2 ++
 scripts/Dpkg/Source/Patch.pm | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d43a06258..88e6f9b48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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
   * Documentation:
     - dpkg(1): Clarify --remove action. Closes: #914478
     - dpkg-query(1): Clarify --list option behavior when no arguments are
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);
-- 
cgit v1.2.3


From 05f666b8e944e7e7cf06966e192f759fa83b4d02 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 12 Oct 2018 20:46:10 +0200
Subject: Dpkg::Source::Package::V3::Bzr: Fix format name in output message

---
 debian/changelog                      | 1 +
 scripts/Dpkg/Source/Package/V3/Bzr.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 88e6f9b48..5d9a187de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - dpkg(1): Clarify --remove action. Closes: #914478
     - dpkg-query(1): Clarify --list option behavior when no arguments are
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();
-- 
cgit v1.2.3


From e0b3b307decf60b2a4e39c511ad970d4a1abd2b6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 13 Oct 2018 10:02:03 +0200
Subject: Dpkg::Source::Package: Add a new format option to the new constructor

This makes it easier to construct a source package object with the
desired object, and initialize it as required.

Prompted-by: James McCoy <jamesan@debian.org>
Ref: https://salsa.debian.org/debian/devscripts/merge_requests/61
---
 debian/changelog               |  2 ++
 scripts/Dpkg/Source/Package.pm | 21 ++++++++++++++++-----
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 5d9a187de..63c983e4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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>.
   * Documentation:
     - dpkg(1): Clarify --remove action. Closes: #914478
     - dpkg-query(1): Clarify --list option behavior when no arguments are
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index c9f8d5e14..b3a80ba1d 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -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 = '1.03';
 our @EXPORT_OK = qw(
     get_default_diff_ignore_regex
     set_default_diff_ignore_regex
@@ -166,12 +166,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
 
@@ -220,6 +223,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;
 }
@@ -670,6 +677,10 @@ sub write_dsc {
 
 =head1 CHANGES
 
+=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().
-- 
cgit v1.2.3


From 23802ae9be9760a4135b8ca2911c86045fe47fc2 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 21 Oct 2018 22:55:29 +0200
Subject: Dpkg::Source::Package: Improve debian/source/format parsing and
 validation

Make the regex more strict and decompose it right away instead of doing
a second pass over it. Only initialize minor when we need to update the
format. And fix the error for an invalid format to stop referencing the
Format field, which might not be involved during the parsing.
---
 debian/changelog               |  2 ++
 scripts/Dpkg/Source/Package.pm | 25 +++++++++----------------
 2 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 63c983e4b..6065bc48d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - dpkg(1): Clarify --remove action. Closes: #914478
     - dpkg-query(1): Clarify --list option behavior when no arguments are
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index b3a80ba1d..29e61170e 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -290,16 +290,8 @@ sub upgrade_object_type {
     $self->{fields}{'Format'} //= '1.0';
     my $format = $self->{fields}{'Format'};
 
-    if ($format =~ /^([\d\.]+)(?:\s+\((.*)\))?$/) {
-        my ($version, $variant) = ($1, $2);
-
-        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;
+    if ($format =~ /^(\d+)(?:\.(\d+))?(?:\s+\(([a-z0-9]+)\))?$/) {
+        my ($major, $minor, $variant) = ($1, $2, $3);
 
         my $module = "Dpkg::Source::Package::V$major";
         $module .= '::' . ucfirst $variant if defined $variant;
@@ -308,19 +300,20 @@ sub upgrade_object_type {
             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, $@);
         }
+
+        if ($update_format) {
+            $minor //= 0;
+            $self->{fields}{'Format'} = "$major.$minor";
+            $self->{fields}{'Format'} .= " ($variant)" if defined $variant;
+        }
         $module->prerequisites() if $module->can('prerequisites');
         bless $self, $module;
     } else {
-        error(g_("invalid Format field '%s'"), $format);
+        error(g_("source package format '%s' is invalid"), $format);
     }
 }
 
-- 
cgit v1.2.3


From c8dcfa3f2c42f51cebf2673312a52e7b71bb00ec Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 23 Oct 2018 02:18:04 +0200
Subject: Dpkg::Source::Format: New module

This new public module centralizes the handling of debian/source/format
so that other projects can reuse it instead of having to reimplement it.

Prompted-by: Mattia Rizzolo <mattia@debian.org>
Ref: https://salsa.debian.org/debian/devscripts/merge_requests/63
---
 debian/changelog               |   2 +
 debian/control                 |   1 +
 scripts/Dpkg.pm                |   4 +
 scripts/Dpkg/Source/Format.pm  | 191 +++++++++++++++++++++++++++++++++++++++++
 scripts/Makefile.am            |   2 +
 scripts/t/Dpkg_Source_Format.t |  65 ++++++++++++++
 6 files changed, 265 insertions(+)
 create mode 100644 scripts/Dpkg/Source/Format.pm
 create mode 100644 scripts/t/Dpkg_Source_Format.t

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 6065bc48d..456c1ec43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
       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
diff --git a/debian/control b/debian/control
index 1d7e33a2e..f78162c41 100644
--- a/debian/control
+++ b/debian/control
@@ -197,6 +197,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/scripts/Dpkg.pm b/scripts/Dpkg.pm
index fd9259ecb..c2768a3dd 100644
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -266,6 +266,10 @@ Base object serializer.
 
 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.
diff --git a/scripts/Dpkg/Source/Format.pm b/scripts/Dpkg/Source/Format.pm
new file mode 100644
index 000000000..55172a2ef
--- /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 an object 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/Makefile.am b/scripts/Makefile.am
index 65867b6b2..aacd630fc 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -105,6 +105,7 @@ nobase_dist_perllib_DATA = \
 	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 \
@@ -251,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 \
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;
-- 
cgit v1.2.3


From d1d35a56e401181b6d15baf474a7db21d3372a65 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 20 Oct 2018 15:04:16 +0200
Subject: Dpkg::Source::Package, dpkg-source: Switch to new
 Dpkg::Source::Format module

This move all ad-hoc code to use the new Dpkg::Source::Format module.
---
 debian/changelog               |  1 +
 scripts/Dpkg/Source/Package.pm | 52 ++++++++++++++++++------------------------
 scripts/dpkg-source.pl         | 12 ++++------
 3 files changed, 27 insertions(+), 38 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 456c1ec43..55d28b816 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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.
   * Build system:
     - get-version: Use a format string with printf.
     - run-script: Use $() instead of deprecated ``.
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index 29e61170e..74daa712b 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -213,6 +213,7 @@ sub new {
     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(),
     };
@@ -287,34 +288,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+)(?:\.(\d+))?(?:\s+\(([a-z0-9]+)\))?$/) {
-        my ($major, $minor, $variant) = ($1, $2, $3);
-
-        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) {
-            $minor //= 0;
-            $self->{fields}{'Format'} = "$major.$minor";
-            $self->{fields}{'Format'} .= " ($variant)" if defined $variant;
-        }
-        $module->prerequisites() if $module->can('prerequisites');
-        bless $self, $module;
-    } else {
-        error(g_("source package format '%s' is invalid"), $format);
+    my $format = $self->{fields}{'Format'} // '1.0';
+    my ($major, $minor, $variant) = $self->{format}->set($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()
@@ -548,10 +543,7 @@ sub extract {
         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);
 	}
     }
 
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 6a4825d22..2e5f41d31 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -396,14 +396,10 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) {
 
     # 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);
+        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')
-- 
cgit v1.2.3


From e989be905db9b9c4761124ce6ee75d4b8903c246 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 13 Oct 2018 10:03:26 +0200
Subject: dpkg-source: Move source format selection earlier in the build

This move it at the beginning were it belongs, as the later code can
change behavior based on the format selected. This also will make it
possible to delegate the source format object selection to the
Dpkg::Source::Package class.
---
 debian/changelog       |  1 +
 scripts/dpkg-source.pl | 39 ++++++++++++++++++++-------------------
 2 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 55d28b816..fcb5e5f19 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
       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.
   * Build system:
     - get-version: Use a format string with printf.
     - run-script: Use $() instead of deprecated ``.
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 2e5f41d31..e1124496c 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -238,9 +238,29 @@ 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;
 
+    # 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(options => \%options);
     my $fields = $srcpkg->{fields};
 
+    $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);
+
     my @sourcearch;
     my %archadded;
     my @binarypackages;
@@ -394,25 +414,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) {
-        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';
-	}
-    }
-    $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);
-- 
cgit v1.2.3


From 103fb161b360a00e4ca97b891b199c8aeacc63c5 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 13 Oct 2018 10:03:26 +0200
Subject: dpkg-source: Use new format argument for Dpkg::Source::Package->new()

This makes the creation of the object more compact and easier to read.
---
 debian/changelog       |  1 +
 scripts/dpkg-source.pl | 12 ++++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index fcb5e5f19..9713e9b60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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().
   * Build system:
     - get-version: Use a format string with printf.
     - run-script: Use $() instead of deprecated ``.
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index e1124496c..5f553e122 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);
@@ -252,13 +253,10 @@ if ($options{opmode} =~ /^(build|print-format|(before|after)-build|commit)$/) {
         }
     }
 
-    my $srcpkg = Dpkg::Source::Package->new(options => \%options);
+    my $srcpkg = Dpkg::Source::Package->new(format => $build_format,
+                                            options => \%options);
     my $fields = $srcpkg->{fields};
 
-    $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);
 
     my @sourcearch;
@@ -570,9 +568,7 @@ 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;
-- 
cgit v1.2.3


From 289dc861960b88f67e45a4a3ba4b9ee51cf3da39 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 9 Nov 2018 01:30:22 +0100
Subject: dpkg-source: Stop filtering @builddeps@ from Testsuite-Triggers field

Filtering this meta-variable means that code parsing the field is unable
to know whether the source specified the build dependencies as relevant
for retriggering. We should also not expand the meta-variable as that
would lose information, so we let it through now.

Closes: #910734
---
 debian/changelog       | 2 ++
 man/dsc.man            | 2 +-
 scripts/dpkg-source.pl | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 9713e9b60..e34532939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 dpkg (1.19.3) UNRELEASED; urgency=medium
 
   [ Guillem Jover ]
+  * dpkg-source: Stop filtering @builddeps@ from Testsuite-Triggers field.
+    Closes: #910734
   * Perl modules:
     - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056
       Thanks to Chris Lamb <lamby@debian.org> for initial test cases.
diff --git a/man/dsc.man b/man/dsc.man
index 3fb20e3b3..c415127b3 100644
--- a/man/dsc.man
+++ b/man/dsc.man
@@ -160,7 +160,7 @@ 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 (that is, converted to
 separate AND relationships), except for binaries generated by this source
-package and meta-dependencies such as \fB@\fP or \fB@builddeps@\fP.
+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/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 5f553e122..32dc1c930 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -537,8 +537,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;
-- 
cgit v1.2.3


From 4a4619831de8b8972f86b489660dc98f187cfa34 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 10 Nov 2018 03:23:19 +0100
Subject: dpkg-genchanges: Only reference binary packages being uploaded

The .changes file describes an upload, and its Binary and Description
fields should contain (as documented) only references to the packages
being uploaded.

In case of a source-only upload, the Binary and Description fields
should be empty.

Closes: #818618
---
 debian/changelog                                     |  3 +++
 man/deb-changes.man                                  |  4 +++-
 scripts/dpkg-genchanges.pl                           | 20 ++++++++++----------
 .../t/dpkg_buildpackage/test-source_0_all.changes    |  3 +--
 .../t/dpkg_buildpackage/test-source_0_any.changes    |  3 +--
 .../t/dpkg_buildpackage/test-source_0_source.changes |  4 ----
 6 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index e34532939..c6c1e191a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ dpkg (1.19.3) UNRELEASED; 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
   * Perl modules:
     - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056
       Thanks to Chris Lamb <lamby@debian.org> for initial test cases.
diff --git a/man/deb-changes.man b/man/deb-changes.man
index e1a43e4fa..be8f6d579 100644
--- a/man/deb-changes.man
+++ b/man/deb-changes.man
@@ -70,8 +70,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 +114,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
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 690a4e59d..8def2f98f 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -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;
 
@@ -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->{$_};
 
@@ -465,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/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
-- 
cgit v1.2.3


From b4384aa5fe06d4de79323139a7b30299ad821f59 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 23 Oct 2018 03:06:49 +0200
Subject: dpkg-shlibdeps: Remove unused variable

---
 debian/changelog          | 1 +
 scripts/dpkg-shlibdeps.pl | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index c6c1e191a..075fff395 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,6 +50,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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.
   * Build system:
     - get-version: Use a format string with printf.
     - run-script: Use $() instead of deprecated ``.
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index fa6c37a4d..2e8bfa73d 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.
@@ -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()) {
-- 
cgit v1.2.3


From 7c77f73438afbcb3163c5aaf08c2ef58274ed345 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 25 Nov 2018 22:26:17 +0100
Subject: dpkg-shlibdeps: Remove duplicate word across newline boundary

---
 scripts/dpkg-shlibdeps.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index 2e8bfa73d..a318a59d1 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -235,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};
-- 
cgit v1.2.3


From 5d4ab4ae7d11c736bdabb51af4bc7e66c69cdd23 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 29 Dec 2018 12:32:26 +0100
Subject: dpkg-scanpackages: Do not compute unnecessary checksums

When we specify a --hash argument we should not compute all checksums to
then discard them.

Closes: #916456
Based-on-patch-by: Chris Lamb <lamby@debian.org>
---
 debian/changelog             |  3 +++
 scripts/dpkg-scanpackages.pl | 11 +++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 075fff395..b244c8d3b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
   * 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
   * Perl modules:
     - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056
       Thanks to Chris Lamb <lamby@debian.org> for initial test cases.
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 05710ae69..dd4308641 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -41,7 +41,7 @@ my (@samemaint, @changedmaint);
 my @spuriousover;
 my %packages;
 my %overridden;
-my %hash;
+my @checksums;
 
 my %options = (help            => sub { usage(); exit 0; },
 	       version         => sub { version(); exit 0; },
@@ -196,10 +196,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 +221,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;
 
-- 
cgit v1.2.3


From 55cdf5fac707895e42a356b3d32d9d648e28fc40 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 7 Jan 2019 22:32:22 +0100
Subject: dpkg-scanpackages: Unroll a single iteration loop

When not in multi-version mode, we can only ever have one package in the
%packages hash, remove the confusing loop and replace with an explicit
assignment using the first array reference element.
---
 debian/changelog             |  1 +
 scripts/dpkg-scanpackages.pl | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index b244c8d3b..6fac0102c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,7 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     - 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.
   * Build system:
     - get-version: Use a format string with printf.
     - run-script: Use $() instead of deprecated ``.
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index dd4308641..bb0bebcf2 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -174,20 +174,20 @@ 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];
+
+        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;
         }
     }
 
-- 
cgit v1.2.3


From 4affcfaa170b3a36348b977ef6f3277b7fb12c99 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 7 Jan 2019 22:34:43 +0100
Subject: dpkg-scanpackages: Emit a warning with the list of repeat packages

When not using --multiversion, track any repeated instance that would
possibly benefit from running with --multiversion, and output it at the
end with a suggestion to use that option.

Prompted-by: Johannes Schauer <josch@debian.org>
---
 debian/changelog             | 2 ++
 scripts/dpkg-scanpackages.pl | 8 ++++++++
 2 files changed, 10 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 6fac0102c..c1d7d8181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
   * 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>.
   * Perl modules:
     - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056
       Thanks to Chris Lamb <lamby@debian.org> for initial test cases.
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index bb0bebcf2..6d6d7946e 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -38,6 +38,7 @@ textdomain('dpkg-dev');
 report_options(info_fh => \*STDERR);
 
 my (@samemaint, @changedmaint);
+my @multi_instances;
 my @spuriousover;
 my %packages;
 my %overridden;
@@ -176,6 +177,9 @@ sub process_deb {
     if (defined($packages{$p}) and not $options{multiversion}) {
         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'}))
         {
@@ -274,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);
-- 
cgit v1.2.3


From 37dd4ce62e0925967c59daec130540d2fa0402d6 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@debian.org>
Date: Fri, 16 Nov 2018 04:15:13 +0100
Subject: scripts/mk: Fix dpkg_vendor_derives_from macro documentation

Add a missing comma, and $(shell) make function invocation.

Closes: #913816
Signed-off-by: Guillem Jover <guillem@debian.org>
---
 debian/changelog     | 2 ++
 scripts/mk/vendor.mk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 4429ccc68..4a4446434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
   * 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
   * Perl modules:
     - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056
       Thanks to Chris Lamb <lamby@debian.org> for initial test cases.
diff --git a/scripts/mk/vendor.mk b/scripts/mk/vendor.mk
index aa75cd6fc..fe06828f5 100644
--- a/scripts/mk/vendor.mk
+++ b/scripts/mk/vendor.mk
@@ -6,7 +6,7 @@
 # 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)
+# ifeq ($(shell $(call dpkg_vendor_derives_from,ubuntu)),yes)
 #   ...
 # endif
 
-- 
cgit v1.2.3


From 91e2ae0b74d9efb47a5635466a8e0f0826c0a0e8 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 27 Nov 2018 04:05:09 +0100
Subject: scripts/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.
---
 debian/changelog          |  3 +++
 scripts/Makefile.am       |  2 ++
 scripts/mk/vendor.mk      | 38 +++++++++++++++++++++++++++++++-------
 scripts/t/mk.t            |  4 +++-
 scripts/t/mk/vendor-v0.mk |  6 ++++++
 scripts/t/mk/vendor-v1.mk |  6 ++++++
 scripts/t/mk/vendor.mk    |  1 +
 7 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 scripts/t/mk/vendor-v0.mk
 create mode 100644 scripts/t/mk/vendor-v1.mk

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 4a4446434..aa84c615e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ dpkg (1.19.3) UNRELEASED; urgency=medium
     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.
   * Perl modules:
     - Dpkg::Changelog::Debian: Preserve modelines at EOF. Closes: #916056
       Thanks to Chris Lamb <lamby@debian.org> for initial test cases.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index aacd630fc..ea8aef557 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -364,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/mk/vendor.mk b/scripts/mk/vendor.mk
index fe06828f5..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 ($(shell $(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/t/mk.t b/scripts/t/mk.t
index 0062e993c..98c7e5083 100644
--- a/scripts/t/mk.t
+++ b/scripts/t/mk.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 6;
+use Test::More tests => 8;
 use Test::Dpkg qw(:paths);
 
 use File::Spec::Functions qw(rel2abs);
@@ -117,5 +117,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/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"
-- 
cgit v1.2.3


From aac92cd67b6446cd6c444709927f18edd702cf9a Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 22 Jan 2019 14:26:03 +0100
Subject: po: Regenerate .pot files and merge .po files with them

---
 dselect/po/bs.po        |   2 +-
 dselect/po/ca.po        |   2 +-
 dselect/po/cs.po        |   2 +-
 dselect/po/da.po        |   2 +-
 dselect/po/de.po        |   2 +-
 dselect/po/dselect.pot  |   4 +-
 dselect/po/el.po        |   2 +-
 dselect/po/es.po        |   2 +-
 dselect/po/et.po        |   2 +-
 dselect/po/eu.po        |   2 +-
 dselect/po/fr.po        |   2 +-
 dselect/po/gl.po        |   2 +-
 dselect/po/hu.po        |   2 +-
 dselect/po/id.po        |   2 +-
 dselect/po/it.po        |   2 +-
 dselect/po/ja.po        |   2 +-
 dselect/po/ko.po        |   2 +-
 dselect/po/nb.po        |   2 +-
 dselect/po/nl.po        |   2 +-
 dselect/po/nn.po        |   2 +-
 dselect/po/pl.po        |   2 +-
 dselect/po/pt.po        |   2 +-
 dselect/po/pt_BR.po     |   2 +-
 dselect/po/ro.po        |   2 +-
 dselect/po/ru.po        |   2 +-
 dselect/po/sk.po        |   2 +-
 dselect/po/sv.po        |   2 +-
 dselect/po/tl.po        |   2 +-
 dselect/po/vi.po        |   2 +-
 dselect/po/zh_CN.po     |   2 +-
 dselect/po/zh_TW.po     |   2 +-
 man/po/de.po            | 459 ++++++++++++++++++++++++++++++++---------
 man/po/dpkg-man.pot     | 238 +++++++++++++++++-----
 man/po/es.po            | 302 ++++++++++++++++++++++-----
 man/po/fr.po            | 316 ++++++++++++++++++++++------
 man/po/hu.po            | 252 ++++++++++++++++++-----
 man/po/it.po            | 317 ++++++++++++++++++++++++-----
 man/po/ja.po            | 300 ++++++++++++++++++++++-----
 man/po/nl.po            | 531 +++++++++++++++++++++++++++++-------------------
 man/po/pl.po            | 301 ++++++++++++++++++++++-----
 man/po/pt_BR.po         | 247 +++++++++++++++++-----
 man/po/ru.po            | 241 +++++++++++++++++-----
 man/po/sv.po            | 313 +++++++++++++++++++++++-----
 man/po/zh_CN.po         | 261 +++++++++++++++++++-----
 po/ast.po               | 114 +++++++++--
 po/bs.po                | 103 ++++++++--
 po/ca.po                | 175 +++++++++++++---
 po/cs.po                | 175 +++++++++++++---
 po/da.po                | 131 +++++++++---
 po/de.po                | 175 +++++++++++++---
 po/dpkg.pot             | 100 ++++++---
 po/dz.po                | 113 +++++++++--
 po/el.po                | 113 +++++++++--
 po/eo.po                | 131 +++++++++---
 po/es.po                | 175 +++++++++++++---
 po/et.po                | 112 ++++++++--
 po/eu.po                | 131 +++++++++---
 po/fr.po                | 131 +++++++++---
 po/gl.po                | 113 +++++++++--
 po/hu.po                | 114 +++++++++--
 po/id.po                | 115 +++++++++--
 po/it.po                |  82 +++++++-
 po/ja.po                | 131 +++++++++---
 po/km.po                | 114 +++++++++--
 po/ko.po                | 115 +++++++++--
 po/ku.po                | 103 ++++++++--
 po/lt.po                | 111 ++++++++--
 po/mr.po                | 114 +++++++++--
 po/nb.po                | 114 +++++++++--
 po/ne.po                | 113 +++++++++--
 po/nl.po                |  82 +++++++-
 po/nn.po                | 112 ++++++++--
 po/pa.po                | 104 ++++++++--
 po/pl.po                | 175 +++++++++++++---
 po/pt.po                | 377 +++++++++++++++++++---------------
 po/pt_BR.po             | 112 ++++++++--
 po/ro.po                | 115 +++++++++--
 po/ru.po                | 131 +++++++++---
 po/sk.po                | 131 +++++++++---
 po/sv.po                | 131 +++++++++---
 po/th.po                | 131 +++++++++---
 po/tl.po                | 112 ++++++++--
 po/tr.po                | 175 +++++++++++++---
 po/vi.po                | 131 +++++++++---
 po/zh_CN.po             | 188 ++++++++++++++---
 po/zh_TW.po             | 175 +++++++++++++---
 scripts/po/ca.po        |  59 +++---
 scripts/po/de.po        |  59 +++---
 scripts/po/dpkg-dev.pot |  52 ++---
 scripts/po/es.po        |  61 +++---
 scripts/po/fr.po        |  59 +++---
 scripts/po/pl.po        |  59 +++---
 scripts/po/ru.po        |  59 +++---
 scripts/po/sv.po        |  59 +++---
 94 files changed, 8007 insertions(+), 2202 deletions(-)

(limited to 'scripts')

diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index 2de5fcd94..61839c8e9 100644
--- a/dselect/po/bs.po
+++ b/dselect/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index 6db557c2c..44c05a27e 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\n"
 "PO-Revision-Date: 2017-04-28 04:22+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
diff --git a/dselect/po/cs.po b/dselect/po/cs.po
index d11617814..e6bdd7625 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/da.po b/dselect/po/da.po
index a29f44a00..5ee527423 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/de.po b/dselect/po/de.po
index 9e9060113..7b2a6cd8d 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index 11b686046..4474afd6a 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.2\n"
+"Project-Id-Version: dpkg 1.19.3\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/el.po b/dselect/po/el.po
index 0be7c25a4..1f1a48e25 100644
--- a/dselect/po/el.po
+++ b/dselect/po/el.po
@@ -11,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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/es.po b/dselect/po/es.po
index b5f3af1f7..3aaada6a5 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/et.po b/dselect/po/et.po
index d27e6afdd..c3efb0065 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/eu.po b/dselect/po/eu.po
index 4127b0da2..dc71d59d0 100644
--- a/dselect/po/eu.po
+++ b/dselect/po/eu.po
@@ -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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index 5e231215b..e07af7546 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/gl.po b/dselect/po/gl.po
index 72cd05ca3..6eb19868b 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/hu.po b/dselect/po/hu.po
index 1e9be03b5..b3e260882 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/id.po b/dselect/po/id.po
index eca2e680b..40c750bca 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/it.po b/dselect/po/it.po
index 7209c7fc0..685838801 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index 734366e49..27a1eefad 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/ko.po b/dselect/po/ko.po
index 40e5f9c54..7d18edd48 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index 2f3cae5e3..77bb1edac 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index f4ab36d4b..9f35e0945 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index e3439a64f..01d0b6962 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/pl.po b/dselect/po/pl.po
index 21ecd6cda..bcb3c42dd 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index e51133fcb..8bf16eacc 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po
index 71d0a79df..ea233152e 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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."
diff --git a/dselect/po/ro.po b/dselect/po/ro.po
index 7f33599af..070e9d64b 100644
--- a/dselect/po/ro.po
+++ b/dselect/po/ro.po
@@ -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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/ru.po b/dselect/po/ru.po
index 71e49c338..d33e70790 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/sk.po b/dselect/po/sk.po
index b92860297..42306bc23 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/sv.po b/dselect/po/sv.po
index 10586487a..2fb73c513 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index e0d906704..a0fcb4418 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index 1b0a66720..086960386 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index ecb6398b2..85b6344c8 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index 0ff89f28c..df0454a2e 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
diff --git a/man/po/de.po b/man/po/de.po
index 3841917f5..dc3d08ae3 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2018-10-11 21:28+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -765,7 +765,7 @@ msgstr ""
 "ist."
 
 #. 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<Binärpaketliste> (verpflichtend)"
@@ -1387,10 +1387,14 @@ msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
+#, fuzzy
+#| 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."
 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 "
@@ -1398,10 +1402,16 @@ msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
+#, fuzzy
+#| 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."
 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 "
@@ -1579,10 +1589,21 @@ msgstr ""
 "unterscheidet folgt dem I<Quellname>n in Klammern eine I<Quellversion>. Dies "
 "kann passieren, falls dies ein rein-binärer-nicht-Betreuer-Upload ist."
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Binary:> I<binary-package-list> (required)"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Binary:> I<Binärpaketliste> (verpflichtend)"
+
 #. type: Plain text
 #: deb-changes.man
+#, fuzzy
+#| 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."
+"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."
@@ -1688,9 +1709,14 @@ msgstr " I<Binärpaketname> B<-> I<Binärpaketzusammenfassung>"
 
 #. type: Plain text
 #: deb-changes.man
+#, fuzzy
+#| msgid ""
+#| "This multiline field contains a list of binary package names followed by "
+#| "a space, a dash (‘B<->’) and their possibly truncated short descriptions."
 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 "
@@ -2674,9 +2700,29 @@ msgstr "BEISPIEL"
 
 #. 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"
@@ -2732,8 +2778,12 @@ 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)."
 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>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 
@@ -2860,12 +2910,20 @@ msgstr "B<Source:> I<Quellpaketname> (verpflichtend)"
 
 #. 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 ""
 "Der Wert dieses Feldes ist der Name des Quellpakets und sollte mit dem Namen "
 "des Quellpakets in der Datei debian/changelog übereinstimmen. Ein Paketname "
@@ -4871,12 +4929,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 ""
 "Eine Variablensubstitution hat die Form B<${>I<Variablenname>B<}>. "
 "Variablennamen bestehen aus alphanumerischen Zeichen (womit sie auch "
@@ -6150,14 +6216,25 @@ msgstr ""
 
 #. type: Plain text
 #: dsc.man
+#, fuzzy
+#| 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."
 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 "
@@ -6310,8 +6387,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"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 "
@@ -6964,13 +7041,23 @@ 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."
+#, 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 ""
 "Entfernt ein installiertes Paket. Dies entfernt alles außer Conffiles, da "
 "damit eine erneute Konfiguration des Paketes vermieden wird, falls es später "
@@ -7008,11 +7095,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 ""
 "Löscht ein installiertes oder bereits entferntes Paket vollständig. Damit "
 "wird alles entfernt, auch Conffiles. Falls statt des Paketnamens B<-a> oder "
@@ -7307,6 +7401,13 @@ 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 ""
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -7976,7 +8077,8 @@ msgstr ""
 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 "
+msgstr ""
+"B<depends>: Verwandle alle Abhängigkeitsprobleme in Warnungen. Dies betrifft "
 "die Felder B<Pre-Depends> und B<Depends>."
 
 #. type: Plain text
@@ -8294,8 +8396,8 @@ msgid ""
 msgstr ""
 "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%>«."
+"installierten und deinstallierten Paketen usw. enthalten. Standardmäßig »I<"
+"%ADMINDIR%>«."
 
 #. type: TP
 #: dpkg.man
@@ -8312,10 +8414,10 @@ msgid ""
 "see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 "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</>«."
+"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
@@ -9024,8 +9126,8 @@ msgstr ""
 "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\">."
+"Optionen mit »B<-+>« zu deaktivieren, beispielsweise B<DPKG_PAGER=\"less -+F"
+"\">."
 
 #. type: TP
 #: dpkg.man dpkg-divert.man dpkg-statoverride.man
@@ -10025,7 +10127,11 @@ msgstr "VARIABLEN"
 
 #. 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 "Die folgenden Variablen werden von B<dpkg-architecture> gesetzt:"
 
 #. type: IP
@@ -12794,9 +12900,10 @@ msgid ""
 "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 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."
+"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
@@ -14937,7 +15044,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."
@@ -15371,8 +15478,8 @@ msgid ""
 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)."
+"Verzeichnis auf »I<Verzeichnis>B<%ADMINDIR%>« gesetzt wird (seit Dpkg "
+"1.19.2)."
 
 #. type: TP
 #: dpkg-divert.man
@@ -15495,8 +15602,8 @@ 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 ""
-"Falls gesetzt und die Option B<--instdir> oder B<--root> nicht angegeben wurde, wird dies "
-"als Dateisystemwurzelverzeichnis 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
@@ -15504,8 +15611,8 @@ 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."
+"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
@@ -18210,10 +18317,15 @@ msgstr "EINSCHRÄNKUNGEN"
 
 #. 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, Emacs variables, 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, was nicht von Dpkg::Changelog ausgewertet werden kann, geht beim "
 "Zusammenführen verloren. Dies betrifft Zeug wie Modelines von Vim, Emacs-"
@@ -18896,7 +19008,11 @@ msgstr "       @@@ changelog-format: I<Anderesformat> @@@\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-Formatnamen sind nichtleere alphanumerische Zeichenketten."
 
 #. type: Plain text
@@ -19035,14 +19151,26 @@ 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'':"
+#, 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 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'':"
+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 ""
 "Liste Pakete auf, deren Namen auf ein bestimmtes Muster passt. Falls kein "
 "I<Paketname-Muster> angegeben ist, liste alle Pakete in I<%ADMINDIR%/status> "
@@ -19402,6 +19530,22 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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 ""
+"Diese Option wird dazu verwendet, das Format der Ausgabe anzugeben, das B<--"
+"show> verwenden wird. 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:"
@@ -19635,6 +19779,35 @@ msgstr ""
 "Es enthält den Paketstatusfehlerschalter, Teil des Statusfeldes (seit Dpkg "
 "1.17.11)."
 
+#. 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.19.1)."
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "Es enthält die Kurzbeschreibung des Pakets (seit Dpkg 1.19.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
 #, no-wrap
@@ -19750,8 +19923,8 @@ msgstr ""
 "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\">."
+"Optionen mit »B<-+>« zu deaktivieren, beispielsweise B<DPKG_PAGER=\"less -+F"
+"\">."
 
 #. type: TH
 #: dpkg-scanpackages.man
@@ -20109,8 +20282,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>"
@@ -21923,16 +22096,27 @@ msgstr "Format: 3.0 (quilt)"
 
 #. type: Plain text
 #: dpkg-source.man
+#, fuzzy
+#| 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."
 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."
+">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>, "
@@ -21987,27 +22171,26 @@ msgid ""
 "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/>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. "
+"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."
+"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
@@ -22959,13 +23142,14 @@ msgstr ""
 "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."
+"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
@@ -25611,6 +25795,74 @@ msgstr ""
 "nur für Programme gedacht, bei denen das selbstständige Forken keinen Sinn "
 "ergibt oder wo es nicht sinnvoll ist, den Code hierfür hinzuzufügen."
 
+#. 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 procotol, 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<number>"
+msgid "B<ERRNO=>I<number>"
+msgstr "B<-n> I<Anzahl>"
+
+#. 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
@@ -26560,6 +26812,13 @@ msgstr ""
 "automatische Modus konfiguriert sind. Diese Option ist nur mit B<--config> "
 "oder B<--all> relevant."
 
+#. 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 "Erzeuge keine Kommentare, es sei denn, ein Fehler tritt auf."
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -26573,8 +26832,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."
+#, fuzzy
+#| msgid "Generate more comments about what is being done."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr "Erzeugt mehr Kommentare darüber, was getan wird."
 
 #. type: Plain text
 #: update-alternatives.man
diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index 9a93cde8e..27a6e9646 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.2\n"
+"Project-Id-Version: dpkg-man 1.19.3\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\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 ""
@@ -1109,16 +1109,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 +1265,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 +1363,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
@@ -2115,7 +2124,6 @@ msgstr ""
 #: deb-control.man
 #, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2147,7 +2155,9 @@ 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 ""
+"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
@@ -2248,9 +2258,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
@@ -3817,10 +3828,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
@@ -4887,10 +4899,11 @@ 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
@@ -5002,8 +5015,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -5543,12 +5556,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
@@ -5581,9 +5596,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
@@ -5803,6 +5819,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
@@ -8003,7 +8026,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
@@ -12047,7 +12072,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."
@@ -14492,8 +14517,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
@@ -15062,7 +15087,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
@@ -15177,13 +15204,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
@@ -15450,6 +15480,14 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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:"
@@ -15620,6 +15658,32 @@ msgid ""
 "dpkg 1.17.11)."
 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
@@ -15981,8 +16045,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 ""
@@ -17348,8 +17412,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."
@@ -20158,6 +20222,73 @@ msgid ""
 "do this themselves."
 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 procotol, 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
@@ -20885,6 +21016,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
@@ -20898,7 +21034,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/po/es.po b/man/po/es.po
index c4d82398c..4befdc0df 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:41+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\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)"
@@ -1298,16 +1298,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 +1481,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 +1612,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
@@ -2638,9 +2647,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"
@@ -2695,7 +2724,8 @@ msgstr ""
 #| 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)."
 
@@ -2841,12 +2871,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 "
@@ -4979,12 +5017,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 "
@@ -6387,10 +6433,11 @@ 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
@@ -6513,8 +6560,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -7156,12 +7203,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
@@ -7195,9 +7244,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
@@ -7519,6 +7569,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
@@ -10431,7 +10488,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
@@ -15705,7 +15766,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."
@@ -19267,8 +19328,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 "
@@ -20026,7 +20087,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."
@@ -20197,13 +20262,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>, "
@@ -20604,6 +20672,22 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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:"
@@ -20829,6 +20913,35 @@ msgid ""
 "dpkg 1.17.11)."
 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
@@ -21353,8 +21466,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>"
@@ -23484,11 +23597,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 "
@@ -27580,6 +27693,74 @@ msgstr ""
 "usarla en programas donde no tiene sentido que hagan fork por sí mismos, o "
 "no si es posible añadir el código para que lo hagan por sí mismos."
 
+#. 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 procotol, 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
@@ -28587,6 +28768,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
@@ -28604,8 +28792,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
diff --git a/man/po/fr.po b/man/po/fr.po
index 5b3f49ffd..779504681 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:41+0100\n"
 "Last-Translator: Sébastien Poher <sbphr@volted.net>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -719,7 +719,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)"
@@ -1277,16 +1277,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
@@ -1461,10 +1461,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<nom-du-paquet-binaire> (requis)"
+
 #. 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
@@ -1586,7 +1594,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
@@ -2629,9 +2638,29 @@ msgstr "EXEMPLE"
 
 #. 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"
@@ -2690,7 +2719,8 @@ msgstr ""
 #| 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)."
 
@@ -2838,12 +2868,20 @@ msgstr "B<Source:> I<nom-du-paquet-source> (requis)"
 
 #. 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 ""
 "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 "
@@ -4971,12 +5009,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 ""
 "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 "
@@ -6401,10 +6447,11 @@ 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
@@ -6527,8 +6574,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -7164,13 +7211,23 @@ msgstr "B<-r>, B<--remove> I<paquet>B<...|-al--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 ""
 "Supprimer un paquet installé. Supprime tout à l'exception des fichiers de "
 "configuration, ce qui évite d'avoir à reconfigurer le paquet s'il était "
@@ -7209,11 +7266,18 @@ msgstr "B<-P>, B<--purge>I<paquet>...|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 ""
 "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é "
@@ -7554,6 +7618,13 @@ 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 ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -10468,7 +10539,11 @@ msgstr "VARIABLES D'ENVIRONNEMENT"
 
 #. 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 "Les variables suivantes sont positionnées par B<dpkg-architecture> :"
 
 #. type: IP
@@ -15739,7 +15814,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."
@@ -19138,8 +19213,8 @@ msgstr "LIMITATIONS"
 #| "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 "
@@ -19886,7 +19961,11 @@ msgstr "       @@@ changelog-format: I<autreformat> @@@\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 ""
 "Les noms de formats de journaux de modifications sont des chaînes non vides "
 "de caractères alphanumériques."
@@ -20062,13 +20141,16 @@ msgstr "B<-l>, B<--list> [I<motif-de-nom-de-paquet>...]"
 #| "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 ""
 "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>, "
@@ -20470,6 +20552,21 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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 ""
+"Cette option sert à spécifier le format de sortie de l'option B<--show>. Ce "
+"format sera utilisé pour chaque paquet listé."
+
 #. type: Plain text
 #: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
@@ -20713,6 +20810,34 @@ msgstr ""
 "Il contient le drapeau d'erreur du statut du paquet, extrait du champ Status "
 "(depuis dpkg 1.17.11)."
 
+#. type: TP
+#: dpkg-query.man
+#, fuzzy, no-wrap
+msgid "B<db-fsys:Files>"
+msgstr "B<--fsys-tarfile> I<archive>"
+
+#. 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 "Il contient la description courte du paquet (depuis 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
@@ -21234,8 +21359,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>"
@@ -23303,11 +23428,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 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 "
@@ -27327,6 +27452,74 @@ msgstr ""
 "duplication n'a pas de sens ou bien des programmes dont le code n'est pas "
 "adaptable pour leur ajouter cette fonctionnalité."
 
+#. 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 procotol, 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<nom-de-fichier>"
+
+#. 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
@@ -28351,6 +28544,13 @@ msgstr ""
 "configurées en mode automatique. Cette option n'est pertinente qu'avec B<--"
 "config> ou 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 "Ne crée pas de commentaire à moins qu'une erreur ne survienne."
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -28366,8 +28566,12 @@ msgstr "Produit plus de commentaires sur ce que fait B<update-alternatives>."
 
 #. 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."
+#, 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 "Produit plus de commentaires sur ce que fait B<update-alternatives>."
 
 #. type: Plain text
 #: update-alternatives.man
@@ -31499,10 +31703,6 @@ msgstr "B<ln>(1), FHS, le standard pour l'organisation du système de fichiers."
 #~ 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>"
diff --git a/man/po/hu.po b/man/po/hu.po
index 81ca00c92..62a1b5209 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -616,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)"
@@ -1145,16 +1145,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 +1315,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
@@ -1436,7 +1444,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
@@ -2385,7 +2394,6 @@ msgstr "PÉLDA"
 #: deb-control.man
 #, fuzzy, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2438,7 +2446,8 @@ msgstr ""
 #: 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
@@ -2547,9 +2556,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
@@ -4222,10 +4232,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
@@ -5308,10 +5319,11 @@ 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
@@ -5427,8 +5439,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -5972,12 +5984,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
@@ -6010,9 +6024,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
@@ -6233,6 +6248,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
@@ -8455,7 +8477,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
@@ -12664,7 +12688,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."
@@ -15160,8 +15184,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
@@ -15732,7 +15756,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
@@ -15847,13 +15873,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
@@ -16120,6 +16149,21 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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:"
@@ -16291,6 +16335,34 @@ msgid ""
 "dpkg 1.17.11)."
 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
@@ -16655,8 +16727,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>"
@@ -18014,11 +18086,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
@@ -20851,6 +20923,72 @@ msgid ""
 "do this themselves."
 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 procotol, 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
@@ -21581,6 +21719,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
@@ -21594,7 +21737,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
@@ -22275,9 +22420,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 f1c128f77..c5b9855d1 100644
--- a/man/po/it.po
+++ b/man/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.16.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\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)"
@@ -1281,16 +1281,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 +1466,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 +1601,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
@@ -2652,9 +2662,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"
@@ -2710,7 +2740,8 @@ msgstr ""
 #| 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)."
 
@@ -2852,12 +2883,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 "
@@ -5020,12 +5059,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 "
@@ -6295,10 +6342,11 @@ 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
@@ -6426,8 +6474,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -7067,13 +7115,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 "
@@ -7112,11 +7170,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<--"
@@ -7460,6 +7525,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
@@ -10373,7 +10445,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
@@ -15289,7 +15365,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."
@@ -18143,8 +18219,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
@@ -18883,7 +18959,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."
@@ -19058,13 +19138,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</"
@@ -19462,6 +19545,22 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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:"
@@ -19706,6 +19805,36 @@ msgstr ""
 "Contiene il contrassegno di errore di stato del pacchetto, parte del campo "
 "Status (a partire da dpkg 1.17.11)."
 
+#. 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
@@ -20224,8 +20353,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>"
@@ -21979,11 +22108,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> "
@@ -25894,6 +26023,74 @@ msgstr ""
 "per i programmi che non ha senso facciano il fork da soli o quando non è "
 "possibile aggiungere il codice per far sì che lo facciano da soli."
 
+#. 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 procotol, 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
@@ -26924,6 +27121,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
@@ -26940,8 +27144,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
diff --git a/man/po/ja.po b/man/po/ja.po
index 920a03c12..4b7686256 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: TAKAHASHI Motonobu <monyo@monyo.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\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)"
@@ -1258,16 +1258,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 +1441,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 +1570,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
@@ -2584,9 +2593,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"
@@ -2642,7 +2671,8 @@ msgstr ""
 #| 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)."
 
@@ -2785,12 +2815,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-"
@@ -4873,12 +4911,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<}> という形式になっている。変数名には"
 "英数字、ハイフン、コロンを使用できるが、先頭文字は英数字である必要がある。変"
@@ -6253,10 +6299,11 @@ 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
@@ -6379,8 +6426,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -7013,12 +7060,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
@@ -7052,9 +7101,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
@@ -7373,6 +7423,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
@@ -10242,7 +10299,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
@@ -15432,7 +15493,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."
@@ -18881,8 +18942,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 の"
 "モードライン、存在しているとは見なされないコメントなどが挙げられる。"
@@ -19622,7 +19683,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
@@ -19786,13 +19851,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 とマークされているもの (完全"
@@ -20184,6 +20252,21 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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:"
@@ -20406,6 +20489,35 @@ msgid ""
 "dpkg 1.17.11)."
 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
@@ -20923,8 +21035,8 @@ msgstr ""
 "無視される。あるパッケージが両方のファイルに現れた場合、セクションの設定にお"
 "いては、ソース override ファイルが優先される。"
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr "B<--debug>"
@@ -22979,11 +23091,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 "
@@ -26938,6 +27050,74 @@ msgstr ""
 "ムや、fork を自身で行うためのコード追加が現実的でないプログラム以外での使用を"
 "意図していない。"
 
+#. 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 procotol, 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
@@ -27923,6 +28103,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
@@ -27939,8 +28126,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
diff --git a/man/po/nl.po b/man/po/nl.po
index 1d51c3738..09caa35cf 100644
--- a/man/po/nl.po
+++ b/man/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.19.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2018-10-15 21:04+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -773,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)"
@@ -1408,10 +1408,14 @@ msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
+#, fuzzy
+#| 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."
 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 B<#>- of de B</* */>-vorm, RCS-trefwoorden, modusregels van "
@@ -1419,10 +1423,16 @@ msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
+#, fuzzy
+#| 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."
 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 ""
 "Oudere changelog-elementen met een andere indeling aan het einde van het "
 "bestand moeten aanvaard worden en in de uitvoer behouden blijven, maar de "
@@ -1604,10 +1614,21 @@ msgstr ""
 "zijn als de upload een uitsluitend binaire upload is die niet door de "
 "onderhouder uitgevoerd wordt."
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Binary:> I<binary-package-list> (required)"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Binary:> I<lijst-binaire-pakketten> (verplicht)"
+
 #. type: Plain text
 #: deb-changes.man
+#, fuzzy
+#| 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."
+"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."
@@ -1713,9 +1734,14 @@ msgstr " I<naam-binaire-pakket> B<-> I<samenvatting-binaire-pakket>"
 
 #. type: Plain text
 #: deb-changes.man
+#, fuzzy
+#| msgid ""
+#| "This multiline field contains a list of binary package names followed by "
+#| "a space, a dash (‘B<->’) and their possibly truncated short descriptions."
 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, "
 "gevolgd door een spatie, een koppelteken (‘B<->’) en hun eventueel afgekapte "
@@ -2682,15 +2708,11 @@ msgstr ""
 #. type: TP
 #: deb-control.man
 #, no-wrap
-#| msgid "B<Build-Date:> I<build-date>"
 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 build profiles that "
-#| "this upload was built with."
 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 "
@@ -2717,9 +2739,29 @@ msgstr "VOORBEELD"
 
 #. 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"
@@ -2774,8 +2816,12 @@ 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)."
 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>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
 
@@ -2903,12 +2949,20 @@ msgstr "B<Source:> I<broncodepakket-naam> (verplicht)"
 
 #. 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 ""
 "De waarde van dit veld is de naam van het broncodepakket en moet "
 "overeenkomen met de naam van het broncodepakket in het bestand debian/"
@@ -3102,9 +3156,6 @@ msgstr "B<Testsuite-Triggers:>I< pakketlijst>"
 
 #. type: Plain text
 #: deb-src-control.man
-#| 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 "
@@ -3788,7 +3839,6 @@ 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 ""
 "I<bestandsnaam> I<sectie> I<prioriteit> [ I<trefwoord=waarde\\&...\\&> ]"
@@ -4950,12 +5000,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 ""
 "Een variabelesubstitutie heeft als vorm B<${>I<variabelenaam>B<}>. "
 "Variabelenamen bestaan uit alfanumerieke tekens, koppeltekens en dubbele "
@@ -6099,12 +6157,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-triggers.man
-#| 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 "
@@ -6247,14 +6299,25 @@ msgstr ""
 
 #. type: Plain text
 #: dsc.man
+#, fuzzy
+#| 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."
 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, "
@@ -6268,10 +6331,6 @@ 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)>."
 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)>.  "
@@ -6410,18 +6469,19 @@ msgstr ""
 
 #. 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@>."
+#| "restrictions removed, and OR dependencies flattened (that is, converted "
+#| "to separate AND relationships), except for binaries generated by this "
+#| "source package and meta-dependencies such as B<@> or B<@builddeps@>."
 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"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 "
@@ -7077,13 +7137,23 @@ 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."
+#, 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 ""
 "Verwijder een geïnstalleerd pakket. Dit verwijdert alles behalve de "
 "conffiles (configuratiebestanden), waardoor vermeden kan worden dat het "
@@ -7122,11 +7192,18 @@ msgstr "B<-P>, B<--purge> I<pakket>...|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 ""
 "Wis een geïnstalleerd of een reeds verwijderd pakket. Dit verwijdert alles, "
 "inclusief conffiles (configuratiebestanden). Indien B<-a> of B<--pending> "
@@ -7428,6 +7505,13 @@ 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 ""
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -8109,7 +8193,6 @@ 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."
@@ -8119,8 +8202,6 @@ 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."
@@ -8130,9 +8211,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-#| msgid ""
-#| "B<breaks>: Install, even if this would break another package (since dpkg "
-#| "1.14.6)."
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
 "1.14.6).  This affects the B<Breaks> field."
@@ -8142,9 +8220,6 @@ 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."
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
 "dangerous, for it will usually cause overwriting of some files.  This "
@@ -8357,9 +8432,6 @@ msgstr "B<--ignore-depends>=I<pakket>,..."
 
 #. type: Plain text
 #: dpkg.man
-#| 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).  This "
@@ -8442,10 +8514,6 @@ 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%>»)"
 msgid ""
 "Set the administrative directory to I<directory>.  This directory contains "
 "many files that give information about status of installed or uninstalled "
@@ -8463,11 +8531,6 @@ 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</>»)"
 msgid ""
 "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) "
@@ -8488,9 +8551,6 @@ 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%>»."
 msgid ""
 "Set the root directory to B<directory>, which sets the installation "
 "directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
@@ -8908,13 +8968,11 @@ msgstr ""
 #. type: TP
 #: dpkg.man dpkg-query.man
 #, no-wrap
-#| msgid "B<--no-triggers>"
 msgid "B<--no-pager>"
 msgstr "B<--no-pager>"
 
 #. type: Plain text
 #: dpkg.man dpkg-query.man
-#| 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 ""
@@ -9102,8 +9160,6 @@ 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."
@@ -9120,7 +9176,6 @@ msgstr "B<PAGER>"
 #. type: TQ
 #: dpkg.man dpkg-query.man
 #, no-wrap
-#| msgid "B<PAGER>"
 msgid "B<DPKG_PAGER>"
 msgstr "B<DPKG_PAGER>"
 
@@ -10220,7 +10275,11 @@ msgstr "VARIABELEN"
 
 #. 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 "De volgende variabelen worden door B<dpkg-architecture> ingesteld:"
 
 #. type: IP
@@ -12074,18 +12133,6 @@ 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>."
 msgid ""
 "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, "
@@ -12296,18 +12343,11 @@ msgstr ""
 #. type: TP
 #: dpkg-buildflags.man
 #, no-wrap
-#| msgid "B<fixdebugpath>"
 msgid "B<fixfilepath>"
 msgstr "B<fixfilepath>"
 
 #. type: Plain text
 #: dpkg-buildflags.man
-#| 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>, 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 debug symbols."
 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>, "
@@ -13010,11 +13050,6 @@ 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."
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
 "what you want is simply to (re-)build the source package from a clean source "
@@ -13484,10 +13519,6 @@ 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)."
 msgid ""
 "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<-"
@@ -13507,7 +13538,6 @@ msgstr "B<--pre-clean>"
 
 #. 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."
@@ -13538,9 +13568,6 @@ msgstr "B<--no-post-clean>"
 
 #. type: Plain text
 #: dpkg-buildpackage.man
-#| msgid ""
-#| "This option does the inverse of B<--no-await> (since dpkg 1.17.21).  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."
@@ -15198,7 +15225,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."
@@ -15600,8 +15627,6 @@ msgstr "B<--admindir>I< map>"
 
 #. 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"
 "%>»."
@@ -15611,16 +15636,11 @@ msgstr ""
 #. type: TP
 #: dpkg-divert.man dpkg-statoverride.man
 #, no-wrap
-#| msgid "B<--admindir>I< directory>"
 msgid "B<--instdir>I< directory>"
 msgstr "B<--instdir>I< map>"
 
 #. type: Plain text
 #: dpkg-divert.man
-#| msgid ""
-#| "If set, it will be used as the B<dpkg> data directory, where the "
-#| "architecture tables are located (since dpkg 1.14.17).  Defaults to "
-#| "«%PKGDATADIR%»."
 msgid ""
 "Set the installation directory, which refers to the directory where packages "
 "get installed (since dpkg 1.19.2). Defaults to «I</>»."
@@ -15632,7 +15652,6 @@ msgstr ""
 #. type: TP
 #: dpkg-divert.man dpkg-statoverride.man
 #, no-wrap
-#| msgid "B<--depotdir>I< directory>"
 msgid "B<--root>I< directory>"
 msgstr "B<--root>I< map>"
 
@@ -15716,9 +15735,6 @@ msgstr "B<--rename>"
 
 #. type: Plain text
 #: dpkg-divert.man
-#| 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.  This is the common behavior "
@@ -15769,9 +15785,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-divert.man dpkg-statoverride.man
-#| 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)."
@@ -15782,9 +15795,6 @@ msgstr ""
 
 #. type: Plain text
 #: 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."
 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."
@@ -18544,10 +18554,15 @@ 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, Emacs variables, 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 modusregels van Vim, "
@@ -18928,12 +18943,6 @@ msgstr "B<--format>I< uitvoerindeling>"
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-#| 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:"
 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 "
@@ -19090,7 +19099,6 @@ msgstr ""
 #. type: TP
 #: dpkg-parsechangelog.man
 #, no-wrap
-#| msgid "B<--verbose>"
 msgid "B<--reverse>"
 msgstr "B<--reverse>"
 
@@ -19240,7 +19248,11 @@ msgstr "       @@@ changelog-format: I<andere-indeling> @@@\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 ""
 "Namen voor changelog-indelingen moeten niet-lege alfanumerieke tekenreeksen "
 "zijn."
@@ -19386,14 +19398,26 @@ 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'':"
+#, 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 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'':"
+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 ""
 "Geef de pakketten weer die beantwoorden aan het opgegeven patroon. Indien "
 "geen I<pakketnaampatroon> opgegeven werd, som dan alle pakketten uit I<"
@@ -19541,11 +19565,6 @@ 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."
 msgid ""
 "Report status of specified package. This just displays the entry in the "
 "installed package status database.  If no I<package-name> is specified it "
@@ -19708,11 +19727,6 @@ 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."
 msgid ""
 "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 "
@@ -19770,6 +19784,22 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 msgstr "B<-f>, B<--showformat=>I<indeling>"
 
+#. 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 ""
+"Deze optie wordt gebruikt om op te geven in welke indeling B<--show> zijn "
+"uitvoer moet produceren. 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:"
@@ -20004,6 +20034,35 @@ msgstr ""
 "Het bevat de status-foutvlag van het pakket, onderdeel van het veld Status "
 "(sinds dpkg 1.17.11)."
 
+#. 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.19.1)."
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "Het bevat de korte beschrijving van het pakket (sinds dpkg 1.19.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
 #, no-wrap
@@ -20078,8 +20137,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
-#| msgid ""
-#| "Sets the output format for the B<--verify> command (since dpkg 1.17.2)."
 msgid ""
 "Sets the program to execute when spawning a command via a shell (since dpkg "
 "1.19.2)."
@@ -20488,8 +20545,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>"
@@ -22334,16 +22391,27 @@ msgstr "Indeling: 3.0 (quilt)"
 
 #. type: Plain text
 #: dpkg-source.man
+#, fuzzy
+#| 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."
 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."
+">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> "
@@ -22379,17 +22447,6 @@ 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."
 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 "
@@ -23359,7 +23416,6 @@ msgstr ""
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
-#| msgid "debian/patches/series"
 msgid "debian/patches/I<vendor>.series"
 msgstr "debian/patches/I<leverancier>.series"
 
@@ -23371,15 +23427,6 @@ msgstr "debian/patches/series"
 
 #. type: Plain text
 #: dpkg-source.man
-#| 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 first ‘B<#>’ 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 "
@@ -24007,9 +24054,6 @@ 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%>."
 msgid ""
 "Set the administrative directory to I<directory>.  This is where the "
 "I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
@@ -24019,10 +24063,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
-#| msgid ""
-#| "If set, it will be used as the B<dpkg> data directory, where the "
-#| "architecture tables are located (since dpkg 1.14.17).  Defaults to "
-#| "«%PKGDATADIR%»."
 msgid ""
 "Set the installation directory, which refers to the directory where packages "
 "get installed (since dpkg 1.19.2).  Defaults to «I</>»."
@@ -24221,9 +24261,6 @@ 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."
 msgid ""
 "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 "
@@ -25756,11 +25793,6 @@ 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>."
 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 "
@@ -26087,6 +26119,74 @@ msgstr ""
 "beginnen, of waarvoor het ondoenbaar is om code toe te voegen waardoor ze "
 "dat uit zichzelf zouden doen."
 
+#. 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 procotol, 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<number>"
+msgid "B<ERRNO=>I<number>"
+msgstr "B<-n> I<aantal>"
+
+#. 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
@@ -27047,6 +27147,13 @@ msgstr ""
 "behoorlijk geconfigureerd zijn. Deze optie is enkel relevant in combinatie "
 "met B<--config> of 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 "Genereer geen commentaar tenzij er zich fouten voordoen."
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -27060,8 +27167,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."
+#, fuzzy
+#| msgid "Generate more comments about what is being done."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
+msgstr "Genereer meer commentaar bij wat er gedaan wordt."
 
 #. type: Plain text
 #: update-alternatives.man
diff --git a/man/po/pl.po b/man/po/pl.po
index ffc2da975..d21e770c2 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\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)"
@@ -1272,16 +1272,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 +1455,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 +1587,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
@@ -2612,9 +2621,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"
@@ -2670,7 +2699,8 @@ msgstr ""
 #| 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)."
 
@@ -2817,12 +2847,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ę "
@@ -4935,12 +4973,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 "
@@ -6331,10 +6377,11 @@ 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
@@ -6456,8 +6503,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -7114,12 +7161,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 ""
 
 #
@@ -7157,9 +7206,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
@@ -7489,6 +7539,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
@@ -10452,7 +10509,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
@@ -15719,7 +15780,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."
@@ -19240,8 +19301,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, "
@@ -19996,7 +20057,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."
@@ -20168,13 +20233,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<"
@@ -20576,6 +20644,22 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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:"
@@ -20799,6 +20883,35 @@ msgid ""
 "dpkg 1.17.11)."
 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
@@ -21322,8 +21435,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>"
@@ -23443,11 +23556,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>, "
@@ -27609,6 +27722,74 @@ msgstr ""
 "same nie tworzą procesów potomnych i nie jest możliwe dodanie do samego "
 "programu kodu uruchamiającego proces potomny."
 
+#. 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 procotol, 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
@@ -28613,6 +28794,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
@@ -28629,8 +28817,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
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index 1572921d8..6b5a65bdc 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Andre Luis Lopes  <andrelop@debian.org>\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -603,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>"
@@ -1111,16 +1111,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
@@ -1267,10 +1267,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
@@ -1358,7 +1365,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
@@ -2124,7 +2132,6 @@ msgstr "EXEMPLOS"
 #: deb-control.man
 #, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2158,7 +2165,8 @@ msgstr ""
 #: 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)"
@@ -2268,9 +2276,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
@@ -3865,10 +3874,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
@@ -4966,10 +4976,11 @@ 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
@@ -5081,8 +5092,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -5705,12 +5716,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
@@ -5745,9 +5758,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
@@ -6003,6 +6017,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
@@ -8435,7 +8456,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
@@ -12549,7 +12572,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."
@@ -15019,8 +15042,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
@@ -15593,7 +15616,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
@@ -15709,13 +15734,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
@@ -15982,6 +16010,14 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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:"
@@ -16153,6 +16189,33 @@ msgid ""
 "dpkg 1.17.11)."
 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
@@ -16518,8 +16581,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>"
@@ -17875,11 +17938,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
@@ -20717,6 +20780,72 @@ msgid ""
 "do this themselves."
 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 procotol, 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
@@ -21596,6 +21725,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
@@ -21611,10 +21748,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
diff --git a/man/po/ru.po b/man/po/ru.po
index bb70ffd51..c9d856c11 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\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)"
@@ -1145,16 +1145,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 +1315,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 +1441,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
@@ -2372,7 +2381,6 @@ msgstr "ПРИМЕР"
 #: deb-control.man
 #, fuzzy, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2425,7 +2433,8 @@ msgstr ""
 #: 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
@@ -2536,9 +2545,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
@@ -4196,10 +4206,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
@@ -5308,10 +5319,11 @@ 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
@@ -5427,8 +5439,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -6049,12 +6061,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
@@ -6087,9 +6101,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
@@ -6365,6 +6380,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
@@ -8864,7 +8886,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
@@ -13001,7 +13025,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."
@@ -15466,8 +15490,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
@@ -16038,7 +16062,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
@@ -16154,13 +16180,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
@@ -16427,6 +16456,14 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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:"
@@ -16598,6 +16635,33 @@ msgid ""
 "dpkg 1.17.11)."
 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
@@ -16960,8 +17024,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>"
@@ -18313,11 +18377,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
@@ -21248,6 +21312,72 @@ msgstr ""
 "программ, которые не умеют выполнять fork() сами, или если нет возможности "
 "добавить в них код для этого."
 
+#. 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 procotol, 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
@@ -21988,6 +22118,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
@@ -22001,7 +22136,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/po/sv.po b/man/po/sv.po
index b250595d6..8a8e33576 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.11\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\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)"
@@ -1258,16 +1258,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 +1441,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 +1572,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
@@ -2592,9 +2601,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"
@@ -2650,7 +2679,8 @@ msgstr ""
 #| 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)."
 
@@ -2793,12 +2823,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å "
@@ -4883,12 +4921,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 "
@@ -6294,10 +6340,11 @@ 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
@@ -6420,8 +6467,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -7049,13 +7096,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 "
@@ -7093,11 +7150,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 "
@@ -7429,6 +7493,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
@@ -10282,7 +10353,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
@@ -15442,7 +15517,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."
@@ -18736,8 +18811,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 "
@@ -19476,7 +19551,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."
 
@@ -19645,13 +19724,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 "
@@ -20038,6 +20120,21 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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:"
@@ -20276,6 +20373,35 @@ msgstr ""
 "Innehåller paketets statusfelflagga, del av Status-fältet (sedan dpkg "
 "1.17.11)."
 
+#. 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
@@ -20782,8 +20908,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>"
@@ -22782,11 +22908,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 "
@@ -26717,6 +26843,74 @@ msgstr ""
 "förgrena på egen hand, eller där det inte är möjligt att lägga till kod för "
 "det på egen hand."
 
+#. 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 procotol, 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
@@ -27714,6 +27908,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
@@ -27729,8 +27930,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
diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index 1460d2b5b..2355ec2c0 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.21\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\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)"
@@ -1150,16 +1150,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 +1310,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 +1411,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
@@ -2176,7 +2185,6 @@ msgstr "示例"
 #: deb-control.man
 #, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2211,7 +2219,8 @@ msgstr ""
 #, 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
@@ -2319,9 +2328,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
@@ -3908,10 +3918,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
@@ -5006,10 +5017,11 @@ 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
@@ -5124,8 +5136,8 @@ 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 (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -5718,13 +5730,23 @@ 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> 中列出的配置"
@@ -5761,11 +5783,18 @@ 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> "
@@ -6063,6 +6092,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
@@ -8499,7 +8535,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
@@ -12600,7 +12638,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."
@@ -15054,8 +15092,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
@@ -15634,7 +15672,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
@@ -15750,13 +15790,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
@@ -16025,6 +16068,14 @@ msgstr ""
 msgid "B<-f>, B<--showformat=>I<format>"
 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:"
@@ -16198,6 +16249,35 @@ msgid ""
 "dpkg 1.17.11)."
 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
@@ -16560,8 +16640,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 ""
@@ -17909,11 +17989,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
@@ -20734,6 +20814,74 @@ msgid ""
 "do this themselves."
 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 procotol, 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
@@ -21463,6 +21611,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
@@ -21476,7 +21629,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/po/ast.po b/po/ast.po
index 6d5bac865..28cfe7b8b 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\n"
 "PO-Revision-Date: 2015-04-07 09:47+0200\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
 "com>\n"
@@ -1584,6 +1584,11 @@ 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"
@@ -1675,6 +1680,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"
@@ -3564,27 +3632,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"
@@ -5307,11 +5375,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
@@ -6670,8 +6736,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 ""
@@ -7226,6 +7293,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/bs.po b/po/bs.po
index 4677312e3..4ef8571d4 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1458,6 +1458,11 @@ 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"
@@ -1544,6 +1549,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'"
@@ -3094,27 +3156,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"
@@ -4464,11 +4526,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
@@ -5527,8 +5585,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/ca.po b/po/ca.po
index 2a34c1ae1..92525ffbf 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.18.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\n"
 "PO-Revision-Date: 2017-04-29 16:21+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1463,6 +1463,11 @@ 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 ""
+
 #: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
 #, c-format
 msgid "ambiguous package name '%s' with more than one installed instance"
@@ -1556,6 +1561,70 @@ msgstr "el subprocés %s ha fallat amb codi d'estat en espera %d"
 msgid "wait for %s subprocess failed"
 msgstr "el «wait» per al subprocés %s ha fallat"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "el caràcter «%c» no és vàlid en l'amplada del camp"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "el caràcter «%c» no és vàlid en l'amplada del camp"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "l'uid %s de statoverride no és vàlid"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "el gid %s de statoverride no és vàlid"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "el caràcter «%c» no és vàlid en l'amplada del camp"
+
+#: 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 "no s'admeten les opcions a la capçalera del fitxer"
+
+#: 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 "el tipus de compressió «%s» és desconegut!"
+
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot stat pathname '%s'"
@@ -3295,30 +3364,72 @@ msgid "Debian '%s' package management program version %s.\n"
 msgstr "Programa de gestió de paquets «%s» de Debian versió %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"
@@ -4994,11 +5105,9 @@ 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"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 "sistema de fitxers de l'arxiu tar corromput - arxiu del paquet corromput"
 
@@ -6237,7 +6346,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"
@@ -6247,8 +6370,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 ""
@@ -6759,6 +6883,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Es requereix autenticació per a executar update-alternatives"
 
+#~ 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»"
 
diff --git a/po/cs.po b/po/cs.po
index 236836a1b..bb095522f 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1418,6 +1418,11 @@ 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"
@@ -1509,6 +1514,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'"
@@ -3198,30 +3267,72 @@ 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"
@@ -4791,11 +4902,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
@@ -5983,7 +6092,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"
@@ -5993,8 +6116,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 ""
@@ -6487,6 +6611,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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“"
 
diff --git a/po/da.po b/po/da.po
index e4e6eabde..116f5ebee 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1475,6 +1475,11 @@ 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"
@@ -1567,6 +1572,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'"
@@ -3317,27 +3386,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"
@@ -4978,11 +5047,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
@@ -6196,7 +6263,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"
@@ -6206,8 +6287,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 ""
@@ -6710,6 +6792,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/de.po b/po/de.po
index b3d62d426..5971c12e5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.2\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\n"
 "PO-Revision-Date: 2018-10-08 18:07+0200\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -1408,6 +1408,11 @@ 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 ""
+
 #: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
 #, c-format
 msgid "ambiguous package name '%s' with more than one installed instance"
@@ -1497,6 +1502,70 @@ msgstr "»%s«-Unterprozess mit Warte-Statuswert %d fehlgeschlagen"
 msgid "wait for %s subprocess failed"
 msgstr "Warten auf »%s«-Unterprozess fehlgeschlagen"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "ungültiges Zeichen »%c« in Feldbreite"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "ungültiges Zeichen »%c« in Feldbreite"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "ungültige Statoverride-UID %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "ungültige Statoverride-GID %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "ungültiges Zeichen »%c« in Feldbreite"
+
+#: 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 "nicht unterstützte Optionen in Dateikopf"
+
+#: 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 "unbekannter Komprimierungstyp »%s«!"
+
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot stat pathname '%s'"
@@ -3240,30 +3309,72 @@ msgid "Debian '%s' package management program version %s.\n"
 msgstr "Debian »%s« Paketmanagement-Programm Version %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"
@@ -4899,11 +5010,9 @@ 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"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr "defektes Tar-Dateisystem - Paketarchiv ist defekt"
 
 #: src/unpack.c
@@ -6101,7 +6210,21 @@ msgstr ""
 "  automatischen Modus höhere Priorität.\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"
@@ -6111,8 +6234,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 ""
@@ -6627,6 +6751,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Authentifizierung ist erforderlich, um update-alternatives auszuführen"
 
+#~ 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"
 
diff --git a/po/dpkg.pot b/po/dpkg.pot
index 2e0c8fee8..9f7786a30 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.2\n"
+"Project-Id-Version: dpkg 1.19.3\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1362,6 +1362,11 @@ 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"
@@ -1448,6 +1453,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'"
@@ -2972,27 +3029,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"
@@ -4318,11 +4375,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
@@ -5368,8 +5421,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 963c158eb..900d55540 100644
--- a/po/dz.po
+++ b/po/dz.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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1518,6 +1518,11 @@ 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"
@@ -1607,6 +1612,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"
@@ -3386,27 +3453,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"
@@ -5041,11 +5108,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
@@ -6341,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 ""
@@ -6854,6 +6920,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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'"
diff --git a/po/el.po b/po/el.po
index d0c180893..f2af471a2 100644
--- a/po/el.po
+++ b/po/el.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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1545,6 +1545,11 @@ 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"
@@ -1637,6 +1642,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"
@@ -3531,27 +3598,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"
@@ -5304,11 +5371,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
@@ -6672,8 +6737,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 ""
@@ -7198,6 +7264,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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'"
diff --git a/po/eo.po b/po/eo.po
index 45dcd37ef..5b3defc1f 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1453,6 +1453,11 @@ 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"
@@ -1545,6 +1550,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'"
@@ -3293,27 +3362,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"
@@ -4930,11 +4999,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
@@ -6156,7 +6223,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"
@@ -6166,8 +6247,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 ""
@@ -6670,6 +6752,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/es.po b/po/es.po
index 2e07aff89..dc83e682f 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1540,6 +1540,11 @@ 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"
@@ -1627,6 +1632,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
@@ -3396,30 +3465,72 @@ 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"
@@ -5107,11 +5218,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
@@ -6347,7 +6456,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"
@@ -6357,8 +6480,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 ""
@@ -6867,6 +6991,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Es necesario autenticarse para ejecutar `update-alternatives'"
 
+#~ 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'"
 
diff --git a/po/et.po b/po/et.po
index 7d83ed288..09e2de34c 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1464,6 +1464,11 @@ 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"
@@ -1552,6 +1557,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"
@@ -3225,27 +3291,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"
@@ -4744,11 +4810,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
@@ -5925,8 +5989,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 ""
@@ -6419,6 +6484,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/eu.po b/po/eu.po
index ad9539095..13927ec90 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1479,6 +1479,11 @@ 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"
@@ -1573,6 +1578,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'"
@@ -3351,27 +3420,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"
@@ -5025,11 +5094,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"
@@ -6289,7 +6356,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"
@@ -6299,8 +6380,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 ""
@@ -6806,6 +6888,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/fr.po b/po/fr.po
index d9bf72a80..5f2cd77c0 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1524,6 +1524,11 @@ 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"
@@ -1620,6 +1625,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'"
@@ -3447,27 +3516,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"
@@ -5170,11 +5239,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
@@ -6471,7 +6538,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"
@@ -6481,8 +6562,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 ""
@@ -7000,6 +7082,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/gl.po b/po/gl.po
index 72057c0ea..f070d640e 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1562,6 +1562,11 @@ 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"
@@ -1654,6 +1659,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"
@@ -3527,27 +3594,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"
@@ -5264,11 +5331,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"
@@ -6633,8 +6698,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 ""
@@ -7156,6 +7222,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/hu.po b/po/hu.po
index fdef50e0b..9e268229b 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1507,6 +1507,11 @@ 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"
@@ -1596,6 +1601,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"
@@ -3350,27 +3418,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"
@@ -4983,11 +5051,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
@@ -6225,8 +6291,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 ""
@@ -6740,6 +6807,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/id.po b/po/id.po
index 4d9d0b0d8..48c7a8998 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1545,6 +1545,11 @@ 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"
@@ -1639,6 +1644,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'"
@@ -3496,27 +3565,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"
@@ -5264,11 +5333,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
@@ -6632,8 +6699,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 ""
@@ -7174,6 +7242,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/it.po b/po/it.po
index 6f426236b..65fc5ac25 100644
--- a/po/it.po
+++ b/po/it.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.3\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-12-29 13:10+0100\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\n"
 "PO-Revision-Date: 2018-12-04 12:15+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1448,6 +1448,11 @@ 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"
@@ -1539,6 +1544,70 @@ msgstr "il sottoprocesso %s è terminato con un codice di wait %d"
 msgid "wait for %s subprocess failed"
 msgstr "wait del sottoprocesso %s non riuscita"
 
+#: 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 "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'"
@@ -5004,11 +5073,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
@@ -6776,3 +6843,6 @@ msgstr ""
 #: utils/update-alternatives.polkit.in
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
+
+#~ 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 e1c1abb1a..d6852499f 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1479,6 +1479,11 @@ 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"
@@ -1571,6 +1576,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'"
@@ -3342,27 +3411,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"
@@ -4975,11 +5044,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 ファイル - パッケージアーカイブが壊れてい"
 "ます"
@@ -6211,7 +6278,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"
@@ -6221,8 +6302,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 ""
@@ -6730,6 +6812,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/km.po b/po/km.po
index b3d6eff90..3b31c1e98 100644
--- a/po/km.po
+++ b/po/km.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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1506,6 +1506,11 @@ 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"
@@ -1595,6 +1600,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"
@@ -3340,27 +3408,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"
@@ -4959,11 +5027,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
@@ -6227,8 +6293,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 ""
@@ -6735,6 +6802,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/ko.po b/po/ko.po
index 0fdbab6af..82193cb92 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1547,6 +1547,11 @@ 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"
@@ -1641,6 +1646,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'"
@@ -3490,27 +3559,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"
@@ -5268,11 +5337,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
@@ -6648,8 +6715,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 ""
@@ -7191,6 +7259,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/ku.po b/po/ku.po
index 3d474fbd0..baee11dad 100644
--- a/po/ku.po
+++ b/po/ku.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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1398,6 +1398,11 @@ 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"
@@ -1486,6 +1491,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'"
@@ -3091,27 +3153,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"
@@ -4497,11 +4559,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
@@ -5570,8 +5628,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/lt.po b/po/lt.po
index 08732b1ef..375940340 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1504,6 +1504,11 @@ 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"
@@ -1593,6 +1598,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"
@@ -3316,27 +3381,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"
@@ -4944,11 +5009,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
@@ -6108,8 +6171,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 ""
@@ -6589,6 +6653,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/mr.po b/po/mr.po
index 7baccec44..c881fd40a 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1498,6 +1498,11 @@ 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"
@@ -1586,6 +1591,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"
@@ -3344,27 +3412,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"
@@ -4960,11 +5028,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
@@ -6196,8 +6262,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 ""
@@ -6709,6 +6776,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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'"
diff --git a/po/nb.po b/po/nb.po
index 05b4d57fe..444642fc3 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1550,6 +1550,11 @@ 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"
@@ -1644,6 +1649,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'"
@@ -3491,27 +3559,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"
@@ -5263,11 +5331,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
@@ -6631,8 +6697,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 ""
@@ -7174,6 +7241,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/ne.po b/po/ne.po
index 470a2966a..3a44baba4 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1509,6 +1509,11 @@ 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"
@@ -1598,6 +1603,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"
@@ -3349,27 +3416,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"
@@ -4998,11 +5065,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
@@ -6279,8 +6344,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 ""
@@ -6789,6 +6855,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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'"
diff --git a/po/nl.po b/po/nl.po
index 50ecbb253..2fe30e84d 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-12-29 13:10+0100\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\n"
 "PO-Revision-Date: 2018-10-09 17:38+0200\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1447,6 +1447,11 @@ 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 ""
+
 #: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
 #, c-format
 msgid "ambiguous package name '%s' with more than one installed instance"
@@ -1535,6 +1540,70 @@ msgstr "subproces %s is mislukt met wachtstatuscode %d"
 msgid "wait for %s subprocess failed"
 msgstr "wachten op subproces %s is mislukt"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "ongeldig teken '%c' in veldgrootte"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "ongeldig teken '%c' in veldgrootte"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride uid %s"
+msgid "invalid tar header uid field"
+msgstr "ongeldige uid %s in overstijging van bestandsstatus (statoverride)"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "ongeldige gid %s in overstijging van bestandsstatus (statoverride)"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "ongeldig teken '%c' in veldgrootte"
+
+#: 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 "onbekende opties in bestandskop"
+
+#: 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 "onbekend compressietype `%s'!"
+
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot stat pathname '%s'"
@@ -4941,11 +5010,9 @@ 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"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 "beschadigd tar-bestand met het bestandssysteem - beschadigd pakketarchief"
 
@@ -6682,6 +6749,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Authenticatie is nodig voor het uitvoeren van update-alternatives"
 
+#~ 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"
 
diff --git a/po/nn.po b/po/nn.po
index 198ada8ac..777c163a3 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1501,6 +1501,11 @@ 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"
@@ -1590,6 +1595,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'"
@@ -3322,27 +3388,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"
@@ -4917,11 +4983,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
@@ -6133,8 +6197,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 ""
@@ -6611,6 +6676,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/pa.po b/po/pa.po
index f35f4d217..099f1bed9 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1421,6 +1421,11 @@ 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"
@@ -1508,6 +1513,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"
@@ -3110,27 +3173,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"
@@ -4646,11 +4709,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
@@ -5859,8 +5918,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/pl.po b/po/pl.po
index bfd4701a9..7b450fae4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1426,6 +1426,11 @@ 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"
@@ -1515,6 +1520,70 @@ msgstr "podproces %s zgłosił błąd poprzez kod %d funkcji \"wait\""
 msgid "wait for %s subprocess failed"
 msgstr "oczekiwanie na podproces %s nie powiodło się"
 
+#: 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 "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'"
@@ -3249,30 +3318,72 @@ msgid "Debian '%s' package management program version %s.\n"
 msgstr "Wersja %2$s programu do zarządzania pakietami Debiana %1$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"
@@ -4874,11 +4985,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
@@ -6074,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"
@@ -6084,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 ""
@@ -6592,6 +6716,9 @@ msgstr "Uruchom update-alternatives, aby zmienić wybór alternatyw w systemie"
 msgid "Authentication is required to run update-alternatives"
 msgstr "Uruchomienie update-alternatives wymaga uwierzytelnienia"
 
+#~ 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\""
 
diff --git a/po/pt.po b/po/pt.po
index afb574461..b52e3bae6 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\n"
 "PO-Revision-Date: 2018-12-30 15:43+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -40,7 +40,8 @@ msgstr "não foi possível fechar o ficheiro '%s'"
 #: lib/dpkg/ar.c
 #, c-format
 msgid "invalid character '%c' in archive '%.250s' member '%.16s' size"
-msgstr "caractere '%c' inválido no membro do arquivo '%.250s' de tamanho '%.16s'"
+msgstr ""
+"caractere '%c' inválido no membro do arquivo '%.250s' de tamanho '%.16s'"
 
 #: lib/dpkg/ar.c utils/update-alternatives.c
 #, c-format
@@ -346,7 +347,6 @@ msgid "unable to open lock file %s for testing"
 msgstr "não foi bloquear ficheiro %s para teste"
 
 #: lib/dpkg/dbmodify.c
-#| msgid "unable to open/create status database lockfile"
 msgid "unable to open/create frontend lockfile"
 msgstr "não foi possível abrir/criar lockfile do frontend"
 
@@ -479,7 +479,6 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-digest.c
 #, c-format
-#| msgid "cannot read control file '%s' for package '%s'"
 msgid "loading control file '%s' for package '%s'"
 msgstr "a carregar o ficheiro control '%s' para o pacote '%s'"
 
@@ -498,7 +497,6 @@ msgstr "desvios em conflito envolvendo '%.250s' ou '%.250s'"
 
 #: lib/dpkg/db-fsys-files.c
 #, c-format
-#| msgid "error closing files list file for package '%.250s'"
 msgid "loading files list file for package '%s'"
 msgstr "a carregar o ficheiro de lista de ficheiros para o pacote '%s'"
 
@@ -596,7 +594,6 @@ msgid "multiple statoverrides present for file '%.250s'"
 msgstr "vários statoverrides presentes para o ficheiro '%.250s'"
 
 #: lib/dpkg/deb-version.c
-#| msgid "format version with empty major component"
 msgid "format version with too big major component"
 msgstr "formato de versão com componente maior demasiado grande"
 
@@ -609,7 +606,6 @@ msgid "format version has no dot"
 msgstr "formato de versão não tem ponto"
 
 #: lib/dpkg/deb-version.c
-#| msgid "format version with empty minor component"
 msgid "format version with too big minor component"
 msgstr "formato de versão com componente demasiado grande"
 
@@ -730,27 +726,24 @@ msgstr "nome de pacote inválido (%.250s)"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "empty file details field '%s'"
 msgid "empty archive details field '%s'"
 msgstr "campo de detalhes de ficheiro vazio '%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "file details field '%s' not allowed in status file"
 msgid "archive details field '%s' not allowed in status file"
 msgstr "campo de detalhes de arquivo '%s' não é permitido no ficheiro status"
 
 #: 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 field '%s' (compared to others)"
 msgstr "demasiados valores no campo de detalhes '%s' (comparado com outros)"
 
 #: 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 field '%s' (compared to others)"
-msgstr "valores a menos no campo de detalhes de arquivo '%s' (comparado com outros)"
+msgstr ""
+"valores a menos no campo de detalhes de arquivo '%s' (comparado com outros)"
 
 #: lib/dpkg/fields.c
 msgid "yes/no in boolean field"
@@ -942,25 +935,21 @@ msgstr "não foi possível definir o modo do ficheiro de destino '%.250s'"
 
 #: lib/dpkg/file.c
 #, c-format
-#| msgid "cannot stat %s: %s"
 msgid "cannot stat %s"
 msgstr "Não pode fazer stat %s"
 
 #: lib/dpkg/file.c
 #, c-format
-#| msgid "archive '%s' is not a regular file"
 msgid "%s is not a regular file"
 msgstr "%s não é um ficheiro normal"
 
 #: lib/dpkg/file.c
 #, c-format
-#| msgid "cannot write %s: %s"
 msgid "cannot read %s"
 msgstr "não pode escrever %s"
 
 #: lib/dpkg/file.c
 #, c-format
-#| msgid "cannot append to '%s'"
 msgid "cannot open %s"
 msgstr "não pode abrir %s"
 
@@ -986,18 +975,15 @@ msgstr "não foi possível bloquear %s"
 
 #: lib/dpkg/file.c
 #, c-format
-#| msgid "cannot append to '%s'"
 msgid "cannot open file %s"
 msgstr "não pode abrir o ficheiro '%s'"
 
 #: lib/dpkg/file.c
-#| msgid "unable to flush file '%s'"
 msgid "pager to show file"
 msgstr "pager para mostrar ficheiro"
 
 #: lib/dpkg/file.c
 #, c-format
-#| msgid "cannot divert file '%s' to itself"
 msgid "cannot write file %s into the pager"
 msgstr "não pode escreiver o ficheiro %s para o pager"
 
@@ -1426,6 +1412,11 @@ 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 ""
+
 #: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
 #, c-format
 msgid "ambiguous package name '%s' with more than one installed instance"
@@ -1486,19 +1477,16 @@ msgstr "falhou fork"
 
 #: lib/dpkg/subproc.c
 #, c-format
-#| msgid "subprocess %s returned error exit status %d"
 msgid "%s subprocess returned error exit status %d"
 msgstr "o subprocesso %s retornou erro do status de saída %d"
 
 #: lib/dpkg/subproc.c
 #, c-format
-#| msgid "subprocess %s was interrupted"
 msgid "%s subprocess was interrupted"
 msgstr "o sub-processo %s foi interrompido"
 
 #: lib/dpkg/subproc.c
 #, c-format
-#| msgid "subprocess %s was killed by signal (%s)%s"
 msgid "%s subprocess was killed by signal (%s)%s"
 msgstr "o subprocesso %s foi morto pelo sinal (%s)%s"
 
@@ -1508,16 +1496,78 @@ msgstr ", core dumped"
 
 #: lib/dpkg/subproc.c
 #, c-format
-#| msgid "subprocess %s failed with wait status code %d"
 msgid "%s subprocess failed with wait status code %d"
 msgstr "o subprocesso %s falhou com o código de status wait %d"
 
 #: lib/dpkg/subproc.c
 #, c-format
-#| msgid "wait for subprocess %s failed"
 msgid "wait for %s subprocess failed"
 msgstr "falhou a espera para o subprocesso %s"
 
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header size field"
+msgstr "caractere inválido '%c' no comprimento do campo"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header mtime field"
+msgstr "caractere inválido '%c' no comprimento do 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 statoverride inválido %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid character '%c' in field width"
+msgid "invalid tar header checksum field"
+msgstr "caractere inválido '%c' no comprimento do 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 "opções não suportadas no ficheiro header"
+
+#: 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 "compressão desconhecida tipo '%s'!"
+
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "cannot stat pathname '%s'"
@@ -1619,8 +1669,8 @@ 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
@@ -1646,8 +1696,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
@@ -1815,8 +1865,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
@@ -1838,8 +1888,8 @@ msgid ""
 "trying to overwrite '%.250s', which is the diverted version of "
 "'%.250s' (package: %.100s)"
 msgstr ""
-"a tentar sobreescrever '%.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
@@ -2632,20 +2682,6 @@ msgstr ""
 
 #: src/divertcmd.c
 #, 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 "
@@ -2670,10 +2706,13 @@ msgstr ""
 "  --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                 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"
+"  --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"
+"  --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"
@@ -2827,7 +2866,8 @@ 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"
+"desviar o ficheiro '%s' de um pacote Essential com renomear é perigoso, "
+"utilize --no-rename"
 
 #: src/divertcmd.c
 #, c-format
@@ -3240,30 +3280,72 @@ msgid "Debian '%s' package management program version %s.\n"
 msgstr "Debian '%s' programa de gestão de pacotes versão %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"
@@ -3951,7 +4033,6 @@ msgid "Description"
 msgstr "Descrição"
 
 #: src/querycmd.c
-#| msgid "showing file on pager"
 msgid "showing package list on pager"
 msgstr "mostrar a lista de pacotes no pager"
 
@@ -3991,11 +4072,9 @@ 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"
-#| "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 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"
+msgstr ""
+"Utilize dpkg --info (= dpkg-deb --info) para examinar ficheiros de arquivo.\n"
 
 #: src/querycmd.c
 #, c-format
@@ -4023,12 +4102,11 @@ msgid "diverted by %s to: %s\n"
 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"
 msgid ""
 "Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
-msgstr "Utilize dpkg --contents (= dpkg-deb --contents) para listar o conteúdo de ficheiros de arquivo.\n"
+msgstr ""
+"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
@@ -4068,20 +4146,6 @@ msgstr ""
 
 #: src/querycmd.c
 #, 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"
@@ -4100,15 +4164,19 @@ 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) pacotes(s).\n"
+"  -L|--listfiles <pacote>...       Listar os ficheiros que pertencem ao(s) "
+"pacotes(s).\n"
 "  -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 control de pacote.\n"
+"  -S|--search <padrão>...          Encontrar pacote(s) dono(s) do(s) "
+"ficheiro(s).\n"
+"     --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 o caminho do ficheiro control do pacote.\n"
+"                                   Escrever o caminho do ficheiro control do "
+"pacote.\n"
 "\n"
 
 #: src/querycmd.c
@@ -4261,8 +4329,8 @@ 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"
@@ -4287,8 +4355,8 @@ 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?"
+"sem privilégios suficientes para alterar o directório raiz com --force-not-"
+"root, considere utilizar --force-script-chrootless?"
 
 #: src/script.c
 #, c-format
@@ -4306,12 +4374,10 @@ 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 pode 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
 #, c-format
-#| msgid "installed %s script"
 msgid "installed %s package %s script"
 msgstr "instalado, do pacote %s, o script %s"
 
@@ -4322,13 +4388,11 @@ msgstr "não foi capaz de stat %s '%.250s'"
 
 #: src/script.c
 #, c-format
-#| msgid "new %s script"
 msgid "new %s package %s script"
 msgstr "do pacote %s, novo script %s"
 
 #: src/script.c
 #, c-format
-#| msgid "old %s script"
 msgid "old %s package %s script"
 msgstr "do pacote antigo %s, script %s"
 
@@ -4443,15 +4507,6 @@ msgstr ""
 
 #: src/statcmd.c
 #, 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"
@@ -4465,11 +4520,16 @@ msgid ""
 "\n"
 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çar uma acção mesmo quando um teste de sanidade falhar.\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çar uma acção mesmo quando um teste de "
+"sanidade falhar.\n"
 "  --quiet                  operação silenciosa, saída mínima.\n"
 "  --help                   mostrar esta mensagem de ajuda.\n"
 "  --version                mostrar a versão.\n"
@@ -4740,7 +4800,6 @@ msgid "De-configuring %s (%s) ...\n"
 msgstr "A desconfigurar %s (%s) ...\n"
 
 #: src/unpack.c
-#| msgid "statoverride file contains empty line"
 msgid "conffile file contains an empty line"
 msgstr "ficheiro conffile contém uma linha vazia"
 
@@ -4886,11 +4945,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"
+#, fuzzy
+#| msgid "corrupted filesystem tarfile - corrupted package archive"
+msgid "corrupted filesystem tarfile in package archive"
 msgstr ""
 "sistema de ficheiros do ficheiro tar corrompido - arquivo de pacote "
 "corrompido"
@@ -5157,9 +5214,9 @@ msgstr "o ficheiro '%.250s' está corrompido - mau cabeçalho de arquivo"
 
 #: dpkg-deb/extract.c
 #, c-format
-#| msgid "file '%.250s' is not a debian binary archive (try dpkg-split?)"
 msgid "file '%.250s' is not a Debian binary archive (try dpkg-split?)"
-msgstr "o ficheiro '%.250s' não é um arquivo Debian binário (tente dpkg-split?)"
+msgstr ""
+"o ficheiro '%.250s' não é um arquivo Debian binário (tente dpkg-split?)"
 
 #: dpkg-deb/extract.c
 msgid "archive information header member"
@@ -5204,9 +5261,6 @@ msgstr "o arquivo '%.250s' contém dois membros de controle, a desistir"
 
 #: dpkg-deb/extract.c
 #, c-format
-#| msgid ""
-#| " new debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd bytes.\n"
 msgid ""
 " new Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd bytes.\n"
@@ -5230,9 +5284,6 @@ msgstr "não pode saltar membro do controlo do arquivo '%s': %s"
 
 #: dpkg-deb/extract.c
 #, c-format
-#| msgid ""
-#| " old debian package, version %d.%d.\n"
-#| " size %jd bytes: control archive=%jd, main archive=%jd.\n"
 msgid ""
 " old Debian package, version %d.%d.\n"
 " size %jd bytes: control archive=%jd, main archive=%jd.\n"
@@ -5250,7 +5301,6 @@ msgstr ""
 
 #: dpkg-deb/extract.c
 #, c-format
-#| msgid "'%.255s' is not a debian format archive"
 msgid "'%.255s' is not a Debian format archive"
 msgstr "'%.255s' não é um arquivo de formato Debian"
 
@@ -5274,9 +5324,8 @@ msgstr "falhou criar directório"
 
 #: dpkg-deb/extract.c
 #, c-format
-#| msgid "unexpected eof in package name at line %d"
 msgid "unexpected pre-existing pathname %s"
-msgstr "nome de caminho %s pré-existente inesperado" 
+msgstr "nome de caminho %s pré-existente inesperado"
 
 #: dpkg-deb/extract.c
 msgid "failed to chdir to directory"
@@ -5434,30 +5483,6 @@ msgstr ""
 
 #: dpkg-deb/main.c
 #, 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"
 msgid ""
 "Options:\n"
 "  -v, --verbose                    Enable verbose output.\n"
@@ -5491,11 +5516,15 @@ msgstr ""
 "      --nocheck                    Suprimir verificação do arquivo controlo "
 "(construir pacotes mal-formados).\n"
 "      --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 para a compilação.\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 "
+"para a compilação.\n"
 "                                     Tipos permitidos: gzip, xz, none.\n"
-"  -S<estratégia>                   Definir a estratégia de compressão para a compilação.\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"
@@ -6116,7 +6145,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"
@@ -6126,8 +6169,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 ""
@@ -6624,12 +6668,17 @@ 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"
+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 "É necessária autenticação para correr update-alternatives"
 
+#~ 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'"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 14282502e..0ff8a8897 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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."
@@ -1564,6 +1564,11 @@ 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"
@@ -1655,6 +1660,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"
@@ -3514,27 +3580,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"
@@ -5247,11 +5313,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"
 
@@ -6601,8 +6665,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 ""
@@ -7123,6 +7188,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/ro.po b/po/ro.po
index de458e284..e4ddaedcf 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1614,6 +1614,11 @@ 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"
@@ -1709,6 +1714,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'"
@@ -3589,27 +3658,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"
@@ -5395,11 +5464,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ă"
@@ -6803,8 +6870,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 ""
@@ -7355,6 +7423,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/ru.po b/po/ru.po
index 601d7cf1e..a2b13b878 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1477,6 +1477,11 @@ 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"
@@ -1573,6 +1578,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'"
@@ -3351,27 +3420,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"
@@ -5035,11 +5104,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
@@ -6293,7 +6360,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"
@@ -6303,8 +6384,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 ""
@@ -6816,6 +6898,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/sk.po b/po/sk.po
index 9654e1f23..c469569c4 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1489,6 +1489,11 @@ 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"
@@ -1582,6 +1587,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'"
@@ -3395,27 +3464,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"
@@ -5122,11 +5191,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
@@ -6352,7 +6419,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"
@@ -6362,8 +6443,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 ""
@@ -6879,6 +6961,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/sv.po b/po/sv.po
index 179b57e45..c8fd8e1be 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1455,6 +1455,11 @@ 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"
@@ -1547,6 +1552,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'"
@@ -3299,27 +3368,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"
@@ -4922,11 +4991,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
@@ -6137,7 +6204,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"
@@ -6147,8 +6228,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 ""
@@ -6650,6 +6732,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/th.po b/po/th.po
index 3537731ba..7f645a474 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1436,6 +1436,11 @@ 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"
@@ -1528,6 +1533,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'"
@@ -3238,27 +3307,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"
@@ -4830,11 +4899,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
@@ -6029,7 +6096,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"
@@ -6039,8 +6120,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 ""
@@ -6530,6 +6612,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/tl.po b/po/tl.po
index 477699e2f..8a9ca0ab8 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1521,6 +1521,11 @@ 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"
@@ -1610,6 +1615,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'"
@@ -3369,27 +3435,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"
@@ -5016,11 +5082,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
@@ -6271,8 +6335,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 ""
@@ -6750,6 +6815,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/tr.po b/po/tr.po
index 2a4ac422d..529095f8a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1437,6 +1437,11 @@ 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"
@@ -1523,6 +1528,70 @@ msgstr "%s alt süreci %d durum kodu döndürerek başarısız oldu"
 msgid "wait for %s subprocess failed"
 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
 msgid "cannot stat pathname '%s'"
@@ -3245,30 +3314,72 @@ 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"
@@ -4891,11 +5002,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
@@ -6093,7 +6202,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 +6226,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 ""
@@ -6622,6 +6746,9 @@ msgid "Authentication is required to run update-alternatives"
 msgstr ""
 "update-alternatives komutunu çalıştırmak için kimlik doğrulama gerekmektedir"
 
+#~ 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"
 
diff --git a/po/vi.po b/po/vi.po
index 7c5584aa4..657bbd1dd 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1458,6 +1458,11 @@ 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"
@@ -1550,6 +1555,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'"
@@ -3321,27 +3390,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"
@@ -4975,11 +5044,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
@@ -6208,7 +6275,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"
@@ -6218,8 +6299,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 ""
@@ -6731,6 +6813,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index b6962e980..859bc1542 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1388,6 +1388,11 @@ 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"
@@ -1474,6 +1479,70 @@ msgstr "%s 子进程失败，获得的等待状态号为 %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(uid) %s"
+
+#: lib/dpkg/tarfn.c
+#, fuzzy
+#| msgid "invalid statoverride gid %s"
+msgid "invalid tar header gid field"
+msgstr "无效的 statoverride 组ID(gid) %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
 #, c-format
 msgid "cannot stat pathname '%s'"
@@ -2710,7 +2779,8 @@ msgstr "忽略重命名 %s 的要求，该文件属主为转移软件包 %s\n"
 msgid ""
 "diverting file '%s' from an Essential package with rename is dangerous, use "
 "--no-rename"
-msgstr "从至关重要的软件包中转移文件 '%s' 并重命名是非常危险的，请用 --no-rename"
+msgstr ""
+"从至关重要的软件包中转移文件 '%s' 并重命名是非常危险的，请用 --no-rename"
 
 #: src/divertcmd.c
 #, c-format
@@ -3109,30 +3179,72 @@ msgid "Debian '%s' package management program version %s.\n"
 msgstr "Debian %s 软件包管理程序 %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"
@@ -3826,8 +3938,7 @@ msgstr "系统没有安装软件包 %s，因而没有相关的信息"
 
 #: src/querycmd.c
 msgid "Use dpkg --info (= dpkg-deb --info) to examine archive files.\n"
-msgstr ""
-"使用 dpkg --info (= dpkg-deb --info) 来检测打包好的文件，\n"
+msgstr "使用 dpkg --info (= dpkg-deb --info) 来检测打包好的文件，\n"
 
 #: src/querycmd.c
 #, c-format
@@ -3857,8 +3968,7 @@ msgstr "被 %s 转移至：%s\n"
 #: src/querycmd.c
 msgid ""
 "Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
-msgstr ""
-"通过 dpkg --contents (= dpkg-deb --contents) 来列出档案文件清单。\n"
+msgstr "通过 dpkg --contents (= dpkg-deb --contents) 来列出档案文件清单。\n"
 
 #: src/querycmd.c dpkg-deb/info.c
 #, c-format
@@ -4087,7 +4197,9 @@ msgstr "为了使dpkg正常工作，管理目录必须在安装目录中"
 msgid ""
 "not enough privileges to change root directory with --force-not-root, "
 "consider using --force-script-chrootless?"
-msgstr "没有足够权限通过 --force-not-root 改变根目录，考虑用 --force-script-chrootless ?"
+msgstr ""
+"没有足够权限通过 --force-not-root 改变根目录，考虑用 --force-script-"
+"chrootless ?"
 
 #: src/script.c
 #, c-format
@@ -4644,11 +4756,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
@@ -5788,7 +5898,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"
@@ -5798,8 +5922,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 ""
@@ -6280,6 +6405,9 @@ msgstr "运行 update-alternatives 工具以修改系统可选项的选择情况
 msgid "Authentication is required to run update-alternatives"
 msgstr "需要认证后才能执行 update-alternatives"
 
+#~ 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 控制文件"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 61b5c0e4a..b4e09b722 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1403,6 +1403,11 @@ 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"
@@ -1489,6 +1494,70 @@ msgstr "「%s」子進程失敗，並傳回了 %d 等待狀態碼(wait status co
 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'！"
+
 # 參閱 stat(2)、lstat(2) 的使用手冊頁面(manpage)
 #: lib/dpkg/treewalk.c
 #, c-format
@@ -3157,30 +3226,72 @@ msgid "Debian '%s' package management program version %s.\n"
 msgstr "Debian `%s' 套件管理程式版本%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"
@@ -4751,11 +4862,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
@@ -5908,7 +6017,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"
@@ -5918,8 +6041,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 ""
@@ -6400,6 +6524,9 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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'"
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 147ffc96c..5e4e9d297 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -8,7 +8,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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\n"
 "PO-Revision-Date: 2017-05-07 16:26+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -1000,7 +1000,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"
@@ -1048,14 +1048,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/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-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1730,6 +1722,10 @@ msgstr "s'ha produït un error en escriure la sortida estàndard"
 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 ""
+
 #: scripts/dpkg-scanpackages.pl
 msgid "Packages in override file with incorrect old maintainer value:"
 msgstr ""
@@ -2109,6 +2105,11 @@ msgstr "%s no és un nivell de compressió"
 msgid "need an action option"
 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"
@@ -2143,11 +2144,6 @@ msgstr "%s no conté cap paquet binari"
 msgid "building source for a binary-only release"
 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"
@@ -2402,6 +2398,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"
@@ -3126,15 +3130,6 @@ msgstr "manca el camp de control font imprescindible %s"
 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"
@@ -3669,7 +3664,9 @@ 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"
+#, fuzzy
+#| msgid "format v3.0 uses only one source file"
+msgid "format v3.0 (bzr) uses only one source file"
 msgstr "el format v3.0 només empra un sol fitxer font"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
@@ -3841,6 +3838,12 @@ msgstr "no es permeten dispositius ni sòcols"
 msgid "unknown file type"
 msgstr "tipus de fitxer desconegut"
 
+#: scripts/Dpkg/Source/Patch.pm
+#, fuzzy, perl-format
+#| msgid "ignoring deletion of directory %s"
+msgid "ignoring deletion of file %s"
+msgstr "s'omet la supressió del directori %s"
+
 #: scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "ignoring deletion of file %s, use --include-removal to override"
@@ -4159,6 +4162,12 @@ 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"
 
diff --git a/scripts/po/de.po b/scripts/po/de.po
index 0b8d642be..a0c880fb9 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-09 08:09+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\n"
 "PO-Revision-Date: 2018-10-09 08:14+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -885,7 +885,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"
@@ -931,14 +931,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/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-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1545,6 +1537,10 @@ msgstr "Fehler beim Schreiben nach Stdout"
 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 ""
+
 #: 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:"
@@ -1926,6 +1922,11 @@ msgstr "%s ist keine Komprimierungsstufe"
 msgid "need an action option"
 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"
@@ -1958,11 +1959,6 @@ msgstr "%s listet kein binäres Paket auf"
 msgid "building source for a binary-only release"
 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"
@@ -2225,6 +2221,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"
@@ -2946,15 +2950,6 @@ msgstr "kritisches Quellsteuerfeld %s fehlt"
 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"
@@ -3491,7 +3486,9 @@ 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"
+#, fuzzy
+#| msgid "format v3.0 uses only one source file"
+msgid "format v3.0 (bzr) uses only one source file"
 msgstr "Format v3.0 verwendet nur eine Quelldatei"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
@@ -3664,6 +3661,12 @@ msgstr "Gerät oder Socket ist nicht erlaubt"
 msgid "unknown file type"
 msgstr "unbekannter Dateityp"
 
+#: scripts/Dpkg/Source/Patch.pm
+#, fuzzy, perl-format
+#| msgid "ignoring deletion of directory %s"
+msgid "ignoring deletion of file %s"
+msgstr "Löschen des Verzeichnisses %s wird ignoriert"
+
 #: scripts/Dpkg/Source/Patch.pm
 #, perl-format
 msgid "ignoring deletion of file %s, use --include-removal to override"
@@ -3980,6 +3983,12 @@ 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}"
 
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index ccabf40ae..191ff60fe 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.2\n"
+"Project-Id-Version: dpkg 1.19.3\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -639,7 +639,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 ""
@@ -681,14 +681,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/BinaryFiles.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"
@@ -1169,6 +1161,10 @@ msgstr ""
 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 ""
@@ -1471,6 +1467,11 @@ msgstr ""
 msgid "need an action option"
 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"
@@ -1501,11 +1502,6 @@ msgstr ""
 msgid "building source for a binary-only release"
 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"
@@ -1690,6 +1686,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"
@@ -2387,15 +2391,6 @@ msgstr ""
 msgid "source package format '%s' is not supported: %s"
 msgstr ""
 
-#: 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 ""
-
 #: scripts/Dpkg/Source/Package.pm
 msgid "source package uses only weak checksums"
 msgstr ""
@@ -2898,7 +2893,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
@@ -3064,6 +3059,11 @@ msgstr ""
 msgid "unknown file type"
 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"
diff --git a/scripts/po/es.po b/scripts/po/es.po
index 3e3aab9a8..d2d5aa8c4 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1040,7 +1040,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"
@@ -1096,14 +1096,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/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-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1859,6 +1851,10 @@ msgstr "Se ha detectado un fallo al escribir por la salida estándar"
 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 ""
@@ -2282,6 +2278,12 @@ msgstr "%s no es un nivel de compresión"
 msgid "need an action option"
 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"
@@ -2316,12 +2318,6 @@ msgstr "%s no menciona ningún paquete binario"
 msgid "building source for a binary-only release"
 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"
@@ -2617,6 +2613,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"
@@ -3398,15 +3402,6 @@ msgstr "falta el campo crítico de control de las fuentes «%s»"
 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 ""
@@ -3978,7 +3973,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
@@ -4157,6 +4154,12 @@ msgstr "el dispositivo o socket de Unix no está permitido"
 msgid "unknown file type"
 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"
@@ -4491,6 +4494,12 @@ 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"
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index 69773a09a..2d45aacd2 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -1015,7 +1015,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"
@@ -1063,14 +1063,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/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-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1784,6 +1776,10 @@ msgstr "échec de l'écriture sur la sortie standard"
 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 ""
@@ -2193,6 +2189,11 @@ msgstr "%s n'est pas un niveau de compression"
 msgid "need an action option"
 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"
@@ -2227,11 +2228,6 @@ msgstr "%s ne comporte aucun paquet binaire"
 msgid "building source for a binary-only release"
 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"
@@ -2531,6 +2527,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"
@@ -3281,15 +3285,6 @@ msgstr "champ de contrôle vital manquant, %s"
 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 ""
@@ -3850,7 +3845,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
@@ -4032,6 +4029,12 @@ msgstr "périphérique ou socket non autorisé"
 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"
@@ -4373,6 +4376,12 @@ 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"
 
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index 1673a1bb1..47ada8130 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -976,7 +976,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"
@@ -1023,14 +1023,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/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-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1747,6 +1739,10 @@ msgstr "błąd podczas wypisywania na standardowe wyjście"
 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 ""
@@ -2152,6 +2148,11 @@ msgstr " %s nie jest poziomem kompresji"
 msgid "need an action option"
 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"
@@ -2184,11 +2185,6 @@ msgstr "%s nie zawiera wpisu o żadnym pakiecie binarnym."
 msgid "building source for a binary-only release"
 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"
@@ -2474,6 +2470,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"
@@ -3220,15 +3224,6 @@ msgstr "brak krytycznego źródłowego pola kontrolnego %s "
 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 ""
@@ -3780,7 +3775,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
@@ -3958,6 +3955,12 @@ msgstr "urządzenie lub gniazdo nie są dozwolone"
 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"
@@ -4286,6 +4289,12 @@ 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"
 
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index 07c8f5203..244369005 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -991,7 +991,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 пуст"
@@ -1038,14 +1038,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/BinaryFiles.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"
@@ -1756,6 +1748,10 @@ msgstr "сбой при записи в стандартный вывод"
 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 ""
@@ -2164,6 +2160,11 @@ msgstr "%s не является степенью сжатия"
 msgid "need an action option"
 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"
@@ -2198,11 +2199,6 @@ msgstr "в «%s» отсутствует какой-либо двоичный п
 msgid "building source for a binary-only release"
 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"
@@ -2495,6 +2491,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"
@@ -3247,15 +3251,6 @@ msgstr "отсутствует критическое управляющее п
 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 ""
@@ -3816,7 +3811,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
@@ -3996,6 +3993,12 @@ msgstr "устройства или сокеты не разрешены"
 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"
@@ -4323,6 +4326,12 @@ 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"
 
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index 3b65a62be..c89f22a4d 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: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:24+0100\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"
@@ -964,7 +964,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"
@@ -1010,14 +1010,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/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-genchanges.pl
 #, perl-format
 msgid "package %s listed in files list but not in control info"
@@ -1722,6 +1714,10 @@ msgstr "misslyckades vid skrivning på standard ut"
 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:"
@@ -2120,6 +2116,11 @@ msgstr "%s är inte en komprimeringsnivå"
 msgid "need an action option"
 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"
@@ -2151,11 +2152,6 @@ msgstr "%s räknar inte upp några binärpaket"
 msgid "building source for a binary-only release"
 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"
@@ -2442,6 +2438,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"
@@ -3183,15 +3187,6 @@ msgstr "saknar kritiska källkodsstyrfältet %s"
 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 ""
@@ -3736,7 +3731,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
@@ -3911,6 +3908,12 @@ msgstr "enhet eller uttag inte tillåtet"
 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"
@@ -4236,6 +4239,12 @@ 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"
 
-- 
cgit v1.2.3


From 12f408dab7184bb12b5907780a5fb4e49b202d3c Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Wed, 23 Jan 2019 18:42:27 +0100
Subject: Update German scripts translation

Update to 603t.
---
 debian/changelog |  3 ++-
 scripts/po/de.po | 17 +++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index be2cde719..53115056b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 dpkg (1.19.5) UNRELEASED; urgency=medium
 
-  *
+  [ Updated scripts translations ]
+  * German (Helge Kreutzmann).
 
  -- Guillem Jover <guillem@debian.org>  Wed, 23 Jan 2019 13:53:46 +0100
 
diff --git a/scripts/po/de.po b/scripts/po/de.po
index a0c880fb9..1391706e9 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-2018.
+# (C) Helge Kreutzmann <debian@helgefjell.de>, 2007-2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg-dev 1.19.1\n"
+"Project-Id-Version: dpkg-dev 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2019-01-22 14:24+0100\n"
-"PO-Revision-Date: 2018-10-09 08:14+0200\n"
+"PO-Revision-Date: 2019-01-23 18:40+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -1539,7 +1539,7 @@ msgstr "Stdout konnte nicht geschlossen werden"
 
 #: scripts/dpkg-scanpackages.pl
 msgid "Packages with multiple instances but no --multiversion specified:"
-msgstr ""
+msgstr "Pakete mit mehreren Instanzen aber kein --multiversion angegeben:"
 
 #: scripts/dpkg-scanpackages.pl
 msgid "Packages in override file with incorrect old maintainer value:"
@@ -3486,10 +3486,8 @@ msgstr ""
 "noch nicht übergebene, nicht ignorierte Änderungen im Arbeitsverzeichnis: %s"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
-#, fuzzy
-#| msgid "format v3.0 uses only one source file"
 msgid "format v3.0 (bzr) uses only one source file"
-msgstr "Format v3.0 verwendet nur eine Quelldatei"
+msgstr "Format v3.0 (bzr) verwendet nur eine Quelldatei"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 #, perl-format
@@ -3662,10 +3660,9 @@ msgid "unknown file type"
 msgstr "unbekannter Dateityp"
 
 #: scripts/Dpkg/Source/Patch.pm
-#, fuzzy, perl-format
-#| msgid "ignoring deletion of directory %s"
+#, perl-format
 msgid "ignoring deletion of file %s"
-msgstr "Löschen des Verzeichnisses %s wird ignoriert"
+msgstr "Löschen der Datei %s wird ignoriert"
 
 #: scripts/Dpkg/Source/Patch.pm
 #, perl-format
-- 
cgit v1.2.3


From 024d7881d39d6ca4262209770d86fd649d0de544 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 15 Feb 2019 04:25:06 +0100
Subject: dpkg-buildpackage: Clarify the warning/error on short OpenPGP key IDs

Print where these are to be used.

Closes: #922039
---
 debian/changelog             | 2 ++
 scripts/dpkg-buildpackage.pl | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 327e980c9..ec12434ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium
     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
   * Documentation:
     - start-stop-daemon(1): Document behavior of --pidfile security checks.
       Closes: #921557
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index c50416580..b19f72278 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -829,10 +829,12 @@ sub signkey_validate {
 
     if (length $keyid <= 8) {
         error(g_('short OpenPGP key IDs are broken; ' .
-                 'please use key fingerprints instead'));
+                 '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 instead'));
+                   'please use key fingerprints in %s or %s instead'),
+                '-k', 'DEB_SIGN_KEYID');
     }
 }
 
-- 
cgit v1.2.3


From 967e990834995a6b3f8d3aa9d2cb12e7a97abdda Mon Sep 17 00:00:00 2001
From: Ralf Treinen <treinen@free.fr>
Date: Thu, 21 Feb 2019 04:40:42 +0100
Subject: dpkg-maintscript-helper: Restrict find for dir-to-symlink move to
 -maxdepth 1

We do not want to move the entries beneath the first depth of the
pathname, as when we try to move those, we will have already moved
their parent.

Closes: #922799
Signed-off-by: Guillem Jover <guillem@debian.org>
---
 debian/changelog                   | 2 ++
 scripts/dpkg-maintscript-helper.sh | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index ec12434ab..7006c9093 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium
     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
   * Documentation:
     - start-stop-daemon(1): Document behavior of --pidfile security checks.
       Closes: #921557
diff --git a/scripts/dpkg-maintscript-helper.sh b/scripts/dpkg-maintscript-helper.sh
index 2865a63d5..a113a938e 100755
--- a/scripts/dpkg-maintscript-helper.sh
+++ b/scripts/dpkg-maintscript-helper.sh
@@ -465,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.
-- 
cgit v1.2.3


From 13cad525ffbcbfba47863ea41024415ac25f7974 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 2 Dec 2018 03:35:49 +0100
Subject: dpkg-genbuildinfo: Add support for a new Build-Tainted-By field

This field will contain a list of tainting reason tags, which can denote
that the current build has potentially been broken.

Suggested-by: Alexander E. Patrakov <patrakov@gmail.com>
---
 debian/changelog                   |  2 ++
 man/deb-buildinfo.man              | 11 +++++++++++
 scripts/Dpkg/Control/FieldsCore.pm |  7 ++++++-
 scripts/Dpkg/Vendor/Debian.pm      | 10 ++++++++++
 scripts/Dpkg/Vendor/Default.pm     | 10 ++++++++++
 scripts/dpkg-genbuildinfo.pl       |  2 ++
 scripts/t/Dpkg_Control_Fields.t    |  5 +++--
 7 files changed, 44 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 7006c9093..58a306652 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ dpkg (1.19.5) UNRELEASED; urgency=medium
     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>.
   * Documentation:
     - start-stop-daemon(1): Document behavior of --pidfile security checks.
       Closes: #921557
diff --git a/man/deb-buildinfo.man b/man/deb-buildinfo.man
index 5013aa047..1a1ddc7d1 100644
--- a/man/deb-buildinfo.man
+++ b/man/deb-buildinfo.man
@@ -149,6 +149,17 @@ 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-exhausitve 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
+.RE
+.TP
 .BR Installed\-Build\-Depends: " (required)"
 .TQ
 .I " package-list"
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/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 7d4b6d802..7b5244042 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -81,6 +81,8 @@ 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);
     }
@@ -439,6 +441,14 @@ sub _add_build_flags {
     }
 }
 
+sub _build_tainted_by {
+    my $self = shift;
+    my %tainted;
+
+    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..ed05c3009 100644
--- a/scripts/Dpkg/Vendor/Default.pm
+++ b/scripts/Dpkg/Vendor/Default.pm
@@ -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
@@ -172,6 +180,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-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
index fe296506e..827b6679f 100755
--- a/scripts/dpkg-genbuildinfo.pl
+++ b/scripts/dpkg-genbuildinfo.pl
@@ -437,6 +437,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/t/Dpkg_Control_Fields.t b/scripts/t/Dpkg_Control_Fields.t
index 00f951052..8e0bd721b 100644
--- a/scripts/t/Dpkg_Control_Fields.t
+++ b/scripts/t/Dpkg_Control_Fields.t
@@ -20,7 +20,7 @@ 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');
@@ -167,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() => {
-- 
cgit v1.2.3


From dd406dc36649bacf646c51735214b9b21a82b5ae Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 2 Dec 2018 03:35:49 +0100
Subject: Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted
 tag

This will detect whether the system we are building on contains the
problematic /usr merged via symlinks deployment method.

Suggested-by: Alexander E. Patrakov <patrakov@gmail.com>
---
 debian/changelog              |  3 +++
 man/deb-buildinfo.man         | 11 +++++++++++
 scripts/Dpkg/Vendor/Debian.pm | 10 ++++++++++
 3 files changed, 24 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 58a306652..a57bd3438 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,9 @@ dpkg (1.19.5) UNRELEASED; urgency=medium
     -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>.
+  * Perl modules:
+    - Dpkg::Vendor::Debian: Add support for merged-usr-via-symlinks tainted
+      tag. Suggested by Alexander E. Patrakov <patrakov@gmail.com>.
   * Documentation:
     - start-stop-daemon(1): Document behavior of --pidfile security checks.
       Closes: #921557
diff --git a/man/deb-buildinfo.man b/man/deb-buildinfo.man
index 1a1ddc7d1..fe276bef2 100644
--- a/man/deb-buildinfo.man
+++ b/man/deb-buildinfo.man
@@ -158,6 +158,17 @@ 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.
 .RE
 .TP
 .BR Installed\-Build\-Depends: " (required)"
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 7b5244042..6948bdc16 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -445,6 +445,16 @@ 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;
+        }
+    }
+
     my @tainted = sort keys %tainted;
     return @tainted;
 }
-- 
cgit v1.2.3


From 769e87e0b9943bae4c62f1a5c85581be653d74b8 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 3 Dec 2018 08:57:14 +0100
Subject: Dpkg::Vendor::Debian: Add support for usr-local-has-* tainted tags

These will detect problematic files under /usr/local which can taint
the current build.
---
 debian/changelog              |  1 +
 man/deb-buildinfo.man         | 12 ++++++++++++
 scripts/Dpkg/Vendor/Debian.pm | 14 ++++++++++++++
 3 files changed, 27 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index a57bd3438..16ea0cf74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,7 @@ dpkg (1.19.5) UNRELEASED; urgency=medium
   * 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.
   * Documentation:
     - start-stop-daemon(1): Document behavior of --pidfile security checks.
       Closes: #921557
diff --git a/man/deb-buildinfo.man b/man/deb-buildinfo.man
index fe276bef2..691acb255 100644
--- a/man/deb-buildinfo.man
+++ b/man/deb-buildinfo.man
@@ -169,6 +169,18 @@ problems, and messes with the understanding of the filesystem that
 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)"
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 6948bdc16..a352bbdde 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -455,6 +455,20 @@ sub _build_tainted_by {
         }
     }
 
+    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,
+        }, map { "/usr/local/$_" } @{$usr_local_types{$type}});
+    }
+
     my @tainted = sort keys %tainted;
     return @tainted;
 }
-- 
cgit v1.2.3


From 41628ced3ebbdb2ed2219b5320b6301aee7d65be Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 1 Feb 2019 03:41:25 +0100
Subject: Dpkg::Source::Package: Add a missing use Dpkg::Source::Format

Closes: #921031
Fixes: commit d1d35a56e401181b6d15baf474a7db21d3372a65
Diagnosed-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 debian/changelog               | 3 +++
 scripts/Dpkg/Source/Package.pm | 1 +
 2 files changed, 4 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 16ea0cf74..90edb01b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ dpkg (1.19.5) UNRELEASED; urgency=medium
     - 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
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index 74daa712b..69c2a2976 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -56,6 +56,7 @@ 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;
 
 my $diff_ignore_default_regex = '
 # Ignore general backup files
-- 
cgit v1.2.3


From 7605ee419fa482baeb8db5ff42e3163df6ac51bd Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 22 Feb 2019 01:42:13 +0100
Subject: Dpkg::BuildOptions: Fix typo in POD

---
 scripts/Dpkg/BuildOptions.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index 057dfc1e3..263381b49 100644
--- a/scripts/Dpkg/BuildOptions.pm
+++ b/scripts/Dpkg/BuildOptions.pm
@@ -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
 
-- 
cgit v1.2.3


From 03a8e6ac6ee204cba9d3b1753656f388637d9db8 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 23 Feb 2019 18:00:53 +0100
Subject: po: Regenerate .pot files and merge .po files with them

---
 dselect/po/bs.po        |   2 +-
 dselect/po/ca.po        |   2 +-
 dselect/po/cs.po        |   2 +-
 dselect/po/da.po        |   2 +-
 dselect/po/de.po        |   2 +-
 dselect/po/dselect.pot  |   4 +-
 dselect/po/el.po        |   2 +-
 dselect/po/es.po        |   2 +-
 dselect/po/et.po        |   2 +-
 dselect/po/eu.po        |   2 +-
 dselect/po/fr.po        |   2 +-
 dselect/po/gl.po        |   2 +-
 dselect/po/hu.po        |   2 +-
 dselect/po/id.po        |   2 +-
 dselect/po/it.po        |   2 +-
 dselect/po/ja.po        |   2 +-
 dselect/po/ko.po        |   2 +-
 dselect/po/nb.po        |   2 +-
 dselect/po/nl.po        |   2 +-
 dselect/po/nn.po        |   2 +-
 dselect/po/pl.po        |   2 +-
 dselect/po/pt.po        |   2 +-
 dselect/po/pt_BR.po     |   2 +-
 dselect/po/ro.po        |   2 +-
 dselect/po/ru.po        |   2 +-
 dselect/po/sk.po        |   2 +-
 dselect/po/sv.po        |   2 +-
 dselect/po/tl.po        |   2 +-
 dselect/po/vi.po        |   2 +-
 dselect/po/zh_CN.po     |   2 +-
 dselect/po/zh_TW.po     |   2 +-
 man/po/de.po            | 361 ++++++++++++++++++++----
 man/po/dpkg-man.pot     | 200 +++++++++++++-
 man/po/es.po            | 240 +++++++++++++++-
 man/po/fr.po            | 190 +++++++++++--
 man/po/hu.po            | 199 +++++++++++++-
 man/po/it.po            | 241 +++++++++++++++-
 man/po/ja.po            | 240 +++++++++++++++-
 man/po/nl.po            | 377 +++++++++++++++++--------
 man/po/pl.po            | 243 +++++++++++++++-
 man/po/pt_BR.po         | 211 +++++++++++++-
 man/po/ru.po            | 221 ++++++++++++++-
 man/po/sv.po            | 240 +++++++++++++++-
 man/po/zh_CN.po         | 218 ++++++++++++++-
 po/ast.po               | 587 +++++++++++++++++++++++----------------
 po/bs.po                | 455 +++++++++++++++++-------------
 po/ca.po                | 599 ++++++++++++++++++++++++----------------
 po/cs.po                | 597 ++++++++++++++++++++++++----------------
 po/da.po                | 594 +++++++++++++++++++++++----------------
 po/de.po                | 657 +++++++++++++++++++++++++++-----------------
 po/dpkg.pot             | 425 +++++++++++++++-------------
 po/dz.po                | 558 +++++++++++++++++++++----------------
 po/el.po                | 578 ++++++++++++++++++++++----------------
 po/eo.po                | 598 ++++++++++++++++++++++++----------------
 po/es.po                | 622 ++++++++++++++++++++++++-----------------
 po/et.po                | 549 +++++++++++++++++++++----------------
 po/eu.po                | 606 ++++++++++++++++++++++++----------------
 po/fr.po                | 657 ++++++++++++++++++++++++++------------------
 po/gl.po                | 576 ++++++++++++++++++++++----------------
 po/hu.po                | 557 +++++++++++++++++++++----------------
 po/id.po                | 577 ++++++++++++++++++++++----------------
 po/it.po                | 621 +++++++++++++++++++++++++----------------
 po/ja.po                | 598 ++++++++++++++++++++++++----------------
 po/km.po                | 554 +++++++++++++++++++++----------------
 po/ko.po                | 577 ++++++++++++++++++++++----------------
 po/ku.po                | 484 ++++++++++++++++++--------------
 po/lt.po                | 554 +++++++++++++++++++++----------------
 po/mr.po                | 556 +++++++++++++++++++++----------------
 po/nb.po                | 574 ++++++++++++++++++++++----------------
 po/ne.po                | 554 +++++++++++++++++++++----------------
 po/nl.po                | 716 ++++++++++++++++++++++++++----------------------
 po/nn.po                | 554 +++++++++++++++++++++----------------
 po/pa.po                | 520 ++++++++++++++++++++---------------
 po/pl.po                | 613 +++++++++++++++++++++++++----------------
 po/pt.po                | 634 ++++++++++++++++++++++++++----------------
 po/pt_BR.po             | 576 ++++++++++++++++++++++----------------
 po/ro.po                | 595 +++++++++++++++++++++++-----------------
 po/ru.po                | 602 ++++++++++++++++++++++++----------------
 po/sk.po                | 610 ++++++++++++++++++++++++-----------------
 po/sv.po                | 594 +++++++++++++++++++++++----------------
 po/th.po                | 591 +++++++++++++++++++++++----------------
 po/tl.po                | 558 +++++++++++++++++++++----------------
 po/tr.po                | 600 ++++++++++++++++++++++++----------------
 po/vi.po                | 597 ++++++++++++++++++++++++----------------
 po/zh_CN.po             | 614 +++++++++++++++++++++++++----------------
 po/zh_TW.po             | 598 ++++++++++++++++++++++++----------------
 scripts/po/ca.po        |  10 +-
 scripts/po/de.po        |  15 +-
 scripts/po/dpkg-dev.pot |  12 +-
 scripts/po/es.po        |  10 +-
 scripts/po/fr.po        |  10 +-
 scripts/po/pl.po        |  10 +-
 scripts/po/ru.po        |  10 +-
 scripts/po/sv.po        |  10 +-
 94 files changed, 17502 insertions(+), 10266 deletions(-)

(limited to 'scripts')

diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index 61839c8e9..723e24284 100644
--- a/dselect/po/bs.po
+++ b/dselect/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index 44c05a27e..50ca1c1db 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2017-04-28 04:22+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
diff --git a/dselect/po/cs.po b/dselect/po/cs.po
index e6bdd7625..9ac63e5af 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/da.po b/dselect/po/da.po
index 5ee527423..152756130 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/de.po b/dselect/po/de.po
index 7b2a6cd8d..65ad7d7d5 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index 4474afd6a..1b5d1d809 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.3\n"
+"Project-Id-Version: dpkg 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/el.po b/dselect/po/el.po
index 1f1a48e25..bba591ff1 100644
--- a/dselect/po/el.po
+++ b/dselect/po/el.po
@@ -11,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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/es.po b/dselect/po/es.po
index 3aaada6a5..15f3d9f68 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/et.po b/dselect/po/et.po
index c3efb0065..c51a26326 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/eu.po b/dselect/po/eu.po
index dc71d59d0..1f59a61c3 100644
--- a/dselect/po/eu.po
+++ b/dselect/po/eu.po
@@ -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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index e07af7546..b4a88d264 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/gl.po b/dselect/po/gl.po
index 6eb19868b..cfdce1c95 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/hu.po b/dselect/po/hu.po
index b3e260882..b8527db70 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/id.po b/dselect/po/id.po
index 40c750bca..f3f1d6090 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/it.po b/dselect/po/it.po
index 685838801..df504e1dd 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index 27a1eefad..c091a5a81 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/ko.po b/dselect/po/ko.po
index 7d18edd48..23f2d66bc 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index 77bb1edac..e68a8bd83 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index 9f35e0945..74ed4b2f2 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index 01d0b6962..fb0b912cd 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/pl.po b/dselect/po/pl.po
index bcb3c42dd..01d5baadb 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index 8bf16eacc..75f05f28a 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po
index ea233152e..fee8a35f0 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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."
diff --git a/dselect/po/ro.po b/dselect/po/ro.po
index 070e9d64b..9637df699 100644
--- a/dselect/po/ro.po
+++ b/dselect/po/ro.po
@@ -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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/ru.po b/dselect/po/ru.po
index d33e70790..29af24f60 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/sk.po b/dselect/po/sk.po
index 42306bc23..a44d9bb98 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/sv.po b/dselect/po/sv.po
index 2fb73c513..f51f4239c 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index a0fcb4418..0b47b23d5 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index 086960386..c0ed3d9fb 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 85b6344c8..3aec4aacd 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index df0454a2e..beb2d8ef6 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
diff --git a/man/po/de.po b/man/po/de.po
index 4738ccea7..342bd5f4b 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2019-01-23 19:46+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -990,6 +990,114 @@ msgstr ""
 "Unter Debian und abgeleiteten Distributionen werden nur Baupfade, die mit I</"
 "build/> beginnen, dieses Feld ausgeben."
 
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<build-indep>"
+msgid "B<Build-Tainted-By:>"
+msgstr "B<build-indep>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "I<variable-list>"
+msgid "I<taint-reason-list>"
+msgstr "I<Variablenliste>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+#, fuzzy
+#| 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)."
+msgid ""
+"This folded field contains a space-separated list of non-exhausitve 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 ist eine durch Leerzeichen getrennte Liste von "
+"hochzuladenen binären Paketen. Falls es sich um einen reinen Quell-Upload "
+"handelt, wird dieses Feld ausgelassen (seit Dpkg 1.19.3)."
+
+#. type: Plain text
+#: deb-buildinfo.man
+#, fuzzy
+#| msgid ""
+#| "On Debian and derivatives only build paths starting with I</build/> will "
+#| "emit this field."
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+"Unter Debian und abgeleiteten Distributionen werden nur Baupfade, die mit I</"
+"build/> beginnen, dieses Feld ausgeben."
+
+#. 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<lokale_shlibs-Datei>"
+
+#. 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<--always-include-path>"
+msgid "B<usr-local-has-includes>"
+msgstr "B<--always-include-path>"
+
+#. 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<lokale_shlibs-Datei>"
+
+#. 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
@@ -1404,9 +1512,9 @@ msgid ""
 "that point."
 msgstr ""
 "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."
+"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
@@ -4893,13 +5001,13 @@ msgid ""
 "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 (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."
+"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
@@ -6179,12 +6287,12 @@ 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 (»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."
+"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
@@ -6770,6 +6878,20 @@ msgstr ""
 "wollen alle Dateien aus den Systemverzeichnissen inklusive der "
 "Konfigurationsdateien entfernen)."
 
+#. 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
@@ -6991,15 +7113,15 @@ msgid ""
 "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 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 "
+"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."
+"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
@@ -7037,10 +7159,11 @@ msgid ""
 "are purged."
 msgstr ""
 "Löscht ein installiertes oder bereits entferntes Paket vollständig. Damit "
-"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."
+"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
@@ -7648,7 +7771,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>"
@@ -7898,13 +8021,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>"
@@ -7934,7 +8057,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)."
 
@@ -8130,6 +8253,28 @@ msgstr ""
 "B<overwrite-diverted>: Überschreibe eine umgeleitete (»diverted«) Datei mit "
 "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 ""
+
+#. 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 ""
@@ -9014,6 +9159,21 @@ 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
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_COLORS>"
+
+#. 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
 #, no-wrap
@@ -9105,6 +9265,19 @@ msgstr ""
 "1.16.0). Diese Variable wird immer auf den aktuellen Wert von B<--admindir> "
 "gesetzt."
 
+#. type: Plain text
+#: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the "
+#| "architecture the package got built for (since dpkg 1.15.4)."
+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 die Betreuer-Skript-Umgebung auf die Architektur "
+"gesetzt, für die das Paket gebaut wurde (seit Dpkg 1.15.4)."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -18253,8 +18426,8 @@ msgid ""
 "etc."
 msgstr ""
 "Alles, was nicht von Dpkg::Changelog ausgewertet werden kann, geht beim "
-"Zusammenführen verloren. Dies betrifft Zeug wie "
-"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
@@ -19091,14 +19264,14 @@ 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:"
+"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
@@ -19457,8 +19630,8 @@ msgid ""
 "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."
+"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
@@ -22027,11 +22200,11 @@ msgstr ""
 "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 (‚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."
+"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
@@ -23648,6 +23821,13 @@ msgstr ""
 "Liste alle Hinwegsetzungen auf. Falls ein Glob-Muster spezifiziert wurde, "
 "begrenze die Ausgabe auf Hinwegsetzungen, die auf den Glob passen."
 
+#. 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 "Gebe Hilfe über die B<--force->I<Sache>-Optionen aus."
+
 #. type: Plain text
 #: dpkg-statoverride.man
 msgid ""
@@ -23666,6 +23846,41 @@ 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
+#, 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 ""
+"Erzwinge oder verweigere (B<no-force> und B<refuse> bedeuten das gleiche) "
+"bestimmte Sachen. 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
+#, 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<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
 #, no-wrap
@@ -23674,9 +23889,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 ""
 "Erzwinge eine Aktion, selbst wenn eine Sinn-Überprüfung diese normalerweise "
 "verböte. Dies ist notwendig, um sich über eine existierende Hinwegsetzung "
@@ -23709,6 +23929,19 @@ msgstr ""
 "Für B<--list>, falls es keine Hinwegsetzungen gab oder keine auf die "
 "angegebenen Metazeichen passte."
 
+#. type: Plain text
+#: dpkg-statoverride.man
+#, fuzzy
+#| 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)."
+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 die Option B<--instdir> oder B<--root> nicht angegeben "
+"wurde, wird dies als Dateisystemwurzelverzeichnis verwandt."
+
 #. type: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -25390,12 +25623,22 @@ msgstr ""
 
 #. type: Plain text
 #: start-stop-daemon.man
-msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+#, fuzzy
+#| msgid ""
+#| "B<Warning:> Using this match option alone with a daemon that writes the "
+#| "pidfile as an unprivileged user is a security risk, because 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."
+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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 "B<Warnung>: Es ist ein Sicherheitsrisiko, diese Abgleichoption alleine mit "
 "einem Daemon, der die PID-Datei als ein nicht privilegierte Benutzer "
@@ -25714,10 +25957,10 @@ msgid ""
 "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:"
+"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
diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index 27a6e9646..a4b7ced1c 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.3\n"
+"Project-Id-Version: dpkg-man 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
@@ -789,6 +789,94 @@ msgid ""
 "emit this field."
 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-exhausitve 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
@@ -5383,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
@@ -6092,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 ""
@@ -6279,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 ""
@@ -6308,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 ""
 
@@ -6448,6 +6550,28 @@ msgstr ""
 msgid "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 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 ""
@@ -7157,6 +7281,20 @@ msgid ""
 "B<auto> (default), B<always> and B<never>."
 msgstr ""
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<DPKG_FORCE>"
+msgstr ""
+
+#. 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
 #, no-wrap
@@ -7226,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
@@ -18640,6 +18785,11 @@ msgid ""
 "overrides which match the glob."
 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 ""
@@ -18654,6 +18804,23 @@ msgid ""
 "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 ""
+"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
 #: dpkg-statoverride.man update-alternatives.man
 #, no-wrap
@@ -18664,7 +18831,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
@@ -18690,6 +18858,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
@@ -19984,11 +20159,14 @@ msgstr ""
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+"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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
diff --git a/man/po/es.po b/man/po/es.po
index 4befdc0df..732a677d5 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2016-12-17 16:41+0100\n"
 "Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
 "Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -968,6 +968,99 @@ msgid ""
 "emit this field."
 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-exhausitve 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
@@ -6978,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
@@ -7917,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>"
@@ -8193,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>"
@@ -8231,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."
 
@@ -8457,6 +8564,28 @@ msgstr ""
 "B<overwrite-diverted>: Sobreescribe una versión desviada de un fichero con "
 "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
@@ -9374,6 +9503,21 @@ msgid ""
 "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
@@ -9451,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
@@ -25428,6 +25585,13 @@ msgstr ""
 "ninguna concuerda con el patrón, B<dpkg-statoverride> finalizará con un "
 "código de salida de 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 "Muestra la ayuda de las opciones B<--force->I<algo>."
+
 #. type: Plain text
 #: dpkg-statoverride.man
 #, fuzzy
@@ -25449,6 +25613,41 @@ msgid ""
 "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
@@ -25457,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 ""
 "Fuerza una acción, incluso si ésta pudiese resultar perjudicial. Es "
 "necesario para poder modificar una sustitución existente."
@@ -25492,6 +25696,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
@@ -27371,11 +27588,14 @@ msgstr ""
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+"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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
diff --git a/man/po/fr.po b/man/po/fr.po
index 3ac19990e..bda235d34 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-17 19:35+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2019-02-17 19:45+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -1002,6 +1002,111 @@ 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
+#, fuzzy, no-wrap
+#| msgid "B<build-indep>"
+msgid "B<Build-Tainted-By:>"
+msgstr "B<build-indep>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "I<variable-list>"
+msgid "I<taint-reason-list>"
+msgstr "I<liste-de-variables>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+#, fuzzy
+#| msgid ""
+#| "This folded field is a space-separated list of binary packages to upload."
+msgid ""
+"This folded field contains a space-separated list of non-exhausitve 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, de paquets binaires à "
+"envoyer."
+
+#. type: Plain text
+#: deb-buildinfo.man
+#, fuzzy
+#| msgid ""
+#| "On Debian and derivatives only build paths starting with I</build/> will "
+#| "emit this field."
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+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<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<fichier-local-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<--always-include-path>"
+msgid "B<usr-local-has-includes>"
+msgstr "B<--always-include-path>"
+
+#. 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<fichier-local-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
 #, no-wrap
@@ -6884,6 +6989,20 @@ msgstr ""
 "supprimer dans les répertoires du système, même les fichiers de "
 "configuration)."
 
+#. 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
@@ -9170,6 +9289,21 @@ msgstr ""
 "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-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_COLORS>"
+
+#. 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
 #, no-wrap
@@ -9259,6 +9393,20 @@ msgstr ""
 "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
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the "
+#| "architecture the package got built for (since dpkg 1.15.4)."
+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 script du responsable, cette "
+"variable contient l'architecture pour laquelle le paquet a été construit "
+"(depuis dpkg 1.15.4)."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -9409,27 +9557,6 @@ msgstr ""
 "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_ARCH>"
-msgid "B<DPKG_MAINTSCRIPT_FORCE>"
-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 (since dpkg 1.15.4)."
-msgid ""
-"Defined by B<dpkg> on the maintainer script environment to the force option "
-"names separated by commas (since dpkg 1.19.3)."
-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 "
-"(depuis dpkg 1.15.4)."
-
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -24036,6 +24163,20 @@ 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
+#, fuzzy
+#| 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)."
+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 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: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -27406,3 +27547,8 @@ msgstr "B<update-alternatives --auto vi>"
 #: update-alternatives.man
 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 "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 62a1b5209..5c7f5bb7f 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian@lists.debian.org>\n"
@@ -821,6 +821,95 @@ msgid ""
 "emit this field."
 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-exhausitve 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
@@ -5810,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
@@ -6528,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>"
@@ -6719,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 ""
@@ -6748,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 ""
 
@@ -6889,6 +6992,28 @@ msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 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 ""
@@ -7597,6 +7722,20 @@ msgid ""
 "B<auto> (default), B<always> and B<never>."
 msgstr ""
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+msgid "B<DPKG_FORCE>"
+msgstr "B<--new>"
+
+#. 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
@@ -7667,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
@@ -19324,6 +19470,11 @@ msgid ""
 "overrides which match the glob."
 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 ""
@@ -19338,6 +19489,23 @@ msgid ""
 "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 ""
+"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
 #: dpkg-statoverride.man update-alternatives.man
 #, fuzzy, no-wrap
@@ -19348,7 +19516,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
@@ -19374,6 +19543,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
@@ -20687,11 +20863,14 @@ msgstr ""
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+"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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
diff --git a/man/po/it.po b/man/po/it.po
index c5b9855d1..1ce8e8873 100644
--- a/man/po/it.po
+++ b/man/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.16.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Beatrice Torracca <beatricet@libero.it>\n"
 "Language-Team: Italian <debian-l10n-italian@lists.debian.org>\n"
@@ -949,6 +949,99 @@ msgid ""
 "emit this field."
 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-exhausitve 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
@@ -6891,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
@@ -7876,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>"
@@ -8152,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>"
@@ -8191,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."
 
@@ -8412,6 +8519,28 @@ msgstr ""
 "B<overwrite-diverted>: sovrascrive una versione diversificata di un file con "
 "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
@@ -9353,6 +9482,21 @@ msgid ""
 "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
@@ -9430,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
@@ -23768,6 +23925,13 @@ msgstr ""
 "sono sovrascritture o nessuna corrisponde al modello glob, B<dpkg-"
 "statoverride> terminerà con 1 come codice di uscita."
 
+#. 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
@@ -23788,6 +23952,42 @@ msgid ""
 "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
@@ -23796,9 +23996,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."
@@ -23828,6 +24033,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
@@ -25704,11 +25922,14 @@ msgstr ""
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+"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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
diff --git a/man/po/ja.po b/man/po/ja.po
index 4b7686256..c7b3a80db 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: TAKAHASHI Motonobu <monyo@monyo.com>\n"
 "Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@@ -929,6 +929,99 @@ msgid ""
 "emit this field."
 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-exhausitve 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
@@ -6840,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
@@ -7768,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>"
@@ -8037,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>"
@@ -8075,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>: 全ての強制オプションを指定する(または指定しない)。"
 
@@ -8297,6 +8404,28 @@ msgstr ""
 "B<overwrite-diverted>: 退避 (divert) した古いファイルを現在のファイルで上書き"
 "する。"
 
+#. 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
@@ -9198,6 +9327,21 @@ msgid ""
 "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
@@ -9275,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
@@ -24871,6 +25028,13 @@ msgstr ""
 "override のみを出力する。override が全くない場合や、glob にマッチするものがひ"
 "とつもなかった場合は、B<dpkg-statoverride> は終了コード 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 "B<--force->I<thing> オプションに関するヘルプを表示する。"
+
 #. type: Plain text
 #: dpkg-statoverride.man
 #, fuzzy
@@ -24891,6 +25055,41 @@ msgid ""
 "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
@@ -24899,9 +25098,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 を変更する場合には、これを指定する必要がある。"
@@ -24934,6 +25138,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
@@ -26730,11 +26947,14 @@ msgstr ""
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+"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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
diff --git a/man/po/nl.po b/man/po/nl.po
index d29188d16..15948d7fe 100644
--- a/man/po/nl.po
+++ b/man/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.19.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2019-01-31 12:21+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -999,6 +999,114 @@ msgstr ""
 "Op Debian en zijn derivaten zullen enkel bouwpaden die beginnen met I</build/"
 "> aanleiding geven tot het aanmaken van dit veld."
 
+#. type: TP
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "B<build-indep>"
+msgid "B<Build-Tainted-By:>"
+msgstr "B<build-indep>"
+
+#. type: TQ
+#: deb-buildinfo.man
+#, fuzzy, no-wrap
+#| msgid "I<variable-list>"
+msgid "I<taint-reason-list>"
+msgstr "I<variabelelijst>"
+
+#. type: Plain text
+#: deb-buildinfo.man
+#, fuzzy
+#| 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)."
+msgid ""
+"This folded field contains a space-separated list of non-exhausitve 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 is een lijst, met spatie als scheidingsteken, van binaire "
+"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: Plain text
+#: deb-buildinfo.man
+#, fuzzy
+#| msgid ""
+#| "On Debian and derivatives only build paths starting with I</build/> will "
+#| "emit this field."
+msgid "On Debian and derivatives the following reason tags can be emitted:"
+msgstr ""
+"Op Debian en zijn derivaten zullen enkel bouwpaden die beginnen met I</build/"
+"> aanleiding geven tot het aanmaken van dit veld."
+
+#. 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<lokaal-shlibs-bestand>"
+
+#. 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<--always-include-path>"
+msgid "B<usr-local-has-includes>"
+msgstr "B<--always-include-path>"
+
+#. 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<lokaal-shlibs-bestand>"
+
+#. 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
@@ -1408,10 +1516,6 @@ msgstr ""
 
 #. 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."
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
 "* */> style comments or RCS keywords."
@@ -1421,10 +1525,6 @@ 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."
 msgid ""
 "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 "
@@ -1614,14 +1714,11 @@ msgstr ""
 #. type: TP
 #: deb-changes.man
 #, no-wrap
-#| msgid "B<Binary:> I<binary-package-list> (required)"
 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."
 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)."
@@ -1731,9 +1828,6 @@ msgstr " I<naam-binaire-pakket> B<-> I<samenvatting-binaire-pakket>"
 
 #. 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."
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
 "space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
@@ -2737,27 +2831,6 @@ msgstr "VOORBEELD"
 #. type: Plain text
 #: deb-control.man
 #, 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 ""
 "Package: grep\n"
 "Essential: yes\n"
@@ -2812,8 +2885,6 @@ 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 ""
 "B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
 "B<dpkg>(1), B<dpkg-deb>(1)."
@@ -2945,12 +3016,6 @@ msgstr "B<Source:> I<broncodepakket-naam> (verplicht)"
 
 #. type: Plain text
 #: deb-src-control.man
-#| 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 "
@@ -4996,12 +5061,6 @@ msgstr ""
 
 #. type: Plain text
 #: 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."
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
 "names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
@@ -6296,15 +6355,6 @@ msgstr ""
 
 #. type: Plain text
 #: dsc.man
-#| 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."
 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 "
@@ -6466,12 +6516,6 @@ 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 (that is, converted "
-#| "to separate AND relationships), except for binaries generated by this "
-#| "source package and meta-dependencies such as B<@> or B<@builddeps@>."
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
@@ -6921,6 +6965,20 @@ 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 ""
+
+#. 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
@@ -7133,13 +7191,6 @@ 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."
 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 "
@@ -7190,11 +7241,6 @@ msgstr "B<-P>, B<--purge> I<pakket>...|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."
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
 "including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
@@ -7832,7 +7878,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>"
@@ -8086,13 +8132,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>"
@@ -8123,7 +8169,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)."
 
@@ -8323,6 +8369,28 @@ msgstr ""
 "B<overwrite-diverted>: Overschrijf een omgeleid bestand 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 ""
+
+#. 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 ""
@@ -9220,6 +9288,21 @@ 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
+#, fuzzy, no-wrap
+#| msgid "B<DPKG_COLORS>"
+msgid "B<DPKG_FORCE>"
+msgstr "B<DPKG_COLORS>"
+
+#. 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
 #, no-wrap
@@ -9312,6 +9395,20 @@ 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
+#, fuzzy
+#| msgid ""
+#| "Defined by B<dpkg> on the maintainer script environment to the "
+#| "architecture the package got built for (since dpkg 1.15.4)."
+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 het script van de "
+"pakketonderhouder als de architectuur waarvoor het pakket gebouwd werd "
+"(sinds dpkg 1.15.4)."
+
 #. type: TP
 #: dpkg.man
 #, no-wrap
@@ -10275,7 +10372,6 @@ msgstr "VARIABELEN"
 
 #. 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):"
@@ -18555,10 +18651,6 @@ msgstr "BEPERKINGEN"
 
 #. type: Plain text
 #: 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."
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
 "This might include stuff like comments which were not supposed to be there, "
@@ -19248,7 +19340,6 @@ 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”)."
@@ -19397,14 +19488,6 @@ 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'':"
 msgid ""
 "List all known packages matching one or more patterns, regardless of their "
 "status, which includes any real or virtual package referenced in any "
@@ -19786,10 +19869,6 @@ 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. 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 "
@@ -20037,13 +20116,11 @@ msgstr ""
 #. type: TP
 #: dpkg-query.man
 #, no-wrap
-#| msgid "B<debian/files>"
 msgid "B<db-fsys:Files>"
 msgstr "B<db-fsys:Files>"
 
 #. type: Plain text
 #: dpkg-query.man
-#| msgid "It contains the package short description (since dpkg 1.19.1)."
 msgid ""
 "It contains the list of the package filesystem entries separated by newlines "
 "(since dpkg 1.19.3)."
@@ -22394,16 +22471,6 @@ msgstr "Indeling: 3.0 (quilt)"
 
 #. type: Plain text
 #: dpkg-source.man
-#| 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."
 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>, "
@@ -24054,6 +24121,13 @@ msgstr ""
 "Som alle modificaties (overrides) op. Beperk de uitvoer tot modificaties die "
 "overeenkomen met het glob-patroon, indien een glob-patroon opgegeven werd."
 
+#. 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 "Geef hulp over de opties B<--force->I<iets>."
+
 #. type: Plain text
 #: dpkg-statoverride.man
 msgid ""
@@ -24072,6 +24146,42 @@ msgstr ""
 "Stel de installatiemap in, 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
+#, 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 ""
+"Het uitvoeren van sommige dingen opleggen of weigeren (B<no-force> en "
+"B<refuse> betekenen hetzelfde). 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
+#, 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<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
 #, no-wrap
@@ -24080,9 +24190,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 ""
 "Verplicht een actie, zelfs als een redelijkheidstoets die anders zou "
 "verbieden. Dit is noodzakelijk om een bestaande modificatie (override) te "
@@ -24115,6 +24230,20 @@ 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
+#, fuzzy
+#| 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)."
+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 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: TP
 #: dpkg-statoverride.man
 #, no-wrap
@@ -25806,12 +25935,22 @@ msgstr ""
 
 #. type: Plain text
 #: start-stop-daemon.man
-msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+#, fuzzy
+#| msgid ""
+#| "B<Warning:> Using this match option alone with a daemon that writes the "
+#| "pidfile as an unprivileged user is a security risk, because 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."
+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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 "B<Waarschuwing:> Deze vergelijkingsoptie alleen gebruiken met een "
 "achtergronddienst die het pid-bestand wegschrijft als gebruiker zonder "
@@ -26124,7 +26263,6 @@ msgstr ""
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
-#| msgid "B<--no-await>"
 msgid "B<--notify-await>"
 msgstr "B<--notify-await>"
 
@@ -26174,7 +26312,6 @@ msgstr ""
 #. type: TP
 #: start-stop-daemon.man
 #, no-wrap
-#| msgid "B<-n> I<number>"
 msgid "B<ERRNO=>I<number>"
 msgstr "B<ERRNO=>I<nummer>"
 
@@ -27167,7 +27304,6 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-#| msgid "Don't generate any comments unless errors occur."
 msgid "Do not generate any comments unless errors occur."
 msgstr "Geen commentaar genereren tenzij er zich fouten voordoen."
 
@@ -27184,7 +27320,6 @@ msgstr "Genereer meer commentaar bij wat er gedaan wordt."
 
 #. type: Plain text
 #: update-alternatives.man
-#| msgid "Generate more comments about what is being done."
 msgid ""
 "Generate even more comments, helpful for debugging, about what is being done "
 "(since version 1.19.3)."
diff --git a/man/po/pl.po b/man/po/pl.po
index d21e770c2..1d5c44170 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Michał Kułach <michal.kulach@gmail.com>\n"
 "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -942,6 +942,99 @@ msgid ""
 "emit this field."
 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-exhausitve 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
@@ -6931,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
@@ -7889,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>"
@@ -8175,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>"
@@ -8216,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\"."
 
@@ -8454,6 +8561,28 @@ msgid ""
 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
@@ -9379,6 +9508,21 @@ msgid ""
 "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
@@ -9456,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
@@ -25403,6 +25560,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
@@ -25423,6 +25588,43 @@ msgid ""
 "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
@@ -25431,9 +25633,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."
@@ -25465,6 +25672,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
@@ -27381,11 +27601,14 @@ msgstr ""
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+"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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index 6b5a65bdc..7bfec3251 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Andre Luis Lopes  <andrelop@debian.org>\n"
 "Language-Team: Portuguese <debian-l10n-portuguese@lists.debian.org>\n"
@@ -787,6 +787,95 @@ msgid ""
 "emit this field."
 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-exhausitve 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
@@ -5507,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
@@ -6307,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>"
@@ -6548,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>"
@@ -6586,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."
@@ -6786,6 +6889,28 @@ msgstr ""
 "B<overwrite-diverted>: Sobrescreve um arquivo desviado com uma versão não "
 "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 ""
@@ -7543,6 +7668,21 @@ msgid ""
 "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
@@ -7615,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
@@ -19180,6 +19327,13 @@ msgid ""
 "overrides which match the glob."
 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 ""
@@ -19194,6 +19348,32 @@ msgid ""
 "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 ""
+"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
 #, fuzzy, no-wrap
@@ -19204,7 +19384,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
@@ -19230,6 +19411,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
@@ -20544,11 +20732,14 @@ msgstr ""
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+"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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
diff --git a/man/po/ru.po b/man/po/ru.po
index c9d856c11..7834852f4 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Yuri Kozlov <kozlov.y@gmail.com>\n"
 "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
@@ -821,6 +821,95 @@ msgid ""
 "emit this field."
 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-exhausitve 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
@@ -5845,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
@@ -6681,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>"
@@ -6934,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>"
@@ -6971,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>: Включить (или выключить) все принудительные параметры."
@@ -7199,6 +7302,28 @@ msgstr ""
 "B<overwrite-diverted>: Перезаписать файл с изменённым "
 "расположением(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 ""
@@ -7962,6 +8087,21 @@ msgid ""
 "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
@@ -8034,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
@@ -19619,6 +19766,13 @@ msgid ""
 "overrides which match the glob."
 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 ""
@@ -19633,6 +19787,42 @@ msgid ""
 "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 ""
+"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
 #, fuzzy, no-wrap
@@ -19643,7 +19833,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
@@ -19669,6 +19860,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
@@ -21018,11 +21216,14 @@ msgstr ""
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+"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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
diff --git a/man/po/sv.po b/man/po/sv.po
index 8a8e33576..825217085 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.11\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\n"
@@ -930,6 +930,99 @@ msgid ""
 "emit this field."
 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-exhausitve 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
@@ -6880,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
@@ -7838,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>"
@@ -8105,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>"
@@ -8143,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."
 
@@ -8357,6 +8464,28 @@ msgstr ""
 "B<overwrite-diverted>: Skriv över en omdirigerad fil med en ej omdirigerad "
 "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
@@ -9277,6 +9406,21 @@ msgid ""
 "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
@@ -9354,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
@@ -24615,6 +24772,13 @@ msgstr ""
 "några överstyrningar, eller inga motsvarar mönstret, kommer B<dpkg-"
 "statoverride> avslutas med statuskod 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 "Get hjälp om B<--force->I<nånting>-flaggorna."
+
 #. type: Plain text
 #: dpkg-statoverride.man
 #, fuzzy
@@ -24635,6 +24799,41 @@ msgid ""
 "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
@@ -24643,9 +24842,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."
@@ -24675,6 +24879,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
@@ -26528,11 +26745,14 @@ msgstr ""
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+"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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index 2355ec2c0..e17ad0783 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.21\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:25+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -825,6 +825,96 @@ msgid ""
 "emit this field."
 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-exhausitve 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
@@ -5526,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
@@ -6425,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>"
@@ -6687,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>"
@@ -6723,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>: 强制选项全开（或全关）。"
 
@@ -6909,6 +7013,28 @@ msgid ""
 "B<overwrite-diverted>: Overwrite a diverted file with an undiverted version."
 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 ""
@@ -7664,6 +7790,20 @@ msgid ""
 "B<auto> (default), B<always> and B<never>."
 msgstr ""
 
+#. type: TP
+#: dpkg.man dpkg-statoverride.man
+#, no-wrap
+msgid "B<DPKG_FORCE>"
+msgstr ""
+
+#. 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
 #, no-wrap
@@ -7733,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
@@ -19222,6 +19369,13 @@ msgid ""
 "overrides which match the glob."
 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 ""
@@ -19236,6 +19390,39 @@ msgid ""
 "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 ""
+"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
@@ -19246,7 +19433,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
@@ -19272,6 +19460,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
@@ -20578,11 +20773,14 @@ msgstr ""
 #. type: Plain text
 #: start-stop-daemon.man
 msgid ""
-"B<Warning:> Using this match option alone with a daemon that writes the "
-"pidfile as an unprivileged user is a security risk, because if the daemon "
-"gets compromised the contents of the pidfile cannot be trusted, and then a "
+"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."
+"acting on any system process.  Using I</dev/null> is excempt from these "
+"checks."
 msgstr ""
 
 #. type: TP
diff --git a/po/ast.po b/po/ast.po
index 28cfe7b8b..7be8e25c0 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\n"
 "PO-Revision-Date: 2015-04-07 09:47+0200\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
 "com>\n"
@@ -375,34 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 ""
 "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 "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"
+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
@@ -410,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"
 
@@ -636,20 +645,25 @@ msgid "syntax error in statoverride file"
 msgstr "fallua al abrir el ficheru de statoverride"
 
 #: lib/dpkg/db-fsys-override.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"
+#, 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
-#, 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"
+#, 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
@@ -803,42 +817,42 @@ 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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "campu de detalles `%s' de ficheru ermu"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "abondos valores nel campu de detalles de ficheru `%s'\n"
 "(comparáu con otros)"
@@ -846,28 +860,32 @@ msgstr ""
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -877,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
@@ -915,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
@@ -1009,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
@@ -1019,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
@@ -1290,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
@@ -1322,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
@@ -1333,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
@@ -1357,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
@@ -1762,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
@@ -2349,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 ""
 
@@ -3528,7 +3555,163 @@ msgid ""
 msgstr ""
 "El paquete %s ta reteníu, nun va tocase. Use --force-hold pa cambiar esto\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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 «force/refuse» desconocía `%.*s'"
+
+#: src/force.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/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "avisu, saltando'l problema por tar activao --force: "
 
@@ -3902,114 +4085,6 @@ msgstr ""
 "Les opciones marcaes con [*] producen una salida extensa,\n"
 "¡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 ""
@@ -4144,34 +4219,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 "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"
@@ -4883,7 +4930,10 @@ msgid ""
 "  --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"
@@ -4961,6 +5011,12 @@ msgstr "Nun existe una redefinición."
 msgid "--update is useless for --remove"
 msgstr "avisu: --update ye inútil pa --remove"
 
+#: 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', por favor, usa nel so llugar '--%s'"
+
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Escriba dpkg-trigger --help pa obtener aida d'esta ferramienta."
@@ -5393,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
@@ -7293,6 +7355,61 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| 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"
 
@@ -7340,11 +7457,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "falló al camudar a un direutoriu dempués de crialu"
 
-#, 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'"
-
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
 #~ msgid "control file '%s' missing value"
@@ -8132,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 4ef8571d4..60f112802 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -372,33 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid ""
 #| "\n"
 #| "Configuration file `%s'"
-msgid "unable to open/create frontend lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr ""
 "\n"
 "Konfiguracijska datoteka `%s'"
 
 #: 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 database lock file for directory %s"
 msgstr ""
+"\n"
+"Konfiguracijska datoteka `%s'"
 
 #: 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 ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
@@ -406,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
@@ -630,7 +639,10 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
+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
@@ -639,7 +651,11 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
+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
@@ -761,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 archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "archive 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 archive 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 archive 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
@@ -823,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
@@ -851,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
@@ -927,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
@@ -937,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
@@ -1200,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
@@ -1228,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
@@ -1237,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
@@ -1259,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
@@ -1622,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
@@ -2125,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 ""
 
@@ -3086,7 +3122,158 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.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/force.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/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/force.c
+#, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr ""
+
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
@@ -3296,110 +3483,6 @@ msgid ""
 "'more' !"
 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 ""
@@ -3522,33 +3605,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 ""
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr ""
-
 #: src/main.c
 #, c-format
 msgid "couldn't open '%i' for stream"
@@ -4137,7 +4193,10 @@ msgid ""
 "  --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"
@@ -4201,6 +4260,11 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
+#: src/statcmd.c
+#, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr ""
+
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4540,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
@@ -6080,15 +6148,6 @@ msgstr ""
 #~ "\n"
 #~ "Konfiguracijska datoteka `%s'"
 
-#, fuzzy
-#~| msgid ""
-#~| "\n"
-#~| "Configuration file `%s'"
-#~ msgid "control file '%s' missing value"
-#~ msgstr ""
-#~ "\n"
-#~ "Konfiguracijska datoteka `%s'"
-
 #, fuzzy
 #~ msgid "%s: error: %s\n"
 #~ msgstr "upozorenje"
diff --git a/po/ca.po b/po/ca.po
index 92525ffbf..9276c63c3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.18.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\n"
 "PO-Revision-Date: 2017-04-29 16:21+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -349,32 +349,39 @@ msgid "unable to seek to start of %.250s after padding"
 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"
+#, 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 es pot obtenir el descriptor de fitxer del directori «%.250s»"
 
 #: lib/dpkg/dbmodify.c
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr ""
 "no es pot obrir/crear el fitxer de blocatge de la base de dades d'estat"
 
 #: 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 es pot obrir/crear el fitxer de blocatge de la base de dades d'estat"
 
 #: 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 teniu permís per a blocar la base de dades d'estat del dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "base de dades d'estat del dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -382,11 +389,15 @@ 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"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "no es pot accedir a l'àrea d'estat del 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'operació requereix accés de lectura i escriptura a l'àrea d'estat del dpkg"
 
@@ -592,8 +603,11 @@ msgstr "error de sintaxi al fitxer de statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "l'usuari «%s» és desconegut al fitxer statoverride"
+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"
@@ -601,8 +615,12 @@ msgstr "s'ha trobat una fi de línia inesperada al fitxer de statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "el grup «%s» és desconegut al fitxer statoverride"
+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
@@ -729,67 +747,76 @@ msgid "internal error"
 msgstr "s'ha produït un error intern"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "manca %s"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "al fitxer de control «%s» 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"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "S'omet la línia invàlida: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "brossa després de %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "el nom del paquet no és vàlid (%.250s)"
+#, fuzzy, c-format
+#| msgid "package name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "el nom de paquet «%s» no és vàlid: %s"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "camp de detalls «%s» del fitxer buit"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive details field '%s' not allowed in status file"
+msgid "archive details '%s' field not allowed in status file"
 msgstr "camp de detalls del fitxer «%s» no permès al fitxer d'estat"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "massa valors en el camp de detalls del fitxer «%s» (comparat amb d'altres)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "nom de valors insuficient en el camp dels detalls de fitxer «%s» (comparat "
 "amb d'altres)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "sí/no en un camp booleà"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "s'ha utilitzat un camp «%s» o «%s» obsolet"
 
 #: 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 un camp d'estat quàdruple"
 
 #: 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 és un nom valid d'arquitectura: %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 "paraula al camp «Priority»"
 
 #: lib/dpkg/fields.c
@@ -798,25 +825,33 @@ 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"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "primera paraula (de requeriment) al camp «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 "segona paraula (d'error) al camp «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 paraula (d'estat) al camp «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 «%2$.250s» del camp «%1$s»"
 
 #: 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'ha utilitzat un camp «%s» o «%s» obsolet"
 
 #: lib/dpkg/fields.c
@@ -825,14 +860,17 @@ msgid "value for '%s' field has malformed line '%.*s'"
 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'"
+#, 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» 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"
+#, 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 "s'ha indicat com conffile el directori arrel o un directori nul"
 
 #: lib/dpkg/fields.c
@@ -919,9 +957,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 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ó"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "en el camp «%s», que fa referència a «%.255s»: la versió conté un «%c»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -930,8 +969,9 @@ msgstr ""
 "en el camp «%s», error de sintaxi després de la referència al 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 "no s'admeten alternatives («|») en el camp %s"
 
 #: lib/dpkg/fields.c
@@ -1195,27 +1235,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "valor duplicat pel camp definit per l'usuari «%.*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 "manca %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "valor buit per a %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "valor duplicat en el camp «%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 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"
+#, fuzzy, c-format
+#| msgid "package has field '%s' but is architecture all"
+msgid "package has '%s' field but is architecture '%s'"
 msgstr "el paquet té el camp «%s» però és d'arquitectura “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 "camp «Config-Version» per a un paquet amb Status no apropiat"
 
 #: lib/dpkg/parse.c
@@ -1224,8 +1270,10 @@ 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"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "el paquet té l'estat %s però s'esperen activadors"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1233,12 +1281,15 @@ 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"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "el paquet té estat %s però els activadors són pendents"
 
 #: 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 que no estant instal·lat té conffiles, ens n'oblidem"
 
 #: lib/dpkg/parse.c
@@ -1259,10 +1310,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-Arch: %s) no és coinstal·lable amb %s, el qual té múltiples "
 "instàncies instal·lades"
@@ -1641,12 +1695,15 @@ msgid "treewalk root %s is not a directory"
 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'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "no es pot obrir el fitxer de blocatge d'activadors «%.250s»"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "àrea d'activadors"
 
 #: lib/dpkg/trigdeferred.c
@@ -2204,10 +2261,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>"
 
@@ -3291,7 +3348,171 @@ msgstr ""
 "El paquet %s està en mantindre, no es toca. Empreu --force-hold per a forçar-"
 "ho.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Activa totes les opcions de forçat"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Reemplaça un paquet amb una versió menor"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configura qualsevol paquet que pugui ajudar a aquest"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Processa paquets accessori fins i tot si són retinguts"
+
+#: 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/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "Falten programes importants al PATH, poden haver-hi problemes"
+
+#: 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/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Processa fins i tot els paquets amb versions errònies"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Instal·la sempre els conffiles que falten"
+
+#: 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/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/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 ""
+"%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/force.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/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 "l'opció de forçat/refusat «%.*s» és desconeguda"
+
+#: src/force.c
+#, c-format
+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:"
 
@@ -3682,114 +3903,6 @@ msgstr ""
 "Les opcions marcades amb ([*]) produeixen una eixida estesa - canalitzeu-la "
 "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"
@@ -3921,42 +4034,6 @@ msgstr "s'esta esborrant l'arquitectura «%s» que és en ús a la base de dades
 msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr "no es pot esborrar l'arquitectura «%s» que és en ús a la base de dades"
 
-#: 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"
@@ -4670,7 +4747,10 @@ msgid ""
 "  --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"
@@ -4736,6 +4816,12 @@ msgstr "no hi ha cap substitució present"
 msgid "--update is useless for --remove"
 msgstr "no té sentit utilitzar --update amb --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+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."
 msgstr ""
@@ -5122,16 +5208,22 @@ 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"
+#, 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 es pot accedir a l'àrea d'estat de dpkg per a una actualització 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'actualització d'«available» requereix accés d'escriptura a l'àrea d'estat "
-"de dpkg"
+"no es pot accedir a l'àrea d'estat de dpkg per a una actualització de "
+"«available»"
 
 #: src/update.c
 #, c-format
@@ -6883,6 +6975,49 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Es requereix autenticació per a executar update-alternatives"
 
+#~ 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 "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"
 
@@ -6921,12 +7056,6 @@ msgstr "Es requereix autenticació per a executar update-alternatives"
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "no s'ha pogut canviar a un directori després de crear-lo"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "l'opció «--%s» és obsoleta, empreu  «--%s» en el seu lloc"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "al fitxer de control «%s» li manca un valor"
-
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "al fitxer de control «%s» li manca un separador de valor"
 
diff --git a/po/cs.po b/po/cs.po
index bb095522f..3ff2e7265 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -343,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "stavová databáze dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -374,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
@@ -575,8 +586,11 @@ msgstr "syntaktická chyba v souboru statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "neznámý uživatel „%s“ v souboru statoverride"
+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"
@@ -584,8 +598,12 @@ msgstr "neočekávaný konec řádku v souboru statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "neznámá skupina „%s“ v souboru statoverride"
+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
@@ -707,64 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "prázdné pole podrobností o souboru „%s“"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 "příliš mnoho hodnot v položce „%s“ (vzhledem k ostatním)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "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
@@ -773,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
@@ -800,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
@@ -885,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
@@ -895,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
@@ -1159,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
@@ -1188,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
@@ -1198,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"
 
@@ -1224,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í"
@@ -1594,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
@@ -2125,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>"
 
@@ -3191,7 +3247,170 @@ msgid ""
 msgstr ""
 "Balík %s je ve stavu hold, ponechávám. K vynucení použijte --force-hold.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "nastaví všechny donucovací volby"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "nahradí balík nižší verzí"
+
+#: 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/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "zpracuje balíky, i když jsou podrženy"
+
+#: 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/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "v PATH chybí důležité programy, očekávejte potíže"
+
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "nainstaluje balík, i když selže kontrola autenticity"
+
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "zpracuje i balíky s chybnou verzí"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "vždy nainstaluje chybějící konfigurační soubory"
+
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr "nabídne nahrazení i konfig. souborů bez nové verze"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "zpracuje i balík s chybnou nebo žádnou architekturou"
+
+#: 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 ""
+"%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/force.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/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 "neznámá donucovací volba „%.*s“"
+
+#: src/force.c
+#, c-format
+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:"
 
@@ -3543,115 +3762,6 @@ msgstr ""
 "\n"
 "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"
@@ -3780,40 +3890,6 @@ msgstr "odstraňovaná architektura „%s“ je momentálně používána"
 msgid "cannot remove architecture '%s' currently in use by the database"
 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"
@@ -4489,7 +4565,10 @@ msgid ""
 "  --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"
@@ -4550,6 +4629,12 @@ msgstr "žádné přepsání neexistuje"
 msgid "--update is useless for --remove"
 msgstr "pro --remove je --update zbytečné"
 
+#: 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."
 msgstr "Pro zobrazení nápovědy napište dpkg-trigger --help."
@@ -4918,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
@@ -6611,6 +6702,50 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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"
 
@@ -6641,9 +6776,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "nelze se přepnout do právě vytvořeného adresáře"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "zastaralá volba „--%s“, použijte místo ní „--%s“"
-
 #~ msgid "control file '%s' missing value"
 #~ msgstr "v řídícím souboru „%s“ chybí hodnota"
 
@@ -7289,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 116f5ebee..f17507da5 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -357,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg's statusdatabase"
 
 #: lib/dpkg/dbmodify.c
@@ -388,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
@@ -593,8 +604,11 @@ msgstr "syntaksfejl i statoverride-fil"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "ukendt bruger '%s' i statoverride-fil"
+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"
@@ -602,8 +616,12 @@ msgstr "uventet linjeafslutning i statoverride-fil"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "ukendt gruppe '%s' i statoverride-fil"
+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
@@ -745,64 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tomt fildetaljefelt '%s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 "for mange værdier i fildetaljefelt '%s' (sammenlignet med andre)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "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
@@ -811,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
@@ -838,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
@@ -927,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
@@ -937,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
@@ -1205,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
@@ -1234,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
@@ -1243,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"
@@ -1269,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"
@@ -1655,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
@@ -2196,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>"
 
@@ -3276,7 +3334,171 @@ msgstr ""
 "Pakken %s er tilbageholdt, rører den ikke.  Brug --force-hold for at "
 "gennemtvinge.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Angiv alle tvungne tilvalg"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Erstat en pakke med en lavere version"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Konfigurer alle pakker som kan hjælpe denne pakke"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Behandl trinvis øgende pakker selv på tilbagehold"
+
+#: 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/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH mangler vigtige programmer, problemer er sandsynlige"
+
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Installer en pakke selv hvis den fejler godkendelseskontrol"
+
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Behandl også pakker med forkerte versioner"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Installer altid manglende konfigurationsfiler"
+
+#: 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/force.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/force.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/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 "ukendt gennemtvingnings/afvisnings-tilvalg '%.*s'"
+
+#: 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/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "undertrykker problemet, fordi --force er givet:"
 
@@ -3637,114 +3859,6 @@ msgstr ""
 "\n"
 "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"
@@ -3873,42 +3987,6 @@ msgstr "fjerner arkitektur '%s' aktuelt i brug af database"
 msgid "cannot remove architecture '%s' currently in use by the database"
 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"
@@ -4622,7 +4700,10 @@ msgid ""
 "  --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"
@@ -4687,6 +4768,12 @@ msgstr "der er ingen omgåelser"
 msgid "--update is useless for --remove"
 msgstr "--update er nytteløs med --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| 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."
 msgstr "Skriv dpkg-tigger --help for at få hjælp om dette værktøj."
@@ -5063,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
@@ -6792,6 +6884,46 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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 "%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"
 
@@ -6830,12 +6962,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "kunne ikke skifte til katalog efter at have oprettet den"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "forældet tilvalg '--%s'; brug venligst '--%s' i stedet"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "kontrolfilen '%s' mangler en værdi"
-
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "kontrolfilen '%s' mangler en værdiseparator"
 
diff --git a/po/de.po b/po/de.po
index 12d07f46c..9123a19bf 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\n"
 "PO-Revision-Date: 2019-01-30 18:28+0100\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -345,28 +345,39 @@ msgid "unable to seek to start of %.250s after padding"
 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"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "Dateideskriptor für Verzeichnis »%s« kann nicht erlangt werden"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create frontend lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create frontend lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "Sperrdatei des Frontends kann nicht geöffnet/angelegt werden"
 
 #: 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 "Sperrdatei der Status-Datenbank kann nicht geöffnet/angelegt werden"
 
 #: 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 "Fehlende Rechte, um die dpkg-Status-Datenbank zu sperren"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg frontend"
+#, fuzzy
+#| msgid "dpkg frontend"
+msgid "dpkg frontend lock"
 msgstr "dpkg-Frontend"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg-Status-Datenbank"
 
 #: lib/dpkg/dbmodify.c
@@ -374,11 +385,15 @@ msgid "requested operation requires superuser privilege"
 msgstr "Angeforderte Operation benötigt Superuser-Rechte"
 
 #: 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 "Auf den Statusbereich von dpkg kann nicht zugegriffen werden"
 
 #: 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 "Operation benötigt Lese-/Schreibrechte für den Statusbereich von dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -575,8 +590,11 @@ msgstr "Syntaxfehler in statoverride-Datei"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "unbekannter Benutzer »%s« in statoverride-Datei"
+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"
@@ -584,8 +602,12 @@ msgstr "unerwartetes Zeilenende in statoverride-Datei"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "unbekannte Gruppe »%s« in statoverride-Datei"
+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
@@ -703,60 +725,73 @@ msgid "internal error"
 msgstr "interner Fehler"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s fehlt"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "Fehlender Wert in Control-Datei »%s«"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "»%.50s« ist nicht erlaubt für %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Ungültige Zeile wird übersprungen: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "Unsinn hinter %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ungültiger Paketname (%.250s)"
+#, fuzzy, c-format
+#| msgid "package name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "Paketname »%s« ist ungültig: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty archive details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "leeres Archivdetailfeld »%s«"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "archive 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 "Archivdetailfeld »%s« in Statusdatei nicht erlaubt"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in archive 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 "zu viele Werte in dem Archivdetailfeld »%s« (im Vergleich zu anderen)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in archive 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 "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"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "veraltetes Feld »%s« oder »%s« benutzt"
 
 #: 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 in Quadstate-Feld"
 
 #: 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« ist kein gültiger Architekturname: %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 "Wort im Feld »Priority«"
 
 #: lib/dpkg/fields.c
@@ -765,25 +800,33 @@ 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"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "erstes (Gewünscht-)Wort im Feld »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 "zweites (Fehler-)Wort im Feld »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 "drittes (Status-)Wort im Feld »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 "Fehler in Zeichenkette »%2$.250s« für Feld »%1$s«"
 
 #: 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 "veraltetes Feld »%s« oder »%s« benutzt"
 
 #: lib/dpkg/fields.c
@@ -792,12 +835,15 @@ msgid "value for '%s' field has malformed line '%.*s'"
 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'"
+#, 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 "Wert für »%s« enthält Zeile, die mit Nicht-Leerzeichen »%c« beginnt"
 
 #: 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 "Wurzel- oder leeres Verzeichnis ist als Conffile aufgeführt"
 
 #: lib/dpkg/fields.c
@@ -881,9 +927,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 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"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "Feld »%s«, Referenz auf »%.255s«: Version enthält »%c«"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -891,8 +938,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "Feld »%s«, Syntaxfehler nach Referenz zu 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 "Alternativen (»|«) sind im Feld %s nicht erlaubt"
 
 #: lib/dpkg/fields.c
@@ -1148,27 +1196,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "doppelter Wert für benutzerdefiniertes Feld »%.*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 fehlt"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "leerer Wert für %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "doppelter Wert für Feld »%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 "Paket hat Feld »%s«, aber fehlende Architektur"
 
 #: 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 "Paket hat Feld %s, ist aber architekturunabhängig"
 
 #: 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 mit unpassendem Status"
 
 #: lib/dpkg/parse.c
@@ -1177,8 +1231,10 @@ 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"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "Paket hat Status %s, aber Trigger werden erwartet"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1186,11 +1242,15 @@ 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"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "Paket hat Status %s, aber Trigger sind anhängig"
 
 #: 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 mit dem Status »nicht installiert« hat Conffiles, vergesse sie"
 
 #: lib/dpkg/parse.c
@@ -1211,10 +1271,13 @@ msgstr ""
 " von einer inoffziellen dpkg-Version"
 
 #: 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) kann nicht zusammen mit %s installiert werden, "
 "welches mehrere installierte Instanzen hat"
@@ -1571,12 +1634,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "Treewalk-Wurzel %s ist kein Verzeichnis"
 
 #: 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-Sperrdatei »%.250s« kann nicht geöffnet/angelegt werden"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "Triggerbereich"
 
 #: lib/dpkg/trigdeferred.c
@@ -2136,10 +2202,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>"
 
@@ -3224,7 +3290,187 @@ msgstr ""
 "Paket %s ist auf »halten«, wird nicht angerührt. Benutzen Sie --force-hold, "
 "um es trotzdem zu verarbeiten.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Alle Optionen zum Erzwingen setzen"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+"Dinge versuchen zu (de)installieren, selbst wenn\n"
+"nicht root"
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "Wichtige Programme nicht in PATH, Probleme wahrsch."
+
+#: 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/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Selbst Pakete mit fehlerhafter Version bearbeiten"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Datei eines anderen Paketes überschreiben"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+"Umgeleitete Datei mit einer nicht umgeleiteten\n"
+"Version überschreiben"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr ""
+"Verzeichnis eines Paketes mit Datei eines\n"
+"anderen überschreiben"
+
+#: 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/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 ""
+"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/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 ""
+"Anbieten, Konf.-Dateien durch nicht neue Versionen\n"
+"zu ersetzen"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
+"Selbst Pakete mit falscher oder fehlender Architektur\n"
+"bearbeiten"
+
+#: 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/force.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/force.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/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 "unbekannte force/refuse-Option »%.*s«"
+
+#: src/force.c
+#, c-format
+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: "
 
@@ -3561,130 +3807,6 @@ msgstr ""
 "\n"
 "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"
@@ -3815,42 +3937,6 @@ msgstr ""
 "Architektur »%s«, derzeit verwendet von der Datenbank, kann nicht entfernt "
 "werden"
 
-#: 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"
@@ -4517,14 +4603,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"
@@ -4592,6 +4693,12 @@ msgstr "kein Override vorhanden"
 msgid "--update is useless for --remove"
 msgstr "--update ist sinnlos für --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "veraltete Option »--%s«; bitte verwenden Sie »--%s« stattdessen"
+
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Geben Sie dpkg-trigger --help für Hilfe zu diesem Programm ein."
@@ -4968,16 +5075,22 @@ 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"
+#, 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 ""
 "Für eine große Verfügbarkeits-Aktualisierung kann nicht auf den\n"
 "dpkg-Status-Bereich zugegriffen werden"
 
 #: 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 ""
-"Große Verfügbarkeits-Aktualisierung benötigt Schreibzugriff auf den dpkg-"
-"Status-Bereich"
+"Für eine große Verfügbarkeits-Aktualisierung kann nicht auf den\n"
+"dpkg-Status-Bereich zugegriffen werden"
 
 #: src/update.c
 #, c-format
@@ -6680,6 +6793,48 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Authentifizierung ist erforderlich, um update-alternatives auszuführen"
 
+#~ 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 "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"
 
@@ -6713,12 +6868,6 @@ msgstr "Authentifizierung ist erforderlich, um update-alternatives auszuführen"
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "Wechsel in das Verzeichnis nach dessen Erzeugung fehlgeschlagen"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "veraltete Option »--%s«; bitte verwenden Sie »--%s« stattdessen"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "Fehlender Wert in Control-Datei »%s«"
-
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "Fehlendes Trennzeichen in Control-Datei »%s«"
 
diff --git a/po/dpkg.pot b/po/dpkg.pot
index 9f7786a30..679dc3c4f 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.3\n"
+"Project-Id-Version: dpkg 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -338,27 +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
-msgid "unable to open/create frontend lockfile"
+#, 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
-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 ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
@@ -366,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
@@ -560,7 +565,10 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
+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
@@ -569,7 +577,11 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
+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
@@ -686,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 archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
 #, c-format
-msgid "archive 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 archive 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 archive 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
@@ -748,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
@@ -776,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
@@ -852,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
@@ -862,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
@@ -1118,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
@@ -1146,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
@@ -1155,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
@@ -1177,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
@@ -1522,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
@@ -2019,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 ""
 
@@ -2959,7 +2980,158 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.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/force.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/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/force.c
+#, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr ""
+
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
@@ -3169,110 +3341,6 @@ msgid ""
 "'more' !"
 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 ""
@@ -3395,33 +3463,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 ""
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr ""
-
 #: src/main.c
 #, c-format
 msgid "couldn't open '%i' for stream"
@@ -4002,7 +4043,10 @@ msgid ""
 "  --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"
@@ -4056,6 +4100,11 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
+#: src/statcmd.c
+#, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr ""
+
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4389,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
diff --git a/po/dz.po b/po/dz.po
index 900d55540..de1c617d9 100644
--- a/po/dz.po
+++ b/po/dz.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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -376,32 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-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"
+#, 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 "ཁྱོད་ལུ་ཌི་པི་ཀེ་ཇི་གནས་ཚད་གནད་སྡུད་གཞི་རྟེན་ལྡེ་མིག་རྐྱབས་ནིའི་གནང་བ་མེད།"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg frontend"
+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
@@ -409,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 ""
 "ཌི་པི་ཀེ་ཇི་གནས་ཚད་མངའ་ཁོངས་ལུ་འཛུལ་སྤྱོད་འབད་ནིའི་དོན་ལས་བཀོལ་སྤྱོད་པ་ལུ་ ལྷག་/འབྲི་ནི་དགོཔ་ཨིན།"
 
@@ -616,9 +624,12 @@ msgid "syntax error in statoverride file"
 msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
+#, 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
@@ -626,9 +637,13 @@ msgid "unexpected end of line in statoverride file"
 msgstr "གྲལ་ཐིག་ %d གུ་ལུ་ཐུམ་སྒྲིལ་མིང་ནང་ལུ་རེ་བ་མེད་པའི་གྲལ་ཐིག་གི་མཇུག"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "སི་ཊེཊི་ཟུར་བཞག་ཡིག་སྣོད་ཁ་ཕྱེ་ནི་འཐུས་ཤོར་བྱུང་ཡོད།"
+#, 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
@@ -765,67 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "ཡིག་སྣོད་སྟོངམ་རྒྱས་བཤད་ས་སྒོ་ `%s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "བུ་ལིན་ས་སྒོ་ནང་ལུ་ཨིན་/མེན།"
+#, 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
@@ -835,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
@@ -873,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
@@ -964,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
@@ -974,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
@@ -1241,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
@@ -1272,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
@@ -1281,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
@@ -1303,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
@@ -1693,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
@@ -2233,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 ""
 
@@ -3374,7 +3402,162 @@ msgstr ""
 "ཐུམ་སྒྲིལ་ %s འདི་འཆང་འདི་ཡོདཔ་ཨིན་  མ་སྤྲོག་པར་བཞག་དོ། ཟུར་བཞག་འབད་ནིའི་དོན་ལུ་ --force-hold "
 "ལག་ལེན་འཐབ།\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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/force.c
+#, fuzzy, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "ཉེན་བརྡ་: ཕན་མེད་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནི་གདམ་ཁ་ `%s'\n"
+
+#: src/force.c
 #, fuzzy
 msgid "overriding problem because --force enabled:"
 msgstr ""
@@ -3688,114 +3871,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 ""
@@ -3926,33 +4001,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 "མ་ཤེས་པའི་བང་བཙོང་ནི་/ངོས་ལེན་མི་འབད་ནིའི་གདམ་ཁ་ `%.*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"
@@ -4645,7 +4693,10 @@ msgid ""
 "  --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"
@@ -4723,6 +4774,11 @@ msgstr "ཟུར་བཞག་གཅིག་ཡང་མེད།"
 msgid "--update is useless for --remove"
 msgstr "ཉེན་བརྡ: --དུས་མཐུན་འདི་ --རྩ་བསྐྲད་ཀྱི་དོན་ལུ་ཁུངས་མེདཔ་ཨིན།"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "ཉེན་བརྡ་:ཕན་མེད་གདམ་ཁ་ `--%s'\n"
+
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5126,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
@@ -6920,6 +6982,49 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "vsnprintf གི་དོན་ལུ་ ཊི་ཨེམ་པི་ཡིག་སྣོད་ ཁ་ཕྱེ་མ་ཚུགས།"
+
+#, fuzzy
+#~ 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 ཊར་ཨའུཊི་པུཏི་ ལྷག་པའི་སྐབས་འཛོལ་བ།"
 
@@ -6960,15 +7065,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "དེ་གསར་བསྐྲུན་འབད་བའི་ཤུལ་ལས་སྣོད་ཐོ་ལུ་སི་ཨེཆ་ཌི་ཨའི་ཨར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "ཉེན་བརྡ་:ཕན་མེད་གདམ་ཁ་ `--%s'\n"
-
-#, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "མིང་རྙིངམ་ `%s' སི་ཊེཊི་འབད་མ་ཚུགས: %s"
-
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/el.po b/po/el.po
index f2af471a2..7a91cd904 100644
--- a/po/el.po
+++ b/po/el.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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -379,33 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-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"
+#, 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 frontend"
+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
@@ -413,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"
@@ -631,9 +639,12 @@ msgid "syntax error in statoverride file"
 msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
+#, 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
@@ -641,9 +652,13 @@ msgid "unexpected end of line in statoverride file"
 msgstr "απρόσμενο τέλος της γραμμής στο όνομα πακέτου στη γραμμή %d"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "αποτυχία κατά το άνοιγμα του αρχείου statoverride"
+#, 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
@@ -778,70 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "πεδίο `%s' λεπτομερειών κενού αρχείου"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "ναι/όχι στο πεδίο 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
@@ -852,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
@@ -890,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
@@ -982,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
@@ -992,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
@@ -1261,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
@@ -1293,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
@@ -1303,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 ""
 "Πακέτο το οποίο στην κατάσταση μη εγκατεστημένο έχει ρυθμίσεις, ξέχασέ το"
 
@@ -1328,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
@@ -1722,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
@@ -2317,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 ""
 
@@ -3491,7 +3520,162 @@ msgstr ""
 "Το πακέτο %s είναι σε συγκράτηση, δεν θα επεξεργαστεί.  Χρησιμοποιήστε το --"
 "force-hold για να παρακάμψετε.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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/force.c
+#, fuzzy, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "Προειδοποίηση: παρωχημένη επιλογή force/refuse `%s'\n"
+
+#: src/force.c
 #, fuzzy
 msgid "overriding problem because --force enabled:"
 msgstr ""
@@ -3891,114 +4075,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 ""
@@ -4130,33 +4206,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'"
-msgstr "Προειδοποίηση: παρωχημένη επιλογή force/refuse `%s'\n"
-
 #: src/main.c
 #, c-format
 msgid "couldn't open '%i' for stream"
@@ -4869,7 +4918,10 @@ msgid ""
 "  --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"
@@ -4950,6 +5002,11 @@ msgstr "Δεν υπάρχει override."
 msgid "--update is useless for --remove"
 msgstr "προειδοποίηση: το --update είναι άχρηστο για το --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n"
+
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -5389,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
@@ -7264,6 +7327,58 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "αδύνατο το άνοιγμα του tmpfile για vsnprintf"
+
+#, fuzzy
+#~ 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"
 
@@ -7308,15 +7423,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "απέτυχε η αλλαγή καταλόγου (chdir) μετά τη δημιουργία του"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Προειδοποίηση: επιλογή εκτός χρήσης `--%s'\n"
-
-#, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "αδυναμία προσδιορισμού κατάστασης του παλιού ονόματος `%s': %s"
-
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/eo.po b/po/eo.po
index 5b3defc1f..9576c3866 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -341,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "stato-datumbazo de dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -372,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
@@ -577,8 +588,11 @@ msgstr "sintaks-eraro en dosiero 'statoverride'"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "nekonata uzanto '%s' en dosiero 'statoverride'"
+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"
@@ -586,8 +600,12 @@ msgstr "neatendata linifinon en dosiero 'statoverride'"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "nekonata grupo '%s' en dosiero 'statoverride'"
+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
@@ -729,65 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "malplena kampo de dosier-detaloj '%s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 "tro multaj valoroj en kampo de dosier-detaloj '%s' (kompare al aliaj)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -796,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
@@ -823,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
@@ -911,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
@@ -921,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
@@ -1186,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
@@ -1215,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
@@ -1224,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"
 
@@ -1249,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"
@@ -1633,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
@@ -2175,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>"
 
@@ -3250,7 +3308,172 @@ msgstr ""
 "La pako %s estas je tenado, ni ne tuŝas ĝin. Uzu --force-hold por "
 "preterpasi.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Difini ĉiujn perfortajn elekteblojn"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Anstataŭigi pakon per pli malalta versio"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Akomodi iun ajn pakon kiu povas helpi tiun ĉi"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Procezi eventualajn pakojn eĉ kiam sub tenado"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Provi (mal)instali aferojn eĉ kiam ne ĉefuzanto"
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH malhavas gravajn programojn, problemoj okazos"
+
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Instali pakon eĉ se ĝi malsukcesas aŭtentikan kontrolon"
+
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Procezi eĉ pakojn kun malĝustaj versioj"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Ĉiam instali mankantajn akomod-dosierojn"
+
+#: 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/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 ""
+"%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/force.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/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 "nekonata perforta/rifuza elekteblo '%.*s'"
+
+#: 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/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "preterpaso de problemo ĉar --force ebligis:"
 
@@ -3613,115 +3836,6 @@ msgstr ""
 "Elektebloj markitaj per [*] produktas multan eligon - duktu ĝin tra 'less' "
 "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"
@@ -3850,42 +3964,6 @@ msgstr "forigado de arkitekturo '%s', nune uzata de datumbazo"
 msgid "cannot remove architecture '%s' currently in use by the database"
 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"
@@ -4575,7 +4653,10 @@ msgid ""
 "  --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"
@@ -4642,6 +4723,12 @@ msgstr "neniu preterpaso ĉeestas"
 msgid "--update is useless for --remove"
 msgstr "--update estas neutila por --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| 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."
 msgstr "Tajpu dpkg-trigger --help por helpo pri tiu ĉi utilaĵo."
@@ -5015,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
@@ -6752,6 +6844,48 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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 "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"
 
@@ -6790,12 +6924,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "malsukceso dum atingo al dosierujo post krei ĝin"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "malaktuala elekteblo '--%s'; bonvolu uzi '--%s' anstataŭe"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "la reg-dosiero '%s' malhavas valoron"
-
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "la reg-dosiero '%s' malhavas valor-apartigilon"
 
diff --git a/po/es.po b/po/es.po
index dc83e682f..5b1c56825 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -415,34 +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
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "base de datos de estado de dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -450,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"
 
@@ -660,8 +670,11 @@ msgstr "error sintáctico en el fichero statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "usuario desconocido `%s' en el archivo statoverride"
+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"
@@ -669,8 +682,12 @@ msgstr "fin de línea inesperado en el fichero statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "grupo desconocido `%s' en el fichero statoverride"
+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
@@ -794,41 +811,43 @@ 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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "campo de detalles `%s' de fichero vacío"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 en el campo de detalles de fichero `%s'\n"
 "(comparado con otros)"
@@ -836,26 +855,33 @@ msgstr ""
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -864,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
@@ -891,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
@@ -985,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
@@ -995,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
@@ -1262,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
@@ -1291,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
@@ -1302,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"
 
@@ -1331,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"
@@ -1713,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
@@ -2281,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>"
 
@@ -3390,7 +3443,178 @@ msgstr ""
 "El paquete %s está mantenido, no se toca. Utilice --force-hold para cambiar\n"
 "el comportamiento predeterminado\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Activa todas las opciones de forzado."
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Reemplaza el paquete con una versión menor."
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configura cualquier paquete que pudiera ayudar a éste."
+
+#: 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 ""
+"No se pueden encontrar programas importante en PATH, seguramente cause "
+"problemas"
+
+#: 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/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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Sobreescribe un fichero de un paquete con otro."
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Sobreescribe un fichero desviado con una versión no desviada."
+
+#: 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/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 ""
+"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/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 ""
+"Procesa incluso los paquetes con arquitectura errónea o sin arquitectura."
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Instala aunque pudiera romper otro paquete."
+
+#: 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/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 ""
+"%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/force.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/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 «force/refuse» desconocida `%.*s'"
+
+#: src/force.c
+#, c-format
+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"
@@ -3777,119 +4001,6 @@ msgstr ""
 "Las opciones marcadas con [*] producen una salida extensa,\n"
 "¡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."
@@ -4022,44 +4133,6 @@ msgstr ""
 "no se puede eliminar la arquitectura '%s' puesto que está en uso actualmente "
 "en la base de datos"
 
-#: 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"
@@ -4777,7 +4850,10 @@ msgid ""
 "  --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"
@@ -4846,6 +4922,12 @@ msgstr "no existe una redefinición"
 msgid "--update is useless for --remove"
 msgstr "es inútil utilizar --update con --remove"
 
+#: 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."
 msgstr "Escriba dpkg-trigger --help para obtener ayuda de esta herramienta."
@@ -5235,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
@@ -6991,6 +7078,53 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr "Es necesario autenticarse para ejecutar `update-alternatives'"
 
+# "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"
 
@@ -7028,9 +7162,6 @@ msgstr "Es necesario autenticarse para ejecutar `update-alternatives'"
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "fallo al cambiar a un directorio después de crearlo"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "opción obsoleta '--%s', utilice '--%s' en su lugar"
-
 # FIXME: Traducción de 'stat'
 #~ msgid "control file '%s' missing value"
 #~ msgstr "falta un valor en el fichero de control `%s'"
@@ -7741,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 09e2de34c..d52cc5223 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -367,34 +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
-#, fuzzy
-msgid "unable to open/create frontend lockfile"
+#, 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
-msgid "unable to open/create status database lockfile"
-msgstr ""
+#, 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"
+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
@@ -402,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
@@ -603,9 +609,12 @@ msgid "syntax error in statoverride file"
 msgstr "viga seadistusfaili `%.255s' lugemisel"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "viga seadistusfaili `%.255s' lugemisel"
+#, 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
@@ -613,9 +622,13 @@ msgid "unexpected end of line in statoverride file"
 msgstr "ootamatu realõpp pakinimes real %d"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "viga seadistusfaili `%.255s' lugemisel"
+#, 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
@@ -747,64 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tühi faili üksikasjade väli `%s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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 archive 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 archive 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
@@ -813,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
@@ -841,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
@@ -918,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
@@ -928,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
@@ -1195,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
@@ -1224,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
@@ -1233,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
@@ -1255,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
@@ -1637,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
@@ -2158,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 ""
 
@@ -3221,7 +3255,162 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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/force.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/force.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/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/force.c
+#, fuzzy, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "Hoiatus: aegunud võti `--%s'\n"
+
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
@@ -3470,114 +3659,6 @@ msgstr ""
 "Märgiga [*] märgitud valikud väljastavad väga palju infot - suuna nende\n"
 "  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 ""
@@ -3705,33 +3786,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 ""
-
-#: 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"
@@ -4397,7 +4451,10 @@ msgid ""
 "  --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"
@@ -4457,6 +4514,11 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr "hoiatus: --update on --remove puhul kasutu"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Hoiatus: aegunud võti `--%s'\n"
+
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -4827,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
@@ -6484,6 +6550,31 @@ 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 "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "tõrge tmpfile avamisel funktsioonis vsnprintf"
+
+#, fuzzy
+#~ 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"
 
@@ -6524,15 +6615,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "tõrge kataloogi aktiveerimisel (chdir) pärast selle loomist"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Hoiatus: aegunud võti `--%s'\n"
-
-#, fuzzy
-#~| msgid "unable to read %s: %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "faili `%s' pole võimalik lugeda: %s"
-
 #, fuzzy
 #~| msgid "unable to read %s: %s"
 #~ msgid "control file '%s' missing value separator"
@@ -6831,11 +6913,6 @@ msgstr ""
 #~ "Autoriõigused (C) 1995 Ian Jackson.\n"
 #~ "Autoriõigused (C) 2000,2001 Wichert Akkerman."
 
-#, 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"
diff --git a/po/eu.po b/po/eu.po
index 13927ec90..7e8d4c00d 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -344,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg egoeraren datu-basea"
 
 #: lib/dpkg/dbmodify.c
@@ -375,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
@@ -587,8 +598,11 @@ msgstr "sintaxi-errorea statoverride fitxategian"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "'%s' erabiltzaile ezezaguna statoverride fitxategian"
+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"
@@ -596,8 +610,12 @@ msgstr "ustekabeko lerro-amaiera statoverride fitxategian"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "'%s' talde ezezaguna statoverride fitxategian"
+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
@@ -741,67 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "fitxategiaren xehetasunen '%s' eremua hutsik dago"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "fitxategiaren xehetasunen '%s' eremuan balio gehiegi (beste batzuen aldean)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -810,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
@@ -837,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
@@ -930,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
@@ -941,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
@@ -1207,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
@@ -1236,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
@@ -1245,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"
@@ -1272,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"
@@ -1661,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
@@ -2217,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>"
 
@@ -3306,7 +3364,175 @@ msgstr ""
 "%s paketea mantenduta dago, ez da ukituko.  Erabili --force-hold\n"
 "gainidazteko\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Ezarri behartzeko aukera guztiak"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+"Instalatu paketea nahiz eta bere autentifikazioaren egiaztapenak huts egin"
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Gainidatzi pakete bateko fitxategia beste batekin"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr ""
+"Gainidatzi fitxategi desbideratu bat desbideratu gabeko bertsio batekin"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Gainidatzi pakete baten direktorioa beste baten fitxategiekin"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Ez landu S/I-ko eragiketa seguruak deskonprimitzean"
+
+#: 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 "Erabili beti konfigurazio-fitxategi berriak, ez galdetu"
+
+#: 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 ""
+"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/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 ""
+"Prozesatu bahi eta paketeak okerrekoak edo arkitekturarik gabekoak izan"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Instalatu nahi eta beste paketeren bat honda dezakeen"
+
+#: 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 ""
+"%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/force.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/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' behartzeko/uko egiteko aukera ezezaguna"
+
+#: 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/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "gainidazteko arazoa --force gaituta dagoelako:"
 
@@ -3682,117 +3908,6 @@ msgstr ""
 "[*] markatutako aukerek emaitza handia dute - iragazi 'less' edo 'more' "
 "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"
@@ -3921,43 +4036,6 @@ msgstr "'%s' arkitektura kentzea unean datu-baseak darabil"
 msgid "cannot remove architecture '%s' currently in use by the database"
 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"
@@ -4660,7 +4738,10 @@ msgid ""
 "  --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"
@@ -4729,6 +4810,12 @@ msgstr "ez dago gainidazketarik"
 msgid "--update is useless for --remove"
 msgstr "--update ezin da --remove aukerarekin erabili"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| 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."
 msgstr "Idatzi dpkg-trigger --help lanabes honen laguntza lortzeko."
@@ -5112,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
@@ -6888,6 +6979,49 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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 "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"
 
@@ -6930,12 +7064,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "huts egin du direktoriora chdir egitean, direktorioa sortu ondoren"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "'--%s' aukera zaharkitua, '--%s' erabili horren ordez"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "'%s' kontrol-fitxategiari balioa falta zaio"
-
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "'%s' kontrol-fitxategiari balioen arteko bereizlea falta zaio"
 
diff --git a/po/fr.po b/po/fr.po
index 5f2cd77c0..94a931d5e 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -351,47 +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
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "base de données d'état de dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -399,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"
@@ -620,9 +620,11 @@ msgstr "impossible d'ouvrir fichier des permissions (« statoverride »)"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
+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 ""
-"utilisateur « %s » inconnu dans le fichier des permissions (« statoverride »)"
 
 #: lib/dpkg/db-fsys-override.c
 msgid "unexpected end of line in statoverride file"
@@ -631,9 +633,12 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
+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 ""
-"groupe « %s » inconnu dans le fichier des permissions (« statoverride »)"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
@@ -780,66 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "champ  « %s » vide"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "trop de valeurs dans le champ du fichier « %s » (par rapport aux autres)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -848,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
@@ -875,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
@@ -969,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
@@ -980,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
@@ -1245,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
@@ -1275,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
@@ -1286,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"
@@ -1316,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"
@@ -1708,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
@@ -2286,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>"
 
@@ -3398,7 +3439,185 @@ msgstr ""
 "Le paquet %s est à garder (on hold), et laissé tel quel. Utilisez --force-"
 "hold pour passer outre.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Utiliser le forçage (force) pour toutes les options"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Remplacer un paquet par une version inférieure"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configurer tout paquet qui pourrait être utile à celui-ci"
+
+#: 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 ""
+"des programmes importants sont absents dans PATH, des problèmes sont à "
+"prévoir"
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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/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/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/force.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/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 ""
+"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/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 ""
+"Proposer de remplacer les fichiers de configuration sans nouvelles versions"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr ""
+"Traiter les paquets même sans architecture ou avec une architecture "
+"incorrecte"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Installer même si cela casse un autre paquet"
+
+#: 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 ""
+"%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/force.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/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 "option de forçage/refus « %.*s » inconnue"
+
+#: src/force.c
+#, c-format
+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 :"
 
@@ -3784,124 +4003,6 @@ msgstr ""
 "Les options marquées d'un [*] affichent beaucoup d'informations : tubez-les "
 "à 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"
@@ -4036,46 +4137,6 @@ msgstr ""
 "impossible de supprimer l'architecture « %s »actuellement utilisée dans la "
 "base de données"
 
-#: 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"
@@ -4793,7 +4854,10 @@ msgid ""
 "  --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,6 +4924,12 @@ msgstr "pas de dérogation (« override ») présente"
 msgid "--update is useless for --remove"
 msgstr "--update est inutile pour --remove"
 
+#: 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."
 msgstr "Taper « dpkg-trigger --help » pour obtenir de l'aide."
@@ -5256,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
@@ -7082,6 +7157,66 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+# ####################################### 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 "'%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"
 
@@ -7129,12 +7264,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "échec de « chdir » vers un répertoire après l'avoir créé"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "option obsolète « --%s » ; veuillez utiliser « --%s » à la place"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "il manque une valeur dans le fichier de contrôle « %s »"
-
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "il n'y a pas de séparateur dans le fichier de contrôle « %s »"
 
diff --git a/po/gl.po b/po/gl.po
index f070d640e..9f086043a 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -376,34 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 ""
 "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 "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"
+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
@@ -411,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"
 
@@ -626,9 +634,12 @@ msgid "syntax error in statoverride file"
 msgstr "non se puido abrir o ficheiro \"statoverride\""
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "non se puido abrir o ficheiro \"statoverride\""
+#, 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
@@ -636,9 +647,13 @@ 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
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "non se puido abrir o ficheiro \"statoverride\""
+#, 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
@@ -784,43 +799,43 @@ 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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "campo de detalles de ficheiro \"%s\" baleiro"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "hai valores de máis no campo de detalles de ficheiro \"%s\" (comparado con "
 "outros)"
@@ -828,28 +843,32 @@ msgstr ""
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -859,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
@@ -897,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
@@ -992,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
@@ -1002,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
@@ -1272,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
@@ -1304,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
@@ -1314,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"
@@ -1339,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
@@ -1739,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
@@ -2326,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 ""
 
@@ -3487,7 +3517,162 @@ msgid ""
 msgstr ""
 "O paquete %s está retido, non se toca. Empregue --force-hold para o facer.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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/force.c
+#, fuzzy, c-format
+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 ""
@@ -3871,114 +4056,6 @@ msgstr ""
 "As opcións marcadas [*] producen moita saída - pásea por \"less\" 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 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 ""
@@ -4110,33 +4187,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 "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"
@@ -4835,7 +4885,10 @@ msgid ""
 "  --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"
@@ -4913,6 +4966,11 @@ msgstr "Non hai unha substitución presente."
 msgid "--update is useless for --remove"
 msgstr "aviso: --update é inútil con --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+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."
 msgstr "Escriba dpkg-trigger --help para obter axuda sobre esta utilidade."
@@ -5351,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
@@ -7222,6 +7286,57 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| 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 "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"
 
@@ -7266,15 +7381,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "non se puido cambiar ao directorio despois de o crear"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Aviso: opción \"--%s\" obsoleta\n"
-
-#, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "non se atopa o nome antigo \"%s\": %s"
-
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/hu.po b/po/hu.po
index 9e268229b..32583285b 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -372,32 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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"
+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
@@ -405,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
@@ -610,9 +618,12 @@ msgid "syntax error in statoverride file"
 msgstr "nem sikerült megnyitni a statoverride fájlt"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "nem sikerült megnyitni a statoverride fájlt"
+#, 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
@@ -620,9 +631,13 @@ 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
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "nem sikerült megnyitni a statoverride fájlt"
+#, 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
@@ -758,67 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "üres `%s' fájl részletek mező"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 "túl sok érték `%s' fájl részletek mezőben (más mezőkhöz képest)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "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
@@ -828,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
@@ -866,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
@@ -954,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
@@ -964,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
@@ -1231,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
@@ -1262,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
@@ -1271,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
@@ -1293,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
@@ -1683,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
@@ -2218,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 ""
 
@@ -3340,7 +3368,162 @@ 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
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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/force.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/force.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/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/force.c
+#, fuzzy, c-format
+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 ""
@@ -3653,114 +3836,6 @@ msgstr ""
 "A [*]-gal jelölt lehetőségek nagy kimenetet írnak - használd a pipát a "
 "`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 ""
@@ -3892,33 +3967,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 "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"
@@ -4599,7 +4647,10 @@ msgid ""
 "  --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"
@@ -4676,6 +4727,11 @@ msgstr "Nincs felülbírálás."
 msgid "--update is useless for --remove"
 msgstr "figyelem: a --update értelmetlen --remove esetén"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Figyelem: elavult lehetőség `--%s'\n"
+
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5069,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
@@ -6807,6 +6870,49 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| 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 "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"
 
@@ -6847,15 +6953,6 @@ msgstr ""
 #~ 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 "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Figyelem: elavult lehetőség `--%s'\n"
-
-#, 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"
-
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/id.po b/po/id.po
index 48c7a8998..2bf6354e9 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -377,32 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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"
+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
@@ -410,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
@@ -620,20 +629,25 @@ msgid "syntax error in statoverride file"
 msgstr "salah sintaks dalam berkas 'statoverride'"
 
 #: lib/dpkg/db-fsys-override.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'"
+#, 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
-#, 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'"
+#, 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
@@ -784,69 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "ruas 'file details' '%s' kosong"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "terlalu banyak nilai dalam ruas 'file details' '%s' (dibandingkan lainnya)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -856,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
@@ -894,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)"
 
@@ -986,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
@@ -996,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
@@ -1267,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
@@ -1299,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
@@ -1308,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"
 
@@ -1331,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
@@ -1727,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
@@ -2302,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>"
 
@@ -3451,7 +3484,163 @@ msgstr ""
 "Paket %s sedang dicekal, tidak akan disentuh. \n"
 "Gunakan '--force-hold' untuk memprosesnya.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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 "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:"
 
@@ -3853,114 +4042,6 @@ msgstr ""
 "Pilihan bertanda [*] menghasilkan banyak keluaran - gunakan pipe ke 'less' "
 "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 ""
@@ -4093,34 +4174,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 "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"
@@ -4848,7 +4901,10 @@ msgid ""
 "  --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"
@@ -4923,6 +4979,12 @@ msgstr "Tidak ada berkas 'override'."
 msgid "--update is useless for --remove"
 msgstr "--update tidak berguna bersama --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| 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."
 msgstr "Ketik 'dpkg-trigger --help' untuk panduan tentang perkakas ini."
@@ -5351,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
@@ -7242,6 +7309,54 @@ 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 "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 "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"
 
@@ -7287,16 +7402,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "gagal berpindah ke direktori setelah membuatnya"
 
-#, 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'. "
-
-#, fuzzy
-#~| msgid "cannot stat file '%s'"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "gagal menata status '%s'"
-
 #, fuzzy
 #~| msgid "cannot stat file '%s'"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/it.po b/po/it.po
index 65fc5ac25..8aed2d3e9 100644
--- a/po/it.po
+++ b/po/it.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.3\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\n"
 "PO-Revision-Date: 2018-12-04 12:15+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -362,28 +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 frontend 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
-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 "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 frontend"
+#, fuzzy
+#| msgid "dpkg frontend"
+msgid "dpkg frontend lock"
 msgstr "frontend dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "database di stato di dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -391,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"
@@ -600,8 +615,11 @@ msgstr "errore di sintassi nel file statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "utente \"%s\" sconosciuto nel file statoverride"
+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"
@@ -609,8 +627,12 @@ msgstr "EOL inatteso nel file statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "gruppo \"%s\" sconosciuto nel file statoverride"
+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
@@ -731,65 +753,78 @@ msgid "internal error"
 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 archive details field '%s'"
+#, 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 "archive 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\" dell'archivio non è consentito nel file di stato"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in archive 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\" dell'archivio (rispetto agli "
 "altri)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in archive 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\" 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
@@ -798,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
@@ -825,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
@@ -918,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
@@ -929,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
@@ -1187,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
@@ -1216,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
@@ -1225,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
@@ -1249,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"
@@ -1624,12 +1687,15 @@ msgid "treewalk root %s is not a 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
@@ -2191,10 +2257,10 @@ msgstr "impossibile accedere all'archivio \"%s\""
 msgid "archive '%s' is not a regular file"
 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>"
 
@@ -3288,7 +3354,175 @@ msgstr ""
 "Il pacchetto %s è bloccato, non viene considerato. Usare --force-hold per "
 "sovrascrivere.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Imposta tutte le opzioni di forzatura"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Sostituisce un pacchetto con una versione precedente"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configura qualsiasi pacchetto che potrebbe essere di aiuto a questo"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Elabora i pacchetti occasionali anche se sono trattenuti"
+
+#: 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/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH non contiene programmi necessari"
+
+#: 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/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Elabora anche i pacchetti con versioni errate"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Installa sempre i file di configurazione mancanti"
+
+# (ndt) non molto chiara
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
+"Chiede di sostituire i file di configurazione con nessuna nuova versione"
+
+#: 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/force.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/force.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/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 "opzione force/refuse \"%.*s\" sconosciuta"
+
+#: src/force.c
+#, c-format
+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:"
 
@@ -3675,118 +3909,6 @@ msgstr ""
 "Le opzioni indicate con [*] producono output prolisso - creare una pipe con "
 "\"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 "Non esegue chroot nell'ambiente dello script del responsabile"
-
-#: 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"
@@ -3919,42 +4041,6 @@ msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr ""
 "impossibile rimuovere l'architettura \"%s\" attualmente in uso dal database"
 
-#: 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
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "opzione force/refuse \"%s\" obsoleta"
-
 #: src/main.c
 #, c-format
 msgid "couldn't open '%i' for stream"
@@ -4630,14 +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"
@@ -4704,6 +4805,11 @@ msgstr "nessun override presente"
 msgid "--update is useless for --remove"
 msgstr "--update è inutile per --remove"
 
+#: src/statcmd.c
+#, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr ""
+
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Usare \"dpkg-trigger --help\" per l'aiuto riguardo a questa utilità."
@@ -5090,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
@@ -6844,5 +6956,44 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "impossibile aprire il file di blocco %s per la verifica"
+
+#~ msgid "unknown user '%s' in statoverride file"
+#~ msgstr "utente \"%s\" sconosciuto nel file statoverride"
+
+#~ msgid "unknown group '%s' in statoverride file"
+#~ msgstr "gruppo \"%s\" sconosciuto nel file statoverride"
+
+#~ msgid "'%.50s' is not allowed for %s"
+#~ msgstr "\"%.50s\" non è consentito per %s"
+
+#~ msgid "junk after %s"
+#~ msgstr "%s è seguito da cose inutili"
+
+#~ msgid "invalid package name (%.250s)"
+#~ msgstr "nome del pacchetto non valido (%.250s)"
+
+#~ msgid "yes/no in boolean field"
+#~ msgstr "yes/no in un campo booleano"
+
+#~ msgid "'%s' field, reference to '%.255s': error in version"
+#~ msgstr "campo \"%s\", riferimento a \"%.255s\": errore nella versione"
+
+#~ msgid "empty value for %s"
+#~ msgstr "valore vuoto per %s"
+
+#~ msgid "package has status triggers-awaited but no triggers awaited"
+#~ msgstr "lo stato del pacchetto è triggers-awaited, ma nessun trigger atteso"
+
+#~ msgid "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "lo stato del pacchetto è triggers-pending, ma nessun trigger imminente"
+
+#~ 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 "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 d6852499f..be9ba7092 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -355,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-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"
+#, 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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg ステータスデータベース"
 
 #: lib/dpkg/dbmodify.c
@@ -386,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
@@ -594,8 +605,11 @@ msgstr "statoverride ファイルに文法エラーがあります"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "statoverride ファイルに未知のユーザ '%s' があります"
+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"
@@ -603,8 +617,12 @@ msgstr "statoverride ファイルに予期せぬ eof があります"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "statoverride ファイルに未知のグループ '%s' があります"
+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
@@ -749,66 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "ファイル記述フィールド `%s' が空です"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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"
+#, 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
@@ -817,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
@@ -844,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 ""
 "ルートディレクトリあるいは空のディレクトリが設定ファイルとして指定されていま"
 "す"
@@ -937,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
@@ -947,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
@@ -1213,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
@@ -1245,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
@@ -1254,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 を持っているので、それらの情報を無視します"
@@ -1280,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 と共"
 "存インストールできません"
@@ -1659,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
@@ -2204,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 "<標準出力>"
 
@@ -3296,7 +3354,172 @@ msgstr ""
 "パッケージ %s は保持されているため、手をつけません。上書きするには --force-"
 "hold を使ってください。\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "すべての強制オプションをセットする"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+"PATH に重要なプログラムを見つけられなくても実行する。問題が起きる可能性が高い"
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "見つからなかった設定ファイルを常にインストールする"
+
+#: 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/force.c
+msgid "Remove an essential package"
+msgstr "不可欠パッケージを削除する"
+
+#: src/force.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/force.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/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/force.c
+#, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "時代遅れの強制・拒否 (force/refuse) オプション `%s'"
+
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "--force が有効なので、問題を無視します:"
 
@@ -3654,115 +3877,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 オプションが与えられ\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 "一般に有用な進行情報"
@@ -3892,42 +4006,6 @@ msgstr "データベースで現在使用中のアーキテクチャ '%s' を削
 msgid "cannot remove architecture '%s' currently in use by the database"
 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"
@@ -4621,7 +4699,10 @@ msgid ""
 "  --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"
@@ -4684,6 +4765,12 @@ msgstr "override が提供されていません"
 msgid "--update is useless for --remove"
 msgstr "--update は --remove には無意味です"
 
+#: 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."
 msgstr ""
@@ -5062,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
@@ -6812,6 +6903,47 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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 出力の読み取り時にエラーが発生しました"
 
@@ -6854,12 +6986,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "ディレクトリ作成後、そのディレクトリに移動できません"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "オプション '--%s' は時代遅れです。'--%s' を代わりに使ってください"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "コントロールファイル '%s' に値がありません"
-
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "コントロールファイル '%s' に値の区切り子がありません"
 
diff --git a/po/km.po b/po/km.po
index 3b31c1e98..d3cc8ddb1 100644
--- a/po/km.po
+++ b/po/km.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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -368,32 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-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"
+#, 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 frontend"
+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
@@ -401,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
@@ -608,9 +616,12 @@ msgid "syntax error in statoverride file"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
+#, 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
@@ -618,9 +629,13 @@ msgid "unexpected end of line in statoverride file"
 msgstr "ចុង​បន្ទាត់​ដែល​មិន​រំពឹង​​ទុកក្នុង​ឈ្មោះ​កញ្ចប់​នៅ​បន្ទាត់ %d"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "បាន​បរាជ័យ​ក្នុង​ការ​បើក​ឯកសារ statoverride"
+#, 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
@@ -757,67 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "សម្អាត​វាល​លម្អិត​ឯកសារ `%s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "បាទ ចាស/ទេ នៅក្នុង​វាល​ប៊ូលីន​"
+#, 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
@@ -827,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
@@ -865,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
@@ -953,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
@@ -963,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
@@ -1230,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
@@ -1261,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
@@ -1270,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
@@ -1292,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
@@ -1682,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
@@ -2210,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 ""
 
@@ -3330,7 +3358,162 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "កញ្ចប់ %s កំពុង​រង់ចាំ មិន​ប៉ះពាល់​វា ។  ប្រើ --force-ដើម្បី​បដិសេធ ។\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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/force.c
+#, fuzzy, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "ព្រមាន ៖ ជម្រើស​បង្ខំ/បដិសេធ ដែល​លែង​ប្រើ `%s'\n"
+
+#: src/force.c
 #, fuzzy
 msgid "overriding problem because --force enabled:"
 msgstr ""
@@ -3632,114 +3815,6 @@ msgstr ""
 "\n"
 "ជម្រើស​បាន​សម្គាល់ [*] បង្កើត​ទិន្នផល​ជា​ច្រើន - បំពង់​ដែល​វា​ឆ្លង​កាត់ `តិច' ឬ `ច្រើន' !"
 
-#: 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 ""
@@ -3869,33 +3944,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 "ជម្រើស​បង្ខំ/បដិសេធ​ដែល​មិនស្គាល់ `%.*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"
@@ -4574,7 +4622,10 @@ msgid ""
 "  --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"
@@ -4651,6 +4702,11 @@ msgstr "គ្មាន​ការ​បដិសេធ​លេច​ឡើង
 msgid "--update is useless for --remove"
 msgstr "ព្រមាន ៖ --update គឺ​គ្មាន​ប្រយោជន៍​សម្រាប់ --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "ព្រមាន ៖ ជម្រើសលែងប្រើ `--%s'\n"
+
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5045,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
@@ -6802,6 +6864,47 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "មិន​អាច​បើក tmpfile សម្រាប់ vsnprintf"
+
+#, fuzzy
+#~ 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"
 
@@ -6842,15 +6945,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "បាន​បរាជ័យ chdir ទៅ​ថត បន្ទាប់​ពី​បង្កើត​វា"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "ព្រមាន ៖ ជម្រើសលែងប្រើ `--%s'\n"
-
-#, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "មិន​អាច​ចាប់​ផ្ដើម​ឈ្មោះ​ចាស់ `%s' ៖ %s"
-
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/ko.po b/po/ko.po
index 82193cb92..a59d36938 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -373,32 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-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"
+#, 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 frontend"
+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
@@ -406,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
@@ -617,20 +626,25 @@ msgid "syntax error in statoverride file"
 msgstr "statoverride 파일에 문법 오류가 있습니다"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-#| msgid "syntax error: unknown user '%s' in statoverride file"
-msgid "unknown user '%s' in statoverride file"
-msgstr "문법 오류: statoverride 파일에서 알 수 없는 사용자 '%s'"
+#, 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
-#, fuzzy, c-format
-#| msgid "syntax error: unknown group '%s' in statoverride file"
-msgid "unknown group '%s' in statoverride file"
-msgstr "문법 오류: statoverride 파일에서 알 수 없는 그룹 '%s'"
+#, 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
@@ -783,67 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "파일 상세 필드 `%s'이(가) 비어 있습니다"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "불리언 필드에서는 예/아니오만 가능합니다"
-
-#: 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
@@ -853,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' 필드를 사용했습니다"
 
@@ -892,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
@@ -984,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
@@ -994,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
@@ -1266,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
@@ -1298,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
@@ -1307,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
@@ -1329,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
@@ -1729,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
@@ -2307,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 "<표준 출력>"
 
@@ -3446,7 +3480,163 @@ msgstr ""
 "%s 패키지는 고정 상태로 건드리지 않습니다.  무시하려면 --force-hold 옵션을 사"
 "용하십시오.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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/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 옵션이 켜져 있으므로 문제를 무시합니다:"
 
@@ -3848,114 +4038,6 @@ msgstr ""
 "\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 ""
-
-#: 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 ""
@@ -4090,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
@@ -4852,7 +4906,10 @@ msgid ""
 "  --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"
@@ -4926,6 +4983,12 @@ msgstr "override가 없습니다."
 msgid "--update is useless for --remove"
 msgstr "--remove 명령에서는 --update 옵션이 무의미합니다"
 
+#: 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."
 msgstr "이 프로그램의 도움말을 보려면 dpkg-trigger --help를 실행하십시오."
@@ -5355,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
@@ -7259,6 +7327,52 @@ 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 "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 ""
+#~ "사용 가능 목록을 업데이트하려면 dpkg 상태 영역에 쓰기 권한이 있어야 합니다"
+
 #~ msgid "error reading dpkg-deb tar output"
 #~ msgstr "dpkg-deb tar 출력을 읽는데 오류가 발생했습니다"
 
@@ -7301,17 +7415,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "디렉터리를 만든 다음에 거기로 이동하는데 실패했습니다"
 
-#, fuzzy
-#~| msgid "obsolete option '--%s', please use '--%s' instead."
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr ""
-#~ "'--%s' 옵션은 더 이상 사용하지 않습니다. '--%s' 옵션을 사용하십시오."
-
-#, fuzzy
-#~| msgid "cannot stat file '%s'"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "'%s' 파일의 정보를 읽을 수 없습니다"
-
 #, fuzzy
 #~| msgid "cannot stat file '%s'"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/ku.po b/po/ku.po
index baee11dad..6b1b8dff8 100644
--- a/po/ku.po
+++ b/po/ku.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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -345,30 +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
-msgid "unable to open/create frontend lockfile"
+#, fuzzy, c-format
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "%s nayê xebitandin"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
-msgstr ""
+#, fuzzy, c-format
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "%s nayê xebitandin"
 
 #: 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 ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg frontend"
+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
@@ -376,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
@@ -571,7 +575,10 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
+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
@@ -580,7 +587,11 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
+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
@@ -703,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 archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "archive 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 archive 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 archive 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
@@ -765,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
@@ -794,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
@@ -870,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
@@ -880,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
@@ -1141,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
@@ -1169,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
@@ -1178,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
@@ -1200,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
@@ -1564,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
@@ -2072,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 ""
 
@@ -3083,7 +3107,162 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, fuzzy
+#| msgid "dependency problems - not removing"
+msgid "Turn all dependency problems into warnings"
+msgstr "pirsgirêkên bindestiyê - nayê rakirin"
+
+#: 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 ""
+"%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/force.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/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/force.c
+#, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr ""
+
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
@@ -3295,114 +3474,6 @@ msgid ""
 "'more' !"
 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 ""
@@ -3526,33 +3597,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 ""
-
-#: src/main.c
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr ""
-
 #: src/main.c
 #, c-format
 msgid "couldn't open '%i' for stream"
@@ -4162,7 +4206,10 @@ msgid ""
 "  --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"
@@ -4216,6 +4263,11 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
+#: src/statcmd.c
+#, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr ""
+
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4573,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
@@ -6102,6 +6158,16 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~ 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î"
@@ -6126,10 +6192,6 @@ msgstr ""
 #~ 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"
-#~ msgstr "di xwendina %s de çewtî"
-
 #, fuzzy
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "di xwendina %s de çewtî"
diff --git a/po/lt.po b/po/lt.po
index 375940340..a8e17a9f8 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -364,32 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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"
+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
@@ -397,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
@@ -602,9 +610,12 @@ msgid "syntax error in statoverride file"
 msgstr "nepavyko atverti statoverride failo"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "nepavyko atverti statoverride failo"
+#, 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
@@ -612,9 +623,13 @@ 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
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "nepavyko atverti statoverride failo"
+#, 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
@@ -746,67 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tuščias failo detalių laukelis `%s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 "per daug reikšmių failo detalių laukelyje `%s' (palyginus su kitais)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "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
@@ -816,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
@@ -854,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
@@ -945,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
@@ -955,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
@@ -1223,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
@@ -1254,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
@@ -1263,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
@@ -1285,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
@@ -1676,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
@@ -2207,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 ""
 
@@ -3302,7 +3330,162 @@ msgid ""
 msgstr ""
 "Paketas %s sulaikytas, neliečiu jo.  Naudokite --force-hold kad apdoroti.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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/force.c
+msgid "Remove packages which require installation"
+msgstr ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.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/force.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/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/force.c
+#, fuzzy, c-format
+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 ""
@@ -3625,114 +3808,6 @@ msgstr ""
 "Pasirinkimai pažymėti [*] išveda daug informacijos - nukreipkite ją per "
 "`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 ""
@@ -3862,33 +3937,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 "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"
@@ -4584,7 +4632,10 @@ msgid ""
 "  --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,6 +4691,11 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Įspėjimas: parametras „--%s“ nebenaudotinas\n"
+
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5027,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
@@ -6653,6 +6715,47 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| 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 "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į"
 
@@ -6693,15 +6796,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "sukūrus aplanką nepavyko jo atverti"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Įspėjimas: parametras „--%s“ nebenaudotinas\n"
-
-#, fuzzy
-#~| msgid "unable to read %s: %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "nepavyko nuskaityti %s: %s"
-
 #, fuzzy
 #~| msgid "unable to read %s: %s"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/mr.po b/po/mr.po
index c881fd40a..e7aef1c1b 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -365,32 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-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"
+#, 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 "आपणांस डीपीकेजी सद्यस्थिती डेटाबेसला टाळे लावण्याची परवानगी नाही"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg frontend"
+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
@@ -398,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
@@ -605,9 +613,12 @@ msgid "syntax error in statoverride file"
 msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
+#, 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
@@ -615,9 +626,13 @@ msgid "unexpected end of line in statoverride file"
 msgstr "%d ओळीवर पॅकेजच्या नावामध्ये अनपेक्षित उद्भवलेला ओळीचा शेवट/एण्ड ऑफ लाइन"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "स्टॅटओवरराइड फाइल उघडण्यास अयशस्वी"
+#, 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
@@ -754,66 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "फाइलचे विवरण क्षेत्र रिकामे `%s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "बुलियन क्षेत्रामधे हो/नाही"
+#, 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
@@ -823,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
@@ -861,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
@@ -945,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
@@ -955,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
@@ -1222,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
@@ -1253,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
@@ -1262,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
@@ -1284,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
@@ -1673,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
@@ -2204,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 ""
 
@@ -3336,7 +3365,162 @@ msgstr ""
 "%s हे तात्पुरता थांबलेले आहे, त्याला हात लावत नाही. दुर्लक्ष करण्यासाठी --फोर्स-होल्ड "
 "वापरा.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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/force.c
+#, fuzzy, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "ताकिद: अप्रचलित फोर्स/रिफ्युज पर्याय `%.*s'\n"
+
+#: src/force.c
 #, fuzzy
 msgid "overriding problem because --force enabled:"
 msgstr "डिपिकेजी - ताकिद, समस्येवर दुर्लक्ष करित आहे कारण --फोर्स कार्यक्षम करतो:\n"
@@ -3640,114 +3824,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 ""
@@ -3877,33 +3953,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 " अज्ञात फोर्स/रिफ्युज पर्याय `%.*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"
@@ -4585,7 +4634,10 @@ msgid ""
 "  --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"
@@ -4663,6 +4715,11 @@ msgstr "अोव्हरराइड अस्तित्वात नाह
 msgid "--update is useless for --remove"
 msgstr "धोक्याची सूचना: --काढा साठी --सुधारा निरुपयोगी आहे"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "ताकिद: अप्रचलित पर्याय `--%s'\n"
+
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5046,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
@@ -6776,6 +6839,48 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "व्हीएसएनप्रिंटएफ़ साठी टीएमपीफाईल उघडता येत नाही"
+
+#, fuzzy
+#~ 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 "डिपिकेजी-डेब टार आउट्पुट/उत्पादन वाचनाची समस्या"
 
@@ -6816,15 +6921,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "निर्देशिका बनवल्यानंतर तिच्यात सीएचडिआयआर करता आले नाही"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "ताकिद: अप्रचलित पर्याय `--%s'\n"
-
-#, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "जुनी नावे `%s': %s स्टॅट करता येत नाहीत"
-
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/nb.po b/po/nb.po
index 444642fc3..4517707d8 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -378,32 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 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 "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"
+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
@@ -411,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
@@ -621,20 +630,25 @@ msgid "syntax error in statoverride file"
 msgstr "syntaksfeil i statoverrid-fila"
 
 #: lib/dpkg/db-fsys-override.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"
+#, 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
-#, 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"
+#, 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
@@ -785,67 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tomt fildetaljfelt «%s»"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 "for mange verdier i fildetaljfeltet «%s» (sammenliknet med andre)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "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
@@ -855,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
@@ -893,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
@@ -983,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
@@ -993,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
@@ -1264,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
@@ -1296,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
@@ -1305,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
@@ -1327,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
@@ -1731,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
@@ -2302,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>"
 
@@ -3444,7 +3477,163 @@ msgstr ""
 "Pakken %s er holdt tilbake, og blir ikke rørt. Bruk --force-hold for å "
 "tvinge gjennom behandling.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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 "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å:"
 
@@ -3854,114 +4043,6 @@ msgstr ""
 "Valg markert med [*] gir mye tekst - bruk «less» eller «more» for å lese "
 "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 ""
@@ -4095,34 +4176,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 "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"
@@ -4849,7 +4902,10 @@ msgid ""
 "  --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"
@@ -4924,6 +4980,12 @@ msgstr "Ingen tilsidesettelse tilstede."
 msgid "--update is useless for --remove"
 msgstr "--update er meningsløs for --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| 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."
 msgstr "Skriv «dpkg-trigger --help» for hjelp om dette programmet."
@@ -5349,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
@@ -7241,6 +7310,53 @@ 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 "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"
 
@@ -7283,11 +7399,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "klarte ikke skifte til katalogen etter å ha opprettet den"
 
-#, fuzzy
-#~| msgid "obsolete option '--%s', please use '--%s' instead."
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "foreldet valg  «--%s», bruk «--%s» istedenfor."
-
 #, fuzzy
 #~| msgid "cannot stat file '%s'"
 #~ msgid "control file '%s' missing value"
@@ -7972,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 3a44baba4..68a4607ef 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -371,32 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-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"
+#, 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 frontend"
+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
@@ -404,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
@@ -610,9 +618,12 @@ msgid "syntax error in statoverride file"
 msgstr "statoverride फाइल खोल्न असफल"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "statoverride फाइल खोल्न असफल"
+#, 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
@@ -620,9 +631,13 @@ msgid "unexpected end of line in statoverride file"
 msgstr "लाइन %d को प्याकेजमा अप्रत्यासित लाइनको समाप्ती"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "statoverride फाइल खोल्न असफल"
+#, 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
@@ -759,67 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "रित्तो फाइल विवरण फाँट `%s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "बोलेइन फाँटमा हो/होइन"
+#, 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
@@ -829,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
@@ -867,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
@@ -955,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
@@ -965,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
@@ -1233,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
@@ -1264,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
@@ -1273,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
@@ -1295,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
@@ -1684,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
@@ -2215,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 ""
 
@@ -3338,7 +3366,162 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "प्याकेज %s पर्खाइमा छ, यसलाई नछोइकन ।  अधिलेखन गर्न Use --force-hold \n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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/force.c
+#, fuzzy, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "चेतावनी: अप्रचलित दवाव/अस्विकार विकल्प `%s'\n"
+
+#: src/force.c
 #, fuzzy
 msgid "overriding problem because --force enabled:"
 msgstr ""
@@ -3662,114 +3845,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 ""
@@ -3899,33 +3974,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 "अज्ञात दवाब/अविस्कार विकल्प `%.*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"
@@ -4607,7 +4655,10 @@ msgid ""
 "  --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"
@@ -4684,6 +4735,11 @@ msgstr "अधिलेखन अवस्थित छैन"
 msgid "--update is useless for --remove"
 msgstr "चेतावनी:--हटाउन--अद्यावधिक उपयोगि छैन"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "चेतावनी: अप्रचलित विकल्प `--%s'\n"
+
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5083,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
@@ -6855,6 +6917,47 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| msgid "unable to open tmpfile for vsnprintf"
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "vsnprintf का लागि tmpfile (अस्थाइ फाइल) खोल्न अक्षम"
+
+#, fuzzy
+#~ 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 टार निर्गत पढ्दा त्रुटि"
 
@@ -6895,15 +6998,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "डाइरेक्टरी सिर्जना गरे पछि डाइरेक्टरीलाई chdir गर्न असफल"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "चेतावनी: अप्रचलित विकल्प `--%s'\n"
-
-#, fuzzy
-#~| msgid "cannot stat old name `%s': %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "पुरानो नाम `%s' तोक्न सकिदैन: %s"
-
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/nl.po b/po/nl.po
index 0ca7652bc..316b40aac 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-23 13:09+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\n"
 "PO-Revision-Date: 2019-01-30 15:46+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -343,31 +343,42 @@ msgid "unable to seek to start of %.250s after padding"
 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"
+#, fuzzy, c-format
+#| msgid "unable to get file descriptor for directory '%s'"
+msgid "unable to check lock file for dpkg database directory %s"
+msgstr "kan bestandsindicator voor map '%s' niet verkrijgen"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create frontend lockfile"
+#, fuzzy, c-format
+#| msgid "unable to open/create frontend lockfile"
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "kan het frontend-vergrendelingsbestand niet openen/aanmaken"
 
 #: 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 ""
 "kan het vergrendelingsbestand van de statusdatabase niet openen/aanmaken"
 
 #: 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 ""
 "u heeft niet de benodigde rechten om de statusdatabase van dpkg te "
 "vergrendelen"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg frontend"
+#, fuzzy
+#| msgid "dpkg frontend"
+msgid "dpkg frontend lock"
 msgstr "dpkg-frontend"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "statusdatabase van dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -375,11 +386,15 @@ 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"
+#, fuzzy, c-format
+#| msgid "unable to access dpkg status area"
+msgid "unable to access the dpkg database directory %s"
 msgstr "kan niet binnen bij het statusgebied van 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 ""
 "voor deze bewerking zijn lees- en schrijfrechten nodig in het statusgebied "
 "van dpkg"
@@ -588,10 +603,11 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
+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 gebruiker '%s' in het statoverride-bestand (bestand met "
-"overstijgingsinfo)"
 
 #: lib/dpkg/db-fsys-override.c
 msgid "unexpected end of line in statoverride file"
@@ -601,10 +617,12 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
+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 groep '%s' in het statoverride-bestand (bestand met "
-"overstijgingsinfo)"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
@@ -725,62 +743,75 @@ msgid "internal error"
 msgstr "interne fout"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "%s is missing"
-msgstr "%s ontbreekt"
+#, fuzzy
+#| msgid "control file '%s' missing value"
+msgid "is missing a value"
+msgstr "er ontbreekt een waarde in het controlebestand '%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.50s' is niet toegestaan voor %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Ongeldige regel wordt overgeslagen: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "rommel na %s"
+msgid "has trailing junk"
+msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "invalid package name (%.250s)"
-msgstr "ongeldige pakketnaam (%.250s)"
+#, fuzzy, c-format
+#| msgid "package name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "pakketnaam '%s' is niet geldig: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty archive details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "leeg veld '%s' met archiefdetails"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "archive 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 "veld '%s' met de archiefdetails niet toegestaan in statusbestand"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in archive 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 ""
 "te veel waarden in veld '%s' met de archiefdetails (vergeleken met andere)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in archive 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 ""
 "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"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "verouderd veld '%s' of '%s' gebruikt"
 
 #: 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 in vierstatusveld"
 
 #: 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' is geen geldige naam voor een architectuur: %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 "woord in het veld 'Priority'"
 
 #: lib/dpkg/fields.c
@@ -789,25 +820,33 @@ 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"
+#, fuzzy, c-format
+#| msgid "first (want) word in 'Status' field"
+msgid "first (want) word in '%s' field: %s"
 msgstr "eerste woord (want) in het veld '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 "tweede woord (error) in het veld '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 "derde woord (status) in het veld '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 "fout in tekenreeks '%.250s' voor veld '%s'"
 
 #: 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 "verouderd veld '%s' of '%s' gebruikt"
 
 #: lib/dpkg/fields.c
@@ -816,12 +855,15 @@ msgid "value for '%s' field has malformed line '%.*s'"
 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'"
+#, 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 "waarde voor '%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"
+#, 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 "hoofd- of null-map wordt genoemd als een configuratiebestand"
 
 #: lib/dpkg/fields.c
@@ -907,9 +949,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 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"
+#, fuzzy, c-format
+#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+msgid "'%s' field, reference to '%.255s': version '%s'"
+msgstr "veld '%s', verwijzing naar '%.255s': versie bevat '%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -917,8 +960,9 @@ msgid "'%s' field, syntax error after reference to package '%.255s'"
 msgstr "veld '%s', syntaxisfout na verwijzing naar pakket '%.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 "alternatieven ('|') niet toegestaan in veld %s"
 
 #: lib/dpkg/fields.c
@@ -998,7 +1042,6 @@ msgstr "kan %s niet vergrendelen"
 
 #: lib/dpkg/file.c
 #, c-format
-#| msgid "cannot open %s"
 msgid "cannot open file %s"
 msgstr "kan bestand %s niet openen"
 
@@ -1008,7 +1051,6 @@ msgstr "pagineringsprogramma om bestand weer te geven"
 
 #: lib/dpkg/file.c
 #, c-format
-#| msgid "cannot divert file '%s' to itself"
 msgid "cannot write file %s into the pager"
 msgstr "kan bestand %s niet naar het pagineringsprogramma schrijven"
 
@@ -1175,27 +1217,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "dubbele waarde voor door gebruiker gedefinieerd veld '%.*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 "ontbrekende %s"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, c-format
-msgid "empty value for %s"
-msgstr "lege waarde voor %s"
+#, fuzzy, c-format
+#| msgid "duplicate value for '%s' field"
+msgid "empty value for '%s' field"
+msgstr "dubbele waarde voor veld '%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 "pakket bevat veld '%s' maar de architectuur ontbreekt"
 
 #: 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 "pakket bevat veld '%s' maar is van het architectuurtype 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 voor pakket met ongepaste Status"
 
 #: lib/dpkg/parse.c
@@ -1204,10 +1252,10 @@ 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"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "de status van het pakket is %s maar er wordt op triggers gewacht"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1215,13 +1263,15 @@ 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"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are pending"
+msgid "package has status %s but no triggers pending"
+msgstr "de status van het pakket is %s maar er staan triggers in de wacht"
 
 #: 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 ""
 "Pakket in niet-geïnstalleerde toestand heeft configuratiebestanden. Ze "
 "worden vergeten"
@@ -1245,10 +1295,13 @@ msgstr ""
 "vanuit een niet-officiële 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) mag niet samen geïnstalleerd worden met %s waarvan "
 "meerdere exemplaren geïnstalleerd zijn"
@@ -1543,27 +1596,22 @@ msgid "wait for %s subprocess failed"
 msgstr "wachten op subproces %s is mislukt"
 
 #: lib/dpkg/tarfn.c
-#| msgid "invalid character '%c' in field width"
 msgid "invalid tar header size field"
 msgstr "ongeldig veld met de grootte van de tar-archiefkop"
 
 #: lib/dpkg/tarfn.c
-#| msgid "invalid character '%c' in field width"
 msgid "invalid tar header mtime field"
 msgstr "ongeldig veld met de 'mtime' van de tar-archiefkop"
 
 #: lib/dpkg/tarfn.c
-#| msgid "invalid statoverride uid %s"
 msgid "invalid tar header uid field"
 msgstr "ongeldig veld met de 'uid' van de tar-archiefkop"
 
 #: lib/dpkg/tarfn.c
-#| msgid "invalid statoverride gid %s"
 msgid "invalid tar header gid field"
 msgstr "ongeldig veld met de 'guid' van de tar-archiefkop"
 
 #: lib/dpkg/tarfn.c
-#| msgid "invalid character '%c' in field width"
 msgid "invalid tar header checksum field"
 msgstr "ongeldig veld met de checksum van de tar-archiefkop"
 
@@ -1586,7 +1634,6 @@ msgstr "niet-ondersteund GNU tar-archiefkoptype '%c'"
 
 #: lib/dpkg/tarfn.c
 #, c-format
-#| msgid "unsupported options in file header"
 msgid "unsupported Solaris tar header type '%c'"
 msgstr "niet-ondersteund Solaris tar-archiefkoptype '%c'"
 
@@ -1597,7 +1644,6 @@ msgstr "niet-ondersteund PAX tar-archiefkoptype '%c'"
 
 #: lib/dpkg/tarfn.c
 #, c-format
-#| msgid "unknown compression type '%s'!"
 msgid "unknown tar header type '%c'"
 msgstr "onbekend tar-archiefkoptype '%c'"
 
@@ -1617,12 +1663,15 @@ msgid "treewalk root %s is not a directory"
 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'"
+#, fuzzy, c-format
+#| msgid "unable to open/create triggers lockfile '%.250s'"
+msgid "unable to open/create triggers lock file '%.250s'"
 msgstr "kan grendelbestand '%.250s' voor triggers niet openen/aanmaken"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "triggergebied"
 
 #: lib/dpkg/trigdeferred.c
@@ -2177,10 +2226,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>"
 
@@ -2728,22 +2777,6 @@ msgstr ""
 
 #: src/divertcmd.c
 #, 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 "
@@ -3274,7 +3307,174 @@ msgstr ""
 "Pakket %s wordt vastgehouden; er wordt niets mee gedaan.\n"
 " Gebruik --force-hold om deze richtlijn te negeren.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Stel alle forceeropties in"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Vervang een pakket door een eerdere versie"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configureer elk pakket dat dit kan helpen"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Verwerk bij-pakketten, ook als ze vastgehouden worden"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Tracht zaken te (de)installeren, zelfs al ben je geen systeembeheerder"
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH loopt belangrijke programma's mis; problemen zijn waarschijnlijk"
+
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Installeer een pakket, zelfs als de authenticiteitstoets faalde"
+
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Behandel zelfs pakketten met foute versienummers"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Overschrijf een bestand uit een pakket met dat uit een ander"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Overschrijf een omgeleid bestand met een niet-omgeleide versie"
+
+#: src/force.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/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Voer geen veilige I/O-bewerkingen uit bij het uitpakken"
+
+#: src/force.c
+msgid "Do not chroot into maintainer script environment"
+msgstr "Chroot niet naar de omgeving van een pakketonderhouder-script"
+
+#: src/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr ""
+"Gebruik steeds de nieuwe configuratiebestanden; stel er geen vragen over"
+
+#: src/force.c
+msgid "Always use the old config files, don't prompt"
+msgstr "Gebruik steeds de oude configuratiebestanden; stel er geen vragen over"
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Installeer steeds ontbrekende configuratiebestanden"
+
+#: src/force.c
+msgid "Offer to replace config files with no new versions"
+msgstr ""
+"Stel voor om configuratiebestanden niet door nieuwere versies te vervangen"
+
+#: src/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Behandel ook pakketten met foute of ontbrekende architectuur"
+
+#: src/force.c
+msgid "Install even if it would break another package"
+msgstr "Installeer toch, zelfs al maakt dit een ander pakket defect"
+
+#: src/force.c
+msgid "Allow installation of conflicting packages"
+msgstr "Laat de installatie van conflicterende pakketten toe"
+
+#: src/force.c
+msgid "Turn all dependency problems into warnings"
+msgstr "Zet alle vereistenproblemen om in waarschuwingen"
+
+#: src/force.c
+msgid "Turn dependency version problems into warnings"
+msgstr "Zet alle versiegebonden vereistenproblemen om in waarschuwingen"
+
+#: src/force.c
+msgid "Remove packages which require installation"
+msgstr "Verwijder pakketten die een installatie vragen"
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr "Verwijder een essentieel pakket"
+
+#: src/force.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"
+"  waarschuwen maar verder gaan:\n"
+"              --force-<ding>,<ding>,...\n"
+"  stoppen met foutmelding:\n"
+"             --refuse-<ding>,<ding>,... | --no-force-<ding>,...\n"
+" Dingen forceren:\n"
+
+#: src/force.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/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 "onbekende force/refuse optie '%.*s'"
+
+#: src/force.c
+#, c-format
+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:"
 
@@ -3348,48 +3548,6 @@ msgstr "Programma voor Debian pakketbeheer '%s' versie %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"
@@ -3642,116 +3800,6 @@ msgstr ""
 "Opties gemarkeerd met [*] geven veel uitvoer - pijp die door 'less' of "
 "'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"
@@ -3884,43 +3932,6 @@ msgstr ""
 "kan architectuur '%s' die momenteel door de database gebruikt wordt, niet "
 "verwijderen"
 
-#: 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"
-"  waarschuwen maar verder gaan:\n"
-"              --force-<ding>,<ding>,...\n"
-"  stoppen met foutmelding:\n"
-"             --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"
@@ -4577,10 +4588,13 @@ 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"
@@ -4593,7 +4607,10 @@ msgid ""
 "  --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"
@@ -4660,6 +4677,12 @@ msgstr "geen overstijging aanwezig"
 msgid "--update is useless for --remove"
 msgstr "--update is waardeloos voor --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+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."
 msgstr "Typ dpkg-trigger --help voor hulp over dit hulpmiddel."
@@ -5020,7 +5043,6 @@ msgid "package filesystem archive extraction"
 msgstr "uitpakken van archief met het bestandssysteem van het pakket"
 
 #: src/unpack.c
-#| msgid "corrupted filesystem tarfile - corrupted package archive"
 msgid "corrupted filesystem tarfile in package archive"
 msgstr "beschadigd tar-bestand met het bestandssysteem in pakketarchief"
 
@@ -5035,16 +5057,22 @@ 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"
+#, 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 ""
 "kan niet bij de statusomgeving van dpkg voor een grote bijwerking van "
 "beschikbare pakketten"
 
 #: 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 ""
-"grote bijwerking van beschikbare pakketten vereist schrijftoegang tot de "
-"statusomgeving van dpkg"
+"kan niet bij de statusomgeving van dpkg voor een grote bijwerking van "
+"beschikbare pakketten"
 
 #: src/update.c
 #, c-format
@@ -6215,20 +6243,6 @@ 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"
@@ -6761,6 +6775,55 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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 "unknown group '%s' in statoverride file"
+#~ msgstr ""
+#~ "onbekende groep '%s' in het statoverride-bestand (bestand met "
+#~ "overstijgingsinfo)"
+
+#~ 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"
 
@@ -6794,13 +6857,6 @@ msgstr "Authenticatie is nodig voor het uitvoeren van update-alternatives"
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "chdir naar de map na het aanmaken ervan is mislukt"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr ""
-#~ "verouderde optie '--%s'; gelieve in plaats ervan '--%s' te gebruiken"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "er ontbreekt een waarde in het controlebestand '%s'"
-
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "er ontbreekt een waardescheidingsteken in controlebestand '%s'"
 
diff --git a/po/nn.po b/po/nn.po
index 777c163a3..7f9eb3067 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -368,32 +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
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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"
+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
@@ -401,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
@@ -606,9 +614,12 @@ msgid "syntax error in statoverride file"
 msgstr "klarte ikkje opna «statoverride»-fila"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "klarte ikkje opna «statoverride»-fila"
+#, 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
@@ -616,9 +627,13 @@ msgid "unexpected end of line in statoverride file"
 msgstr "uventa slutt på linje i pakkenamnet på linje %d"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "klarte ikkje opna «statoverride»-fila"
+#, 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
@@ -752,66 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tomt fildetaljfelt «%s»"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 "for mange verdiar i fildetaljfeltet «%s» (samanlikna med andre)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "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
@@ -820,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
@@ -856,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
@@ -947,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
@@ -957,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
@@ -1221,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
@@ -1252,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
@@ -1261,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."
 
@@ -1284,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
@@ -1674,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
@@ -2213,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 ""
 
@@ -3310,7 +3338,162 @@ msgstr ""
 "Pakken %s er halden tilbake, og vert ikkje rørt. Bruk --force-hold for å "
 "tvinga gjennom behandling.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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/force.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/force.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/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/force.c
+#, fuzzy, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "Åtvaring: Forelda val «%s»\n"
+
+#: src/force.c
 #, fuzzy
 msgid "overriding problem because --force enabled:"
 msgstr ""
@@ -3620,114 +3803,6 @@ msgstr ""
 "Val markert med [*] gjev mykje tekst - bruk «less» eller «more» for å lesa "
 "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 ""
@@ -3857,33 +3932,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 "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"
@@ -4567,7 +4615,10 @@ msgid ""
 "  --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"
@@ -4622,6 +4673,11 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Åtvaring: Forelda val «%s»\n"
+
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5001,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
@@ -6676,6 +6739,47 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| 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 "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"
 
@@ -6716,14 +6820,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "klarte ikkje skifta til katalogen etter å ha oppretta han"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Åtvaring: Forelda val «%s»\n"
-
-#, fuzzy
-#~ msgid "control file '%s' missing value"
-#~ msgstr "fann ikkje «%.255s» (i «%.255s»)"
-
 #, fuzzy
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "fann ikkje «%.255s» (i «%.255s»)"
diff --git a/po/pa.po b/po/pa.po
index 099f1bed9..f01f850f0 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -352,40 +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
-#, fuzzy
-msgid "unable to open/create frontend lockfile"
+#, fuzzy, c-format
+msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create status database lockfile"
-msgstr ""
+#, fuzzy, c-format
+msgid "unable to open/create dpkg database lock file for directory %s"
+msgstr "ਕੰਟਰੋਲ ਫਾਇਲ ਜਾਣਕਾਰੀ `%.250s' ਹਟਾਉਣ ਲਈ ਅਸਫ਼ਲ"
 
 #: 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 ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
-msgstr ""
+#, 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
@@ -578,7 +584,10 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
+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
@@ -587,7 +596,11 @@ msgstr ""
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
+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
@@ -718,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 archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr ""
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "archive 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 archive 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 archive 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
@@ -781,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
@@ -810,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
@@ -886,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
@@ -896,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
@@ -1161,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
@@ -1190,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
@@ -1199,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
@@ -1221,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
@@ -1589,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
@@ -2095,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 ""
 
@@ -3103,7 +3131,164 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr ""
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+"%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/force.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/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/force.c
+#, fuzzy, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
+
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr ""
 
@@ -3384,116 +3569,6 @@ msgid ""
 "'more' !"
 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 ""
@@ -3616,33 +3691,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 ""
-
-#: 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"
@@ -4263,7 +4311,10 @@ msgid ""
 "  --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"
@@ -4334,6 +4385,11 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
+
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr ""
@@ -4723,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
@@ -6420,6 +6480,27 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "%s ਖੋਲ੍ਹਣ ਲਈ ਅਸਫ਼ਲ: %s"
+
+#~ msgid "%s is missing"
+#~ msgstr "%s ਗੁੰਮ ਹੈ"
+
+#, fuzzy
+#~| 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'"
@@ -6449,15 +6530,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "ਡਾਇਰੈਕਟਰੀ ਬਣਾਉਣ ਬਾਅਦ ਇਸ 'ਚ ਜਾਣ ਲਈ ਫੇਲ੍ਹ"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "ਅਣਜਾਣੀ ਚੋਣ --%s"
-
-#, fuzzy
-#~| msgid "unable to read %s: %s"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "%s ਪੜ੍ਹਨ ਲਈ ਅਸਫ਼ਲ: %s"
-
 #, fuzzy
 #~| msgid "unable to read %s: %s"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/pl.po b/po/pl.po
index 7b450fae4..3018f11f2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -351,28 +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 frontend 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
-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 "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 frontend"
+#, fuzzy
+#| msgid "dpkg frontend"
+msgid "dpkg frontend lock"
 msgstr "fasada dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "baza danych stanu dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -380,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
@@ -581,8 +596,11 @@ msgstr "błąd składni w pliku statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "nieznany użytkownik \"%s\" w pliku statoverride"
+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"
@@ -590,8 +608,12 @@ msgstr "niespodziewany koniec linii w pliku statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "nieznana grupa \"%s\" w pliku statoverride"
+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
@@ -712,60 +734,73 @@ msgid "internal error"
 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 archive details field '%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 "archive 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 "pole opisu archiwum \"%s\" jest niedozwolone w pliku statusu"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in archive 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 "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 archive 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 "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
@@ -774,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
@@ -801,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
@@ -894,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
@@ -904,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
@@ -1163,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
@@ -1192,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
@@ -1201,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"
@@ -1228,10 +1288,13 @@ msgstr ""
 "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"
@@ -1600,13 +1663,16 @@ msgid "treewalk root %s is not a directory"
 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
@@ -2153,10 +2219,10 @@ msgstr "brak dostępu do archiwum \"%s\""
 msgid "archive '%s' is not a regular file"
 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>"
 
@@ -3241,7 +3307,173 @@ msgstr ""
 "Pakiet %s jest wstrzymany i nie będzie przetwarzany. --force-hold wymusza "
 "jego przetworzenie.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Ustawianie wszystkich opcji wymuszenia"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+"Instalowanie pakietów nawet jeśli nie uda się sprawdzanie autentyczności"
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: src/force.c
+msgid "Overwrite a file from one package with another"
+msgstr "Nadpisywanie plików jednego pakietu innym"
+
+#: src/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Nadpisywanie ominiętego pliku wersją bez ominięć"
+
+#: src/force.c
+msgid "Overwrite one package's directory with another's file"
+msgstr "Nadpisywanie katalogu danego pakietu innym plikiem"
+
+#: src/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Nieprzeprowadzanie bezpiecznych operacji we/wy podczas rozpakowywania"
+
+#: 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/force.c
+msgid "Always use the new config files, don't prompt"
+msgstr "Używanie nowych plików konfiguracyjnych zawsze, bez pytania"
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Instalowanie brakujących plików konfiguracyjnych za każdym razem"
+
+#: 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/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/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 ""
+"%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/force.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/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 "nieznana opcja force/refuse \"%.*s\""
+
+#: src/force.c
+#, c-format
+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:"
 
@@ -3611,117 +3843,6 @@ msgstr ""
 "Opcje oznaczone [*] podają dużo treści - proszę użyć potoku z \"less\" lub "
 "\"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 ""
-"Nie używaj chroot do przejścia do środowiska skryptu od opiekuna pakietu"
-
-#: 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"
@@ -3852,41 +3973,6 @@ msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr ""
 "nie można usunąć architektury \"%s\" używanej aktualnie 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
-#, c-format
-msgid "obsolete force/refuse option '%s'"
-msgstr "niewykorzystywana już opcja force/refuse \"%s\""
-
 #: src/main.c
 #, c-format
 msgid "couldn't open '%i' for stream"
@@ -4556,7 +4642,10 @@ msgid ""
 "  --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"
@@ -4620,6 +4709,13 @@ msgstr "brak nadpisania"
 msgid "--update is useless for --remove"
 msgstr "--update jest bezużyteczne w połączeniu z --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| 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."
 msgstr "Proszę wpisać dpkg-trigger --help, aby otrzymać pomoc."
@@ -5001,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
@@ -6716,6 +6818,46 @@ msgstr "Uruchom update-alternatives, aby zmienić wybór alternatyw w systemie"
 msgid "Authentication is required to run update-alternatives"
 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 "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 ""
+#~ "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"
 
@@ -6746,10 +6888,6 @@ msgstr "Uruchomienie update-alternatives wymaga uwierzytelnienia"
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "nie można zmienić katalogu po jego utworzeniu"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr ""
-#~ "niewykorzystywana już opcja \"--%s\", zamiast niej proszę używać \"--%s\""
-
 #~ msgid "control file '%s' missing value"
 #~ msgstr "brak wartości w pliku kontrolnym \"%s\""
 
@@ -7468,9 +7606,6 @@ msgstr "Uruchomienie update-alternatives wymaga uwierzytelnienia"
 #~ 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 b52e3bae6..e829b9584 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\n"
 "PO-Revision-Date: 2018-12-30 15:43+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
@@ -342,28 +342,39 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "não foi possível executar seek para o inicio de %.250s após enchimento"
 
 #: lib/dpkg/dbmodify.c
-#, c-format
-msgid "unable to open lock file %s for testing"
-msgstr "não foi bloquear ficheiro %s para teste"
+#, fuzzy, c-format
+#| 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 obter descriptor de ficheiro para o directório '%s'"
 
 #: lib/dpkg/dbmodify.c
-msgid "unable to open/create frontend lockfile"
+#, fuzzy, 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 lockfile do frontend"
 
 #: 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 "não foi possível abrir/criar lockfile de status da base de dados"
 
 #: 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 "não tem permissão para bloquear a base de dados do status dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg frontend"
+#, fuzzy
+#| msgid "dpkg frontend"
+msgid "dpkg frontend lock"
 msgstr "frontend do dpkg"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "base de dados de estado do dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -371,11 +382,15 @@ 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"
+#, fuzzy, 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 à área de status 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 ""
 "a operação necessita de acesso de leitura/escrita na área do estado do dpkg"
 
@@ -576,8 +591,11 @@ msgstr "erro de sintaxe no ficheiro statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "utilizador desconhecido '%s' no ficheiro statoverride"
+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"
@@ -585,8 +603,12 @@ msgstr "fim de linha inesperado no ficheiro statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "grupo '%s' desconhecido no statoverride"
+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
@@ -705,61 +727,74 @@ msgid "internal error"
 msgstr "erro 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 pacote"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "'%.50s' is not allowed for %s"
-msgstr "'%.50s' não é permitido para %s"
+#, fuzzy, c-format
+#| msgid "Skip invalid line: %s"
+msgid "has invalid value '%.50s'"
+msgstr "Saltar linha inválida: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "junk after %s"
-msgstr "lixo após %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 name '%s' is invalid: %s"
+msgid "invalid package name in '%s' field: %s"
+msgstr "o nome de pacote '%s' é inválido: %s"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "empty archive details field '%s'"
+#, fuzzy, c-format
+#| msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "campo de detalhes de ficheiro vazio '%s'"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "archive 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 "campo de detalhes de arquivo '%s' não é permitido no ficheiro status"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in archive 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 "demasiados valores no campo de detalhes '%s' (comparado com outros)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in archive 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 ""
 "valores a menos no campo de detalhes de arquivo '%s' (comparado com outros)"
 
 #: lib/dpkg/fields.c
-msgid "yes/no in boolean field"
-msgstr "sim/não no campo booleano"
+#, fuzzy, c-format
+#| msgid "obsolete '%s' or '%s' field used"
+msgid "boolean (yes/no) '%s' field: %s"
+msgstr "utilizados campos obsoletos '%s' ou '%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 em campo de quatro estados"
 
 #: 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ão é um nome válido de arquitectura: %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 "palavra no campo 'Priority'"
 
 #: lib/dpkg/fields.c
@@ -768,25 +803,33 @@ 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"
+#, fuzzy, c-format
+#| 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
-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 (error) palavra no 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 "terceira (status) palavra no 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 "erro na string do campo '%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 "utilizados campos obsoletos '%s' ou '%s'"
 
 #: lib/dpkg/fields.c
@@ -795,12 +838,15 @@ msgid "value for '%s' field has malformed line '%.*s'"
 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'"
+#, 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 "o valor para '%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"
+#, 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 "raiz ou directório nulo está listado como conffile"
 
 #: lib/dpkg/fields.c
@@ -884,9 +930,10 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 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"
+#, fuzzy, c-format
+#| 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
@@ -894,8 +941,9 @@ msgid "'%s' field, syntax error after reference to package '%.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"
+#, fuzzy, c-format
+#| 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
@@ -1150,27 +1198,33 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "valor duplicado para campo definido pelo utilizador '%.*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 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"
+#, fuzzy, c-format
+#| 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"
+#, fuzzy, c-format
+#| 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 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 para o pacote com Status inapropriado"
 
 #: lib/dpkg/parse.c
@@ -1179,9 +1233,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'"
+#, fuzzy, c-format
+#| msgid "package has status %s but triggers are awaited"
+msgid "package has status %s but no triggers awaited"
+msgstr "o pacote tem estado %s mas são esperados 'triggers'"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1189,12 +1244,15 @@ 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"
+#, fuzzy, 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 estão 'triggers' 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 tem estado não-instalado tem ficheiros de configuração, a esquecê-"
 "los"
@@ -1217,10 +1275,13 @@ msgstr ""
 "dpkg não-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-Arch: %s) não é co-instalável com %s que tem várias instâncias "
 "instaladas"
@@ -1584,12 +1645,15 @@ msgid "treewalk root %s is not a directory"
 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'"
+#, fuzzy, c-format
+#| 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 acesso exclusivo '%.250s'"
 
 #: lib/dpkg/trigdeferred.c
-msgid "triggers area"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "área de triggers"
 
 #: lib/dpkg/trigdeferred.c
@@ -2135,10 +2199,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>"
 
@@ -3207,7 +3271,174 @@ msgstr ""
 "Pacote %s está em espera, não lhe tocando. Utilize --force-hold para "
 "forçar.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Definir todas as opções de forçar"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Substituir um pacote por uma versão inferior"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Configurar qualquer pacote que poderá ajudar este"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Processar pacotes incidentes mesmo quando em manter"
+
+#: src/force.c
+msgid "Try to (de)install things even when not root"
+msgstr "Tentar (des)instalar coisas mesmo não sendo root"
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "Faltam programas importantes em PATH, seguramente problemas"
+
+#: 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/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Processar até pacotes com versões erradas"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Instalar sempre ficheiros de configuração em falta"
+
+#: 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/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/force.c
+msgid "Remove an essential package"
+msgstr "Remover um pacote essencial"
+
+#: src/force.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/force.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/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 desconhecida de forçar/recusar '%.*s'"
+
+#: src/force.c
+#, c-format
+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: "
 
@@ -3573,115 +3804,6 @@ msgstr ""
 "Opções marcadas com [*] produzem muita saída de texto - utilize pipes com "
 "'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"
@@ -3813,44 +3935,6 @@ msgstr ""
 "nao pode remover a arquitectura '%s' actualmente em utilização pela base de "
 "dados"
 
-#: 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"
@@ -4506,14 +4590,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"
@@ -4584,6 +4683,12 @@ msgstr "não está presente nenhum 'override'"
 msgid "--update is useless for --remove"
 msgstr "--update é inútil para --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| msgid "obsolete option '--%s'; please use '--%s' instead"
+msgid "deprecated --%s option; use --%s instead"
+msgstr "opção obsoleta '--%s'; por favor utilize antes '--%s'"
+
 #: src/trigcmd.c
 msgid "Type dpkg-trigger --help for help about this utility."
 msgstr "Escreva dpkg-trigger --help para ajuda acerca deste utilitário."
@@ -4963,16 +5068,22 @@ 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"
+#, 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 ""
 "não foi possível aceder à area de status do dpkg para uma completa "
 "actualização"
 
 #: 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 ""
-"actualização completa de disponibilidade necessita de acesso de escrita à "
-"área de estado do dpkg"
+"não foi possível aceder à area de status do dpkg para uma completa "
+"actualização"
 
 #: src/update.c
 #, c-format
@@ -6676,6 +6787,49 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 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 "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"
 
@@ -6710,9 +6864,6 @@ msgstr "É necessária autenticação para correr update-alternatives"
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "falhou o chdir para o directório após o ter criado"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "opção obsoleta '--%s'; por favor utilize antes '--%s'"
-
 #~ msgid "control file '%s' missing value"
 #~ msgstr "falta valor no ficheiro de controlo '%s'"
 
@@ -7424,9 +7575,6 @@ msgstr "É necessária autenticação para correr update-alternatives"
 #~ 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 0ff8a8897..4643e617a 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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."
@@ -379,35 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 ""
 "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 "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"
+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
@@ -415,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
@@ -628,9 +636,12 @@ msgid "syntax error in statoverride file"
 msgstr "falhou ao abrir arquivo \"statoverride\""
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "falhou ao abrir arquivo \"statoverride\""
+#, 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
@@ -638,9 +649,13 @@ 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
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "falhou ao abrir arquivo \"statoverride\""
+#, 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
@@ -789,69 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "campo de detalhes de arquivo '%s' vazio"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "muitos valores no campo de detalhes de arquivo '%s' (comparado a outros)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -861,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
@@ -899,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"
 "\")"
@@ -994,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
@@ -1004,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
@@ -1273,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
@@ -1305,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
@@ -1315,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"
@@ -1340,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
@@ -1739,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
@@ -2312,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 ""
 
@@ -3472,7 +3502,162 @@ msgstr ""
 "Pacote %s está sendo retido, não vou tocá-lo. Use --force-hold para "
 "sobrepor.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+
+#: src/force.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/force.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/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/force.c
+#, fuzzy, c-format
+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 ""
@@ -3857,114 +4042,6 @@ msgstr ""
 "Opções marcadas com [*] produzem muita saída de texto - passe-a por 'less' "
 "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 ""
@@ -4096,33 +4173,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 "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"
@@ -4816,7 +4866,10 @@ msgid ""
 "  --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"
@@ -4896,6 +4949,11 @@ msgstr "Nenhum \"override\" presente."
 msgid "--update is useless for --remove"
 msgstr "aviso: --update é inútil para --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+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."
 msgstr "Digite dpkg-trigger --help para ajuda sobre este utilitário."
@@ -5332,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
@@ -7188,6 +7252,57 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| 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 "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"
 
@@ -7232,15 +7347,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "falhou ao mudar para o diretório após criá-lo"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Aviso: opção obsoleta '--%s'\n"
-
-#, 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"
-
 #, fuzzy
 #~| msgid "cannot stat old name `%s': %s"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/ro.po b/po/ro.po
index e4ddaedcf..0511d8617 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -394,36 +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
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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"
+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
@@ -431,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
@@ -658,20 +664,25 @@ msgid "syntax error in statoverride file"
 msgstr "eroare de sintaxă în fișierul statoverride"
 
 #: lib/dpkg/db-fsys-override.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"
+#, 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
-#, 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"
+#, 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
@@ -825,71 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "câmp „%s” cu detalii fișier gol"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "prea multe valori în câmpul detaliilor fișier „%s” (comparativ cu altele)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -899,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
@@ -937,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
@@ -1031,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
@@ -1041,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
@@ -1313,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
@@ -1345,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
@@ -1355,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"
 
@@ -1380,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
@@ -1797,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
@@ -2383,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>"
 
@@ -3541,7 +3566,163 @@ msgstr ""
 "Pachetul %s este reținut, nu se atinge. Folosiți --force-hold pentru al "
 "forța.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+
+#: src/force.c
+msgid "Remove an essential package"
+msgstr ""
+
+#: src/force.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/force.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/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ț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: "
 
@@ -3962,114 +4143,6 @@ msgstr ""
 "Opțiunile marcate cu [*] produc foarte mult text - redirectați prin „less” "
 "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 ""
@@ -4204,34 +4277,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 "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"
@@ -4976,7 +5021,10 @@ msgid ""
 "  --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"
@@ -5052,6 +5100,12 @@ msgstr "Nu este prezentă nici o înlocuire."
 msgid "--update is useless for --remove"
 msgstr "--update este inutil pentru --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| 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."
 msgstr "Tastați dpkg-trigger --help pentru ajutor despre acest utilitar."
@@ -5484,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
@@ -7423,6 +7483,63 @@ 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 "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 "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"
 
@@ -7477,16 +7594,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "eșec la schimbarea directorului după crearea lui"
 
-#, 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."
-
-#, fuzzy
-#~| msgid "cannot stat file '%s'"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "stat imposibil pentru fișierul „%s”"
-
 #, fuzzy
 #~| msgid "cannot stat file '%s'"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/ru.po b/po/ru.po
index a2b13b878..99ad90099 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -344,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-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"
+#, 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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "база данных состояния dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -375,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
@@ -582,8 +593,11 @@ msgstr "синтаксическая ошибка в файле statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "неизвестный пользователь «%s» в файле statoverride"
+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"
@@ -591,8 +605,12 @@ msgstr "неожиданный конец строки в файле statoverrid
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "неизвестная группа «%s» в файле statoverride"
+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
@@ -737,67 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "пустое значение в поле информации о файле «%s»"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "значение «да» или «нет» в логическом поле"
+#, 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
@@ -806,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
@@ -833,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
@@ -923,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
@@ -933,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
@@ -1199,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
@@ -1228,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
@@ -1237,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 имел файлы настройки, можно не принимать во "
 "внимание"
@@ -1265,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, для "
 "которого имеется несколько установленных экземпляров"
@@ -1661,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
@@ -2208,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 "<стандартный вывод>"
 
@@ -3303,7 +3361,174 @@ msgstr ""
 "Пакет %s зафиксирован и не будет обработан. Если вас это не устраивает, "
 "используйте --force-hold.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Установить все параметры игнорирования"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+"Попытаться выполнить установку/удаление даже не имея прав суперпользователя"
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "В PATH отсутствуют важные программы, возможны проблемы"
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Всегда устанавливать отсутствующие файлы настройки"
+
+#: 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/force.c
+msgid "Remove an essential package"
+msgstr "Удалить пакет первой необходимости"
+
+#: src/force.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/force.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/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/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "устаревший параметр игнорирования/обработки «%s»\n"
+
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "проблема игнорируется, поскольку задан параметр --force:"
 
@@ -3689,116 +3914,6 @@ msgstr ""
 "Команды, отмеченные [*], выводят большое количество информации.\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 ""
-"Попытаться выполнить установку/удаление даже не имея прав суперпользователя"
-
-#: 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 "Общая полезная информация о происходящих событиях"
@@ -3929,43 +4044,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"
-"обнаружении ошибок:\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"
@@ -4673,7 +4751,10 @@ msgid ""
 "  --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"
@@ -4740,6 +4821,12 @@ msgstr "нет замещений"
 msgid "--update is useless for --remove"
 msgstr "--update бесполезен вместе с --remove"
 
+#: 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."
 msgstr "Чтобы получить справку, введите dpkg-trigger --help."
@@ -5120,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
@@ -6898,6 +6991,47 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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"
 
@@ -6936,9 +7070,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "не удалось после создания каталога перейти в него"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "устаревший параметр «--%s»; вместо него используйте «--%s»."
-
 #~ msgid "control file '%s' missing value"
 #~ msgstr "в управляющем файле «%s» отсутствует значение"
 
@@ -7617,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 c469569c4..90c76f514 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -346,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "stavová databáza dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -377,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
@@ -585,20 +596,25 @@ msgid "syntax error in statoverride file"
 msgstr "syntaktická chyba v súbore statoverride"
 
 #: lib/dpkg/db-fsys-override.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"
+#, 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
-#, 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"
+#, 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
@@ -740,41 +756,43 @@ 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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "prázdne pole s podrobnosťami súboru „%s“"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "príliš veľa hodnôt v poli s podrobnosťami súboru „%s“ (v porovnaní s "
 "ostatnými)"
@@ -782,27 +800,32 @@ msgstr ""
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -812,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
@@ -850,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
@@ -937,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
@@ -947,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
@@ -1213,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
@@ -1244,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
@@ -1255,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"
@@ -1283,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"
@@ -1670,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
@@ -2213,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>"
 
@@ -3347,7 +3386,173 @@ msgstr ""
 "Balík %s je v stave podržaný, ponecháva sa. Použite --force-hold na "
 "prekonanie.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Nastaviť všetky voľby vynútenia"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Nahradiť balík nižšou verziou"
+
+#: 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/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Spracovať náhodné balíky aj pri podržaní"
+
+#: 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/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/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Nainštalovať balík aj ak neprejde kontrolou autentickosti"
+
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Spracovávať aj balíky s nesprávnymi verziami"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Vždy inštalovať chýbajúce konfiguračné súbory"
+
+#: 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/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 ""
+"%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/force.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/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 "neznáma vynucovacia/odmietacia voľba „%.*s“"
+
+#: 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/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "prekonáva sa problém, pretože je nastavené --force: "
 
@@ -3762,115 +3967,6 @@ msgstr ""
 "\n"
 "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"
@@ -4000,43 +4096,6 @@ msgstr "odstraňuje sa architektúra „%s“, ktorú momentálne používa data
 msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr "nemožno odstrániť architektúru „%s“, ktorú momentálne používa databáza"
 
-#: 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"
@@ -4742,7 +4801,10 @@ msgid ""
 "  --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"
@@ -4809,6 +4871,12 @@ msgstr "nie je prítomné žiadne prekonanie"
 msgid "--update is useless for --remove"
 msgstr "--update je nepoužiteľný pri --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| 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."
 msgstr "Pomocníka k tomuto nástroju zobrazíte napísaním dpkg-trigger --help"
@@ -5208,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
@@ -6961,6 +7034,55 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ msgid "unable to open lock file %s for testing"
+#~ msgstr "nie je možné otvoriť súbor zámku %s na testovanie"
+
+#, fuzzy
+#~| 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"
 
@@ -6999,14 +7121,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "zlyhalo vykonanie chdir do adresára po jeho vytvorení"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "zastaraná voľba „--%s“. Prosím, použite namiesto nej „--%s“"
-
-#, fuzzy
-#~| msgid "control file '%s' does not exist"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "riadiaci súbor „%s“ neexistuje"
-
 #, fuzzy
 #~| msgid "control file '%s' does not exist"
 #~ msgid "control file '%s' missing value separator"
diff --git a/po/sv.po b/po/sv.po
index c8fd8e1be..fba8634d9 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -342,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg-statusdatabas"
 
 #: lib/dpkg/dbmodify.c
@@ -373,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
@@ -578,8 +589,11 @@ msgstr "syntaxfel i statoverride-fil"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "användaren \"%s\" i statoverride-filen är okänd"
+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"
@@ -587,8 +601,12 @@ msgstr "oväntat radslut i statoverride-fil"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "gruppen \"%s\" i statoverride-filen är okänd"
+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
@@ -730,64 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "tomt filinformationfält \"%s\""
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 "för många värden i fildetaljsfältet \"%s\" (jämfört med andra)"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "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
@@ -796,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
@@ -823,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
@@ -913,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
@@ -923,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
@@ -1188,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
@@ -1217,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
@@ -1226,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
@@ -1251,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"
@@ -1635,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
@@ -2181,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>"
 
@@ -3257,7 +3315,170 @@ 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
+#: src/force.c
+msgid "Set all force options"
+msgstr "Aktivera alla tvingande flaggor"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Ersätt paket med en lägre version"
+
+#: src/force.c
+msgid "Configure any package which may help this one"
+msgstr "Konfigurera godtyckligt paket som kan hjälpa detta"
+
+#: src/force.c
+msgid "Process incidental packages even when on hold"
+msgstr "Hantera oväsentliga paket även när de hålls"
+
+#: 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/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr "PATH saknar viktiga program, problem trolliga"
+
+#: src/force.c
+msgid "Install a package even if it fails authenticity check"
+msgstr "Installera paket även om autentisering misslyckas"
+
+#: src/force.c
+msgid "Process even packages with wrong versions"
+msgstr "Hantera även paket med fel versioner"
+
+#: src/force.c
+msgid "Overwrite an existing stat override when adding it"
+msgstr ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Installera alltid saknade konfigurationsfiler"
+
+#: 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/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 ""
+"%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/force.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/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 "okänd flagga för force/refuse: \"%.*s\""
+
+#: 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/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "ignorerar problem då --force använts:"
 
@@ -3603,113 +3824,6 @@ msgstr ""
 "Flaggor markerade med [*] ger mycket utdata - kör genom \"less\" eller \"more"
 "\"!"
 
-#: 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"
@@ -3839,42 +3953,6 @@ msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr ""
 "kan inte ta bort arkitekturen \"%s\" som för närvarande används av 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 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"
@@ -4564,7 +4642,10 @@ msgid ""
 "  --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"
@@ -4631,6 +4712,12 @@ msgstr "det finns inga överskrivningar"
 msgid "--update is useless for --remove"
 msgstr "--update är oanvändbar tillsammans med --remove"
 
+#: src/statcmd.c
+#, fuzzy, c-format
+#| 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."
 msgstr "Skriv dpkg-trigger --help för hjälp om detta verktyg."
@@ -5007,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
@@ -6732,6 +6825,47 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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"
 
@@ -6770,9 +6904,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "kunde inte byta till katalog efter att ha skapat den"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "föråldrad flagga \"--%s\", använd \"--%s\" istället"
-
 #~ msgid "control file '%s' missing value"
 #~ msgstr "styrfilen \"%s\" saknar värde"
 
@@ -7445,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 7f645a474..d3768626b 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -336,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-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"
+#, 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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "ฐานข้อมูลสถานะของ dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -367,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
@@ -568,8 +579,11 @@ msgstr "พบรูปแบบผิดพลาดในแฟ้ม statover
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "พบผู้ใช้ '%s' ที่ไม่รู้จักอยู่ในแฟ้ม statoverride"
+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"
@@ -577,8 +591,12 @@ msgstr "พบจุดจบบรรทัดก่อนกำหนดใน
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "พบกลุ่ม '%s' ที่ไม่รู้จักอยู่ในแฟ้ม statoverride"
+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
@@ -720,64 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "เขตข้อมูลรายละเอียดแฟ้ม `%s' ว่างเปล่า"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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"
+#, 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
@@ -786,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
@@ -813,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
@@ -897,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
@@ -907,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
@@ -1172,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
@@ -1201,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
@@ -1210,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
@@ -1234,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
@@ -1616,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
@@ -2138,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 "<เอาต์พุตมาตรฐาน>"
 
@@ -3200,7 +3258,170 @@ msgstr ""
 "แพกเกจ %s ถูกกำหนดให้คงรุ่นไว้ จะไม่ทำอะไรกับแพกเกจดังกล่าว ใช้ตัวเลือก --force-hold "
 "ถ้าจะบังคับให้ทำ\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "บังคับทุกรายการ"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 "PATH ขาดโปรแกรมสำคัญ ซึ่งน่าจะเป็นปัญหา"
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "ติดตั้งแฟ้มค่าตั้งที่ขาดหายเสมอ"
+
+#: 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/force.c
+msgid "Remove an essential package"
+msgstr "ถอดถอนแพกเกจจำเป็น"
+
+#: src/force.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/force.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/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/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "ตัวเลือก force/refuse '%s' เลิกใช้แล้ว\n"
+
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "จะข้ามปัญหาไปเพราะมีการเปิดตัวเลือก --force:"
 
@@ -3539,113 +3760,6 @@ msgstr ""
 "\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 "ไม่ต้องใช้การกระทำ 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 "ข้อมูลความคืบหน้าทั่วไปที่เป็นประโยชน์"
@@ -3774,42 +3888,6 @@ msgstr "กำลังลบสถาปัตยกรรม '%s' ซึ่ง
 msgid "cannot remove architecture '%s' currently in use by the database"
 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"
@@ -4490,7 +4568,10 @@ msgid ""
 "  --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"
@@ -4555,6 +4636,12 @@ msgstr "ไม่มีรายการ override อยู่"
 msgid "--update is useless for --remove"
 msgstr "--update ไม่มีประโยชน์อะไรสำหรับ --remove"
 
+#: 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."
 msgstr "พิมพ์ dpkg-trigger --help เพื่อดูวิธีใช้โปรแกรมนี้"
@@ -4915,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
@@ -6612,6 +6705,46 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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"
 
@@ -6650,9 +6783,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "เปลี่ยนเข้าไดเรกทอรีหลังจากสร้างแล้วไม่สำเร็จ"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "ตัวเลือก '--%s' เลิกใช้แล้ว กรุณาใช้ '--%s' แทน"
-
 #~ msgid "control file '%s' missing value"
 #~ msgstr "แฟ้มควบคุม '%s' ขาดข้อมูล"
 
@@ -7105,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 8a9ca0ab8..68f8e2fdf 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -365,32 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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"
+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
@@ -398,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"
@@ -618,9 +626,12 @@ msgid "syntax error in statoverride file"
 msgstr "bigo sa pagbukas ng talaksang statoverride"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "bigo sa pagbukas ng talaksang statoverride"
+#, 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
@@ -628,9 +639,13 @@ 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
-#, fuzzy, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "bigo sa pagbukas ng talaksang statoverride"
+#, 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
@@ -766,43 +781,42 @@ 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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "walang laman ang saklaw ng detalyeng talaksan `%s'"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "labis ang dami ng halaga sa saklaw ng detalyeng talaksan `%s' (hinambing sa "
 "iba)"
@@ -810,27 +824,33 @@ msgstr ""
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -839,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
@@ -875,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
@@ -970,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
@@ -980,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
@@ -1243,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
@@ -1274,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
@@ -1283,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"
@@ -1307,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
@@ -1694,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
@@ -2245,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 ""
 
@@ -3356,7 +3384,162 @@ msgstr ""
 "upang\n"
 "ma-override.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr ""
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "PATH is missing important programs, problems likely"
+msgstr ""
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr ""
+
+#: 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
+#, 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 ""
+
+#: src/force.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/force.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/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/force.c
+#, fuzzy, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "Babala: laos na opsyon `--%s'\n"
+
+#: src/force.c
 #, fuzzy
 msgid "overriding problem because --force enabled:"
 msgstr ""
@@ -3685,114 +3868,6 @@ msgstr ""
 "Mga opsyon na may markang [*] ay nagpapakita ng maraming output - i-pipe ito "
 "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 ""
@@ -3924,33 +3999,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 "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"
@@ -4661,7 +4709,10 @@ msgid ""
 "  --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,6 +4767,11 @@ msgstr ""
 msgid "--update is useless for --remove"
 msgstr ""
 
+#: src/statcmd.c
+#, fuzzy, c-format
+msgid "deprecated --%s option; use --%s instead"
+msgstr "Babala: laos na opsyon `--%s'\n"
+
 #: src/trigcmd.c
 #, fuzzy
 msgid "Type dpkg-trigger --help for help about this utility."
@@ -5100,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
@@ -6815,6 +6875,50 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#, fuzzy
+#~| 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 "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"
 
@@ -6868,14 +6972,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "bigo na mag-chdir sa directory matapos likhain ito"
 
-#, fuzzy
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "Babala: laos na opsyon `--%s'\n"
-
-#, fuzzy
-#~ msgid "control file '%s' missing value"
-#~ msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
-
 #, fuzzy
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "hindi ma-stat ang `%.255s' (sa `%.255s')"
diff --git a/po/tr.po b/po/tr.po
index 529095f8a..2111f9cb6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -343,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg durum veritabanı"
 
 #: lib/dpkg/dbmodify.c
@@ -374,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
@@ -579,8 +590,11 @@ msgstr "statoverride dosyasında söz dizimi hatası"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "'statoverride' dosyasında bilinmeyen '%s' kullanıcısı"
+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"
@@ -588,8 +602,12 @@ msgstr "statoverride dosyasında beklenmeyen satır sonu"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "'statoverride' dosyasında bilinmeyen '%s' grubu"
+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
@@ -709,66 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "dosya ayrıntıları alanı (%s) boş"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "dosya ayrıntıları alanı (%s) diğer alanlara kıyasla çok fazla değer içeriyor"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -777,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
@@ -804,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ş"
 
@@ -893,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
@@ -903,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
@@ -1169,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
@@ -1199,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
@@ -1208,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"
@@ -1236,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"
@@ -1608,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
@@ -2161,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ı>"
 
@@ -3238,7 +3295,170 @@ msgstr ""
 "%s paketi tutuluyor, bu pakete dokunulmayacak. Geçersiz kılmak için\n"
 "  --force-hold seçeneğini kullanabilirsiniz.\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "Tüm zorlama seçeneklerini ayarla"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: src/force.c
+msgid "Replace a package with a lower version"
+msgstr "Bir paketi eski bir sürümüyle değiştir"
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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/force.c
+msgid "Overwrite a diverted file with an undiverted version"
+msgstr "Yönlendirilmemiş bir dosyayı yönlendirilmiş olanın üzerine yaz"
+
+#: 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/force.c
+msgid "Do not perform safe I/O operations when unpacking"
+msgstr "Paket açarken güvenli G/Ç işlemlerini kullanma"
+
+#: 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/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/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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "Eksik yapılandırma dosyalarını her zaman kur"
+
+#: 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/force.c
+msgid "Process even packages with wrong or no architecture"
+msgstr "Yanlış mimariye sahip ya da mimarisi olmayan paketleri bile işle"
+
+#: 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 ""
+"%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/force.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/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 "bilinmeyen zorlama/reddetme seçeneği '%.*s'"
+
+#: src/force.c
+#, c-format
+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:"
 
@@ -3610,114 +3830,6 @@ msgstr ""
 "[*] ile işaretlenmiş komutlar çok miktarda çıktı üretir - 'less' ya da\n"
 "'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"
@@ -3850,41 +3962,6 @@ msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr ""
 "veritabanı tarafından hâlâ kullanılmakta olan '%s' mimarisi kaldırılamıyor"
 
-#: 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"
@@ -4578,7 +4655,10 @@ msgid ""
 "  --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"
@@ -4643,6 +4723,13 @@ msgstr "herhangi bir geçersiz kılma mevcut değil"
 msgid "--update is useless for --remove"
 msgstr "--remove için --update gereksizdir"
 
+#: 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."
 msgstr ""
@@ -5018,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
@@ -6746,6 +6839,49 @@ 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 "package has status triggers-pending but no triggers pending"
+#~ msgstr ""
+#~ "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ı"
 
@@ -6777,14 +6913,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "dizin oluşturulduktan sonra dizine geçilemedi"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr ""
-#~ "'--%s' seçeneği kullanımdan kalkmıştır; lütfen bunun yerine '--%s' "
-#~ "kullanın"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "'%s' denetim dosyasında eksik değer"
-
 #~ 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 657bbd1dd..b8c63fbd1 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -345,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-msgid "unable to open/create frontend 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 "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 "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 "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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "cơ sở dữ liệu trạng thái dpkg"
 
 #: lib/dpkg/dbmodify.c
@@ -376,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
@@ -581,8 +592,11 @@ msgstr "gặp lỗi cú pháp trong tập tin stateoverride"
 
 #: lib/dpkg/db-fsys-override.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"
+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"
@@ -590,8 +604,12 @@ 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 group '%s' in statoverride file"
-msgstr " nhóm chưa biết “%s” trong tập tin stateoverride"
+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
@@ -733,66 +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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive 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
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-msgid "archive 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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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 ""
 "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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 ""
 "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
@@ -801,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
@@ -828,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
@@ -915,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
@@ -925,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
@@ -1189,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
@@ -1218,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
@@ -1227,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"
@@ -1253,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"
@@ -1638,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
@@ -2179,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>"
 
@@ -3271,7 +3329,172 @@ 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
+#: 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 ""
+
+#: 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 ""
+"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/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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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/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/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/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/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 "Luôn dùng các tập tin cấu hình mới, không cần hỏi"
+
+#: 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/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 ""
+"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/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/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/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/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 ""
+"%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/force.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/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 "không rõ tùy chọn ép buộc hoặc từ chối “%.*s”"
+
+#: src/force.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/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 "
@@ -3654,115 +3877,6 @@ msgstr ""
 "Tùy chọn có dấu [*] thì xuất nhiều — hãy gửi qua ống dẫn cho “less” hoặc "
 "“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"
@@ -3895,42 +4009,6 @@ msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr ""
 "không thể gỡ bỏ kiến trúc “%s” hiện tại đang được dùng bởi cơ sở dữ liệu"
 
-#: 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"
@@ -4627,7 +4705,10 @@ msgid ""
 "  --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"
@@ -4692,6 +4773,12 @@ 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/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."
 msgstr "Gõ “dpkg-trigger --help” để xem trợ giúp về tiện ích này."
@@ -5060,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
@@ -6813,6 +6906,48 @@ msgstr ""
 msgid "Authentication is required to run update-alternatives"
 msgstr ""
 
+#~ 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 "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”"
 
@@ -6851,12 +6986,6 @@ msgstr ""
 #~ 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 "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 "control file '%s' missing value"
-#~ msgstr "tập tin điều khiển “%s” thiếu giá trị"
-
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "tập tin điều khiển “%s” thiếu giá trị ngăn cách"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 84879dfbe..bfaa931ff 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -346,28 +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
-msgid "unable to open/create frontend lockfile"
+#, 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"
+#, 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 frontend"
+#, fuzzy
+#| msgid "dpkg frontend"
+msgid "dpkg frontend lock"
 msgstr "dpkg 前端"
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "dpkg 状态数据库"
 
 #: lib/dpkg/dbmodify.c
@@ -375,11 +386,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
@@ -570,8 +585,11 @@ msgstr "statoverride 文件中有语法错误"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown user '%s' in statoverride file"
-msgstr "在 statoverride 文件中有未知用户 '%s'"
+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"
@@ -579,8 +597,12 @@ msgstr "statoverride 文件有非预期的行结束符"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
-msgid "unknown group '%s' in statoverride file"
-msgstr "statoverride 文件有无效组 %s "
+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
@@ -698,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 archive details field '%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 "archive 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 "状态文件不允许档案详情字段 ‘%s’ "
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too many values in archive 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 "档案详情字段 %s 的值过多(和其他的相比)"
 
 #: lib/dpkg/fields.c
-#, c-format
-msgid "too few values in archive 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 "档案详情字段 %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
@@ -760,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"
+#, 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"
+#, 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"
+#, 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
@@ -787,12 +830,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
@@ -871,9 +917,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
@@ -881,8 +928,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
@@ -1137,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
@@ -1166,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
@@ -1175,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
@@ -1197,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
@@ -1547,12 +1610,15 @@ msgid "treewalk root %s is not a directory"
 msgstr "treewalk 的根节点 %s 不是一个目录"
 
 #: 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
@@ -2057,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 "<标准输出>"
 
@@ -3098,7 +3164,168 @@ msgstr ""
 "软件包 %s 被要求保持原来的版本，因而不会去改动它。请使用 --force-hold 选项来"
 "忽略该设置。\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "设置所有的强制选项"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 "环境变量 PATH 里缺失重要的程序，问题可能"
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "总是安装缺失的配置文件"
+
+#: 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/force.c
+msgid "Remove an essential package"
+msgstr "移除一个至关重要的软件包"
+
+#: src/force.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/force.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/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/force.c
+#, c-format
+msgid "obsolete force/refuse option '%s'"
+msgstr "废弃的强制或拒绝选项 '%s'"
+
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "由于开启了 --force 选项，以下问题被忽略："
 
@@ -3396,113 +3623,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 "不要 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 "常规的进度信息"
@@ -3631,40 +3751,6 @@ msgstr "将要移除的体系结构 %s ，当前仍被数据库使用"
 msgid "cannot remove architecture '%s' currently in use by the database"
 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"
@@ -4290,14 +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"
@@ -4360,6 +4461,12 @@ msgstr "override 不存在。"
 msgid "--update is useless for --remove"
 msgstr "对于 --remove，--update 是无效的"
 
+#: 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."
 msgstr "输入 'dpkg-trigger --help' 以获取此功能的帮助信息。"
@@ -4716,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
@@ -6336,6 +6449,45 @@ msgstr "运行 update-alternatives 工具以修改系统可选项的选择情况
 msgid "Authentication is required to run update-alternatives"
 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 "%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 "软件包处于触发器等待状态，但没有触发器在等待"
+
+#~ 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 文件"
 
@@ -6366,12 +6518,6 @@ msgstr "需要认证后才能执行 update-alternatives"
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "新建目录后，chdir 到该目录失败"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "废弃的选项 --%s，请使用 --%s 代替"
-
-#~ msgid "control file '%s' missing value"
-#~ msgstr "control 文件 %s 中缺少值"
-
 #~ msgid "control file '%s' missing value separator"
 #~ msgstr "control 文件 %s 缺少值分隔符"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b4e09b722..527940745 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 17:59+0100\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"
@@ -339,30 +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
-#, fuzzy
+#, fuzzy, c-format
 #| msgid "unable to open/create status database lockfile"
-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"
+#, 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 frontend"
+msgid "dpkg frontend lock"
 msgstr ""
 
 #: lib/dpkg/dbmodify.c
-msgid "dpkg status database"
+#, fuzzy
+#| msgid "dpkg status database"
+msgid "dpkg database lock"
 msgstr "無法鎖定 dpkg 的狀態資料庫"
 
 #: lib/dpkg/dbmodify.c
@@ -370,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
@@ -572,20 +583,25 @@ msgid "syntax error in statoverride file"
 msgstr "statoverride 檔語法錯誤"
 
 #: lib/dpkg/db-fsys-override.c
-#, fuzzy, c-format
-#| msgid "syntax error: unknown user '%s' in statoverride file"
-msgid "unknown user '%s' in statoverride file"
-msgstr "語法錯誤：statoverride 的使用者 '%s' 不明"
+#, 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
-#, fuzzy, c-format
-#| msgid "syntax error: unknown group '%s' in statoverride file"
-msgid "unknown group '%s' in statoverride file"
-msgstr "語法錯誤：statoverride 檔中未知的 '%s' 群組"
+#, 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
@@ -701,64 +717,73 @@ msgid "internal error"
 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
 #, fuzzy, c-format
 #| msgid "empty file details field '%s'"
-msgid "empty archive details field '%s'"
+msgid "empty archive details '%s' field"
 msgstr "檔案說明欄位 `%s' 是空的"
 
 #: lib/dpkg/fields.c
 #, fuzzy, c-format
 #| msgid "file details field '%s' not allowed in status file"
-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
 #, fuzzy, c-format
 #| msgid "too many values in file details field '%s' (compared to others)"
-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
 #, fuzzy, c-format
 #| msgid "too few values in file details field '%s' (compared to others)"
-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 "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
-msgid "word in 'Priority' field"
+#, fuzzy, c-format
+#| msgid "word in 'Priority' field"
+msgid "word in '%s' field: %s"
 msgstr "「優先等級」欄位中的字"
 
 #: lib/dpkg/fields.c
@@ -767,25 +792,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」欄位中的第一個字 (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」欄位中的第二個字 (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」欄位中的第三個字 (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
@@ -794,12 +827,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 "root 或空目錄也被列為 conffile"
 
 #: lib/dpkg/fields.c
@@ -878,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
@@ -888,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
@@ -1152,27 +1190,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 "套件存在 Configured-Version 但處於錯誤的狀態中"
 
 #: lib/dpkg/parse.c
@@ -1181,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
@@ -1190,11 +1236,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 "該套件的狀態是尚未安裝，但是它卻有 conffile，不去理會它"
 
 #: lib/dpkg/parse.c
@@ -1212,10 +1262,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 "已安裝多份的 %4$s ，無法同時安裝 %1$s %2$s（多硬體平台：%3$s）"
 
 #: lib/dpkg/parse.c
@@ -1575,8 +1628,9 @@ msgid "treewalk root %s is not a directory"
 msgstr "目錄樹遊走(treewalk)的根節點「%s」不是個目錄"
 
 #: 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」"
 
 # file_lock(&lock_fd, FILE_LOCK_WAIT, fn.buf, _("triggers area"));
@@ -1584,7 +1638,9 @@ msgstr "無法開啟或建立觸發程式鎖定檔「%.250s」"
 # 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"
+#, fuzzy
+#| msgid "triggers area"
+msgid "triggers database lock"
 msgstr "觸發程式區域"
 
 #: lib/dpkg/trigdeferred.c
@@ -2098,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 "<標準輸出>"
 
@@ -3158,7 +3214,168 @@ msgid ""
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "套件 %s 目前保留，不會去變動。用 --force-hold 來忽略該設定。\n"
 
-#: src/errors.c
+#: src/force.c
+msgid "Set all force options"
+msgstr "設定所有強制選項"
+
+#: src/force.c
+msgid "Use MAC based security if available"
+msgstr ""
+
+#: 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 "PATH 中缺少重要程式，可能是問題"
+
+#: 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 ""
+
+#: src/force.c
+msgid "Ignore a missing stat override when removing it"
+msgstr ""
+
+#: 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 ""
+"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/force.c
+msgid "Always install missing config files"
+msgstr "永遠安裝缺的設定檔"
+
+#: 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/force.c
+msgid "Remove an essential package"
+msgstr "移除核心套件"
+
+#: src/force.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/force.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/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/force.c
+#, fuzzy, c-format
+#| msgid "obsolete force/refuse option '%s'\n"
+msgid "obsolete force/refuse option '%s'"
+msgstr "已作廢的 force/refuse 選項 '%s'\n"
+
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "使用了 --force 選項，忽略問題："
 
@@ -3497,112 +3714,6 @@ msgstr ""
 "\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 "移除核心套件"
-
 #: src/main.c
 msgid "Generally helpful progress information"
 msgstr "普通的輔助進度資料"
@@ -3732,41 +3843,6 @@ msgstr "移除資料庫正在使用的 '%s' 硬體平台"
 msgid "cannot remove architecture '%s' currently in use by the database"
 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"
@@ -4444,7 +4520,10 @@ msgid ""
 "  --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"
@@ -4509,6 +4588,12 @@ msgstr "沒有設定強制選項"
 msgid "--update is useless for --remove"
 msgstr "--remove 時 --update 無效"
 
+#: 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."
 msgstr "輸入 dpkg-trigger --help 以取得這個工具的說明。"
@@ -4878,12 +4963,18 @@ msgid "--%s takes at most one Packages-file argument"
 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
@@ -6524,6 +6615,49 @@ 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 "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 檔時發生錯誤"
 
@@ -6562,14 +6696,6 @@ msgstr ""
 #~ msgid "failed to chdir to directory after creating it"
 #~ msgstr "建立目錄後，無法切換到該目錄"
 
-#~ msgid "obsolete option '--%s'; please use '--%s' instead"
-#~ msgstr "已作廢選項 '--%s' ；請改用 '--%s'"
-
-#, fuzzy
-#~| msgid "control file '%s' does not exist"
-#~ msgid "control file '%s' missing value"
-#~ msgstr "查無控制檔 '%s'"
-
 #, fuzzy
 #~| msgid "control file '%s' does not exist"
 #~ msgid "control file '%s' missing value separator"
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 5e4e9d297..3b9db9925 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -8,7 +8,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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2017-05-07 16:26+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -692,13 +692,17 @@ msgid "unknown %% substitution in hook: %%%s"
 msgstr "la substitució %% és desconeguda en el lligam: %%%s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+#, 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 "
-"instead"
+"in %s or %s instead"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
diff --git a/scripts/po/de.po b/scripts/po/de.po
index 1391706e9..96c58ae3b 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\n"
 "PO-Revision-Date: 2019-01-23 18:40+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -591,15 +591,24 @@ msgid "unknown %% substitution in hook: %%%s"
 msgstr "unbekannte %% Substitution in Hook: %%%s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+#, fuzzy, perl-format
+#| msgid ""
+#| "short OpenPGP key IDs are broken; please use key fingerprints instead"
+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"
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy, perl-format
+#| msgid ""
+#| "long OpenPGP key IDs are strongly discouraged; please use key "
+#| "fingerprints instead"
 msgid ""
 "long OpenPGP key IDs are strongly discouraged; please use key fingerprints "
-"instead"
+"in %s or %s instead"
 msgstr ""
 "von langen OpenPGP-Schlüsselkennungen wird klar abgeraten; bitte verwenden "
 "Sie stattdessen Fingerabdrücke"
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 191ff60fe..d329a9159 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.3\n"
+"Project-Id-Version: dpkg 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
@@ -428,13 +428,17 @@ msgid "unknown %% substitution in hook: %%%s"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl
-msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+#, 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 "
-"instead"
+"in %s or %s instead"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
diff --git a/scripts/po/es.po b/scripts/po/es.po
index d2d5aa8c4..161ed57b1 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
@@ -709,13 +709,17 @@ msgid "unknown %% substitution in hook: %%%s"
 msgstr "variable de sustitución %% desconocida en gancho: %%%s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+#, 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 "
-"instead"
+"in %s or %s instead"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index 2d45aacd2..833c03500 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
@@ -696,13 +696,17 @@ msgid "unknown %% substitution in hook: %%%s"
 msgstr "substitution %% inconnue dans le point d'ancrage: %%%s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+#, 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 "
-"instead"
+"in %s or %s instead"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index 47ada8130..8ab9d2cc6 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
@@ -662,13 +662,17 @@ msgid "unknown %% substitution in hook: %%%s"
 msgstr "nieznane podstawienie %% w hooku: %%%s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+#, 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 "
-"instead"
+"in %s or %s instead"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index 244369005..cc1429600 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
@@ -667,13 +667,17 @@ msgid "unknown %% substitution in hook: %%%s"
 msgstr "неизвестная подстановка %% в ловушке: %%%s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+#, 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 "
-"instead"
+"in %s or %s instead"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index c89f22a4d..3dc6fdb35 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: 2019-01-22 14:24+0100\n"
+"POT-Creation-Date: 2019-02-23 18:00+0100\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"
@@ -654,13 +654,17 @@ msgid "unknown %% substitution in hook: %%%s"
 msgstr "okänd %%-substituering i krok: %%%s"
 
 #: scripts/dpkg-buildpackage.pl
-msgid "short OpenPGP key IDs are broken; please use key fingerprints instead"
+#, 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 "
-"instead"
+"in %s or %s instead"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
-- 
cgit v1.2.3


From 6b405c6db943486bbb59a476d71c86db55ebe237 Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Sun, 24 Feb 2019 17:43:50 +0100
Subject: Update German scripts translation

Update to 603t.
---
 debian/changelog |  4 ++++
 scripts/po/de.po | 15 +++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 8b0eb4199..b4b7d3554 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 dpkg (1.19.6) UNRELEASED; urgency=medium
 
+  [ Guillem Jover ]
   *
 
+  [ Updated scripts translations ]
+  * German (Helge Kreutzmann).
+
  -- Guillem Jover <guillem@debian.org>  Sat, 23 Feb 2019 18:29:46 +0100
 
 dpkg (1.19.5) unstable; urgency=medium
diff --git a/scripts/po/de.po b/scripts/po/de.po
index 96c58ae3b..593ecd467 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2019-02-23 18:00+0100\n"
-"PO-Revision-Date: 2019-01-23 18:40+0100\n"
+"PO-Revision-Date: 2019-02-24 17:42+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
 "Language: de\n"
@@ -591,27 +591,22 @@ msgid "unknown %% substitution in hook: %%%s"
 msgstr "unbekannte %% Substitution in Hook: %%%s"
 
 #: scripts/dpkg-buildpackage.pl
-#, fuzzy, perl-format
-#| msgid ""
-#| "short OpenPGP key IDs are broken; please use key fingerprints instead"
+#, 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"
+"stattdessen Fingerabdrücke in %s oder %s"
 
 #: scripts/dpkg-buildpackage.pl
-#, fuzzy, perl-format
-#| msgid ""
-#| "long OpenPGP key IDs are strongly discouraged; please use key "
-#| "fingerprints instead"
+#, 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"
+"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
-- 
cgit v1.2.3


From 740c330ad0deb5d4894ad43619fc80cfa0cf8313 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 2 Mar 2019 02:41:40 +0100
Subject: 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
---
 debian/changelog                  | 5 +++++
 man/dpkg-source.man               | 2 +-
 scripts/Dpkg/Source/Package/V1.pm | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 3346afa9e..dc7a3e4d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,11 @@ dpkg (1.19.6) UNRELEASED; urgency=medium
     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.
+  * 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
   * Packaging:
     - Update usertags.
     - Install a lintian profile for dpkg based on the debian profile, so that
diff --git a/man/dpkg-source.man b/man/dpkg-source.man
index 502c67311..09a2ec7bd 100644
--- a/man/dpkg-source.man
+++ b/man/dpkg-source.man
@@ -400,7 +400,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
diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm
index 38c2498f4..be13750a4 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);
-- 
cgit v1.2.3


From ae3b466f03f30a71b31403dd1696ccda65e7177b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 11 Mar 2019 22:39:38 +0100
Subject: 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.

Fixes: commit d1d35a56e401181b6d15baf474a7db21d3372a65
---
 debian/changelog               | 4 ++++
 scripts/Dpkg/Source/Package.pm | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index dc7a3e4d6..ea6a844d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,10 @@ dpkg (1.19.6) UNRELEASED; urgency=medium
       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
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index 69c2a2976..9cc5d178f 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -537,7 +537,8 @@ sub extract {
     }
 
     # 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');
-- 
cgit v1.2.3


From 1da502d98ca40a9495172a95a49fdbf0f27ec4de Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 11 Mar 2019 23:21:38 +0100
Subject: dpkg-gencontrol: Check presence of package build dir before
 traversing it

The find() function does not cope well with trying to traverse an
unexistent directory and generates various alarming warnings.
---
 debian/changelog           | 1 +
 scripts/dpkg-gencontrol.pl | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index ea6a844d9..da5802f58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ dpkg (1.19.6) UNRELEASED; urgency=medium
     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
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 960043fa2..443217103 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -350,7 +350,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);
 }
-- 
cgit v1.2.3


From 375cb622993ded786e99a28630439c8abb19a75f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 25 Mar 2019 15:08:25 +0100
Subject: po: Regenerate .pot files and merge .po files with them

---
 dselect/po/bs.po        |  2 +-
 dselect/po/ca.po        |  2 +-
 dselect/po/cs.po        |  2 +-
 dselect/po/da.po        |  2 +-
 dselect/po/de.po        |  2 +-
 dselect/po/dselect.pot  |  4 +--
 dselect/po/el.po        |  2 +-
 dselect/po/es.po        |  2 +-
 dselect/po/et.po        |  2 +-
 dselect/po/eu.po        |  2 +-
 dselect/po/fr.po        |  2 +-
 dselect/po/gl.po        |  2 +-
 dselect/po/hu.po        |  2 +-
 dselect/po/id.po        |  2 +-
 dselect/po/it.po        |  2 +-
 dselect/po/ja.po        |  2 +-
 dselect/po/ko.po        |  2 +-
 dselect/po/nb.po        |  2 +-
 dselect/po/nl.po        |  2 +-
 dselect/po/nn.po        |  2 +-
 dselect/po/pl.po        |  2 +-
 dselect/po/pt.po        |  2 +-
 dselect/po/pt_BR.po     |  2 +-
 dselect/po/ro.po        |  2 +-
 dselect/po/ru.po        |  2 +-
 dselect/po/sk.po        |  2 +-
 dselect/po/sv.po        |  2 +-
 dselect/po/tl.po        |  2 +-
 dselect/po/vi.po        |  2 +-
 dselect/po/zh_CN.po     |  2 +-
 dselect/po/zh_TW.po     |  2 +-
 man/po/dpkg-man.pot     | 17 ++++++++---
 man/po/es.po            | 29 +++++++++++++++++--
 man/po/fr.po            | 27 ++++++++++++++++--
 man/po/hu.po            | 15 ++++++++--
 man/po/it.po            | 15 ++++++++--
 man/po/ja.po            | 29 +++++++++++++++++--
 man/po/nl.po            | 75 +++++++++++++++++++++++--------------------------
 man/po/pl.po            | 29 +++++++++++++++++--
 man/po/pt_BR.po         | 15 ++++++++--
 man/po/ru.po            | 15 ++++++++--
 man/po/sv.po            | 29 +++++++++++++++++--
 man/po/zh_CN.po         | 15 ++++++++--
 po/ast.po               |  2 +-
 po/bs.po                |  2 +-
 po/ca.po                |  2 +-
 po/cs.po                |  2 +-
 po/da.po                |  2 +-
 po/de.po                |  2 +-
 po/dpkg.pot             |  4 +--
 po/dz.po                |  2 +-
 po/el.po                |  2 +-
 po/eo.po                |  2 +-
 po/es.po                |  2 +-
 po/et.po                |  2 +-
 po/eu.po                |  2 +-
 po/fr.po                |  2 +-
 po/gl.po                |  2 +-
 po/hu.po                |  2 +-
 po/id.po                |  2 +-
 po/it.po                |  2 +-
 po/ja.po                |  2 +-
 po/km.po                |  2 +-
 po/ko.po                |  2 +-
 po/ku.po                |  2 +-
 po/lt.po                |  2 +-
 po/mr.po                |  2 +-
 po/nb.po                |  2 +-
 po/ne.po                |  2 +-
 po/nl.po                | 58 +-------------------------------------
 po/nn.po                |  2 +-
 po/pa.po                |  2 +-
 po/pl.po                |  2 +-
 po/pt.po                |  2 +-
 po/pt_BR.po             |  2 +-
 po/ro.po                |  2 +-
 po/ru.po                |  2 +-
 po/sk.po                |  2 +-
 po/sv.po                |  2 +-
 po/th.po                |  2 +-
 po/tl.po                |  2 +-
 po/tr.po                |  2 +-
 po/vi.po                |  2 +-
 po/zh_CN.po             |  2 +-
 po/zh_TW.po             |  2 +-
 scripts/po/ca.po        |  2 +-
 scripts/po/de.po        |  2 +-
 scripts/po/dpkg-dev.pot |  4 +--
 scripts/po/es.po        |  2 +-
 scripts/po/fr.po        |  2 +-
 scripts/po/pl.po        |  2 +-
 scripts/po/ru.po        |  2 +-
 scripts/po/sv.po        |  2 +-
 93 files changed, 321 insertions(+), 213 deletions(-)

(limited to 'scripts')

diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index 723e24284..031b56eaf 100644
--- a/dselect/po/bs.po
+++ b/dselect/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index 50ca1c1db..055ffcb9f 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.17.23\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
 "PO-Revision-Date: 2017-04-28 04:22+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
diff --git a/dselect/po/cs.po b/dselect/po/cs.po
index 9ac63e5af..d3a3fef3b 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/da.po b/dselect/po/da.po
index 152756130..68c470503 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/de.po b/dselect/po/de.po
index 65ad7d7d5..1de42be9f 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index 1b5d1d809..0a702317c 100644
--- a/dselect/po/dselect.pot
+++ b/dselect/po/dselect.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.5\n"
+"Project-Id-Version: dpkg 1.19.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/el.po b/dselect/po/el.po
index bba591ff1..4db6e199e 100644
--- a/dselect/po/el.po
+++ b/dselect/po/el.po
@@ -11,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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/es.po b/dselect/po/es.po
index 15f3d9f68..6f410dc0b 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/et.po b/dselect/po/et.po
index c51a26326..0e4a2dacc 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/eu.po b/dselect/po/eu.po
index 1f59a61c3..ea4ed2125 100644
--- a/dselect/po/eu.po
+++ b/dselect/po/eu.po
@@ -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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index b4a88d264..91ecf815e 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/gl.po b/dselect/po/gl.po
index cfdce1c95..22720d198 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/hu.po b/dselect/po/hu.po
index b8527db70..d7b7b4c85 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/id.po b/dselect/po/id.po
index f3f1d6090..1eb416d4e 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/it.po b/dselect/po/it.po
index df504e1dd..1e506a74f 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index c091a5a81..3085e7c38 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/ko.po b/dselect/po/ko.po
index 23f2d66bc..941ce84c0 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index e68a8bd83..f89ece8fb 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index 74ed4b2f2..67e5e85fb 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index fb0b912cd..5b709bcd9 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/pl.po b/dselect/po/pl.po
index 01d5baadb..12c4ba269 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index 75f05f28a..13327b442 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po
index fee8a35f0..319eba231 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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."
diff --git a/dselect/po/ro.po b/dselect/po/ro.po
index 9637df699..aae0dcdc4 100644
--- a/dselect/po/ro.po
+++ b/dselect/po/ro.po
@@ -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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/ru.po b/dselect/po/ru.po
index 29af24f60..724f03216 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/sk.po b/dselect/po/sk.po
index a44d9bb98..9f45f90af 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/sv.po b/dselect/po/sv.po
index f51f4239c..9c8925587 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index 0b47b23d5..6e5251554 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index c0ed3d9fb..69a641b45 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index 3aec4aacd..b53661a57 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index beb2d8ef6..3b893e459 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index e424ed572..abf0c8986 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.5\n"
+"Project-Id-Version: dpkg-man 1.19.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
@@ -1481,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
@@ -17427,7 +17427,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."
+"B<-sa> was specified.  B<-sa> is the default."
 msgstr ""
 
 #. type: TP
@@ -17598,6 +17598,15 @@ msgid ""
 "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
 #: dpkg-source.man
 msgid ""
diff --git a/man/po/es.po b/man/po/es.po
index 17d9bdeaf..f48220eb2 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -38,7 +38,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.16.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+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"
@@ -1737,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
@@ -23540,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 "
@@ -23551,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 "
@@ -23831,6 +23845,15 @@ msgstr ""
 "opción B<-p1> de B<patch>. De no ser así, mostrará un aviso en caso de "
 "encontrar tales opciones, y cabe que la construcción falle."
 
+#. 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 ""
diff --git a/man/po/fr.po b/man/po/fr.po
index 3eb4af1bb..7ae3e7d1d 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
 "PO-Revision-Date: 2019-02-24 18:25+0100\n"
 "Last-Translator: Jean-Pierre Giraud <jean-pierregiraud@neuf.fr>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -22223,6 +22223,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 "
@@ -22234,7 +22248,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 ""
 "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 "
@@ -22501,6 +22515,15 @@ msgstr ""
 "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."
 
+#. 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 ""
diff --git a/man/po/hu.po b/man/po/hu.po
index 29baf7823..900d2e15b 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+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"
@@ -1563,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
@@ -18103,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
@@ -18273,6 +18273,15 @@ msgid ""
 "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
 #: dpkg-source.man
 msgid ""
diff --git a/man/po/it.po b/man/po/it.po
index 638364b39..beb409389 100644
--- a/man/po/it.po
+++ b/man/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.16.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+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"
@@ -1726,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
@@ -22088,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
@@ -22343,6 +22343,15 @@ msgstr ""
 "B<patch>. Emetterà pertanto un avvertimento quando incontra tali opzioni ed "
 "è probabile che la generazione fallisca."
 
+#. 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 ""
diff --git a/man/po/ja.po b/man/po/ja.po
index 970370ad4..30b7a6a89 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+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"
@@ -1695,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
@@ -23039,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 "
@@ -23050,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 番目の引数が指定されている場合、それは上記のいずれであってもよい"
@@ -23323,6 +23337,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 ""
diff --git a/man/po/nl.po b/man/po/nl.po
index d7bbc70bf..f7508bce5 100644
--- a/man/po/nl.po
+++ b/man/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
 "PO-Revision-Date: 2019-03-04 20:35+0100\n"
 "Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
 "Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -1002,23 +1002,17 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, no-wrap
-#| msgid "B<build-indep>"
 msgid "B<Build-Tainted-By:>"
 msgstr "B<Build-Tainted-By:>"
 
 #. type: TQ
 #: deb-buildinfo.man
 #, no-wrap
-#| msgid "I<variable-list>"
 msgid "I<taint-reason-list>"
 msgstr "I<lijst-met-bezoedelingsredenen>"
 
 #. type: Plain text
 #: deb-buildinfo.man
-#| 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)."
 msgid ""
 "This folded field contains a space-separated list of non-exhausitve reason "
 "tags (formed by alphanumeric and dash characters) which identify why the "
@@ -1031,9 +1025,6 @@ msgstr ""
 
 #. type: Plain text
 #: deb-buildinfo.man
-#| msgid ""
-#| "On Debian and derivatives only build paths starting with I</build/> will "
-#| "emit this field."
 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:"
@@ -1070,7 +1061,6 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, no-wrap
-#| msgid "B<-L>I<local-shlibs-file>"
 msgid "B<usr-local-has-configs>"
 msgstr "B<usr-local-has-configs>"
 
@@ -1082,7 +1072,6 @@ msgstr "Het systeem bevat configuratiebestanden onder I</usr/local/etc>."
 #. type: TP
 #: deb-buildinfo.man
 #, no-wrap
-#| msgid "B<--always-include-path>"
 msgid "B<usr-local-has-includes>"
 msgstr "B<usr-local-has-includes>"
 
@@ -1107,7 +1096,6 @@ msgstr ""
 #. type: TP
 #: deb-buildinfo.man
 #, no-wrap
-#| msgid "B<-L>I<local-shlibs-file>"
 msgid "B<usr-local-has-libraries>"
 msgstr "B<usr-local-has-libraries>"
 
@@ -9316,7 +9304,6 @@ msgstr ""
 #. type: TP
 #: dpkg.man dpkg-statoverride.man
 #, no-wrap
-#| msgid "B<DPKG_COLORS>"
 msgid "B<DPKG_FORCE>"
 msgstr "B<DPKG_FORCE>"
 
@@ -9426,9 +9413,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-#| msgid ""
-#| "Defined by B<dpkg> on the maintainer script environment to the "
-#| "architecture the package got built for (since dpkg 1.15.4)."
 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)."
@@ -22314,6 +22298,20 @@ 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 "
+#| "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 "
@@ -22325,7 +22323,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 "
@@ -22585,6 +22583,15 @@ msgstr ""
 "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 ""
+
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
@@ -24152,7 +24159,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
-#| 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 "Hulp bieden over de opties B<--force->I<iets> (sinds dpkg 1.19.5)."
 
@@ -24176,11 +24182,6 @@ 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. 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 "
@@ -24195,10 +24196,6 @@ 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.>"
 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 "
@@ -24216,9 +24213,6 @@ msgstr "B<--force>"
 
 #. type: Plain text
 #: dpkg-statoverride.man
-#| 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.  This option is deprecated "
@@ -24257,9 +24251,6 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-statoverride.man
-#| 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)."
 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)."
@@ -25959,12 +25950,16 @@ msgstr ""
 
 #. type: Plain text
 #: start-stop-daemon.man
+#, fuzzy
 #| msgid ""
-#| "B<Warning:> Using this match option alone with a daemon that writes the "
-#| "pidfile as an unprivileged user is a security risk, because 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."
+#| "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 "
+#| "excempt from these checks."
 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-"
@@ -25972,7 +25967,7 @@ msgid ""
 "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 excempt from these "
+"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 "
diff --git a/man/po/pl.po b/man/po/pl.po
index 5c15df639..ae1793a30 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.15.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+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"
@@ -1712,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
@@ -23501,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 "
@@ -23512,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, "
@@ -23791,6 +23805,15 @@ msgstr ""
 "napotkaniu takich opcji wysyłane jest ostrzeżenie, zaś proces budowania "
 "prawdopodobnie się nie powiedzie."
 
+#. 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 ""
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index 6fd603854..025a0419f 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+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"
@@ -1484,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
@@ -17956,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
@@ -18126,6 +18126,15 @@ msgid ""
 "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
 #: dpkg-source.man
 msgid ""
diff --git a/man/po/ru.po b/man/po/ru.po
index 60b239712..8ce98d84f 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+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"
@@ -1560,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
@@ -18395,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
@@ -18565,6 +18565,15 @@ msgid ""
 "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
 #: dpkg-source.man
 msgid ""
diff --git a/man/po/sv.po b/man/po/sv.po
index 5122930c5..c3ef71972 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.11\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+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"
@@ -1697,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
@@ -22859,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 "
@@ -22870,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 "
@@ -23143,6 +23157,15 @@ msgstr ""
 "B<patch>. Det kommer därför visa en varning sådana flaggor upptäcks, och "
 "bygget kommer troligen att misslyckas."
 
+#. 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 ""
diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index d24227a52..a9aa33c61 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.21\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+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"
@@ -1531,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
@@ -18007,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
@@ -18177,6 +18177,15 @@ msgid ""
 "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
 #: dpkg-source.man
 msgid ""
diff --git a/po/ast.po b/po/ast.po
index 7be8e25c0..5bd68d9d0 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
 "PO-Revision-Date: 2015-04-07 09:47+0200\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
 "com>\n"
diff --git a/po/bs.po b/po/bs.po
index 60f112802..254f35e72 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/ca.po b/po/ca.po
index 9276c63c3..4cbb21c5f 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.18.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
 "PO-Revision-Date: 2017-04-29 16:21+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
diff --git a/po/cs.po b/po/cs.po
index 3ff2e7265..99e798445 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/da.po b/po/da.po
index f17507da5..e3f7436ca 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/de.po b/po/de.po
index 9123a19bf..e073991b7 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
 "PO-Revision-Date: 2019-01-30 18:28+0100\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
diff --git a/po/dpkg.pot b/po/dpkg.pot
index 679dc3c4f..4a43d006e 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.5\n"
+"Project-Id-Version: dpkg 1.19.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/dz.po b/po/dz.po
index de1c617d9..44c98fecf 100644
--- a/po/dz.po
+++ b/po/dz.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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/el.po b/po/el.po
index 7a91cd904..68dc92539 100644
--- a/po/el.po
+++ b/po/el.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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/eo.po b/po/eo.po
index 9576c3866..21209154e 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/es.po b/po/es.po
index 5b1c56825..7d0845a2b 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/et.po b/po/et.po
index d52cc5223..cdce49b43 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/eu.po b/po/eu.po
index 7e8d4c00d..6b900f64d 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/fr.po b/po/fr.po
index 94a931d5e..a8e78f98c 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/gl.po b/po/gl.po
index 9f086043a..59cf7f0fa 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/hu.po b/po/hu.po
index 32583285b..8c8969dbd 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/id.po b/po/id.po
index 2bf6354e9..570bd2400 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/it.po b/po/it.po
index 8aed2d3e9..5296d52e6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.3\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
 "PO-Revision-Date: 2018-12-04 12:15+0100\n"
 "Last-Translator: Milo Casagrande <milo@milo.name>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
diff --git a/po/ja.po b/po/ja.po
index be9ba7092..352b7507e 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/km.po b/po/km.po
index d3cc8ddb1..5757cb24a 100644
--- a/po/km.po
+++ b/po/km.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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/ko.po b/po/ko.po
index a59d36938..68e5420d4 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/ku.po b/po/ku.po
index 6b1b8dff8..072355014 100644
--- a/po/ku.po
+++ b/po/ku.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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/lt.po b/po/lt.po
index a8e17a9f8..bcf470575 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/mr.po b/po/mr.po
index e7aef1c1b..e758fb2ae 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/nb.po b/po/nb.po
index 4517707d8..a005250a9 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/ne.po b/po/ne.po
index 68a4607ef..6558d591e 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/nl.po b/po/nl.po
index 82292ebd2..d7524a07b 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
@@ -344,38 +344,32 @@ msgstr "kan niet naar het begin van %.250s gaan na opvulling"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
-#| msgid "unable to get file descriptor for directory '%s'"
 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 frontend lockfile"
 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
 #, c-format
-#| msgid "unable to open/create status database lockfile"
 msgid "unable to open/create dpkg database lock file for directory %s"
 msgstr ""
 "kan het dpkg-databasevergrendelingsbestand voor map %s niet openen/aanmaken"
 
 #: lib/dpkg/dbmodify.c
 #, 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 ""
 "u heeft niet de benodigde rechten om de dpkg-databasemap %s te vergrendelen"
 
 #: lib/dpkg/dbmodify.c
-#| msgid "dpkg frontend"
 msgid "dpkg frontend lock"
 msgstr "dpkg-frontendvergrendeling"
 
 #: lib/dpkg/dbmodify.c
-#| msgid "dpkg status database"
 msgid "dpkg database lock"
 msgstr "dpkg-databasevergrendeling"
 
@@ -385,13 +379,11 @@ msgstr "deze bewerking kan alleen uitgevoerd worden door de systeembeheerder"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
-#| msgid "unable to access dpkg status area"
 msgid "unable to access the dpkg database directory %s"
 msgstr "kan dpkg-databasemap %s niet benaderen"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
-#| msgid "operation requires read/write access to dpkg status area"
 msgid "required read/write access to the dpkg database directory %s"
 msgstr "lees- en schrijftoegang tot de dpkg-databasemap %s is vereist"
 
@@ -736,13 +728,11 @@ msgid "internal error"
 msgstr "interne fout"
 
 #: lib/dpkg/fields.c
-#| msgid "control file '%s' missing value"
 msgid "is missing a value"
 msgstr "mist een waarde"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "Skip invalid line: %s"
 msgid "has invalid value '%.50s'"
 msgstr "heeft de ongeldige waarde '%.50s'"
 
@@ -752,57 +742,48 @@ msgstr "heeft rommel achteraan"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "package name '%s' is invalid: %s"
 msgid "invalid package name in '%s' field: %s"
 msgstr "ongeldige pakketnaam in veld '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "empty archive details field '%s'"
 msgid "empty archive details '%s' field"
 msgstr "leeg veld '%s' met archiefdetails"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "archive details field '%s' not allowed in status file"
 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 archive 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' met de archiefdetails (vergeleken met andere)"
 
 #: lib/dpkg/fields.c
 #, 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 ""
 "te weinig waarden in veld '%s' met de archiefdetails (vergeleken met andere)"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "obsolete '%s' or '%s' field used"
 msgid "boolean (yes/no) '%s' field: %s"
 msgstr "booleaans (yes/no) veld '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "foreign/allowed/same/no in quadstate field"
 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"
 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
 #, c-format
-#| msgid "word in 'Priority' field"
 msgid "word in '%s' field: %s"
 msgstr "woord in het veld '%s': %s"
 
@@ -813,31 +794,26 @@ msgstr "waarde voor veld '%s' is niet toegestaan in deze context"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "first (want) word in 'Status' field"
 msgid "first (want) word in '%s' field: %s"
 msgstr "eerste woord (want) in het veld '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "second (error) word in 'Status' field"
 msgid "second (error) word in '%s' field: %s"
 msgstr "tweede woord (error) in het veld '%s': %s"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "third (status) word in 'Status' field"
 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'"
 msgid "'%s' field value '%.250s'"
 msgstr "waarde '%.250s' voor veld '%s'"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "obsolete '%s' or '%s' field used"
 msgid "obsolete '%s' field used"
 msgstr "verouderd veld '%s' gebruikt"
 
@@ -848,14 +824,12 @@ 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'"
 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
 #, 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 ""
 "hoofd- of lege map wordt genoemd als een configuratiebestand in veld '%s'"
@@ -944,7 +918,6 @@ msgstr "veld '%s', verwijzing naar '%.255s': versie niet afgesloten"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
 msgid "'%s' field, reference to '%.255s': version '%s'"
 msgstr "veld '%s', verwijzing naar '%.255s': versie '%s'"
 
@@ -955,7 +928,6 @@ msgstr "veld '%s', syntaxisfout na verwijzing naar pakket '%.255s'"
 
 #: lib/dpkg/fields.c
 #, c-format
-#| msgid "alternatives ('|') not allowed in %s field"
 msgid "alternatives ('|') not allowed in '%s' field"
 msgstr "alternatieven ('|') niet toegestaan in veld '%s'"
 
@@ -1212,31 +1184,26 @@ msgstr "dubbele waarde voor door gebruiker gedefinieerd veld '%.*s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-#| msgid "missing %s"
 msgid "missing '%s' field"
 msgstr "ontbrekend veld '%s'"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
 #, c-format
-#| msgid "duplicate value for '%s' field"
 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"
 msgid "package has '%s' field but is architecture '%s'"
 msgstr "pakket bevat veld '%s' maar is van het architectuurtype '%s'"
 
 #: lib/dpkg/parse.c
 #, c-format
-#| msgid "Config-Version for package with inappropriate Status"
 msgid "'%s' field present for package with inappropriate '%s' field"
 msgstr "veld '%s' aanwezig voor pakket met ongepast veld '%s'"
 
@@ -1247,7 +1214,6 @@ msgstr "de status van het pakket is %s maar er wordt op triggers gewacht"
 
 #: lib/dpkg/parse.c
 #, c-format
-#| msgid "package has status %s but triggers are awaited"
 msgid "package has status %s but no triggers awaited"
 msgstr "de status van het pakket is %s maar er wordt niet op triggers gewacht"
 
@@ -1258,13 +1224,11 @@ msgstr "de status van het pakket is %s maar er staan triggers in de wacht"
 
 #: lib/dpkg/parse.c
 #, c-format
-#| msgid "package has status %s but triggers are pending"
 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
 #, c-format
-#| msgid "Package which in state not-installed has conffiles, forgetting them"
 msgid "package has status %s and has conffiles, forgetting them"
 msgstr ""
 "het pakket heeft status %s en het heeft configuratiebestanden. Ze worden "
@@ -1290,9 +1254,6 @@ 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 ""
 "package %s (%s) with field '%s: %s' is not co-installable with %s which has "
 "multiple installed instances"
@@ -1658,12 +1619,10 @@ 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'"
 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"
 msgid "triggers database lock"
 msgstr "triggersdatabankvergrendeling"
 
@@ -4589,18 +4548,6 @@ 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"
@@ -4682,7 +4629,6 @@ msgstr "--update is waardeloos voor --remove"
 
 #: src/statcmd.c
 #, c-format
-#| msgid "obsolete option '--%s'; please use '--%s' instead"
 msgid "deprecated --%s option; use --%s instead"
 msgstr "verouderde optie --%s; gelieve in plaats ervan --%s te gebruiken"
 
@@ -5061,7 +5007,6 @@ msgstr "--%s verwacht hoogstens één Packages-bestand als argument"
 
 #: src/update.c
 #, 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 ""
 "kan de databasemap '%s' van dpkg niet benaderen voor een grote bijwerking "
@@ -5069,7 +5014,6 @@ msgstr ""
 
 #: src/update.c
 #, 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"
diff --git a/po/nn.po b/po/nn.po
index 7f9eb3067..c27d49098 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/pa.po b/po/pa.po
index f01f850f0..abbfee0f5 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/pl.po b/po/pl.po
index 3018f11f2..af8140039 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/pt.po b/po/pt.po
index e829b9584..5b2aceb5c 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
 "PO-Revision-Date: 2018-12-30 15:43+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 4643e617a..8f0ad3c46 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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."
diff --git a/po/ro.po b/po/ro.po
index 0511d8617..c8db8f6c4 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/ru.po b/po/ru.po
index 99ad90099..99f11deff 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/sk.po b/po/sk.po
index 90c76f514..978ed3f19 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/sv.po b/po/sv.po
index fba8634d9..9a0df1707 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/th.po b/po/th.po
index d3768626b..a48b18990 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/tl.po b/po/tl.po
index 68f8e2fdf..feb59a041 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/tr.po b/po/tr.po
index 2111f9cb6..c6935877b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/vi.po b/po/vi.po
index b8c63fbd1..5e254789d 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: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index bfaa931ff..77d4254f0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 527940745..6bf2ac4c8 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 17:59+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 3b9db9925..000b88da7 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -8,7 +8,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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
 "PO-Revision-Date: 2017-05-07 16:26+0200\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
diff --git a/scripts/po/de.po b/scripts/po/de.po
index 593ecd467..fb87dea1c 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\n"
 "PO-Revision-Date: 2019-02-24 17:42+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index d329a9159..0384d8fdf 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.5\n"
+"Project-Id-Version: dpkg 1.19.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/es.po b/scripts/po/es.po
index 161ed57b1..8fb4f9cc0 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index 833c03500..efaad3166 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index 8ab9d2cc6..2d76f5408 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index cc1429600..2ee3451f0 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index 3dc6fdb35..57ca6a25b 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: 2019-02-23 18:00+0100\n"
+"POT-Creation-Date: 2019-03-25 15:07+0100\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"
-- 
cgit v1.2.3


From 53b39b3536d4e5a125e060685f68ff75da29ab2b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 23 Apr 2019 00:41:57 +0200
Subject: po: Update Catalan translations

---
 debian/changelog |  10 +
 dselect/po/ca.po |   8 +-
 po/ca.po         | 660 +++++++++++++++++++------------------------------------
 scripts/po/ca.po | 319 +++++++--------------------
 4 files changed, 323 insertions(+), 674 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 69ca90e2b..3d97a0111 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,21 @@
 dpkg (1.19.7) UNRELEASED; 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
 
+  [ Updated programs translations ]
+  * Catalan (Guillem Jover).
+
+  [ Updated dselect translations ]
+  * Catalan (Guillem Jover).
+
+  [ Updated scripts translations ]
+  * Catalan (Guillem Jover).
+
  -- Guillem Jover <guillem@debian.org>  Mon, 25 Mar 2019 15:41:00 +0100
 
 dpkg (1.19.6) unstable; urgency=medium
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index 055ffcb9f..d40c527ef 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: 2019-03-25 15:07+0100\n"
-"PO-Revision-Date: 2017-04-28 04:22+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"
 
diff --git a/po/ca.po b/po/ca.po
index 4cbb21c5f..ef9fd4b1b 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: 2019-03-25 15:07+0100\n"
-"PO-Revision-Date: 2017-04-29 16: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
@@ -349,57 +349,49 @@ msgid "unable to seek to start of %.250s after padding"
 msgstr "no es pot tornar al principi de %.250s després del farciment"
 
 #: lib/dpkg/dbmodify.c
-#, fuzzy, c-format
-#| msgid "unable to get file descriptor for directory '%s'"
+#, c-format
 msgid "unable to check lock file for dpkg database directory %s"
-msgstr "no es pot obtenir el descriptor de fitxer del directori «%.250s»"
+msgstr "no es pot comprovar l'estat de blocatge pel directori %s de la base de dades de dpkg"
 
 #: lib/dpkg/dbmodify.c
-#, fuzzy, c-format
-#| msgid "unable to open/create status database lockfile"
+#, c-format
 msgid "unable to open/create dpkg frontend lock for directory %s"
 msgstr ""
-"no es pot obrir/crear el fitxer de blocatge de la base de dades d'estat"
+"no es pot obrir/crear el fitxer de blocatge frontal de dpkg per al directori %s"
 
 #: lib/dpkg/dbmodify.c
-#, fuzzy, c-format
-#| msgid "unable to open/create status database lockfile"
+#, 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 d'estat"
+"no es pot obrir/crear el fitxer de blocatge de la base de dades de dpkg per al directori %s"
 
 #: lib/dpkg/dbmodify.c
-#, fuzzy, c-format
-#| 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 "no teniu permís per a blocar la base de dades d'estat del dpkg"
+msgstr "no teniu permís per a blocar el directori %s de la base de dades de dpkg "
 
 #: lib/dpkg/dbmodify.c
 msgid "dpkg frontend lock"
-msgstr ""
+msgstr "blocatge frontal de dpkg"
 
 #: lib/dpkg/dbmodify.c
-#, fuzzy
-#| msgid "dpkg status database"
 msgid "dpkg database lock"
-msgstr "base de dades d'estat del dpkg"
+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
-#, fuzzy, c-format
-#| msgid "unable to access dpkg status area"
+#, c-format
 msgid "unable to access the dpkg database directory %s"
-msgstr "no es pot accedir a l'àrea d'estat del dpkg"
+msgstr "no es pot accedir al directori %s de la base de dades de dpkg"
 
 #: lib/dpkg/dbmodify.c
-#, fuzzy, c-format
-#| 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
@@ -424,7 +416,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
@@ -501,10 +493,9 @@ msgstr ""
 "el fitxer de control «%s» del paquet «%.250s» conté un nom de fitxer buit"
 
 #: lib/dpkg/db-fsys-digest.c
-#, fuzzy, c-format
-#| msgid "cannot read control file '%s' for package '%s'"
+#, c-format
 msgid "loading control file '%s' for package '%s'"
-msgstr "no es pot llegir el fitxer de control «%s» del paquet «%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"
@@ -512,7 +503,7 @@ 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» sobre el fitxer de desviacions"
+msgstr "no s'ha pogut fer «fstat» al fitxer de desviacions"
 
 #: lib/dpkg/db-fsys-divert.c
 #, c-format
@@ -520,12 +511,9 @@ msgid "conflicting diversions involving '%.250s' or '%.250s'"
 msgstr "hi ha desviacions en conflicte en «%.250s» o «%.250s»"
 
 #: lib/dpkg/db-fsys-files.c
-#, fuzzy, c-format
-#| msgid "error closing files list file for package '%.250s'"
+#, c-format
 msgid "loading files list file for package '%s'"
-msgstr ""
-"s'ha produït un error en tancar el fitxer de la llista de fitxers del paquet "
-"«%.250s»"
+msgstr "s'esta carregant el fitxer de la llista de fitxers del paquet «%s»"
 
 #: lib/dpkg/db-fsys-files.c
 #, c-format
@@ -582,7 +570,7 @@ 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» sobre el fitxer de statoverride"
+msgstr "no s'ha pogut fer «fstat» al fitxer de statoverride"
 
 #: lib/dpkg/db-fsys-override.c
 #, c-format
@@ -608,6 +596,10 @@ msgid ""
 "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"
@@ -621,6 +613,10 @@ msgid ""
 "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
@@ -628,10 +624,8 @@ 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"
@@ -642,10 +636,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"
@@ -664,7 +656,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
@@ -681,7 +673,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
@@ -747,77 +739,65 @@ msgid "internal error"
 msgstr "s'ha produït un error intern"
 
 #: lib/dpkg/fields.c
-#, fuzzy
-#| msgid "control file '%s' missing value"
 msgid "is missing a value"
-msgstr "al fitxer de control «%s» li manca un valor"
+msgstr "li manca un valor"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "Skip invalid line: %s"
+#, c-format
 msgid "has invalid value '%.50s'"
-msgstr "S'omet la línia invàlida: %s"
+msgstr "hi ha un valor invàlid «%.50s»"
 
 #: lib/dpkg/fields.c
 msgid "has trailing junk"
-msgstr ""
+msgstr "hi ha brossa al final"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "package name '%s' is invalid: %s"
+#, c-format
 msgid "invalid package name in '%s' field: %s"
-msgstr "el nom de paquet «%s» no és vàlid: %s"
+msgstr "el nom de paquet no és vàlid en el camp «%s»: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "empty file details field '%s'"
+#, c-format
 msgid "empty archive details '%s' field"
-msgstr "camp de detalls «%s» del fitxer buit"
+msgstr "el camp «%s» de detalls de l'arxiu és buit"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "file details field '%s' not allowed in status file"
+#, c-format
 msgid "archive details '%s' field not allowed in status file"
-msgstr "camp de detalls del fitxer «%s» no permès al fitxer d'estat"
+msgstr "el camp «%s» de detalls de l'arxiu no es permès al fitxer d'estat"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "too many values in file details field '%s' (compared to others)"
+#, c-format
 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
-#, fuzzy, c-format
-#| msgid "too few values in file details field '%s' (compared to others)"
+#, c-format
 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 "
+"valors insuficients en el camp «%s» dels detalls de l'arxiu (comparat "
 "amb d'altres)"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "obsolete '%s' or '%s' field used"
+#, c-format
 msgid "boolean (yes/no) '%s' field: %s"
-msgstr "s'ha utilitzat un camp «%s» o «%s» obsolet"
+msgstr "camp «%s» booleà (yes/no): %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "foreign/allowed/same/no in quadstate field"
+#, c-format
 msgid "quadstate (foreign/allowed/same/no) '%s' field: %s"
-msgstr "foreign/allowed/same/no en un camp d'estat quàdruple"
+msgstr "camp «%s» d'estat quàdruple (foreign/allowed/same/no): %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "'%s' is not a valid architecture name: %s"
+#, c-format
 msgid "'%s' is not a valid architecture name in '%s' field: %s"
-msgstr "«%s» no és un nom valid d'arquitectura: %s"
+msgstr "«%s» no és un nom valid d'arquitectura en el camp «%s»: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "word in 'Priority' field"
+#, c-format
 msgid "word in '%s' field: %s"
-msgstr "paraula al camp «Priority»"
+msgstr "paraula al camp «%s»: %s"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -825,34 +805,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
-#, fuzzy, c-format
-#| msgid "first (want) word in 'Status' field"
+#, c-format
 msgid "first (want) word in '%s' field: %s"
-msgstr "primera paraula (de requeriment) al camp «Status»"
+msgstr "primera paraula (de requeriment) al camp «%s»: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "second (error) word in 'Status' field"
+#, c-format
 msgid "second (error) word in '%s' field: %s"
-msgstr "segona paraula (d'error) al camp «Status»"
+msgstr "segona paraula (d'error) al camp «%s»: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "third (status) word in 'Status' field"
+#, c-format
 msgid "third (status) word in '%s' field: %s"
-msgstr "tercera paraula (d'estat) al camp «Status»"
+msgstr "tercera paraula (d'estat) al camp «%s»: %s"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "error in '%s' field string '%.250s'"
+#, c-format
 msgid "'%s' field value '%.250s'"
-msgstr "error en la cadena «%2$.250s» del camp «%1$s»"
+msgstr "valor «%2$.250s» del camp «%1$s»"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "obsolete '%s' or '%s' field used"
+#, c-format
 msgid "obsolete '%s' field used"
-msgstr "s'ha utilitzat un camp «%s» o «%s» obsolet"
+msgstr "s'ha utilitzat un camp «%s» obsolet"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -860,18 +835,16 @@ msgid "value for '%s' field has malformed line '%.*s'"
 msgstr "el valor de «%s» té una línia amb format erroni «%.*s»"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "value for '%s' has line starting with non-space '%c'"
+#, c-format
 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 "
+"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
-#, fuzzy, c-format
-#| 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 "s'ha indicat com conffile el directori arrel o un directori nul"
+msgstr "s'ha indicat com conffile el directori arrel o un directori buit en el camp «%s»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -957,10 +930,9 @@ msgid "'%s' field, reference to '%.255s': version unterminated"
 msgstr "en el camp «%s», que fa referència a «%.255s»: versió no terminada"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "'%s' field, reference to '%.255s': version contains '%c'"
+#, c-format
 msgid "'%s' field, reference to '%.255s': version '%s'"
-msgstr "en el camp «%s», que fa referència a «%.255s»: la versió conté un «%c»"
+msgstr "en el camp «%s», que fa referència a «%.255s»: versió «%s»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -969,10 +941,9 @@ msgstr ""
 "en el camp «%s», error de sintaxi després de la referència al paquet «%.255s»"
 
 #: lib/dpkg/fields.c
-#, fuzzy, c-format
-#| msgid "alternatives ('|') not allowed in %s field"
+#, c-format
 msgid "alternatives ('|') not allowed in '%s' field"
-msgstr "no s'admeten alternatives («|») en el camp %s"
+msgstr "no s'admeten alternatives («|») en el camp «%s»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -997,7 +968,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
@@ -1010,28 +981,24 @@ msgid "unable to set mode of target file '%.250s'"
 msgstr "no es pot establir el mode del fitxer destí «%.250s»"
 
 #: lib/dpkg/file.c
-#, fuzzy, c-format
-#| msgid "cannot stat file '%s'"
+#, c-format
 msgid "cannot stat %s"
-msgstr "no es pot fer «stat» sobre el fitxer «%s»"
+msgstr "no es pot fer «stat» a «%s»"
 
 #: lib/dpkg/file.c
-#, fuzzy, c-format
-#| msgid "archive '%s' is not a regular file"
+#, c-format
 msgid "%s is not a regular file"
-msgstr "l'arxiu «%s» no és un fitxer regular"
+msgstr "«%s» no és un fitxer regular"
 
 #: lib/dpkg/file.c
-#, fuzzy, c-format
-#| msgid "cannot append to '%s'"
+#, c-format
 msgid "cannot read %s"
-msgstr "no es pot afegir a «%s»"
+msgstr "no es pot llegir «%s»"
 
 #: lib/dpkg/file.c
-#, fuzzy, c-format
-#| msgid "cannot append to '%s'"
+#, c-format
 msgid "cannot open %s"
-msgstr "no es pot afegir a «%s»"
+msgstr "no es pot obrir «%s»"
 
 #: lib/dpkg/file.c
 #, c-format
@@ -1054,22 +1021,18 @@ msgid "unable to lock %s"
 msgstr "no es pot desblocar %s"
 
 #: lib/dpkg/file.c
-#, fuzzy, c-format
-#| msgid "cannot append to '%s'"
+#, c-format
 msgid "cannot open file %s"
-msgstr "no es pot afegir a «%s»"
+msgstr "no es pot obrir el fitxer «%s»"
 
 #: lib/dpkg/file.c
-#, fuzzy
-#| msgid "unable to flush file '%s'"
 msgid "pager to show file"
-msgstr "no es pot fer «flush» sobre el fitxer «%s»"
+msgstr "paginador per mostrar el fitxer"
 
 #: lib/dpkg/file.c
-#, fuzzy, c-format
-#| msgid "cannot divert file '%s' to itself"
+#, c-format
 msgid "cannot write file %s into the pager"
-msgstr "no es pot desviar el fitxer «%s» cap a ell mateix"
+msgstr "no es pot escriure el fitxer «%s» al paginador"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -1235,34 +1198,29 @@ msgid "duplicate value for user-defined field '%.*s'"
 msgstr "valor duplicat pel camp definit per l'usuari «%.*s»"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, fuzzy, c-format
-#| msgid "missing %s"
+#, c-format
 msgid "missing '%s' field"
-msgstr "manca %s"
+msgstr "manca el camp «%s»"
 
 #: lib/dpkg/parse.c lib/dpkg/parsehelp.c
-#, fuzzy, c-format
-#| msgid "duplicate value for '%s' field"
+#, c-format
 msgid "empty value for '%s' field"
-msgstr "valor duplicat en el camp «%s»"
+msgstr "valor buit en el camp «%s»"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "package has field '%s' but is missing architecture"
+#, c-format
 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
-#, fuzzy, c-format
-#| msgid "package has field '%s' but is architecture all"
+#, c-format
 msgid "package has '%s' field but is architecture '%s'"
-msgstr "el paquet té el camp «%s» però és d'arquitectura “all”"
+msgstr "el paquet té el camp «%s» però és d'arquitectura “%s”"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "Config-Version for package with inappropriate Status"
+#, c-format
 msgid "'%s' field present for package with inappropriate '%s' field"
-msgstr "camp «Config-Version» per a un paquet amb Status no apropiat"
+msgstr "el camp «%s» es present per a un paquet amb un camp «%s» no apropiat"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1270,10 +1228,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
-#, fuzzy, c-format
-#| msgid "package has status %s but triggers are awaited"
+#, c-format
 msgid "package has status %s but no triggers awaited"
-msgstr "el paquet té l'estat %s però s'esperen activadors"
+msgstr "el paquet té l'estat %s però no s'esperen activadors"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1281,16 +1238,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
-#, fuzzy, c-format
-#| msgid "package has status %s but triggers are pending"
+#, c-format
 msgid "package has status %s but no triggers pending"
-msgstr "el paquet té estat %s però els activadors són pendents"
+msgstr "el paquet té estat %s però els activadors no són pendents"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid "Package which in state not-installed has conffiles, forgetting them"
+#, c-format
 msgid "package has status %s and has conffiles, forgetting them"
-msgstr "Paquet que no estant instal·lat té conffiles, ens n'oblidem"
+msgstr "el paquet té testat %s i té “conffiles”, ens n'oblidem"
 
 #: lib/dpkg/parse.c
 msgid ""
@@ -1310,16 +1265,13 @@ msgstr ""
 "oficial"
 
 #: lib/dpkg/parse.c
-#, fuzzy, c-format
-#| msgid ""
-#| "%s %s (Multi-Arch: %s) is not co-installable with %s which has multiple "
-#| "installed instances"
+#, c-format
 msgid ""
 "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
@@ -1330,7 +1282,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
@@ -1342,7 +1294,7 @@ msgstr ""
 #, c-format
 msgid "can't mmap package info file '%.255s'"
 msgstr ""
-"no es pot executar «mmap» sobre el fitxer d'informació de paquet «%.255s»"
+"no es pot executar «mmap» al fitxer d'informació de paquet «%.255s»"
 
 #: lib/dpkg/parse.c
 #, c-format
@@ -1520,7 +1472,7 @@ msgstr "manca la clau de tancament"
 #: lib/dpkg/pkg-format.c
 #, c-format
 msgid "cannot get package %s filesystem last modification time"
-msgstr ""
+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
@@ -1582,107 +1534,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
-#, fuzzy
-#| msgid "invalid character '%c' in field width"
 msgid "invalid tar header size field"
-msgstr "el caràcter «%c» no és vàlid en l'amplada del camp"
+msgstr "el camp de mida de la capçalera tar no és vàlid"
 
 #: lib/dpkg/tarfn.c
-#, fuzzy
-#| msgid "invalid character '%c' in field width"
 msgid "invalid tar header mtime field"
-msgstr "el caràcter «%c» no és vàlid en l'amplada del camp"
+msgstr "el camp «mtime» de la capçalera tar no és vàlid"
 
 #: lib/dpkg/tarfn.c
-#, fuzzy
-#| msgid "invalid statoverride uid %s"
 msgid "invalid tar header uid field"
-msgstr "l'uid %s de statoverride no és vàlid"
+msgstr "el camp «uid» de la capçalera tar no és vàlid"
 
 #: lib/dpkg/tarfn.c
-#, fuzzy
-#| msgid "invalid statoverride gid %s"
 msgid "invalid tar header gid field"
-msgstr "el gid %s de statoverride no és vàlid"
+msgstr "el camp «gid» de la capçalera tar no és vàlid"
 
 #: lib/dpkg/tarfn.c
-#, fuzzy
-#| msgid "invalid character '%c' in field width"
 msgid "invalid tar header checksum field"
-msgstr "el caràcter «%c» no és vàlid en l'amplada del camp"
+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 ""
+msgstr "la suma de verificació de la capçalera tar no és vàlida"
 
 #: lib/dpkg/tarfn.c
 msgid "partially read tar header"
-msgstr ""
+msgstr "la capçalera tar s'ha llegit parcialment"
 
 #: lib/dpkg/tarfn.c
 msgid "invalid tar header with empty name field"
-msgstr ""
+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 ""
+msgstr "no s'admet el tipus '%c' de capçalera de tar GNU"
 
 #: lib/dpkg/tarfn.c
-#, fuzzy, c-format
-#| msgid "unsupported options in file header"
+#, c-format
 msgid "unsupported Solaris tar header type '%c'"
-msgstr "no s'admeten les opcions a la capçalera del fitxer"
+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 ""
+msgstr "no s'admet el tipus '%c' de capçalera de tar PAX"
 
 #: lib/dpkg/tarfn.c
-#, fuzzy, c-format
-#| msgid "unknown compression type '%s'!"
+#, c-format
 msgid "unknown tar header type '%c'"
-msgstr "el tipus de compressió «%s» és desconegut!"
+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
@@ -1695,16 +1630,13 @@ msgid "treewalk root %s is not a directory"
 msgstr "l'arrel pel caminador de l'arbre «%s» no és un directori"
 
 #: lib/dpkg/trigdeferred.c
-#, fuzzy, c-format
-#| msgid "unable to open/create triggers lockfile '%.250s'"
+#, c-format
 msgid "unable to open/create triggers lock file '%.250s'"
-msgstr "no es pot obrir el fitxer de blocatge d'activadors «%.250s»"
+msgstr "no es pot obrir/crear el fitxer de blocatge d'activadors «%.250s»"
 
 #: lib/dpkg/trigdeferred.c
-#, fuzzy
-#| msgid "triggers area"
 msgid "triggers database lock"
-msgstr "àrea d'activadors"
+msgstr "blocatge de la base de dades d'activadors"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
@@ -1714,7 +1646,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
@@ -1983,7 +1915,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 "
+"no s'ha pogut fer «stat» (dereferència) a l'enllaç simbòlic existent "
 "«%.250s»"
 
 #: src/archives.c
@@ -1992,7 +1924,7 @@ 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ç "
+"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
@@ -2020,7 +1952,7 @@ msgstr ""
 #, 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)"
+"no es pot fer «stat» a «%.255s» (que és el que s'anava a instal·lar)"
 
 #: src/archives.c
 #, c-format
@@ -2034,7 +1966,7 @@ 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 "
+"no es pot fer «stat» al «%.255s» restablert abans d'instal·lar una "
 "altra versió"
 
 #: src/archives.c
@@ -2083,7 +2015,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
@@ -2434,7 +2366,7 @@ 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 "
+"error en escriure a l'eixida d'error, s'ha descobert abans de preguntar sobre "
 "conffiles"
 
 #: src/configure.c
@@ -2451,7 +2383,7 @@ msgstr "visualitzador de diferencies de conffile"
 
 #: src/configure.c
 msgid "Useful environment variables:\n"
-msgstr ""
+msgstr "Variables d'entorn útils:\n"
 
 #: src/configure.c
 msgid "Type 'exit' when you're done.\n"
@@ -2464,12 +2396,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
@@ -2603,7 +2535,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
@@ -2813,21 +2745,7 @@ msgstr ""
 
 # Move the file aside (or back) ? -- Jordà
 #: src/divertcmd.c
-#, 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"
+#, c-format
 msgid ""
 "Options:\n"
 "  --package <package>      name of the package whose copy of <file> will "
@@ -2852,7 +2770,12 @@ 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"
@@ -2879,11 +2802,13 @@ 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
@@ -3005,6 +2930,8 @@ 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
@@ -3354,7 +3281,7 @@ msgstr "Activa totes les opcions de forçat"
 
 #: src/force.c
 msgid "Use MAC based security if available"
-msgstr ""
+msgstr "Empra seguretat basada en MAC si està disponible"
 
 #: src/force.c
 msgid "Replace a package with a lower version"
@@ -3386,11 +3313,11 @@ msgstr "Processa fins i tot els paquets amb versions errònies"
 
 #: src/force.c
 msgid "Overwrite an existing stat override when adding it"
-msgstr ""
+msgstr "Sobreescriu un statoverride existent al afegir-lo"
 
 #: src/force.c
 msgid "Ignore a missing stat override when removing it"
-msgstr ""
+msgstr "Ignora un statoverride que manga al eliminar-lo"
 
 #: src/force.c
 msgid "Overwrite a file from one package with another"
@@ -3501,6 +3428,9 @@ msgid ""
 "Currently enabled options:\n"
 " %s\n"
 msgstr ""
+"\n"
+"Opcions habilitades actualment:\n"
+" %s\n"
 
 #: src/force.c
 #, c-format
@@ -3585,49 +3515,7 @@ msgid "Debian '%s' package management program version %s.\n"
 msgstr "Programa de gestió de paquets «%s» de Debian versió %s.\n"
 
 #: src/main.c
-#, 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"
+#, c-format
 msgid ""
 "Commands:\n"
 "  -i|--install       <.deb file name>... | -R|--recursive <directory>...\n"
@@ -3674,7 +3562,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"
@@ -3690,8 +3578,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"
@@ -3845,7 +3733,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"
 
@@ -4218,10 +4106,8 @@ msgid "Description"
 msgstr "Descripció"
 
 #: src/querycmd.c
-#, fuzzy
-#| msgid "showing file on pager"
 msgid "showing package list on pager"
-msgstr "s'està mostrant el fitxer en el paginador"
+msgstr "s'està mostrant la llista de paquets en el paginador"
 
 #: src/querycmd.c
 #, c-format
@@ -4258,14 +4144,9 @@ 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
-#, 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 ""
-"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 --info (= dpkg-deb --info) per a examinar els fitxers d'arxiu.\n"
 
 #: src/querycmd.c
 #, c-format
@@ -4293,15 +4174,10 @@ msgid "diverted by %s to: %s\n"
 msgstr "desviat per %s cap 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 --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
@@ -4341,21 +4217,7 @@ msgstr ""
 "%s.\n"
 
 #: src/querycmd.c
-#, 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"
+#, c-format
 msgid ""
 "Commands:\n"
 "  -s, --status [<package>...]      Display package status details.\n"
@@ -4372,12 +4234,12 @@ msgid ""
 "\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"
@@ -4567,6 +4429,8 @@ 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
@@ -4589,32 +4453,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 ..."
@@ -4731,16 +4592,7 @@ msgstr ""
 "\n"
 
 #: src/statcmd.c
-#, 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"
+#, c-format
 msgid ""
 "Options:\n"
 "  --admindir <directory>   set the directory with the statoverride file.\n"
@@ -4759,10 +4611,16 @@ 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"
@@ -4817,10 +4675,9 @@ msgid "--update is useless for --remove"
 msgstr "no té sentit utilitzar --update amb --remove"
 
 #: src/statcmd.c
-#, fuzzy, c-format
-#| msgid "obsolete option '--%s'; please use '--%s' instead"
+#, c-format
 msgid "deprecated --%s option; use --%s instead"
-msgstr "l'opció «--%s» és obsoleta, empreu  «--%s» en el seu lloc"
+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."
@@ -5042,10 +4899,8 @@ msgid "De-configuring %s (%s) ...\n"
 msgstr "S'està desconfigurant %s (%s)…\n"
 
 #: src/unpack.c
-#, fuzzy
-#| msgid "statoverride file contains empty line"
 msgid "conffile file contains an empty line"
-msgstr "el fitxer de statoverride conté una línia buida"
+msgstr "el fitxer «conffile» conté una línia buida"
 
 #: src/unpack.c dpkg-deb/build.c
 #, c-format
@@ -5120,8 +4975,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
@@ -5136,7 +4990,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
@@ -5191,11 +5045,8 @@ msgid "package filesystem archive extraction"
 msgstr "extracció de l'arxiu de sistema de fitxers del paquet"
 
 #: src/unpack.c
-#, fuzzy
-#| msgid "corrupted filesystem tarfile - corrupted package archive"
 msgid "corrupted filesystem tarfile in package archive"
-msgstr ""
-"sistema de fitxers de l'arxiu tar corromput - arxiu del paquet corromput"
+msgstr "sistema de fitxers de l'arxiu tar corromput en l'arxiu de paquet"
 
 #: src/unpack.c
 #, c-format
@@ -5208,22 +5059,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
-#, fuzzy, c-format
-#| 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
-#, fuzzy, c-format
-#| msgid "unable to access dpkg status area for bulk available update"
+#, c-format
 msgid ""
 "required write access to 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»"
+"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
@@ -5271,7 +5120,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"
@@ -5324,7 +5173,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
@@ -5464,11 +5313,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
@@ -5513,15 +5361,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
@@ -5540,15 +5385,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
@@ -5560,10 +5402,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
@@ -5585,10 +5426,9 @@ msgid "failed to create directory"
 msgstr "no s'ha pogut crear el directori"
 
 #: dpkg-deb/extract.c
-#, fuzzy, c-format
-#| msgid "unexpected eof in package name at line %d"
+#, c-format
 msgid "unexpected pre-existing pathname %s"
-msgstr "s'ha trobat un EOF inesperat en el nom del paquet en la línia %d"
+msgstr "s'ha trobat un nom de camí %s pre-existent inesperat"
 
 #: dpkg-deb/extract.c
 msgid "failed to chdir to directory"
@@ -5669,7 +5509,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
@@ -5750,31 +5590,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"
@@ -5807,7 +5623,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"
@@ -6280,7 +6098,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
@@ -6336,7 +6154,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
@@ -6438,21 +6256,7 @@ msgstr ""
 "\n"
 
 #: utils/update-alternatives.c
-#, 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"
+#, c-format
 msgid ""
 "Options:\n"
 "  --altdir <directory>     change the alternatives directory.\n"
@@ -6478,8 +6282,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"
 
@@ -6626,7 +6430,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
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 000b88da7..173ec036f 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: 2019-03-25 15:07+0100\n"
-"PO-Revision-Date: 2017-05-07 16:26+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"
 
@@ -263,73 +242,6 @@ msgid "Usage: %s [<option>...]"
 msgstr "Forma d'ús: %s [<opció>…]"
 
 #: scripts/dpkg-buildpackage.pl
-#, fuzzy
-#| msgid ""
-#| "Options:\n"
-#| "      --build=<type>[,...]    specify the build <type>: full, source, "
-#| "binary,\n"
-#| "                                any, all (default is 'full').\n"
-#| "  -F                          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"
-#| "  -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 "
-#| "(default).\n"
-#| "  -d                          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 "
-#| "active.\n"
-#| "  -R, --rules-file=<rules>    rules file to execute (default is debian/"
-#| "rules).\n"
-#| "  -T, --rules-target=<target> call debian/rules <target>.\n"
-#| "      --as-root               ensure -T calls the target with root "
-#| "rights.\n"
-#| "  -j, --jobs[=<number>|auto]  jobs to run simultaneously (passed to "
-#| "<rules>),\n"
-#| "                                forced mode.\n"
-#| "  -J, --jobs-try[=<number>|auto]\n"
-#| "                              jobs to run simultaneously (passed to "
-#| "<rules>),\n"
-#| "                                opt-in mode (default is auto).\n"
-#| "  -r, --root-command=<command>\n"
-#| "                              command to gain root rights (default is "
-#| "fakeroot).\n"
-#| "      --check-command=<command>\n"
-#| "                              command to check the .changes file (no "
-#| "default).\n"
-#| "      --check-option=<opt>    pass <opt> to check <command>.\n"
-#| "      --hook-<name>=<command> set <command> as the hook <name>, known "
-#| "hooks:\n"
-#| "                                init preclean source build binary "
-#| "buildinfo\n"
-#| "                                changes postclean check sign done\n"
-#| "      --buildinfo-option=<opt>\n"
-#| "                              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"
-#| "  -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"
-#| "  -ui, --unsigned-buildinfo   unsigned .buildinfo file.\n"
-#| "  -uc, --unsigned-changes     unsigned .buildinfo and .changes file.\n"
-#| "      --no-sign               do not sign any file.\n"
-#| "      --force-sign            force signing the resulting files.\n"
-#| "      --admindir=<directory>  change the administrative directory.\n"
-#| "  -?, --help                  show this help message.\n"
-#| "      --version               show the version."
 msgid ""
 "Options:\n"
 "      --build=<type>[,...]    specify the build <type>: full, source, "
@@ -415,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/"
@@ -564,7 +475,7 @@ msgstr "l'opció o argument %s és desconeguda"
 #: 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
@@ -663,28 +574,28 @@ 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
+#, perl-format
 #| msgid "unknown build type %s"
 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
@@ -697,6 +608,8 @@ 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
@@ -704,6 +617,8 @@ 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
@@ -862,22 +777,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"
@@ -904,6 +803,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"
@@ -986,7 +886,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"
@@ -1214,41 +1114,6 @@ msgid "cannot install output control file '%s'"
 msgstr "no s'ha pogut instal·lar el fitxer de control de sortida «%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 "
@@ -1286,6 +1151,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"
@@ -1536,27 +1403,6 @@ msgstr ""
 "      --version            mostra la versió."
 
 #: 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"
@@ -1577,22 +1423,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"
 
@@ -1729,6 +1576,7 @@ 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:"
@@ -2325,7 +2173,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."
 
@@ -2476,10 +2324,10 @@ msgid "you can only specify one of 'to' and 'until', using 'until'"
 msgstr "només es pot especificar «to» o «until», s'emprarà «until»"
 
 #: scripts/Dpkg/Changelog.pm
-#, fuzzy, perl-format
+#, perl-format
 #| msgid "'%s' option specifies non-existing version"
 msgid "'%s' option specifies non-existing version '%s'"
-msgstr "l'opció «%s» especifica una versió inexistent"
+msgstr "l'opció «%s» especifica una versió «%s» inexistent"
 
 #: scripts/Dpkg/Changelog.pm
 msgid "use newest entry that is earlier than the one specified"
@@ -2494,22 +2342,21 @@ msgid "use oldest entry that is later than the one specified"
 msgstr "empra l'entrada més antiga que és posterior a l'especificada"
 
 #: scripts/Dpkg/Changelog.pm
-#, fuzzy, perl-format
-#| msgid "no such entry found, ignoring '%s' parameter"
+#, perl-format
 msgid "no such entry found, ignoring '%s' parameter '%s'"
-msgstr "no s'ha trobat l'entrada, s'ignorarà el paràmetre «%s»"
+msgstr "no s'ha trobat l'entrada, s'ignorarà el paràmetre «%s» = «%s»"
 
 #: scripts/Dpkg/Changelog.pm
-#, fuzzy, perl-format
+#, perl-format
 #| msgid "'since' option specifies most recent version, ignoring"
 msgid "'since' option specifies most recent version '%s', ignoring"
-msgstr "l'opció «since» especifica la versió més recent, s'ignorarà"
+msgstr "l'opció «since» especifica la versió «%s» més recent, s'ignorarà"
 
 #: scripts/Dpkg/Changelog.pm
-#, fuzzy, perl-format
+#, perl-format
 #| msgid "'until' option specifies oldest version, ignoring"
 msgid "'until' option specifies oldest version '%s', ignoring"
-msgstr "l'opció «until» especifica la versió més antiga, s'ignorarà"
+msgstr "l'opció «until» especifica la versió «%s» més antiga, s'ignorarà"
 
 #: scripts/Dpkg/Changelog/Debian.pm
 msgid "first heading"
@@ -2623,10 +2470,9 @@ msgid "the trailer doesn't match the expected regex"
 msgstr "el final no coincideix amb la regex esperada"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, fuzzy, perl-format
-#| msgid "cannot stat file %s"
+#, perl-format
 msgid "cannot seek into file %s"
-msgstr "no es pot fer «stat» al fitxer «%s»"
+msgstr "no es pot reposicionar al fitxer «%s»"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
@@ -2817,10 +2663,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
@@ -2873,21 +2718,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."
@@ -2943,29 +2786,26 @@ 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 ""
+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"
@@ -2985,6 +2825,8 @@ 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
@@ -3089,10 +2931,9 @@ msgid "cannot read timestamp from %s"
 msgstr "no es pot llegir la marca horària de %s"
 
 #: scripts/Dpkg/Source/Functions.pm
-#, fuzzy, perl-format
-#| msgid "cannot open file %s"
+#, perl-format
 msgid "cannot open file %s for binary detection"
-msgstr "no es pot obrir el fitxer %s"
+msgstr "no es pot obrir el fitxer %s per a detecció binaria"
 
 #: scripts/Dpkg/Source/BinaryFiles.pm
 #, perl-format
@@ -3668,10 +3509,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
-#, fuzzy
-#| msgid "format v3.0 uses only one source file"
 msgid "format v3.0 (bzr) uses only one source file"
-msgstr "el format v3.0 només empra un sol fitxer font"
+msgstr "el format v3.0 (bzr) només empra un sol fitxer font"
 
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm
 #, perl-format
@@ -3794,10 +3633,9 @@ msgid "can't create symlink %s"
 msgstr "no es pot crear l'enllaç simbòlic %s"
 
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
-#, fuzzy, perl-format
-#| msgid "using options from %s: %s"
+#, perl-format
 msgid "using patch list from %s"
-msgstr "s'estan emprant opcions de %s: %s"
+msgstr "s'esta emprant la llista de pedaços de %s"
 
 #: scripts/Dpkg/Source/Package/V3/Quilt.pm
 #, perl-format
@@ -3843,10 +3681,9 @@ msgid "unknown file type"
 msgstr "tipus de fitxer desconegut"
 
 #: scripts/Dpkg/Source/Patch.pm
-#, fuzzy, perl-format
-#| msgid "ignoring deletion of directory %s"
+#, perl-format
 msgid "ignoring deletion of file %s"
-msgstr "s'omet la supressió del directori %s"
+msgstr "s'omet la supressió del fitxer %s"
 
 #: scripts/Dpkg/Source/Patch.pm
 #, perl-format
@@ -4089,16 +3926,14 @@ msgid "obsolete substitution variable ${%s}"
 msgstr "la variable de substitució ${%s} és obsoleta"
 
 #: scripts/Dpkg/Substvars.pm
-#, fuzzy, perl-format
-#| msgid "unused substitution variable ${%s}"
+#, perl-format
 msgid "substitution variable ${%s} used, but is not defined"
-msgstr "la variable de substitució ${%s} no s'utilitza"
+msgstr "la variable de substitució ${%s} s'utilitza, però no s'ha definit"
 
 #: scripts/Dpkg/Substvars.pm
-#, fuzzy, perl-format
-#| msgid "unused substitution variable ${%s}"
+#, perl-format
 msgid "substitution variable ${%s} unused, but is defined"
-msgstr "la variable de substitució ${%s} no s'utilitza"
+msgstr "la variable de substitució ${%s} no s'utilitza, però s'ha definit"
 
 #: scripts/Dpkg/Vars.pm
 #, perl-format
-- 
cgit v1.2.3


From 66223cb9ee839f4fe9c661fbb8818fae9833cf8d Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 10 May 2019 03:58:25 +0200
Subject: po: Update Catalan translations

---
 po/ca.po         | 72 +++++++++++++++++++++++++++++++++-----------------------
 scripts/po/ca.po |  7 ++----
 2 files changed, 44 insertions(+), 35 deletions(-)

(limited to 'scripts')

diff --git a/po/ca.po b/po/ca.po
index ef9fd4b1b..55320bde3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -351,24 +351,29 @@ msgstr "no es pot tornar al principi de %.250s després del farciment"
 #: lib/dpkg/dbmodify.c
 #, c-format
 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"
+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"
+"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"
+"no es pot obrir/crear el fitxer de blocatge de la base de dades de dpkg per "
+"al directori %s"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "you do not have permission to lock the dpkg database directory %s"
-msgstr "no teniu permís per a blocar el directori %s de la base de dades de dpkg "
+msgstr ""
+"no teniu permís per a blocar el directori %s de la base de dades de dpkg "
 
 #: lib/dpkg/dbmodify.c
 msgid "dpkg frontend lock"
@@ -391,7 +396,8 @@ msgstr "no es pot accedir al directori %s de la base de dades de dpkg"
 #, c-format
 msgid "required read/write access to the dpkg database directory %s"
 msgstr ""
-"l'operació requereix accés de lectura i escriptura al directori %s de la base de dades de 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
@@ -776,8 +782,8 @@ msgstr ""
 #, c-format
 msgid "too few values in archive details '%s' field (compared to others)"
 msgstr ""
-"valors insuficients en el camp «%s» dels detalls de l'arxiu (comparat "
-"amb d'altres)"
+"valors insuficients en el camp «%s» dels detalls de l'arxiu (comparat amb "
+"d'altres)"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -838,13 +844,15 @@ msgstr "el valor de «%s» té una línia amb format erroni «%.*s»"
 #, c-format
 msgid "value for '%s' field has line starting with non-space '%c'"
 msgstr ""
-"el valor del camp «%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
 #, 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»"
+msgstr ""
+"s'ha indicat com conffile el directori arrel o un directori buit en el camp "
+"«%s»"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -1293,8 +1301,7 @@ msgstr ""
 #: lib/dpkg/parse.c
 #, c-format
 msgid "can't mmap package info file '%.255s'"
-msgstr ""
-"no es pot executar «mmap» al 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
@@ -1472,7 +1479,9 @@ 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"
+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
@@ -1915,8 +1924,7 @@ msgstr ""
 #, c-format
 msgid "failed to stat (dereference) existing symlink '%.250s'"
 msgstr ""
-"no s'ha pogut fer «stat» (dereferència) a 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
@@ -1924,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) a 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
@@ -1951,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» a «%.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
@@ -1966,8 +1973,8 @@ msgstr ""
 #, c-format
 msgid "unable to stat restored '%.255s' before installing another version"
 msgstr ""
-"no es pot fer «stat» al «%.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
@@ -2366,8 +2373,8 @@ msgstr "[no hi ha opció per defecte]"
 #: src/configure.c
 msgid "error writing to stderr, discovered before conffile prompt"
 msgstr ""
-"error en escriure a 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"
@@ -2773,9 +2780,11 @@ msgstr ""
 "  --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"
+"  --instdir <directori>    estableix el directori arrel, però no el "
+"directori\n"
 "                             administratiu.\n"
-"  --root <directori>       estableix el directori arrel del sistema de fixters.\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"
@@ -2802,8 +2811,8 @@ 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"
+"especifiqueu --no-rename explícitament, l'opció predeterminada canviar a --"
+"rename a 1.20.x"
 
 #: src/divertcmd.c utils/update-alternatives.c
 #, c-format
@@ -4177,7 +4186,8 @@ msgstr "desviat per %s cap a: %s\n"
 msgid ""
 "Use dpkg --contents (= dpkg-deb --contents) to list archive files contents.\n"
 msgstr ""
-"Empreu dpkg --contents (= dpkg-deb --contents) per a llistar el contingut d'arxiu.\n"
+"Empreu dpkg --contents (= dpkg-deb --contents) per a llistar el contingut "
+"d'arxiu.\n"
 
 #: src/querycmd.c dpkg-deb/info.c
 #, c-format
@@ -4611,8 +4621,10 @@ 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"
+"  --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"
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 173ec036f..41e33e76a 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -583,7 +583,6 @@ msgstr "paraula clau %s desconeguda en el camp %s a l'espai de noms de dpkg"
 
 #: scripts/dpkg-buildpackage.pl
 #, perl-format
-#| msgid "unknown build type %s"
 msgid "unknown %s field keyword %s"
 msgstr "paraula clau %s desconeguda en el camp %s"
 
@@ -2325,7 +2324,6 @@ 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"
 msgid "'%s' option specifies non-existing version '%s'"
 msgstr "l'opció «%s» especifica una versió «%s» inexistent"
 
@@ -2348,13 +2346,11 @@ msgstr "no s'ha trobat l'entrada, s'ignorarà el paràmetre «%s» = «%s»"
 
 #: scripts/Dpkg/Changelog.pm
 #, perl-format
-#| msgid "'since' option specifies most recent version, ignoring"
 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
 #, perl-format
-#| msgid "'until' option specifies oldest version, ignoring"
 msgid "'until' option specifies oldest version '%s', ignoring"
 msgstr "l'opció «until» especifica la versió «%s» més antiga, s'ignorarà"
 
@@ -2790,7 +2786,8 @@ 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"
+msgstr ""
+"no es pot armar el fitxer de signatura en OpenPGP ASCII ja que manca gpg"
 
 #: scripts/Dpkg/OpenPGP.pm
 #, perl-format
-- 
cgit v1.2.3


From 63b674de77ede42f1e9547ad760f3c83fd051a4e Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 23 May 2019 22:04:56 +0200
Subject: doc: Fix typos

Warned-by: codespell
---
 ChangeLog.old                          |  2 +-
 debian/changelog                       |  3 ++-
 dselect/pkglist.h                      |  2 +-
 man/deb-buildinfo.man                  |  2 +-
 man/deb-src-rules.man                  |  2 +-
 man/dpkg-buildflags.man                |  4 ++--
 man/dpkg-query.man                     |  2 +-
 man/start-stop-daemon.man              |  2 +-
 scripts/Dpkg/Changelog/Entry/Debian.pm |  2 +-
 t/codespell/stopwords                  | 13 +++++++++++++
 10 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'scripts')

diff --git a/ChangeLog.old b/ChangeLog.old
index 8cd7ba729..1889f112f 100644
--- a/ChangeLog.old
+++ b/ChangeLog.old
@@ -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>
diff --git a/debian/changelog b/debian/changelog
index 29cec6642..b30d204f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ dpkg (1.19.7) UNRELEASED; urgency=medium
       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).
@@ -327,7 +328,7 @@ dpkg (1.19.3) unstable; urgency=medium
   * Test suite:
     - Add new shellcheck author test.
     - Add descriptions for the shellcheck exclude codes.
-    - Update cppcheck supressions.
+    - Update cppcheck suppressions.
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #912023
diff --git a/dselect/pkglist.h b/dselect/pkglist.h
index f60a93169..3d46dcfd8 100644
--- a/dselect/pkglist.h
+++ b/dselect/pkglist.h
@@ -212,7 +212,7 @@ protected:
 
   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/man/deb-buildinfo.man b/man/deb-buildinfo.man
index 691acb255..6a9d00b40 100644
--- a/man/deb-buildinfo.man
+++ b/man/deb-buildinfo.man
@@ -152,7 +152,7 @@ will emit this field.
 .B Build\-Tainted\-By:
 .TQ
 .I " taint-reason-list"
-This folded field contains a space-separated list of non-exhausitve reason
+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
diff --git a/man/deb-src-rules.man b/man/deb-src-rules.man
index 19a8f7207..9fd8b30ba 100644
--- a/man/deb-src-rules.man
+++ b/man/deb-src-rules.man
@@ -40,7 +40,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
diff --git a/man/dpkg-buildflags.man b/man/dpkg-buildflags.man
index ba18dbbb7..f352c18ee 100644
--- a/man/dpkg-buildflags.man
+++ b/man/dpkg-buildflags.man
@@ -107,7 +107,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
@@ -575,7 +575,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-query.man b/man/dpkg-query.man
index de14b9afe..1358d0c0b 100644
--- a/man/dpkg-query.man
+++ b/man/dpkg-query.man
@@ -140,7 +140,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
diff --git a/man/start-stop-daemon.man b/man/start-stop-daemon.man
index 2a083f34c..d5a53ccff 100644
--- a/man/start-stop-daemon.man
+++ b/man/start-stop-daemon.man
@@ -272,7 +272,7 @@ code for them to do this themselves.
 .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 procotol, as specified
+This implements parts of the systemd readiness protocol, as specified
 in the \fBsd_notify\fP(3) man page.
 The following variables are supported:
 .RS
diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm
index 3d1888638..5f4c9e569 100644
--- a/scripts/Dpkg/Changelog/Entry/Debian.pm
+++ b/scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -236,7 +236,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 {
diff --git a/t/codespell/stopwords b/t/codespell/stopwords
index 1909fdd40..75dcb1767 100644
--- a/t/codespell/stopwords
+++ b/t/codespell/stopwords
@@ -1,12 +1,25 @@
+accreting
+ba
 cas
 chage
+chang
+claus
 cmo
 creat
+files'
+finitel
+fo
 iff
 isnt
+ist
+ists
 lowercased
 mitre
+msdos
 objext
+od
+packages'
+process'
 readded
 rela
 te
-- 
cgit v1.2.3


From ddc4121f5b2f591cae3afb358b44c3e013ee9354 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 2 Jun 2019 23:30:10 +0200
Subject: po: Unfuzzy translations due to typo fixes

---
 man/po/de.po     | 12 ++++++------
 man/po/es.po     | 12 ++++++------
 man/po/fr.po     | 14 +++++++-------
 man/po/hu.po     | 12 ++++++------
 man/po/it.po     | 14 +++++++-------
 man/po/ja.po     | 12 ++++++------
 man/po/nl.po     | 18 +++++++++---------
 man/po/pl.po     | 12 ++++++------
 man/po/pt_BR.po  | 12 ++++++------
 man/po/ru.po     | 12 ++++++------
 man/po/sv.po     | 12 ++++++------
 man/po/zh_CN.po  | 12 ++++++------
 scripts/po/ca.po |  2 +-
 scripts/po/de.po |  2 +-
 scripts/po/es.po |  2 +-
 scripts/po/fr.po |  2 +-
 scripts/po/pl.po |  2 +-
 scripts/po/ru.po |  2 +-
 scripts/po/sv.po |  2 +-
 19 files changed, 84 insertions(+), 84 deletions(-)

(limited to 'scripts')

diff --git a/man/po/de.po b/man/po/de.po
index 59d22f65e..ca7f4f647 100644
--- a/man/po/de.po
+++ b/man/po/de.po
@@ -1005,7 +1005,7 @@ msgstr "I<taint-reason-list>"
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -3981,7 +3981,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 ""
@@ -11289,7 +11289,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 "
@@ -12568,7 +12568,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
@@ -19531,7 +19531,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, "
@@ -25955,7 +25955,7 @@ msgstr "B<--notify-await>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"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 "
diff --git a/man/po/es.po b/man/po/es.po
index f48220eb2..952fdcb72 100644
--- a/man/po/es.po
+++ b/man/po/es.po
@@ -984,7 +984,7 @@ msgstr ""
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -4033,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 ""
@@ -11854,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 ""
 
@@ -13161,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
@@ -20714,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 "
@@ -27948,7 +27948,7 @@ msgstr "B<--no-await>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/man/po/fr.po b/man/po/fr.po
index 7ae3e7d1d..c70e503aa 100644
--- a/man/po/fr.po
+++ b/man/po/fr.po
@@ -1022,7 +1022,7 @@ msgstr "I<liste-de-variables>"
 #| msgid ""
 #| "This folded field is a space-separated list of binary packages to upload."
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -4058,7 +4058,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 ""
@@ -11431,12 +11431,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
@@ -12709,7 +12709,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 ""
 "Pour passer des drapeaux de compilation à une commande de compilation dans "
 "un Makefile :"
@@ -19732,7 +19732,7 @@ msgstr "B<-S>, B<--search> I<motif-de-nom-à-rechercher>..."
 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 "
@@ -26195,7 +26195,7 @@ msgstr "B<--no-await>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/man/po/hu.po b/man/po/hu.po
index 900d2e15b..a6f3a44c6 100644
--- a/man/po/hu.po
+++ b/man/po/hu.po
@@ -836,7 +836,7 @@ msgstr ""
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -3490,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 ""
@@ -9576,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 ""
 
@@ -10585,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
@@ -16222,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 ""
 
@@ -21122,7 +21122,7 @@ msgstr "B<--new>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/man/po/it.po b/man/po/it.po
index beb409389..0c4f28b37 100644
--- a/man/po/it.po
+++ b/man/po/it.po
@@ -965,7 +965,7 @@ msgstr ""
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -4088,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 ""
@@ -11150,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)."
 
@@ -11684,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 ""
 
@@ -12712,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
@@ -19589,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 "
@@ -26265,7 +26265,7 @@ msgstr "B<--no-await>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/man/po/ja.po b/man/po/ja.po
index 30b7a6a89..5de83ec39 100644
--- a/man/po/ja.po
+++ b/man/po/ja.po
@@ -945,7 +945,7 @@ msgstr ""
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -3963,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 ""
@@ -11650,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 ""
 
@@ -12930,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
@@ -20297,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 ""
 "指定したパターンにマッチするファイルをインストールしたパッケージを検索する。"
@@ -27305,7 +27305,7 @@ msgstr "B<--no-await>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/man/po/nl.po b/man/po/nl.po
index f7508bce5..3534a31cd 100644
--- a/man/po/nl.po
+++ b/man/po/nl.po
@@ -1014,7 +1014,7 @@ msgstr "I<lijst-met-bezoedelingsredenen>"
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -4036,7 +4036,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 ""
@@ -11438,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
@@ -12716,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
@@ -19778,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 "
@@ -26293,12 +26293,12 @@ msgstr "B<--notify-await>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"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 procotol' van systemd toe, zoals dit in de "
+"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:"
 
diff --git a/man/po/pl.po b/man/po/pl.po
index ae1793a30..b479ae6c0 100644
--- a/man/po/pl.po
+++ b/man/po/pl.po
@@ -958,7 +958,7 @@ msgstr ""
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -4005,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 ""
@@ -11866,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 ""
 
@@ -13169,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
@@ -20688,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 "
@@ -27980,7 +27980,7 @@ msgstr "B<--no-await>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/man/po/pt_BR.po b/man/po/pt_BR.po
index 025a0419f..81e25071a 100644
--- a/man/po/pt_BR.po
+++ b/man/po/pt_BR.po
@@ -802,7 +802,7 @@ msgstr ""
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -3146,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 ""
@@ -9558,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 ""
 
@@ -10566,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
@@ -16084,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 ""
 
@@ -20991,7 +20991,7 @@ msgstr "B<--nocheck>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/man/po/ru.po b/man/po/ru.po
index 8ce98d84f..d29c0d2e9 100644
--- a/man/po/ru.po
+++ b/man/po/ru.po
@@ -836,7 +836,7 @@ msgstr ""
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -3461,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 ""
@@ -9989,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 ""
 
@@ -10997,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
@@ -16530,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 ""
 
@@ -21533,7 +21533,7 @@ msgstr "B<--no-debsig>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/man/po/sv.po b/man/po/sv.po
index c3ef71972..17f0d66dc 100644
--- a/man/po/sv.po
+++ b/man/po/sv.po
@@ -946,7 +946,7 @@ msgstr ""
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -3964,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 ""
@@ -11588,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. "
@@ -12863,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
@@ -20167,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 "
@@ -27098,7 +27098,7 @@ msgstr "B<--no-await>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index a9aa33c61..5a6d70d34 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -840,7 +840,7 @@ msgstr ""
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -3211,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 ""
@@ -9623,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 ""
 
@@ -10627,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
@@ -16141,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 ""
 
@@ -21033,7 +21033,7 @@ msgstr "B<--version>"
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 41e33e76a..a0822f898 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -2458,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
diff --git a/scripts/po/de.po b/scripts/po/de.po
index fb87dea1c..8fe30da88 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -2438,7 +2438,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
diff --git a/scripts/po/es.po b/scripts/po/es.po
index 8fb4f9cc0..995a4f466 100644
--- a/scripts/po/es.po
+++ b/scripts/po/es.po
@@ -2840,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
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index efaad3166..de38e5df1 100644
--- a/scripts/po/fr.po
+++ b/scripts/po/fr.po
@@ -2753,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
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index 2d76f5408..c69a9abfc 100644
--- a/scripts/po/pl.po
+++ b/scripts/po/pl.po
@@ -2694,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
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index 2ee3451f0..557145cfc 100644
--- a/scripts/po/ru.po
+++ b/scripts/po/ru.po
@@ -2716,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
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index 57ca6a25b..83b79158b 100644
--- a/scripts/po/sv.po
+++ b/scripts/po/sv.po
@@ -2662,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
-- 
cgit v1.2.3


From 702ca65cdf4cd0eb9369ff1a8b246dad267e643a Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 3 Jun 2019 23:22:34 +0200
Subject: po: Regenerate .pot files and merge .po files with them

---
 dselect/po/bs.po        |  2 +-
 dselect/po/ca.po        |  2 +-
 dselect/po/cs.po        |  2 +-
 dselect/po/da.po        |  2 +-
 dselect/po/de.po        |  2 +-
 dselect/po/dselect.pot  |  4 ++--
 dselect/po/el.po        |  2 +-
 dselect/po/es.po        |  2 +-
 dselect/po/et.po        |  2 +-
 dselect/po/eu.po        |  2 +-
 dselect/po/fr.po        |  2 +-
 dselect/po/gl.po        |  2 +-
 dselect/po/hu.po        |  2 +-
 dselect/po/id.po        |  2 +-
 dselect/po/it.po        |  2 +-
 dselect/po/ja.po        |  2 +-
 dselect/po/ko.po        |  2 +-
 dselect/po/nb.po        |  2 +-
 dselect/po/nl.po        |  2 +-
 dselect/po/nn.po        |  2 +-
 dselect/po/pl.po        |  2 +-
 dselect/po/pt.po        |  2 +-
 dselect/po/pt_BR.po     |  2 +-
 dselect/po/ro.po        |  2 +-
 dselect/po/ru.po        |  2 +-
 dselect/po/sk.po        |  2 +-
 dselect/po/sv.po        |  2 +-
 dselect/po/tl.po        |  2 +-
 dselect/po/vi.po        |  2 +-
 dselect/po/zh_CN.po     |  2 +-
 dselect/po/zh_TW.po     |  2 +-
 man/po/dpkg-man.pot     | 16 ++++++++--------
 po/ast.po               |  2 +-
 po/bs.po                |  2 +-
 po/ca.po                |  2 +-
 po/cs.po                |  2 +-
 po/da.po                |  2 +-
 po/de.po                |  2 +-
 po/dpkg.pot             |  4 ++--
 po/dz.po                |  2 +-
 po/el.po                |  2 +-
 po/eo.po                |  2 +-
 po/es.po                |  2 +-
 po/et.po                |  2 +-
 po/eu.po                |  2 +-
 po/fr.po                |  2 +-
 po/gl.po                |  2 +-
 po/hu.po                |  2 +-
 po/id.po                |  2 +-
 po/it.po                |  2 +-
 po/ja.po                |  2 +-
 po/km.po                |  2 +-
 po/ko.po                |  2 +-
 po/ku.po                |  2 +-
 po/lt.po                |  2 +-
 po/mr.po                |  2 +-
 po/nb.po                |  2 +-
 po/ne.po                |  2 +-
 po/nl.po                |  2 +-
 po/nn.po                |  2 +-
 po/pa.po                |  2 +-
 po/pl.po                |  2 +-
 po/pt.po                |  2 +-
 po/pt_BR.po             |  2 +-
 po/ro.po                |  2 +-
 po/ru.po                |  2 +-
 po/sk.po                |  2 +-
 po/sv.po                |  2 +-
 po/th.po                |  2 +-
 po/tl.po                |  2 +-
 po/tr.po                |  2 +-
 po/vi.po                |  2 +-
 po/zh_CN.po             |  2 +-
 po/zh_TW.po             |  2 +-
 scripts/po/ca.po        |  2 +-
 scripts/po/de.po        |  2 +-
 scripts/po/dpkg-dev.pot |  6 +++---
 scripts/po/es.po        |  2 +-
 scripts/po/fr.po        |  2 +-
 scripts/po/pl.po        |  2 +-
 scripts/po/ru.po        |  2 +-
 scripts/po/sv.po        |  2 +-
 82 files changed, 93 insertions(+), 93 deletions(-)

(limited to 'scripts')

diff --git a/dselect/po/bs.po b/dselect/po/bs.po
index 031b56eaf..79730de24 100644
--- a/dselect/po/bs.po
+++ b/dselect/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/ca.po b/dselect/po/ca.po
index d40c527ef..0dbdd77f6 100644
--- a/dselect/po/ca.po
+++ b/dselect/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/cs.po b/dselect/po/cs.po
index d3a3fef3b..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/da.po b/dselect/po/da.po
index 68c470503..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/de.po b/dselect/po/de.po
index 1de42be9f..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/dselect.pot b/dselect/po/dselect.pot
index 0a702317c..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.6\n"
+"Project-Id-Version: dpkg 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/el.po b/dselect/po/el.po
index 4db6e199e..4aa0aff98 100644
--- a/dselect/po/el.po
+++ b/dselect/po/el.po
@@ -11,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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/es.po b/dselect/po/es.po
index 6f410dc0b..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/et.po b/dselect/po/et.po
index 0e4a2dacc..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/eu.po b/dselect/po/eu.po
index ea4ed2125..6b1a79223 100644
--- a/dselect/po/eu.po
+++ b/dselect/po/eu.po
@@ -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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/fr.po b/dselect/po/fr.po
index 91ecf815e..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/gl.po b/dselect/po/gl.po
index 22720d198..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/hu.po b/dselect/po/hu.po
index d7b7b4c85..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/id.po b/dselect/po/id.po
index 1eb416d4e..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/it.po b/dselect/po/it.po
index 1e506a74f..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/ja.po b/dselect/po/ja.po
index 3085e7c38..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/ko.po b/dselect/po/ko.po
index 941ce84c0..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/nb.po b/dselect/po/nb.po
index f89ece8fb..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/nl.po b/dselect/po/nl.po
index 67e5e85fb..34d1dd9c5 100644
--- a/dselect/po/nl.po
+++ b/dselect/po/nl.po
@@ -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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/nn.po b/dselect/po/nn.po
index 5b709bcd9..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/pl.po b/dselect/po/pl.po
index 12c4ba269..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/pt.po b/dselect/po/pt.po
index 13327b442..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/pt_BR.po b/dselect/po/pt_BR.po
index 319eba231..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: 2019-03-25 15:07+0100\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."
diff --git a/dselect/po/ro.po b/dselect/po/ro.po
index aae0dcdc4..d27fb36ba 100644
--- a/dselect/po/ro.po
+++ b/dselect/po/ro.po
@@ -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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/ru.po b/dselect/po/ru.po
index 724f03216..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/sk.po b/dselect/po/sk.po
index 9f45f90af..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/sv.po b/dselect/po/sv.po
index 9c8925587..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/tl.po b/dselect/po/tl.po
index 6e5251554..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/vi.po b/dselect/po/vi.po
index 69a641b45..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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/zh_CN.po b/dselect/po/zh_CN.po
index b53661a57..d89c2f6c6 100644
--- a/dselect/po/zh_CN.po
+++ b/dselect/po/zh_CN.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: 2019-03-25 15:07+0100\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"
diff --git a/dselect/po/zh_TW.po b/dselect/po/zh_TW.po
index 3b893e459..1d44030b3 100644
--- a/dselect/po/zh_TW.po
+++ b/dselect/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dselect 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/man/po/dpkg-man.pot b/man/po/dpkg-man.pot
index abf0c8986..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.6\n"
+"Project-Id-Version: dpkg-man 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
@@ -804,7 +804,7 @@ msgstr ""
 #. type: Plain text
 #: deb-buildinfo.man
 msgid ""
-"This folded field contains a space-separated list of non-exhausitve reason "
+"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 ""
@@ -3119,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 ""
@@ -9098,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 ""
 
@@ -10099,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
@@ -15552,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 ""
 
@@ -20420,7 +20420,7 @@ msgstr ""
 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 procotol, as specified in the B<sd_notify>(3) "
+"parts of the systemd readiness protocol, as specified in the B<sd_notify>(3) "
 "man page.  The following variables are supported:"
 msgstr ""
 
diff --git a/po/ast.po b/po/ast.po
index 5bd68d9d0..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: 2019-03-25 15:07+0100\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"
diff --git a/po/bs.po b/po/bs.po
index 254f35e72..095bc9db8 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/ca.po b/po/ca.po
index 55320bde3..14400a8db 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/cs.po b/po/cs.po
index 99e798445..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: 2019-03-25 15:07+0100\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"
diff --git a/po/da.po b/po/da.po
index e3f7436ca..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: 2019-03-25 15:07+0100\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"
diff --git a/po/de.po b/po/de.po
index e073991b7..d1bc073d6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.4\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2019-01-30 18:28+0100\n"
 "Last-Translator: Sven Joachim <svenjoac@gmx.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
diff --git a/po/dpkg.pot b/po/dpkg.pot
index 4a43d006e..54ba5e7fc 100644
--- a/po/dpkg.pot
+++ b/po/dpkg.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.19.6\n"
+"Project-Id-Version: dpkg 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/dz.po b/po/dz.po
index 44c98fecf..40c306394 100644
--- a/po/dz.po
+++ b/po/dz.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: 2019-03-25 15:07+0100\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"
diff --git a/po/el.po b/po/el.po
index 68dc92539..328bc2747 100644
--- a/po/el.po
+++ b/po/el.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: 2019-03-25 15:07+0100\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"
diff --git a/po/eo.po b/po/eo.po
index 21209154e..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: 2019-03-25 15:07+0100\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"
diff --git a/po/es.po b/po/es.po
index 7d0845a2b..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: 2019-03-25 15:07+0100\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"
diff --git a/po/et.po b/po/et.po
index cdce49b43..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: 2019-03-25 15:07+0100\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"
diff --git a/po/eu.po b/po/eu.po
index 6b900f64d..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: 2019-03-25 15:07+0100\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"
diff --git a/po/fr.po b/po/fr.po
index a8e78f98c..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: 2019-03-25 15:07+0100\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"
diff --git a/po/gl.po b/po/gl.po
index 59cf7f0fa..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: 2019-03-25 15:07+0100\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"
diff --git a/po/hu.po b/po/hu.po
index 8c8969dbd..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: 2019-03-25 15:07+0100\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"
diff --git a/po/id.po b/po/id.po
index 570bd2400..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: 2019-03-25 15:07+0100\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"
diff --git a/po/it.po b/po/it.po
index 5296d52e6..3e4581407 100644
--- a/po/it.po
+++ b/po/it.po
@@ -25,7 +25,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.3\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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 <tp@lists.linux.it>\n"
diff --git a/po/ja.po b/po/ja.po
index 352b7507e..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: 2019-03-25 15:07+0100\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"
diff --git a/po/km.po b/po/km.po
index 5757cb24a..f8a34f507 100644
--- a/po/km.po
+++ b/po/km.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: 2019-03-25 15:07+0100\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"
diff --git a/po/ko.po b/po/ko.po
index 68e5420d4..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: 2019-03-25 15:07+0100\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"
diff --git a/po/ku.po b/po/ku.po
index 072355014..a091e0953 100644
--- a/po/ku.po
+++ b/po/ku.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: 2019-03-25 15:07+0100\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"
diff --git a/po/lt.po b/po/lt.po
index bcf470575..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: 2019-03-25 15:07+0100\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"
diff --git a/po/mr.po b/po/mr.po
index e758fb2ae..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: 2019-03-25 15:07+0100\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"
diff --git a/po/nb.po b/po/nb.po
index a005250a9..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: 2019-03-25 15:07+0100\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"
diff --git a/po/ne.po b/po/ne.po
index 6558d591e..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: 2019-03-25 15:07+0100\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"
diff --git a/po/nl.po b/po/nl.po
index d7524a07b..fe5dad5e9 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+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"
diff --git a/po/nn.po b/po/nn.po
index c27d49098..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: 2019-03-25 15:07+0100\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"
diff --git a/po/pa.po b/po/pa.po
index abbfee0f5..4bd5d3d01 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/pl.po b/po/pl.po
index af8140039..20a4bc2d0 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.1\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/pt.po b/po/pt.po
index 5b2aceb5c..dad661bb8 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.14\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2018-12-30 15:43+0000\n"
 "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n"
 "Language-Team: Portuguese <traduz@debianpt.org>\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8f0ad3c46..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: 2019-03-25 15:07+0100\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."
diff --git a/po/ro.po b/po/ro.po
index c8db8f6c4..58d959a98 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -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: 2019-03-25 15:07+0100\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"
diff --git a/po/ru.po b/po/ru.po
index 99f11deff..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: 2019-03-25 15:07+0100\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"
diff --git a/po/sk.po b/po/sk.po
index 978ed3f19..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: 2019-03-25 15:07+0100\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"
diff --git a/po/sv.po b/po/sv.po
index 9a0df1707..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: 2019-03-25 15:07+0100\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"
diff --git a/po/th.po b/po/th.po
index a48b18990..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: 2019-03-25 15:07+0100\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"
diff --git a/po/tl.po b/po/tl.po
index feb59a041..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: 2019-03-25 15:07+0100\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"
diff --git a/po/tr.po b/po/tr.po
index c6935877b..85cd8d46c 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.17.10\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/vi.po b/po/vi.po
index 5e254789d..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: 2019-03-25 15:07+0100\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"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 77d4254f0..947944ea0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.19.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 6bf2ac4c8..94405fda4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg 1.13\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index a0822f898..d7308988b 100644
--- a/scripts/po/ca.po
+++ b/scripts/po/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/de.po b/scripts/po/de.po
index 8fe30da88..cca180604 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.19.5\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\n"
+"POT-Creation-Date: 2019-06-03 23:21+0200\n"
 "PO-Revision-Date: 2019-02-24 17:42+0100\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 0384d8fdf..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.6\n"
+"Project-Id-Version: dpkg 1.19.7\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-03-25 15:07+0100\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"
@@ -1897,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
diff --git a/scripts/po/es.po b/scripts/po/es.po
index 995a4f466..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: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index de38e5df1..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: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index c69a9abfc..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: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index 557145cfc..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: 2019-03-25 15:07+0100\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"
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index 83b79158b..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: 2019-03-25 15:07+0100\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"
-- 
cgit v1.2.3


From f0c3cccfef69a054ffe4975d9da12cd86066ec04 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 7 Jun 2019 18:01:47 +0200
Subject: Bump version to 1.20.0

---
 TODO             | 2 +-
 debian/changelog | 6 ++++++
 scripts/Dpkg.pm  | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/TODO b/TODO
index a4f485da4..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.
diff --git a/debian/changelog b/debian/changelog
index a85e9473a..d556ed5bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dpkg (1.20.0) UNRELEASED; urgency=medium
+
+  *
+
+ -- Guillem Jover <guillem@debian.org>  Fri, 07 Jun 2019 18:00:53 +0200
+
 dpkg (1.19.7) unstable; urgency=medium
 
   [ Guillem Jover ]
diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm
index c2768a3dd..21444b802 100644
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -101,7 +101,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';
-- 
cgit v1.2.3


From c3808237c6be5316d170aa928dd755390b667af9 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 27 Mar 2019 03:12:04 +0100
Subject: scripts: Switch Getopt::Long from bundling to bundling_values

This got introduced after a request so that we could switch our tools
to a safe subset of the bundling logic, so let's enable it now that it
is available in the minimum supported perl version.

Bundling is in general unsafe, and not future-proof, as new options
might gain arguments which would then get misinterpreted, we should
not really be using it. But bundling the value into the option is a
common pattern and should be allowed.
---
 debian/changelog                | 4 ++++
 scripts/dpkg-checkbuilddeps.pl  | 2 +-
 scripts/dpkg-mergechangelogs.pl | 2 +-
 scripts/dpkg-scanpackages.pl    | 2 +-
 scripts/dpkg-scansources.pl     | 2 +-
 5 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 22d2b1fc7..0d76488ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
   [ 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.
   * Build system:
     - Bump minimal Perl version to 5.24.1.
 
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index c5a65e1ab..0621f5f8d 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;
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index 20b33dc75..0f4d85165 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;
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 6d6d7946e..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;
 
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;
 
-- 
cgit v1.2.3


From c7079f5e8b8bac01ce579e0b869977ff8661a1db Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 19 May 2019 01:48:17 +0200
Subject: dpkg-buildpackage: Remove transient backwards R³ compat code
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This code got deprecated before the spec had been finalized, but left in
just to make sure no remaining implementations were still using it.
---
 debian/changelog             | 1 +
 scripts/dpkg-buildpackage.pl | 4 ----
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 0d76488ce..ef5cc6660 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     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.
   * Build system:
     - Bump minimal Perl version to 5.24.1.
 
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index b19f72278..81c6f57c7 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -740,13 +740,9 @@ sub parse_rules_requires_root {
     } elsif ($keywords_impl) {
         # Set only on <implementations-keywords>.
         $ENV{DEB_GAIN_ROOT_CMD} = join ' ', @rootcommand;
-        # XXX: For ephemeral backwards compatibility.
-        $ENV{DPKG_GAIN_ROOT_CMD} = $ENV{DEB_GAIN_ROOT_CMD};
     } else {
         # We should not provide the variable otherwise.
         delete $ENV{DEB_GAIN_ROOT_CMD};
-        # XXX: For ephemeral backwards compatibility.
-        delete $ENV{DPKG_GAIN_ROOT_CMD};
     }
 
     return %rrr;
-- 
cgit v1.2.3


From 1046c10897ba54a67ce5bd5760d054e39440a865 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 2 Jun 2019 23:13:02 +0200
Subject: scripts/mk: Add support for nostrip DEB_BUILD_OPTIONS when setting
 STRIP

---
 debian/changelog         | 2 ++
 scripts/mk/buildtools.mk | 7 ++++++-
 scripts/t/mk.t           | 8 +++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 87ee5bb24..5cf0d7bfe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     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.
   * Documentation:
     - man: Fix uncommon wording constructs.
   * Build system:
diff --git a/scripts/mk/buildtools.mk b/scripts/mk/buildtools.mk
index c3b44bb8a..cdf7734d3 100644
--- a/scripts/mk/buildtools.mk
+++ b/scripts/mk/buildtools.mk
@@ -32,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
@@ -44,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)
@@ -61,7 +66,7 @@ $(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))
+$(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))
diff --git a/scripts/t/mk.t b/scripts/t/mk.t
index 98c7e5083..2e62cf5cf 100644
--- a/scripts/t/mk.t
+++ b/scripts/t/mk.t
@@ -16,7 +16,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 8;
+use Test::More tests => 9;
 use Test::Dpkg qw(:paths);
 
 use File::Spec::Functions qw(rel2abs);
@@ -109,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"};
-- 
cgit v1.2.3


From c4530cbda9144accd41255da96288ad530554b58 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 21 Mar 2019 03:11:57 +0100
Subject: dpkg-genbuildinfo: Do not include irrelevant packages in the Binary
 field

This change is the companion to the one in dpkg-genchanges that lists
only relevant packages, instead of all the ones listed in debian/control,
but for the .buildinfo file instead of the .changes file.
---
 debian/changelog             |  1 +
 man/deb-buildinfo.man        |  3 ++-
 scripts/dpkg-genbuildinfo.pl | 12 +++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 5cf0d7bfe..3e6612de0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
   * 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.
   * Documentation:
     - man: Fix uncommon wording constructs.
   * Build system:
diff --git a/man/deb-buildinfo.man b/man/deb-buildinfo.man
index 6a9d00b40..5f24a2aae 100644
--- a/man/deb-buildinfo.man
+++ b/man/deb-buildinfo.man
@@ -72,8 +72,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
diff --git a/scripts/dpkg-genbuildinfo.pl b/scripts/dpkg-genbuildinfo.pl
index 827b6679f..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;
 
@@ -385,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});
 
@@ -397,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;
-- 
cgit v1.2.3


From 81f8816cbdc73dba843b080eb388e40b84cadc6d Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 23 Apr 2019 01:18:05 +0200
Subject: dpkg-shlibdeps: Add support for new Build-Depends-Packages

This makes it possible to specify more than one package, which might be
needed during transition periods for example.

Closes: #926669
Based-on-patch-by: Frank Schaefer <kelledin@gmail.com>
---
 debian/changelog          | 3 +++
 man/deb-symbols.man       | 7 +++++++
 scripts/dpkg-shlibdeps.pl | 5 +++--
 3 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 6690b4154..3581597c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     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>.
   * Documentation:
     - man: Fix uncommon wording constructs.
   * Build system:
diff --git a/man/deb-symbols.man b/man/deb-symbols.man
index ca52b1733..7da0a7682 100644
--- a/man/deb-symbols.man
+++ b/man/deb-symbols.man
@@ -67,6 +67,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 a “\-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/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index a318a59d1..f662b2f58 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -435,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) {
-- 
cgit v1.2.3


From 9229100918a1741ceb4b0f60636869cfc9432731 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 2 May 2019 02:58:32 +0200
Subject: scripts: Remove support for versioned GnuPG 2 program and packages

The current default in Debian and anywhere else is to use unversioned
GnuPG 2.x binaries, so there's no need anymore to try these first or at
all.
---
 debian/changelog               | 1 +
 debian/control                 | 8 ++++----
 man/dpkg-buildpackage.man      | 7 +++----
 scripts/Dpkg/Source/Package.pm | 6 +-----
 scripts/dpkg-buildpackage.pl   | 6 ++----
 5 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 3581597c1..bb386ab0b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
   * 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.
   * Documentation:
     - man: Fix uncommon wording constructs.
   * Build system:
diff --git a/debian/control b/debian/control
index 63b5c7f26..bd1a3619f 100644
--- a/debian/control
+++ b/debian/control
@@ -101,8 +101,8 @@ Recommends:
  build-essential,
  gcc | c-compiler,
  fakeroot,
- gnupg | gnupg2,
- gpgv | gpgv2,
+ gnupg,
+ gpgv,
 # Used by dpkg-mergechangelogs.
  libalgorithm-merge-perl,
 Suggests:
@@ -136,8 +136,8 @@ Recommends:
  xz-utils,
 Suggests:
  debian-keyring,
- gnupg | gnupg2,
- gpgv | gpgv2,
+ gnupg,
+ gpgv,
  gcc | c-compiler,
  binutils,
  patch,
diff --git a/man/dpkg-buildpackage.man b/man/dpkg-buildpackage.man
index d60b09f54..6a6965f2f 100644
--- a/man/dpkg-buildpackage.man
+++ b/man/dpkg-buildpackage.man
@@ -90,7 +90,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
@@ -399,9 +399,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
@@ -584,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/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index 9cc5d178f..df3ac8737 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -428,12 +428,8 @@ sub check_signature {
     my $dsc = $self->get_filename();
     my @exec;
 
-    if (find_command('gpgv2')) {
-        push @exec, 'gpgv2';
-    } elsif (find_command('gpgv')) {
+    if (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';
     }
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 81c6f57c7..e48f972a9 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -101,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.
@@ -394,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';
     }
 }
-- 
cgit v1.2.3


From 522e3b46ee9861f6e1b87124066d716a5b6a6c0c Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 1 May 2019 23:18:34 +0200
Subject: Dpkg::Source::Package: Refactor original tarball handling

---
 debian/changelog                  |  2 ++
 scripts/Dpkg/Source/Package/V1.pm |  8 +++++---
 scripts/Dpkg/Source/Package/V2.pm | 32 ++++++++++++++------------------
 3 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index bb386ab0b..bcec8748f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
   * perl: Remove support for versioned GnuPG 2 program and packages.
   * Documentation:
     - man: Fix uncommon wording constructs.
+  * Code internals:
+    - Dpkg::Source::Package: Refactor original tarball handling.
   * Build system:
     - Bump minimal Perl version to 5.24.1.
 
diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm
index be13750a4..ff683af21 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -409,9 +409,11 @@ 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);
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index e2c1b49fb..db9bd3e71 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -408,26 +408,22 @@ sub _generate_patch {
                          'one is allowed'), $tarfile, $file);
             }
             $tarfile = $file;
-            push @origtarfiles, $file;
-            $self->add_file($file);
-            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";
-                $self->add_file("$file.asc")
-            }
         } elsif ($file =~ /\.orig-([[:alnum:]-]+)\.tar\.$comp_ext_regex$/) {
             $addonfile{$1} = $file;
-            push @origtarfiles, $file;
-            $self->add_file($file);
-            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";
-                $self->add_file("$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";
+            $self->add_file("$file.asc")
         }
     }
 
-- 
cgit v1.2.3


From 1973a0789cea5ac0e7da10a81cc5cca8384200df Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 1 May 2019 23:19:17 +0200
Subject: perl: Use File::Copy instead of spawning mv/cp commands

We use cp() in Dpkg::Source::Package to preserve the file attributes,
but just move() in dpkg-buildpackage where it does not matter.
---
 debian/changelog               | 1 +
 scripts/Dpkg/Source/Package.pm | 5 +++--
 scripts/dpkg-buildpackage.pl   | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index bcec8748f..0418c6fe6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - man: Fix uncommon wording constructs.
   * Code internals:
     - Dpkg::Source::Package: Refactor original tarball handling.
+    - perl: Use File::Copy instead of spawning mv/cp commands.
   * Build system:
     - Bump minimal Perl version to 5.24.1.
 
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index df3ac8737..e800a6392 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -44,6 +44,7 @@ our @EXPORT_OK = qw(
 use Exporter qw(import);
 use POSIX qw(:errno_h :sys_wait_h);
 use Carp;
+use File::Copy qw(cp);
 use File::Basename;
 
 use Dpkg::Gettext;
@@ -519,8 +520,8 @@ 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);
             }
         }
     }
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index e48f972a9..2c49738b5 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -851,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";
-- 
cgit v1.2.3


From 139dfc4c78593d995610c0aa180300a9a7dd94ac Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 1 May 2019 23:20:38 +0200
Subject: Dpkg::OpenPGP: Refactor signature verification into a new function

---
 debian/changelog               |  1 +
 scripts/Dpkg/OpenPGP.pm        | 40 +++++++++++++++++++++++++++++++++++
 scripts/Dpkg/Source/Package.pm | 47 ++++++++----------------------------------
 3 files changed, 50 insertions(+), 38 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 0418c6fe6..42e536756 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
   * 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.
   * Build system:
     - Bump minimal Perl version to 5.24.1.
 
diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm
index f719e6e4e..234c90a4d 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;
 
@@ -80,4 +81,43 @@ sub openpgp_sig_to_asc
     return;
 }
 
+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;
+
+    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/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index e800a6392..e7c4fb22d 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -58,6 +58,7 @@ 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
@@ -427,48 +428,18 @@ then any problem will result in a fatal error.
 sub check_signature {
     my $self = shift;
     my $dsc = $self->get_filename();
-    my @exec;
+    my @keyrings;
 
-    if (find_command('gpgv')) {
-        push @exec, 'gpgv';
-    } elsif (find_command('gpg')) {
-        push @exec, 'gpg', '--no-default-keyring', '-q', '--verify';
+    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 {
-- 
cgit v1.2.3


From e4f9fc7a5040f0eeef330e82bdeda6483bbd8a50 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 31 Aug 2019 03:55:10 +0200
Subject: Dpkg::OpenPGP: Make it possible to verify detached signatures

This is required to be able to verify original upstream tarball
signatures, as they are expected to be ASCII armored detached
signatures for the upstream tarballs.
---
 debian/changelog        | 1 +
 scripts/Dpkg/OpenPGP.pm | 1 +
 2 files changed, 2 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 42e536756..876e3460b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Build system:
     - Bump minimal Perl version to 5.24.1.
 
diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm
index 234c90a4d..f207af228 100644
--- a/scripts/Dpkg/OpenPGP.pm
+++ b/scripts/Dpkg/OpenPGP.pm
@@ -103,6 +103,7 @@ sub verify_signature {
         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,
-- 
cgit v1.2.3


From 2f238b0e7286d401acd1325e30c86363a1e380db Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 1 May 2019 23:23:03 +0200
Subject: Dpkg::OpenPGP: Add support for importing an OpenPGP key into a
 keyring

This is needed, for example, to verify original tarball signatures.
---
 debian/changelog        |  1 +
 scripts/Dpkg/OpenPGP.pm | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 876e3460b..168e2d281 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Build system:
     - Bump minimal Perl version to 5.24.1.
 
diff --git a/scripts/Dpkg/OpenPGP.pm b/scripts/Dpkg/OpenPGP.pm
index f207af228..f08bd3b12 100644
--- a/scripts/Dpkg/OpenPGP.pm
+++ b/scripts/Dpkg/OpenPGP.pm
@@ -81,6 +81,42 @@ sub openpgp_sig_to_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) = @_;
 
-- 
cgit v1.2.3


From 3821f024d92aabf24a333025c1c1956d8a45e718 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 1 May 2019 23:23:03 +0200
Subject: Dpkg::Source::Package: Verify original tarball signatures at build
 time

When we are building the source package, while detecting whether there
is any original upstream tarball signature to be included in the .dsc,
it's the best time to verify them, so that when the .dsc gets eventually
signed there's a certification path for the maintainer that they are
including what they expected to be there.
---
 debian/changelog                  |  2 ++
 scripts/Dpkg/Source/Package.pm    | 36 ++++++++++++++++++++++++++++++++++--
 scripts/Dpkg/Source/Package/V1.pm |  2 ++
 scripts/Dpkg/Source/Package/V2.pm |  4 ++++
 4 files changed, 42 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 168e2d281..16428b983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     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.
+  * Perl modules:
+    - Dpkg::Source::Package: Verify original tarball signatures at build time.
   * Documentation:
     - man: Fix uncommon wording constructs.
   * Code internals:
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index e7c4fb22d..35bdbafa1 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
@@ -34,7 +34,7 @@ is the one that supports the extraction of the source package.
 use strict;
 use warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '1.04';
 our @EXPORT_OK = qw(
     get_default_diff_ignore_regex
     set_default_diff_ignore_regex
@@ -44,6 +44,7 @@ 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;
 
@@ -403,6 +404,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.
@@ -632,6 +660,10 @@ sub write_dsc {
 
 =head1 CHANGES
 
+=head2 Version 1.04 (dpkg 1.20.0)
+
+New method: check_original_tarball_signature().
+
 =head2 Version 1.03 (dpkg 1.19.3)
 
 New option: format in new().
diff --git a/scripts/Dpkg/Source/Package/V1.pm b/scripts/Dpkg/Source/Package/V1.pm
index ff683af21..d91cea03b 100644
--- a/scripts/Dpkg/Source/Package/V1.pm
+++ b/scripts/Dpkg/Source/Package/V1.pm
@@ -418,6 +418,8 @@ sub do_build {
     if ($tarsign and -e $tarsign) {
         info(g_('building %s using existing %s'), $sourcepackage, $tarsign);
         $self->add_file($tarsign);
+
+        $self->check_original_tarball_signature($tarsign);
     }
 
     if ($sourcestyle =~ m/[kpKP]/) {
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index db9bd3e71..3da317550 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -401,6 +401,7 @@ sub _generate_patch {
     my ($tarfile, %addonfile);
     my $comp_ext_regex = compression_get_file_extension_regex();
     my @origtarfiles;
+    my @origtarsigns;
     foreach my $file (sort $self->find_original_tarballs()) {
         if ($file =~ /\.orig\.tar\.$comp_ext_regex$/) {
             if (defined($tarfile)) {
@@ -423,6 +424,7 @@ sub _generate_patch {
         }
         if (-e "$file.asc") {
             push @origtarfiles, "$file.asc";
+            push @origtarsigns, "$file.asc";
             $self->add_file("$file.asc")
         }
     }
@@ -435,6 +437,8 @@ sub _generate_patch {
             info(g_('building %s using existing %s'),
                  $self->{fields}{'Source'}, $origtarfile);
         }
+
+        $self->check_original_tarball_signature(@origtarsigns);
     }
 
     # Unpack a second copy for comparison
-- 
cgit v1.2.3


From 195edc4201f063a11ccdc10c523d671048353cca Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 28 Jun 2019 02:54:32 +0200
Subject: dpkg-shlibdeps: Document split_soname() function

Explain what each different pattern means, and what it maps to.

Prompted-by: Christopher Crim <christopher.crim@quoininc.com>
---
 debian/changelog          | 2 ++
 scripts/dpkg-shlibdeps.pl | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index e893f5a96..36ae294bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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>.
   * Code internals:
     - Dpkg::Source::Package: Refactor original tarball handling.
     - perl: Use File::Copy instead of spawning mv/cp commands.
diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index f662b2f58..8142c85b4 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -705,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;
     }
 }
-- 
cgit v1.2.3


From 0e1709f6f4002a87bff1b0caa495ded77dd38d1f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 30 Jul 2019 04:45:36 +0200
Subject: Dpkg::BuildFlags: Remove unused hash keys

---
 debian/changelog           | 1 +
 scripts/Dpkg/BuildFlags.pm | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 36ae294bd..ada26a5a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -33,6 +33,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Build system:
     - Bump minimal Perl version to 5.24.1.
     - Add a serial versioning to the m4 files.
diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm
index a8fd4584a..906527b23 100644
--- a/scripts/Dpkg/BuildFlags.pm
+++ b/scripts/Dpkg/BuildFlags.pm
@@ -68,8 +68,6 @@ 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} = {};
     $self->{flags} = {
 	CPPFLAGS => '',
-- 
cgit v1.2.3


From 36925e06749e495a475f6c42543b226d3f7ae27b Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 30 Jul 2019 04:45:57 +0200
Subject: Dpkg::BuildFlags: Add new unset() method

This makes it possible to unset variables, so that they do not get
output by the various tools.

Requested-by: Daniel Schepler <dschepler@gmail.com>
---
 debian/changelog           |  2 ++
 scripts/Dpkg/BuildFlags.pm | 20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index ada26a5a2..a18c3b892 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     never the correct solution.
   * 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>.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm
index 906527b23..edf16e4f3 100644
--- a/scripts/Dpkg/BuildFlags.pm
+++ b/scripts/Dpkg/BuildFlags.pm
@@ -18,7 +18,7 @@ package Dpkg::BuildFlags;
 use strict;
 use warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '1.04';
 
 use Dpkg ();
 use Dpkg::Gettext;
@@ -212,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
@@ -440,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
-- 
cgit v1.2.3


From ae231c65b162df729a6492105a0ce64945e293c2 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 30 Jul 2019 04:57:47 +0200
Subject: Dpkg::Source::Package::V2: Emit a special patch header on
 single-debian-patch

The previous default patch header does not make sense for a conglomerate
patch. Instead provide a more suitable default, that can always be
overridden with either the local-patch-header or patch-header files.

Closes: #933152
---
 debian/changelog                  |  2 ++
 scripts/Dpkg/Source/Package/V2.pm | 12 ++++++++++++
 2 files changed, 14 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index a18c3b892..e559872dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm
index 3da317550..d84fce2dd 100644
--- a/scripts/Dpkg/Source/Package/V2.pm
+++ b/scripts/Dpkg/Source/Package/V2.pm
@@ -587,6 +587,7 @@ 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');
@@ -594,6 +595,17 @@ sub _get_patch_header {
     if (-f $ph) {
         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;
-- 
cgit v1.2.3


From 63e9d12972c866ed02aca040501de1d9b922e880 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Fri, 9 Aug 2019 04:30:42 +0200
Subject: Dpkg::Changelog: Document methods provided by subclasses

Reported-by: Felix Lechner <felix.lechner@lease-up.com>
---
 debian/changelog          |  2 ++
 scripts/Dpkg/Changelog.pm | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index e559872dd..d1fbe287a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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>.
   * Code internals:
     - Dpkg::Source::Package: Refactor original tarball handling.
     - perl: Use File::Copy instead of spawning mv/cp commands.
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index 47752b911..060081079 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -90,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
-- 
cgit v1.2.3


From 73888d612ad370e8147ddb503bf2e5f2ad80c7b6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 29 Aug 2019 02:22:21 +0200
Subject: scripts: Remove support for ~vola versioning

This was part of the volatile.debian.org archive, which was
decommissioned some time ago.

Ref: https://lists.debian.org/debian-volatile-announce/2012/msg00000.html
---
 debian/changelog                | 2 ++
 scripts/dpkg-genchanges.pl      | 4 ++--
 scripts/dpkg-mergechangelogs.pl | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d42410ce0..6964f2a49 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
   * 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.
   * Perl modules:
     - Dpkg::Source::Package: Verify original tarball signatures at build time.
     - Dpkg::BuildFlags: Add new unset() method.
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 8def2f98f..4391b8a4c 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -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)/;
+        # ~bpo are backports and have lower version number by definition.
+        unless $changelog->{'Version'} =~ /~bpo/;
 }
 
 # Scan control info of source package
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index 0f4d85165..1e9b44f5f 100755
--- a/scripts/dpkg-mergechangelogs.pl
+++ b/scripts/dpkg-mergechangelogs.pl
@@ -173,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) = @_;
@@ -182,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)/+$1/;
+    $b =~ s/~(bpo)/+$1/;
     if ($merge_prereleases) {
 	$a =~ s/~[^~]*$//;
 	$b =~ s/~[^~]*$//;
-- 
cgit v1.2.3


From d178013236e0617e40e4287ff6ddbf66370d58c6 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 28 Sep 2019 23:02:07 +0200
Subject: scripts: Match ~deb also as a backport marker in versions

Closes: #934980
---
 debian/changelog                | 2 ++
 scripts/dpkg-genchanges.pl      | 4 ++--
 scripts/dpkg-mergechangelogs.pl | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 6964f2a49..044255a0e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     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
   * Perl modules:
     - Dpkg::Source::Package: Verify original tarball signatures at build time.
     - Dpkg::BuildFlags: Add new unset() method.
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index 4391b8a4c..57d7ced06 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -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 are backports and have lower version number by definition.
-        unless $changelog->{'Version'} =~ /~bpo/;
+        # Backports have lower version number by definition.
+        unless $changelog->{'Version'} =~ /~(?:bpo|deb)/;
 }
 
 # Scan control info of source package
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index 1e9b44f5f..6216edabb 100755
--- a/scripts/dpkg-mergechangelogs.pl
+++ b/scripts/dpkg-mergechangelogs.pl
@@ -183,8 +183,8 @@ sub compare_versions {
     $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');
     # Backports are not real prereleases.
-    $a =~ s/~(bpo)/+$1/;
-    $b =~ s/~(bpo)/+$1/;
+    $a =~ s/~(bpo|deb)/+$1/;
+    $b =~ s/~(bpo|deb)/+$1/;
     if ($merge_prereleases) {
 	$a =~ s/~[^~]*$//;
 	$b =~ s/~[^~]*$//;
-- 
cgit v1.2.3


From da3fa9f03c3a0d313fe1ead4b0f28678baf349d8 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 15 Sep 2019 17:20:18 +0200
Subject: test: Fix typos

Warned-by: codespell
---
 debian/changelog                | 2 +-
 scripts/t/Dpkg_Changelog/shadow | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 93751ff7b..c8dcaac32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5918,7 +5918,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”
diff --git a/scripts/t/Dpkg_Changelog/shadow b/scripts/t/Dpkg_Changelog/shadow
index 5f4bddb85..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
-- 
cgit v1.2.3


From 2bdb55b5ea54b0c300490b45020d73f1581e88bc Mon Sep 17 00:00:00 2001
From: Helge Kreutzmann <debian@helgefjell.de>
Date: Fri, 1 Nov 2019 06:12:46 +0100
Subject: Update German scripts translation

Update to 608t.
---
 debian/changelog |  3 +++
 scripts/po/de.po | 56 ++++++++++++++++++++++++++++++++++++++++----------------
 2 files changed, 43 insertions(+), 16 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d1284e0e5..1072a001f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,6 +75,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - Update stopwords for codespell 1.16.0.
     - Suppress new bogus cppcheck 1.89 false positives.
 
+  [ Updated scripts translations ]
+  * German (Helge Kreutzmann).
+
   [ Updated man pages translations ]
   * German (Helge Kreutzmann). Closes: #931135
 
diff --git a/scripts/po/de.po b/scripts/po/de.po
index cca180604..5125cb9c8 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg-dev 1.19.5\n"
+"Project-Id-Version: dpkg-dev 1.20.0\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2019-06-03 23:21+0200\n"
-"PO-Revision-Date: 2019-02-24 17:42+0100\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"
@@ -287,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"
@@ -355,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"
@@ -623,6 +623,11 @@ msgstr "%s kann nicht geöffnet werden"
 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"
@@ -2783,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"
@@ -2966,21 +2993,21 @@ 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
 msgid "%s is not a valid option for %s"
 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"
@@ -4542,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"
 
-- 
cgit v1.2.3


From f029f28260b62a43792d39f9e935132425d4b609 Mon Sep 17 00:00:00 2001
From: Sven Joachim <svenjoac@gmx.de>
Date: Sun, 3 Nov 2019 00:18:19 +0100
Subject: dpkg-gencontrol: Take hardlinks into account when computing
 Installed-Size

We should not add up the size of each hardlink into the final sum,
otherwise we will get a size in excess.

Closes: #923475
Co-Authored-by: Guillem Jover <guillem@debian.org>
Signed-off-by: Guillem Jover <guillem@debian.org>
---
 debian/changelog           | 3 +++
 man/deb-substvars.man      | 1 +
 scripts/dpkg-gencontrol.pl | 9 ++++++++-
 3 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 2fa7c28f6..88903136d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     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>.
   * Perl modules:
     - Dpkg::Source::Package: Verify original tarball signatures at build time.
     - Dpkg::BuildFlags: Add new unset() method.
diff --git a/man/deb-substvars.man b/man/deb-substvars.man
index 3d5381915..bfaa6ff4f 100644
--- a/man/deb-substvars.man
+++ b/man/deb-substvars.man
@@ -131,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
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 443217103..a5dda70d0 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -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
-- 
cgit v1.2.3


From 79d01b9283bb8c5c9867a9601a4b3011f207684f Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 3 Nov 2019 01:34:29 +0100
Subject: Dpkg::Vendor::Debian: Only scan /usr/local/ directories that exist

Closes: #932967
---
 debian/changelog              | 2 ++
 scripts/Dpkg/Vendor/Debian.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index f6f70357e..f9698ef17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       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
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index a352bbdde..65c7f2bad 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -466,7 +466,7 @@ sub _build_tainted_by {
         File::Find::find({
             wanted => sub { $tainted{"usr-local-has-$type"} = 1 if -f },
             no_chdir => 1,
-        }, map { "/usr/local/$_" } @{$usr_local_types{$type}});
+        }, grep { -d } map { "/usr/local/$_" } @{$usr_local_types{$type}});
     }
 
     my @tainted = sort keys %tainted;
-- 
cgit v1.2.3


From 35430c52c8b8b311985535b46bd7ba592bb5d805 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 3 Nov 2019 16:29:05 +0100
Subject: Dpkg::Vendor::Debian: Do not set
 -Werror=implicit-function-declaration for C++

Closes: #939969
---
 debian/changelog              |  2 ++
 scripts/Dpkg/Vendor/Debian.pm | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index f9698ef17..abd1c27f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       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
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 65c7f2bad..71aa59038 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -185,8 +185,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");
         }
-- 
cgit v1.2.3


From b958054076c236d470f46f35b94ee16a032ed368 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sun, 3 Nov 2019 17:36:02 +0100
Subject: Dpkg::Deps: Check for valid virtual package version relations

Do not allow non-equal version relations in virtual provides.

Closes: #930317
---
 debian/changelog               |  2 ++
 scripts/Dpkg/Deps.pm           | 19 ++++++++++++++++++-
 scripts/dpkg-checkbuilddeps.pl |  2 +-
 scripts/dpkg-gencontrol.pl     |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index abd1c27f1..8b5317f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       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
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Deps.pm b/scripts/Dpkg/Deps.pm
index f3a19e78e..ec02fd8c8 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -46,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
@@ -235,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”.
@@ -265,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;
 
@@ -301,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});
@@ -437,6 +450,10 @@ provide.
 
 =head1 CHANGES
 
+=head2 Version 1.07 (dpkg 1.20.0)
+
+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)
 
 New option: Add tests_dep option to Dpkg::Deps::deps_parse().
diff --git a/scripts/dpkg-checkbuilddeps.pl b/scripts/dpkg-checkbuilddeps.pl
index 0621f5f8d..d249ced45 100755
--- a/scripts/dpkg-checkbuilddeps.pl
+++ b/scripts/dpkg-checkbuilddeps.pl
@@ -165,7 +165,7 @@ sub parse_status {
         $facts->add_installed_package($package, $version, $arch, $multiarch);
 
         if (/^Provides: (.*)$/m) {
-            my $provides = deps_parse($1, reduce_arch => 1, union => 1);
+            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())
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index a5dda70d0..04a5c68b9 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -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')) {
-- 
cgit v1.2.3


From 88d2ceac86373a3ccc37fc7ceff1319a4528a889 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 10 Aug 2019 02:51:10 +0200
Subject: Dpkg: Remove internal lowercase variables

Bump module version to 2.00.
---
 debian/changelog |  2 ++
 scripts/Dpkg.pm  | 21 +++++----------------
 2 files changed, 7 insertions(+), 16 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 8b5317f07..d2a040681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm
index 21444b802..9d06b4145 100644
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -31,7 +31,7 @@ It is also the entry point to the Dpkg module hierarchy.
 use strict;
 use warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '2.00';
 our @EXPORT_OK = qw(
     $PROGNAME
     $PROGVERSION
@@ -43,13 +43,6 @@ our @EXPORT_OK = qw(
     $LIBDIR
     $DATADIR
 );
-our @EXPORT = qw(
-    $version
-    $progname
-    $admindir
-    $dpkglibdir
-    $pkgdatadir
-);
 
 use Exporter qw(import);
 
@@ -113,14 +106,6 @@ 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
@@ -290,6 +275,10 @@ Parse and manipulate Debian package versions.
 
 =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.
-- 
cgit v1.2.3


From 895a2e525adfd90a57e1e4dfbcc18bb0c1ca64b4 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 10 Aug 2019 02:51:10 +0200
Subject: Dpkg::Changelog: Remove obsolete methods dpkg() and rfc822()

Bump module version to 2.00.
---
 debian/changelog          |  1 +
 scripts/Dpkg/Changelog.pm | 36 +++++-------------------------------
 2 files changed, 6 insertions(+), 31 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d2a040681..5c37bcb23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       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().
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index 060081079..1485ae583 100644
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -34,7 +34,7 @@ package Dpkg::Changelog;
 use strict;
 use warnings;
 
-our $VERSION = '1.01';
+our $VERSION = '2.00';
 
 use Carp;
 
@@ -670,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
@@ -779,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().
-- 
cgit v1.2.3


From 9b0dc0a1a879d35443781058415550059db1589c Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 10 Aug 2019 02:51:10 +0200
Subject: Dpkg::Changelog::Entry::Debian: Remove obsolete methods and hide
 variables

Remove obsolete methods check_header() and check_trailer(). Hide internal
lowercase variables $regex_header and $regex_trailer.

Bump module version to 2.00.
---
 debian/changelog                       |  2 ++
 scripts/Dpkg/Changelog/Entry/Debian.pm | 49 +++++++---------------------------
 2 files changed, 11 insertions(+), 40 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 5c37bcb23..fdb702b5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,6 +49,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm
index 5f4c9e569..2d1c4e6a1 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
@@ -55,12 +53,9 @@ implementation are described below.
 
 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 +68,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 +95,6 @@ my %month_name = map { $_ => } qw(
     August September October November December
 );
 
-## use critic
-
 =head1 METHODS
 
 =over 4
@@ -245,36 +238,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 +428,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().
-- 
cgit v1.2.3


From e4fed400378c4ade6b7ceb3aeb03c4252c11c12e Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:25:33 +0100
Subject: Dpkg::Changelog::Parse: Remove $ sigil from option names in POD

These are not actual variables, but option passed in a hash, so using
the $ sigil here is very confusing.
---
 debian/changelog                | 1 +
 scripts/Dpkg/Changelog/Parse.pm | 2 +-
 t/pod-spell.t                   | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index fdb702b5b..cfae6636c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Code internals:
     - Dpkg::Source::Package: Refactor original tarball handling.
     - perl: Use File::Copy instead of spawning mv/cp commands.
diff --git a/scripts/Dpkg/Changelog/Parse.pm b/scripts/Dpkg/Changelog/Parse.pm
index 91da43ab2..8bf099b00 100644
--- a/scripts/Dpkg/Changelog/Parse.pm
+++ b/scripts/Dpkg/Changelog/Parse.pm
@@ -217,7 +217,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/t/pod-spell.t b/t/pod-spell.t
index 111d592ca..87b669d7e 100644
--- a/t/pod-spell.t
+++ b/t/pod-spell.t
@@ -72,12 +72,14 @@ dup'ed
 env
 envvar
 fieldnames
+forceplugin
 ge
 getters
 gettext
 hurd
 keyrings
 le
+libdir
 lzma
 modelines
 multiarch
-- 
cgit v1.2.3


From 7656016155c2dc408c4659d050a6e4bedb741069 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 10 Aug 2019 02:51:10 +0200
Subject: Dpkg::Changelog::Parse: Remove warnings for obsolete options and
 functions

Remove warnings for obsolete options forceplugin and libdir. Remove
obsolete functions changelog_parse_debian() and changelog_parse_plugin().

Bump module version to 2.00.
---
 debian/changelog                |  3 +++
 scripts/Dpkg/Changelog/Parse.pm | 60 +++++------------------------------------
 2 files changed, 10 insertions(+), 53 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index cfae6636c..69d274984 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,6 +51,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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().
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Changelog/Parse.pm b/scripts/Dpkg/Changelog/Parse.pm
index 8bf099b00..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
 );
 
@@ -75,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
@@ -137,15 +101,9 @@ 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});
@@ -195,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)
 
-- 
cgit v1.2.3


From ab8176cb9a92a39d062da002cf9192bdc6e5f3d1 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:29:13 +0100
Subject: Dpkg::Compression: Hide internal lowercase variables

Bump module version to 2.00.
---
 debian/changelog            |  3 +++
 scripts/Dpkg/Compression.pm | 17 +++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 69d274984..28373d1c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -54,6 +54,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
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()
-- 
cgit v1.2.3


From 7a68fdc76ea3a009ace005aa7972bb337995b127 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:30:04 +0100
Subject: Dpkg::Deps::KnownFacts: Remove obsolete check_package() method

Bump module version to 2.00.
---
 debian/changelog                |  1 +
 scripts/Dpkg/Deps/KnownFacts.pm | 37 +++++--------------------------------
 2 files changed, 6 insertions(+), 32 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 28373d1c6..bef7ecc95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -57,6 +57,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - Dpkg::Compression: Hide internal lowercase variables
       $default_compression, $default_compression_level and
       $compression_re_file_ext.
+    - Dpkg::Deps::KnownFacts: Remove obsolete check_package() method.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Deps/KnownFacts.pm b/scripts/Dpkg/Deps/KnownFacts.pm
index 192f6aa6b..a414eb49b 100644
--- a/scripts/Dpkg/Deps/KnownFacts.pm
+++ b/scripts/Dpkg/Deps/KnownFacts.pm
@@ -37,7 +37,7 @@ packages provided (by the set of installed packages).
 use strict;
 use warnings;
 
-our $VERSION = '1.01';
+our $VERSION = '2.00';
 
 use Dpkg::Version;
 
@@ -109,37 +109,6 @@ sub add_provided_package {
     push @{$self->{virtualpkg}{$pkg}}, $v;
 }
 
-=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.
-
-=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}) {
-        my $arrayref = [ map { [
-            $_->{provider}, $_->{relation}, $_->{version}
-        ] } @{$self->{virtualpkg}{$pkg}} ];
-        return (1, $arrayref);
-    }
-    return (0, undef);
-}
-
 ##
 ## The functions below are private to Dpkg::Deps::KnownFacts.
 ##
@@ -228,6 +197,10 @@ sub evaluate_simple_dep {
 
 =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
-- 
cgit v1.2.3


From 2adeecad3d72ccfb46ed39278c6b1831d8dbad64 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:30:40 +0100
Subject: Dpkg::Exit: Hide internal lowercase @handlers variable

Bump module version to 2.00.
---
 debian/changelog     |  1 +
 scripts/Dpkg/Exit.pm | 11 ++++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index bef7ecc95..60865b3b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       $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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Exit.pm b/scripts/Dpkg/Exit.pm
index 5e513b496..fb51a3abf 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
 
@@ -91,6 +88,10 @@ $SIG{QUIT} = \&_exit_handler;
 
 =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()
-- 
cgit v1.2.3


From 27228611177b0cde44325df2ac8c32ae6bc6d2eb Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:31:07 +0100
Subject: Dpkg::Gettext: Remove obsolete _g() function

Bump module version to 2.00.
---
 debian/changelog        |  1 +
 scripts/Dpkg/Gettext.pm | 16 ++++------------
 2 files changed, 5 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 60865b3b8..64b463182 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -59,6 +59,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       $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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Gettext.pm b/scripts/Dpkg/Gettext.pm
index 03b723c9d..e61cdd1a0 100644
--- a/scripts/Dpkg/Gettext.pm
+++ b/scripts/Dpkg/Gettext.pm
@@ -30,14 +30,13 @@ 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);
@@ -189,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)
 
-- 
cgit v1.2.3


From 605d9f8a8a59c8413a9ba0ab260b6f10a7ac1c70 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:32:09 +0100
Subject: Dpkg::Source::Package: Remove and hide internal lowercase variables

Bump module version to 2.00.
---
 debian/changelog               |  3 +++
 scripts/Dpkg/Source/Package.pm | 16 +++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 64b463182..8841b1cb2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -60,6 +60,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index 35bdbafa1..d973c5643 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -34,7 +34,7 @@ is the one that supports the extraction of the source package.
 use strict;
 use warnings;
 
-our $VERSION = '1.04';
+our $VERSION = '2.00';
 our @EXPORT_OK = qw(
     get_default_diff_ignore_regex
     set_default_diff_ignore_regex
@@ -81,14 +81,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
@@ -660,10 +654,14 @@ sub write_dsc {
 
 =head1 CHANGES
 
-=head2 Version 1.04 (dpkg 1.20.0)
+=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().
-- 
cgit v1.2.3


From e9fa0cd0bce704657bad9d26810f6fa57f78caf2 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:32:44 +0100
Subject: Dpkg::Substvars: Remove obsolete no_warn() method

Bump module version to 2.00.
---
 debian/changelog          |  1 +
 scripts/Dpkg/Substvars.pm | 21 +++++----------------
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 8841b1cb2..0cf8c186d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -63,6 +63,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Substvars.pm b/scripts/Dpkg/Substvars.pm
index d2060efc5..49ebd902b 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);
@@ -168,21 +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->parse($fh, $desc)
 
 Add new substitutions read from the filehandle. $desc is used to identify
@@ -438,6 +423,10 @@ indicated file.
 
 =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().
-- 
cgit v1.2.3


From 2c08a8a2a2503398c7d17b4ecb7f364ea4eb3aed Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:33:52 +0100
Subject: Dpkg::Index: Change default value for unique_tuple_key to 1

Bump module version to 2.00.
---
 debian/changelog      |  1 +
 scripts/Dpkg/Index.pm | 35 +++++++++++++++--------------------
 2 files changed, 16 insertions(+), 20 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 0cf8c186d..93c9c2f08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -64,6 +64,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       @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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Index.pm b/scripts/Dpkg/Index.pm
index 682f16921..7859bf669 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;
@@ -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 {
@@ -435,6 +426,10 @@ based on their extensions.
 
 =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
-- 
cgit v1.2.3


From 69b98260c76342a72f3c819961a33b9a14e899ab Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:37:17 +0100
Subject: Dpkg::Version: Remove deprecation warning from semantic change in
 bool overload

---
 debian/changelog         |  2 ++
 scripts/Dpkg/Version.pm  | 13 ++++++-------
 scripts/t/Dpkg_Version.t |  6 ------
 3 files changed, 8 insertions(+), 13 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 93c9c2f08..a87e747ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -65,6 +65,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       $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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Version.pm b/scripts/Dpkg/Version.pm
index 2900e5790..51d46c543 100644
--- a/scripts/Dpkg/Version.pm
+++ b/scripts/Dpkg/Version.pm
@@ -22,7 +22,7 @@ use strict;
 use warnings;
 use warnings::register qw(semantic_change::overload::bool);
 
-our $VERSION = '1.02';
+our $VERSION = '1.03';
 our @EXPORT = qw(
     version_compare
     version_compare_relation
@@ -56,12 +56,7 @@ use overload
     '<=>' => \&_comparison,
     'cmp' => \&_comparison,
     '""'  => sub { return $_[0]->as_string(); },
-    'bool' => sub {
-        warnings::warnif('Dpkg::Version::semantic_change::overload::bool',
-                         'Dpkg::Version bool overload behavior has changed ' .
-                         'back to be an is_valid() alias');
-        return $_[0]->is_valid();
-    },
+    'bool' => sub { return $_[0]->is_valid(); },
     'fallback' => 1;
 
 =encoding utf8
@@ -473,6 +468,10 @@ 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.
diff --git a/scripts/t/Dpkg_Version.t b/scripts/t/Dpkg_Version.t
index 34ab1772f..69f0fecf0 100644
--- a/scripts/t/Dpkg_Version.t
+++ b/scripts/t/Dpkg_Version.t
@@ -85,12 +85,6 @@ my $truth = {
     },
 };
 
-# XXX: Some of the tests check the bool overload, which currently emits
-# the semantic_change warning. Disable it until we stop emitting the
-# warning in dpkg 1.20.x.
-## no critic (TestingAndDebugging::ProhibitNoWarnings)
-no warnings(qw(Dpkg::Version::semantic_change::overload::bool));
-
 # Handling of empty/invalid versions
 my $empty = Dpkg::Version->new('');
 ok($empty eq '', "Dpkg::Version->new('') eq ''");
-- 
cgit v1.2.3


From 83b1500011a0656263afbdeffffca182758ef061 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:38:37 +0100
Subject: Dpkg::Checksums: Remove obsolete 'program' property warning

---
 debian/changelog          |  1 +
 scripts/Dpkg/Checksums.pm | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index a87e747ca..7a9dd2981 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -67,6 +67,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Checksums.pm b/scripts/Dpkg/Checksums.pm
index 1237e8b89..9b7316b07 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
@@ -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.
-- 
cgit v1.2.3


From a376ff0b20918ec4c66a6905529065d992095c35 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:40:03 +0100
Subject: Dpkg::Conf: Remove obsolete methods and obsolete croak for method
 option

We do not bump the module version to 2.00, as these functions and option
have croak'ed almost since their introduction.
---
 debian/changelog     |  1 +
 scripts/Dpkg/Conf.pm | 26 +++++++-------------------
 2 files changed, 8 insertions(+), 19 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 7a9dd2981..d481e4b1d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -68,6 +68,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Conf.pm b/scripts/Dpkg/Conf.pm
index 5b98bbd8e..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,8 +199,6 @@ 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}};
 }
@@ -253,6 +235,12 @@ Save the options in a file.
 
 =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().
-- 
cgit v1.2.3


From 6e6bd74a5664b3d354dc7fd892a08eaf928980ad Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 16 Nov 2019 00:41:57 +0100
Subject: Dpkg::Vendor: Remove obsolete 'keyrings' hook

This hook has been obsoleted for a while and been emitting deprecation
warnings, so it's safe to remove now.
---
 debian/changelog               | 1 +
 scripts/Dpkg/Vendor/Debian.pm  | 3 ---
 scripts/Dpkg/Vendor/Default.pm | 3 ---
 3 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d481e4b1d..d28e3257a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -69,6 +69,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       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.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 71aa59038..a37b23cfc 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -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') {
diff --git a/scripts/Dpkg/Vendor/Default.pm b/scripts/Dpkg/Vendor/Default.pm
index ed05c3009..6b7c5204f 100644
--- a/scripts/Dpkg/Vendor/Default.pm
+++ b/scripts/Dpkg/Vendor/Default.pm
@@ -157,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') {
-- 
cgit v1.2.3


From e8c48a3965fe83b4f89c73cf60009e745000fec5 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 7 Nov 2019 00:01:46 +0100
Subject: dpkg-source: Remove backwards compatibility code for legacy
 build-profiles

---
 debian/changelog       | 1 +
 scripts/dpkg-source.pl | 7 -------
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d28e3257a..c5bad0b90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
   * 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.
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 32dc1c930..17f916600 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -306,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:
 
-- 
cgit v1.2.3


From ddb82d8bfe58e8a25444bdd772f534e0564efb3d Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 5 Oct 2019 04:26:23 +0200
Subject: Dpkg::Exit: Unregister all signal handlers once we have executed them

We should cleanup the handlers to the previous state otherwise we
end up changing the behavior globally, when this should be a local
cleanup behavior.

Closes: #932841
---
 debian/changelog     |  2 ++
 scripts/Dpkg/Exit.pm | 23 ++++++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index c5bad0b90..3bb18cef3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -71,6 +71,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Exit.pm b/scripts/Dpkg/Exit.pm
index fb51a3abf..53c4981cd 100644
--- a/scripts/Dpkg/Exit.pm
+++ b/scripts/Dpkg/Exit.pm
@@ -52,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;
 }
 
@@ -62,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;
 }
 
@@ -80,9 +83,23 @@ sub _exit_handler {
     exit(127);
 }
 
-$SIG{INT} = \&_exit_handler;
-$SIG{HUP} = \&_exit_handler;
-$SIG{QUIT} = \&_exit_handler;
+my @SIGNAMES = qw(INT HUP QUIT);
+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
 
-- 
cgit v1.2.3


From b287a80263dd4e45bb82b7e6bad76faeb47358d4 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 5 Oct 2019 04:28:30 +0200
Subject: Dpkg::Exit: Register exit handlers also for __DIE__

This makes sure we execute the handlers on normal errors, and can thus
remove the traps from several functions to run the handlers and to then
rethrow the exception.
---
 debian/changelog               |  1 +
 scripts/Dpkg/Exit.pm           |  2 +-
 scripts/Dpkg/Source/Package.pm | 21 +++++----------------
 3 files changed, 7 insertions(+), 17 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 3bb18cef3..4367a5673 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -73,6 +73,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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__.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg/Exit.pm b/scripts/Dpkg/Exit.pm
index 53c4981cd..70a29b1a6 100644
--- a/scripts/Dpkg/Exit.pm
+++ b/scripts/Dpkg/Exit.pm
@@ -83,7 +83,7 @@ sub _exit_handler {
     exit(127);
 }
 
-my @SIGNAMES = qw(INT HUP QUIT);
+my @SIGNAMES = qw(INT HUP QUIT __DIE__);
 my %SIGOLD;
 
 sub _setup_exit_handlers
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index d973c5643..d38e228e5 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -54,7 +54,6 @@ 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);
@@ -520,11 +519,7 @@ sub extract {
     }
 
     # 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'} and
@@ -569,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 {
@@ -603,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 {
-- 
cgit v1.2.3


From 7ab69d4acbdabd3af0f8c27801527750505c1a11 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 6 Nov 2019 02:07:17 +0100
Subject: Dpkg: Say class instead of object when appropriate

These were referring to the type and not the instance, which makes
using the incorrect nomenclature confusing.
---
 debian/changelog                       |  1 +
 scripts/Dpkg/BuildFlags.pm             |  2 +-
 scripts/Dpkg/BuildOptions.pm           |  2 +-
 scripts/Dpkg/Changelog.pm              |  2 +-
 scripts/Dpkg/Changelog/Entry.pm        |  2 +-
 scripts/Dpkg/Changelog/Entry/Debian.pm |  2 +-
 scripts/Dpkg/Checksums.pm              |  2 +-
 scripts/Dpkg/Compression/FileHandle.pm | 18 +++++++++---------
 scripts/Dpkg/Control/Changelog.pm      |  2 +-
 scripts/Dpkg/Control/HashCore.pm       |  4 ++--
 scripts/Dpkg/Control/Info.pm           |  2 +-
 scripts/Dpkg/Control/Tests.pm          |  2 +-
 scripts/Dpkg/Control/Tests/Entry.pm    |  2 +-
 scripts/Dpkg/Deps.pm                   |  8 ++++----
 scripts/Dpkg/Deps/AND.pm               |  2 +-
 scripts/Dpkg/Deps/KnownFacts.pm        |  2 +-
 scripts/Dpkg/Deps/OR.pm                |  2 +-
 scripts/Dpkg/Deps/Simple.pm            |  5 +++--
 scripts/Dpkg/Deps/Union.pm             |  4 ++--
 scripts/Dpkg/Index.pm                  |  2 +-
 scripts/Dpkg/Interface/Storable.pm     |  4 ++--
 scripts/Dpkg/Source/Format.pm          |  2 +-
 scripts/Dpkg/Source/Package.pm         |  4 ++--
 scripts/Dpkg/Substvars.pm              |  2 +-
 scripts/Dpkg/Vendor/Debian.pm          |  4 ++--
 scripts/Dpkg/Vendor/Default.pm         |  8 ++++----
 scripts/Dpkg/Vendor/Ubuntu.pm          |  4 ++--
 27 files changed, 49 insertions(+), 47 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 4367a5673..d41eaa836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
   * Code internals:
     - Dpkg::Source::Package: Refactor original tarball handling.
     - perl: Use File::Copy instead of spawning mv/cp commands.
diff --git a/scripts/Dpkg/BuildFlags.pm b/scripts/Dpkg/BuildFlags.pm
index edf16e4f3..53b3cad00 100644
--- a/scripts/Dpkg/BuildFlags.pm
+++ b/scripts/Dpkg/BuildFlags.pm
@@ -34,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
diff --git a/scripts/Dpkg/BuildOptions.pm b/scripts/Dpkg/BuildOptions.pm
index 263381b49..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.
 
diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index 1485ae583..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
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 2d1c4e6a1..8658ae493 100644
--- a/scripts/Dpkg/Changelog/Entry/Debian.pm
+++ b/scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -45,7 +45,7 @@ Dpkg::Changelog::Entry::Debian - represents a Debian changelog entry
 
 =head1 DESCRIPTION
 
-This object represents a Debian changelog entry. It implements the
+This class represents a Debian changelog entry. It implements the
 generic interface Dpkg::Changelog::Entry. Only functions specific to this
 implementation are described below.
 
diff --git a/scripts/Dpkg/Checksums.pm b/scripts/Dpkg/Checksums.pm
index 9b7316b07..93bdf4bd8 100644
--- a/scripts/Dpkg/Checksums.pm
+++ b/scripts/Dpkg/Checksums.pm
@@ -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.
 
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/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/HashCore.pm b/scripts/Dpkg/Control/HashCore.pm
index 542069332..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).
@@ -440,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 9b07eedbe..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
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 ec02fd8c8..80d249019 100644
--- a/scripts/Dpkg/Deps.pm
+++ b/scripts/Dpkg/Deps.pm
@@ -29,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
@@ -429,11 +429,11 @@ sub deps_compare {
     }
 }
 
-=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
+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
@@ -443,7 +443,7 @@ 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.
diff --git a/scripts/Dpkg/Deps/AND.pm b/scripts/Dpkg/Deps/AND.pm
index e16a2cf35..7b403c237 100644
--- a/scripts/Dpkg/Deps/AND.pm
+++ b/scripts/Dpkg/Deps/AND.pm
@@ -29,7 +29,7 @@ Dpkg::Deps::AND - list of AND dependencies
 
 =head1 DESCRIPTION
 
-This object represents a list of dependencies that must be met at the same
+This class represents a list of dependencies that must be met at the same
 time. It inherits from Dpkg::Deps::Multiple.
 
 =cut
diff --git a/scripts/Dpkg/Deps/KnownFacts.pm b/scripts/Dpkg/Deps/KnownFacts.pm
index a414eb49b..ef8655fdd 100644
--- a/scripts/Dpkg/Deps/KnownFacts.pm
+++ b/scripts/Dpkg/Deps/KnownFacts.pm
@@ -29,7 +29,7 @@ Dpkg::Deps::KnownFacts - list of installed real and virtual packages
 
 =head1 DESCRIPTION
 
-This object represents a list of installed packages and a list of virtual
+This class represents a list of installed packages and a list of virtual
 packages provided (by the set of installed packages).
 
 =cut
diff --git a/scripts/Dpkg/Deps/OR.pm b/scripts/Dpkg/Deps/OR.pm
index b2f8d03ed..4ce5c9818 100644
--- a/scripts/Dpkg/Deps/OR.pm
+++ b/scripts/Dpkg/Deps/OR.pm
@@ -29,7 +29,7 @@ Dpkg::Deps::OR - list of OR dependencies
 
 =head1 DESCRIPTION
 
-This object represents a list of dependencies of which only one must be met
+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
diff --git a/scripts/Dpkg/Deps/Simple.pm b/scripts/Dpkg/Deps/Simple.pm
index efe635cec..aa23e7da2 100644
--- a/scripts/Dpkg/Deps/Simple.pm
+++ b/scripts/Dpkg/Deps/Simple.pm
@@ -29,7 +29,8 @@ Dpkg::Deps::Simple - represents a single dependency statement
 
 =head1 DESCRIPTION
 
-This object has several interesting properties:
+This class represents a single dependency statement.
+It has several interesting properties:
 
 =over 4
 
@@ -576,7 +577,7 @@ sub get_evaluation {
 =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
+class Dpkg::Deps::KnownFacts) and a list of other dependencies that are
 known to be true.
 
 =cut
diff --git a/scripts/Dpkg/Deps/Union.pm b/scripts/Dpkg/Deps/Union.pm
index 62cf5c38a..148e38ed3 100644
--- a/scripts/Dpkg/Deps/Union.pm
+++ b/scripts/Dpkg/Deps/Union.pm
@@ -29,8 +29,8 @@ Dpkg::Deps::Union - list of unrelated dependencies
 
 =head1 DESCRIPTION
 
-This object represents a list of relationships. It inherits from
-Dpkg::Deps::Multiple.
+This class represents a list of relationships.
+It inherits from Dpkg::Deps::Multiple.
 
 =cut
 
diff --git a/scripts/Dpkg/Index.pm b/scripts/Dpkg/Index.pm
index 7859bf669..cfe86ba17 100644
--- a/scripts/Dpkg/Index.pm
+++ b/scripts/Dpkg/Index.pm
@@ -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
 
diff --git a/scripts/Dpkg/Interface/Storable.pm b/scripts/Dpkg/Interface/Storable.pm
index 5ed308cf2..5ac078ac1 100644
--- a/scripts/Dpkg/Interface/Storable.pm
+++ b/scripts/Dpkg/Interface/Storable.pm
@@ -38,12 +38,12 @@ 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
diff --git a/scripts/Dpkg/Source/Format.pm b/scripts/Dpkg/Source/Format.pm
index 55172a2ef..41596a233 100644
--- a/scripts/Dpkg/Source/Format.pm
+++ b/scripts/Dpkg/Source/Format.pm
@@ -24,7 +24,7 @@ Dpkg::Source::Format - manipulate debian/source/format files
 
 =head1 DESCRIPTION
 
-This module provides an object that can manipulate Debian source
+This module provides a class that can manipulate Debian source
 package F<debian/source/format> files.
 
 =cut
diff --git a/scripts/Dpkg/Source/Package.pm b/scripts/Dpkg/Source/Package.pm
index d38e228e5..337000cb8 100644
--- a/scripts/Dpkg/Source/Package.pm
+++ b/scripts/Dpkg/Source/Package.pm
@@ -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.
@@ -204,7 +204,7 @@ source package after its extraction.
 
 =cut
 
-# Object methods
+# Class methods
 sub new {
     my ($this, %args) = @_;
     my $class = ref($this) || $this;
diff --git a/scripts/Dpkg/Substvars.pm b/scripts/Dpkg/Substvars.pm
index 49ebd902b..27107fe3d 100644
--- a/scripts/Dpkg/Substvars.pm
+++ b/scripts/Dpkg/Substvars.pm
@@ -39,7 +39,7 @@ Dpkg::Substvars - handle variable substitution in strings
 
 =head1 DESCRIPTION
 
-It provides an object which is able to substitute variables in strings.
+It provides a class which is able to substitute variables in strings.
 
 =cut
 
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index a37b23cfc..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
diff --git a/scripts/Dpkg/Vendor/Default.pm b/scripts/Dpkg/Vendor/Default.pm
index 6b7c5204f..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).
 
diff --git a/scripts/Dpkg/Vendor/Ubuntu.pm b/scripts/Dpkg/Vendor/Ubuntu.pm
index e6335c204..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
-- 
cgit v1.2.3


From 2eafcd122aa4e772cd6bb40c3eb82ac27aff3646 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 5 Nov 2019 12:57:13 +0100
Subject: Dpkg::Changelog: Clarify inheritance and implementation references

Make it clear that these classes inherit from some other base class,
which will contain the missing documentation.

Prompted-by: intrigeri <intrigeri@debian.org>
---
 debian/changelog                       |  3 +++
 scripts/Dpkg/Changelog/Debian.pm       | 13 ++++++++++---
 scripts/Dpkg/Changelog/Entry/Debian.pm |  7 ++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index d41eaa836..3874bc4e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -88,6 +88,9 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
diff --git a/scripts/Dpkg/Changelog/Debian.pm b/scripts/Dpkg/Changelog/Debian.pm
index 937acb5e0..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.
 
diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm
index 8658ae493..1e7daf55b 100644
--- a/scripts/Dpkg/Changelog/Entry/Debian.pm
+++ b/scripts/Dpkg/Changelog/Entry/Debian.pm
@@ -45,9 +45,10 @@ Dpkg::Changelog::Entry::Debian - represents a Debian changelog entry
 
 =head1 DESCRIPTION
 
-This class 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
 
-- 
cgit v1.2.3


From 89afa9af7cd589eb8384ed96b6d86dd59d56bdf5 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 5 Nov 2019 12:59:17 +0100
Subject: Dpkg::Source::Package::V3::Native: Do not say v1.0 for 3.0 formats

---
 debian/changelog                         | 1 +
 scripts/Dpkg/Source/Package/V3/Native.pm | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts')

diff --git a/debian/changelog b/debian/changelog
index 3874bc4e1..b3a0fbe91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
     - 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.
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);
-- 
cgit v1.2.3