po: Regenerate .pot files and merge .po files with them

8 files changed, 2106 insertions, 1524 deletions

diff --git a/scripts/po/ca.po b/scripts/po/ca.po
index 3a85729df..eda5297e5 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: 2016-05-09 03:21+0200\n"
+"POT-Creation-Date: 2016-07-03 19:11+0200\n"
 "PO-Revision-Date: 2014-12-10 03:47+0100\n"
 "Last-Translator: Guillem Jover <guillem@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -25,7 +25,7 @@ msgstr ""
 #: scripts/dpkg-mergechangelogs.pl scripts/dpkg-name.pl
 #: scripts/dpkg-parsechangelog.pl scripts/dpkg-scanpackages.pl
 #: scripts/dpkg-scansources.pl scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl
-#: scripts/dpkg-vendor.pl scripts/changelog/debian.pl
+#: scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versió %s.\n"
@@ -35,7 +35,6 @@ msgstr "Debian %s versió %s.\n"
 #: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
 #: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
 #: scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl scripts/dpkg-vendor.pl
-#: scripts/changelog/debian.pl
 msgid ""
 "\n"
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -288,52 +287,61 @@ msgstr "Forma d'ús: %s [<opció>…]"
 #| "      --version  show the version."
 msgid ""
 "Options:\n"
-"  --build=<type>[,...]\n"
-"                 specify the build <type>: full, source, binary, any, all\n"
-"                   (default is 'full').\n"
-"  -F             normal full build (binaries and sources, 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            do not clean source tree (implies -b).\n"
-"  -tc            clean source tree when finished.\n"
-"  -D             check build dependencies and conflicts (default).\n"
-"  -d             do not check build dependencies and conflicts.\n"
-"  -P<profiles>   assume given build profiles as active (comma-separated "
-"list).\n"
-"  -R<rules>      rules file to execute (default is debian/rules).\n"
-"  -T<target>     call debian/rules <target> with the proper environment.\n"
-"      --as-root  ensure -T calls the target with root rights.\n"
-"  -j[<number>]   jobs to run simultaneously (passed to <rules>), forced "
-"mode.\n"
-"  -J[<number>]   jobs to run simultaneously (passed to <rules>), opt-in "
-"mode.\n"
-"  -r<gain-root-command>\n"
-"                 command to gain root privileges (default is fakeroot).\n"
-"  --check-command=<check-command>\n"
-"                 command to check the .changes file (no default).\n"
-"  --check-option=<opt>\n"
-"                 pass <opt> to <check-command>.\n"
-"  --hook-<hook-name>=<hook-command>\n"
-"                 set <hook-command> as the hook <hook-name>, known hooks:\n"
-"                   init preclean source build binary changes postclean\n"
-"                   check sign done\n"
-"  -p<sign-command>\n"
-"                 command to sign .dsc and/or .changes files\n"
-"                   (default is gpg2 or gpg).\n"
-"  -k<keyid>      the key to use for signing.\n"
-"  -ap            add pause before starting signature process.\n"
-"  -us            unsigned source package.\n"
-"  -uc            unsigned .changes file.\n"
-"      --force-sign\n"
-"                 force signing the resulting files.\n"
-"      --admindir=<directory>\n"
-"                 change the administrative directory.\n"
-"  -?, --help     show this help message.\n"
-"      --version  show the version."
+"      --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"
+"  -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.\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 changes\n"
+"                                postclean check sign done\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"
+"  -uc, --unsigned-changes     unsigned .changes 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."
 msgstr ""
 "Opcions:\n"
 "  -F (predeterminat)\n"
@@ -387,12 +395,19 @@ msgstr ""
 "      --version  mostra la versió."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-architecture:\n"
+#| "  -a, --host-arch <arch>    set the host Debian architecture.\n"
+#| "  -t, --host-type <type>    set the host GNU system type.\n"
+#| "      --target-arch <arch>  set the target Debian architecture.\n"
+#| "      --target-type <type>  set the target GNU system type."
 msgid ""
 "Options passed to dpkg-architecture:\n"
-"  -a, --host-arch <arch>    set the host Debian architecture.\n"
-"  -t, --host-type <type>    set the host GNU system type.\n"
-"      --target-arch <arch>  set the target Debian architecture.\n"
-"      --target-type <type>  set the target GNU system type."
+"  -a, --host-arch <arch>      set the host Debian architecture.\n"
+"  -t, --host-type <type>      set the host GNU system type.\n"
+"      --target-arch <arch>    set the target Debian architecture.\n"
+"      --target-type <type>    set the target GNU system type."
 msgstr ""
 "Opcions passades a dpkg-architecture:\n"
 "  -a, --host-arch <arq>     estableix l'arquitectura amfitrió de Debian.\n"
@@ -415,15 +430,15 @@ msgstr ""
 #| "                 pass option <opt> to dpkg-genchanges."
 msgid ""
 "Options passed to dpkg-genchanges:\n"
-"  -si            source includes orig, if new upstream (default).\n"
-"  -sa            source includes orig, always.\n"
-"  -sd            source is diff and .dsc only.\n"
-"  -v<version>    changes since version <version>.\n"
-"  -m<maint>      maintainer for package is <maint>.\n"
-"  -e<maint>      maintainer for release is <maint>.\n"
-"  -C<descfile>   changes are described in <descfile>.\n"
-"      --changes-option=<opt>\n"
-"                 pass option <opt> to dpkg-genchanges."
+"  -si                         source includes orig, if new upstream "
+"(default).\n"
+"  -sa                         source includes orig, always.\n"
+"  -sd                         source is diff and .dsc only.\n"
+"  -v<version>                 changes since version <version>.\n"
+"  -m, --release-by=<maint>    maintainer for this release is <maint>.\n"
+"  -e, --build-by=<maint>      maintainer for this build is <maint>.\n"
+"  -C<descfile>                changes are described in <descfile>.\n"
+"      --changes-option=<opt>  pass option <opt> to dpkg-genchanges."
 msgstr ""
 "Opcions passades a dpkg-genchanges:\n"
 "  -si            el font inclou l'orig, si és un nou original "
@@ -438,16 +453,30 @@ msgstr ""
 "                 passa l'opció <opció> a dpkg-genchanges."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-source:\n"
+#| "  -sn            force Debian native source format.\n"
+#| "  -s[sAkurKUR]   see dpkg-source for explanation.\n"
+#| "  -z<level>      compression level to use for source.\n"
+#| "  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
+#| "  -i[<regex>]    ignore diffs of files matching regex.\n"
+#| "  -I[<pattern>]  filter out files when building tarballs.\n"
+#| "      --source-option=<opt>\n"
+#| "                 pass option <opt> to dpkg-source.\n"
 msgid ""
 "Options passed to dpkg-source:\n"
-"  -sn            force Debian native source format.\n"
-"  -s[sAkurKUR]   see dpkg-source for explanation.\n"
-"  -z<level>      compression level to use for source.\n"
-"  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
-"  -i[<regex>]    ignore diffs of files matching regex.\n"
-"  -I[<pattern>]  filter out files when building tarballs.\n"
-"      --source-option=<opt>\n"
-"                 pass option <opt> to dpkg-source.\n"
+"  -sn                         force Debian native source format.\n"
+"  -s[sAkurKUR]                see dpkg-source for explanation.\n"
+"  -z, --compression-level=<level>\n"
+"                              compression level to use for source.\n"
+"  -Z, --compression=<compressor>\n"
+"                              compression to use for source (gz|xz|bzip2|"
+"lzma).\n"
+"  -i, --diff-ignore[=<regex>] ignore diffs of files matching <regex>.\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                              filter out files when building tarballs.\n"
+"      --source-option=<opt>   pass option <opt> to dpkg-source.\n"
 msgstr ""
 "Opcions passades a dpkg-source:\n"
 "  -sn            força el format de font nadiu de Debian.\n"
@@ -551,15 +580,6 @@ msgstr ""
 "contenir fitxers no desitjats"
 
 #: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid ""
-"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
-"least '%s' seems to be missing)"
-msgstr ""
-"s'ha d'actualitzar %s per admetre els objectius «build-arch» i «build-"
-"indep» (almenys sembla que manca «%s»)"
-
-#: scripts/dpkg-buildpackage.pl
 msgid "parse changes file"
 msgstr "analitza un fitxer de canvis"
 
@@ -638,6 +658,15 @@ msgstr "pujada de binaris i diff (NO s'inclou el codi font original)"
 msgid "full upload (original source is included)"
 msgstr "pujada sencera (s'inclou el codi font original)"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
+"least '%s' seems to be missing)"
+msgstr ""
+"s'ha d'actualitzar %s per admetre els objectius «build-arch» i «build-"
+"indep» (almenys sembla que manca «%s»)"
+
 #: scripts/dpkg-checkbuilddeps.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<control-file>]"
@@ -1438,7 +1467,6 @@ msgid ""
 "Options:\n"
 "  -l <changelog-file>      get per-version info from this file.\n"
 "  -F <changelog-format>    force changelog format.\n"
-"  -L <libdir>              look for changelog parsers in <libdir>.\n"
 "  -S, --show-field <field> show the values for <field>.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
@@ -1519,8 +1547,10 @@ msgstr ""
 "    --all                       inclou tots els canvis.\n"
 
 #: scripts/dpkg-parsechangelog.pl
-msgid "missing library directory"
-msgstr ""
+#, fuzzy
+#| msgid "-i%s is deprecated; it is without effect"
+msgid "-L is obsolete; it is without effect"
+msgstr "-i%s és obsolet; no té efecte"
 
 #: scripts/dpkg-parsechangelog.pl
 #, fuzzy
@@ -1580,8 +1610,7 @@ msgstr "  %s (el paquet especifica %s, i no %s)"
 msgid "unconditional maintainer override for %s"
 msgstr "substitució de mantenidor incondicional per a %s"
 
-#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl
-#: scripts/Dpkg/Changelog/Parse.pm scripts/Dpkg/IPC.pm
+#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "cannot fork for %s"
@@ -2120,7 +2149,10 @@ msgstr "--%s no accepta més de dos arguments"
 msgid "--%s needs the .dsc file as first argument, not a directory"
 msgstr "--%s necessita el fitxer .dsc com a primer argument, no un directori"
 
-#: scripts/dpkg-source.pl
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V1.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Bzr.pm
+#: scripts/Dpkg/Source/Package/V3/Git.pm
+#: scripts/Dpkg/Source/Package/V3/Native.pm
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "la destinació del desempaquetat existeix: %s"
@@ -2141,6 +2173,12 @@ msgid "extracting %s in %s"
 msgstr "s'està extraient %s a %s"
 
 #: scripts/dpkg-source.pl
+#, fuzzy, perl-format
+#| msgid "%s is not a plain file"
+msgid "test control %s is not a regular file"
+msgstr "%s no és un fitxer normal"
+
+#: scripts/dpkg-source.pl
 #, perl-format
 msgid "%s field contains value %s, but no tests control file %s"
 msgstr ""
@@ -2177,7 +2215,27 @@ msgstr ""
 "                           desa canvis als fitxers originals en un pedaç nou."
 
 #: scripts/dpkg-source.pl
-#, perl-format
+#, fuzzy, perl-format
+#| msgid ""
+#| "Build options:\n"
+#| "  -c<control-file>         get control info from this file.\n"
+#| "  -l<changelog-file>       get per-version info from this file.\n"
+#| "  -F<changelog-format>     force changelog format.\n"
+#| "  --format=<source-format> set the format to be used for the source "
+#| "package.\n"
+#| "  -V<name>=<value>         set a substitution variable.\n"
+#| "  -T<substvars-file>       read variables here.\n"
+#| "  -D<field>=<value>        override or add a .dsc field and value.\n"
+#| "  -U<field>                remove a field.\n"
+#| "  -q                       quiet mode.\n"
+#| "  -i[<regex>]              filter out files to ignore diffs of\n"
+#| "                             (defaults to: '%s').\n"
+#| "  -I[<pattern>]            filter out files when building tarballs\n"
+#| "                             (defaults to: %s).\n"
+#| "  -Z<compression>          select compression to use (defaults to '%s',\n"
+#| "                             supported are: %s).\n"
+#| "  -z<level>                compression level to use (defaults to '%d',\n"
+#| "                             supported are: '1'-'9', 'best', 'fast')"
 msgid ""
 "Build options:\n"
 "  -c<control-file>         get control info from this file.\n"
@@ -2189,14 +2247,17 @@ msgid ""
 "  -T<substvars-file>       read variables here.\n"
 "  -D<field>=<value>        override or add a .dsc field and value.\n"
 "  -U<field>                remove a field.\n"
-"  -q                       quiet mode.\n"
-"  -i[<regex>]              filter out files to ignore diffs of\n"
+"  -i, --diff-ignore[=<regex>]\n"
+"                           filter out files to ignore diffs of\n"
 "                             (defaults to: '%s').\n"
-"  -I[<pattern>]            filter out files when building tarballs\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                           filter out files when building tarballs\n"
 "                             (defaults to: %s).\n"
-"  -Z<compression>          select compression to use (defaults to '%s',\n"
+"  -Z, --compression=<compression>\n"
+"                           select compression to use (defaults to '%s',\n"
 "                             supported are: %s).\n"
-"  -z<level>                compression level to use (defaults to '%d',\n"
+"  -z, --compression-level=<level>\n"
+"                           compression level to use (defaults to '%d',\n"
 "                             supported are: '1'-'9', 'best', 'fast')"
 msgstr ""
 "Opcions de construcció:\n"
@@ -2234,6 +2295,7 @@ msgid ""
 "  --no-copy                don't copy .orig tarballs\n"
 "  --no-check               don't check signature and checksums before "
 "unpacking\n"
+"  --no-overwrite-dir       do not overwrite directory on extraction\n"
 "  --require-valid-signature abort if the package doesn't have a valid "
 "signature\n"
 "  --require-strong-checksums\n"
@@ -2251,8 +2313,14 @@ msgstr ""
 "  --ignore-bad-version     permet versions de font no vàlides."
 
 #: scripts/dpkg-source.pl
+#, fuzzy
+#| msgid ""
+#| "General options:\n"
+#| "  -?, --help               show this help message.\n"
+#| "      --version            show the version."
 msgid ""
 "General options:\n"
+"  -q                       quiet mode.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
 msgstr ""
@@ -2300,97 +2368,6 @@ msgstr ""
 msgid "vendor %s doesn't exist in %s"
 msgstr "el proveïdor %s no existeix a %s"
 
-#: scripts/changelog/debian.pl
-#, fuzzy, perl-format
-#| msgid "Usage: %s [<option>...] [<control-file>]"
-msgid "Usage: %s [<option>...] [<changelog-file>]"
-msgstr "Forma d'ús: %s [<opció>…] [<fitxer-control>]"
-
-#: scripts/changelog/debian.pl
-#, fuzzy
-#| msgid ""
-#| "Parser options:\n"
-#| "    --format <output-format>    see man page for list of available\n"
-#| "                                output formats, defaults to 'dpkg'\n"
-#| "                                for compatibility with dpkg-dev\n"
-#| "    --since <version>,          include all changes later than version\n"
-#| "      -s<version>, -v<version>\n"
-#| "    --until <version>,          include all changes earlier than version\n"
-#| "      -u<version>\n"
-#| "    --from <version>,           include all changes equal or later\n"
-#| "      -f<version>               than version\n"
-#| "    --to <version>, -t<version> include all changes up to or equal\n"
-#| "                                than version\n"
-#| "    --count <number>,           include <number> entries from the top\n"
-#| "      -c<number>, -n<number>    (or the tail if <number> is lower than "
-#| "0)\n"
-#| "    --offset <number>,          change the starting point for --count,\n"
-#| "      -o<number>                counted from the top (or the tail if\n"
-#| "                                <number> is lower than 0)\n"
-#| "    --all                       include all changes\n"
-msgid ""
-"Options:\n"
-"      --file <file>       changelog <file> to parse (defaults to '-').\n"
-"  -l, --label <file>      changelog <file> name to use in error messages.\n"
-"      --format <output-format>\n"
-"                          set the 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 if\n"
-"                            <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"
-"  -?, --help              print usage information.\n"
-"  -V, --version           print version information.\n"
-msgstr ""
-"Opcions de l'analitzador:\n"
-"    --format <format-sortida>   vegeu la pàgina de manual per la llista de\n"
-"                                  formats de sortida disponibles, el valor\n"
-"                                  predeterminat és «dpkg».\n"
-"    --since <versió>,           inclou tots els canvis posteriors a "
-"<versió>.\n"
-"      -s<versió>, -v<versió>\n"
-"    --until <versió>,           inclou tots els canvis anteriors a "
-"<versió>.\n"
-"      -u<versió>\n"
-"    --from <versió>,            inclou tots els canvis iguals o posteriors "
-"a\n"
-"      -f<versió>                  <versió>.\n"
-"    --to <versió>, -t<versió>   inclou tots els canvis fins o iguals a\n"
-"                                  <versió>.\n"
-"    --count <número>,           inclou el <número> d'entrades des del "
-"principi,\n"
-"      -c<número>, -n<número>      o des del final si <número> és inferior a "
-"0.\n"
-"    --offset <número>,          canvia el punt d'inici per a --count, "
-"contant\n"
-"      -o<número>                  des del principi, o des del final si "
-"<número>\n"
-"                                  és inferior a 0.\n"
-"    --all                       inclou tots els canvis.\n"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "output format %s not supported"
-msgstr "no s'admet el el format de sortida %s"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "more than one file specified (%s and %s)"
-msgstr "s'ha especificat més d'un fitxer (%s i %s)"
-
-#: scripts/changelog/debian.pl scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "fatal error occurred while parsing %s"
-msgstr "s'ha produït un error fatal en analitzar %s"
-
 #: scripts/Dpkg/Arch.pm
 #, fuzzy
 #| msgid ""
@@ -2620,12 +2597,6 @@ 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 "unknown option or argument %s"
-msgid "unknown output format %s"
-msgstr "l'opció o argument %s és desconeguda"
-
-#: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
 msgid "cannot create pipe for %s"
 msgstr "no es pot crear el conducte per a %s"
@@ -2636,29 +2607,21 @@ msgid "tail of %s"
 msgstr "cua de %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "format parser %s not executable"
-msgstr "analitzador de format %s no és executable"
+#, fuzzy, perl-format
+#| msgid "changelog format %s is unknown"
+msgid "changelog format %s is unknown: %s"
+msgstr "el format %s del registre de canvis és desconegut"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "changelog format %s is unknown"
-msgstr "el format %s del registre de canvis és desconegut"
+msgid "fatal error occurred while parsing %s"
+msgstr "s'ha produït un error fatal en analitzar %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
-#| msgid "cannot exec format parser: %s"
-msgid "cannot execute format parser: %s"
-msgstr "no es pot executar l'analitzador de format: %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-msgid "output of changelog parser"
-msgstr "sortida de l'analitzador del registre de canvis"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "changelog parser %s"
-msgstr "analitzador del registre de canvis %s"
+#| msgid "unknown option or argument %s"
+msgid "unknown output format %s"
+msgstr "l'opció o argument %s és desconeguda"
 
 #: scripts/Dpkg/Checksums.pm
 #, perl-format
@@ -2736,6 +2699,12 @@ msgid "license stanza of copyright file"
 msgstr ""
 
 #: scripts/Dpkg/Control.pm
+#, fuzzy
+#| msgid "package's section of control info file"
+msgid "package's tests control file"
+msgstr "secció del paquet del fitxer d'informació de control"
+
+#: scripts/Dpkg/Control.pm
 #, fuzzy, perl-format
 #| msgid "entry in repository's %s file"
 msgid "repository's %s file"
@@ -4052,6 +4021,12 @@ msgid "bad line in substvars file %s at line %d"
 msgstr "línia errònia al fitxer de substitució de variables %s en la línia %d"
 
 #: scripts/Dpkg/Substvars.pm
+#, fuzzy, perl-format
+#| msgid "source version"
+msgid "invalid source version %s"
+msgstr "versió del font"
+
+#: scripts/Dpkg/Substvars.pm
 #, perl-format
 msgid "too many substitutions - recursive ? - in '%s'"
 msgstr "massa substitucions (recursives?) a «%s»"
@@ -4146,6 +4121,107 @@ 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»"
 
+#, fuzzy
+#~| msgid "Usage: %s [<option>...] [<control-file>]"
+#~ msgid "Usage: %s [<option>...] [<changelog-file>]"
+#~ msgstr "Forma d'ús: %s [<opció>…] [<fitxer-control>]"
+
+#, fuzzy
+#~| msgid ""
+#~| "Parser options:\n"
+#~| "    --format <output-format>    see man page for list of available\n"
+#~| "                                output formats, defaults to 'dpkg'\n"
+#~| "                                for compatibility with dpkg-dev\n"
+#~| "    --since <version>,          include all changes later than version\n"
+#~| "      -s<version>, -v<version>\n"
+#~| "    --until <version>,          include all changes earlier than "
+#~| "version\n"
+#~| "      -u<version>\n"
+#~| "    --from <version>,           include all changes equal or later\n"
+#~| "      -f<version>               than version\n"
+#~| "    --to <version>, -t<version> include all changes up to or equal\n"
+#~| "                                than version\n"
+#~| "    --count <number>,           include <number> entries from the top\n"
+#~| "      -c<number>, -n<number>    (or the tail if <number> is lower than "
+#~| "0)\n"
+#~| "    --offset <number>,          change the starting point for --count,\n"
+#~| "      -o<number>                counted from the top (or the tail if\n"
+#~| "                                <number> is lower than 0)\n"
+#~| "    --all                       include all changes\n"
+#~ msgid ""
+#~ "Options:\n"
+#~ "      --file <file>       changelog <file> to parse (defaults to '-').\n"
+#~ "  -l, --label <file>      changelog <file> name to use in error "
+#~ "messages.\n"
+#~ "      --format <output-format>\n"
+#~ "                          set the 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 "
+#~ "if\n"
+#~ "                            <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"
+#~ "  -?, --help              print usage information.\n"
+#~ "  -V, --version           print version information.\n"
+#~ msgstr ""
+#~ "Opcions de l'analitzador:\n"
+#~ "    --format <format-sortida>   vegeu la pàgina de manual per la llista "
+#~ "de\n"
+#~ "                                  formats de sortida disponibles, el "
+#~ "valor\n"
+#~ "                                  predeterminat és «dpkg».\n"
+#~ "    --since <versió>,           inclou tots els canvis posteriors a "
+#~ "<versió>.\n"
+#~ "      -s<versió>, -v<versió>\n"
+#~ "    --until <versió>,           inclou tots els canvis anteriors a "
+#~ "<versió>.\n"
+#~ "      -u<versió>\n"
+#~ "    --from <versió>,            inclou tots els canvis iguals o "
+#~ "posteriors a\n"
+#~ "      -f<versió>                  <versió>.\n"
+#~ "    --to <versió>, -t<versió>   inclou tots els canvis fins o iguals a\n"
+#~ "                                  <versió>.\n"
+#~ "    --count <número>,           inclou el <número> d'entrades des del "
+#~ "principi,\n"
+#~ "      -c<número>, -n<número>      o des del final si <número> és inferior "
+#~ "a 0.\n"
+#~ "    --offset <número>,          canvia el punt d'inici per a --count, "
+#~ "contant\n"
+#~ "      -o<número>                  des del principi, o des del final si "
+#~ "<número>\n"
+#~ "                                  és inferior a 0.\n"
+#~ "    --all                       inclou tots els canvis.\n"
+
+#~ msgid "output format %s not supported"
+#~ msgstr "no s'admet el el format de sortida %s"
+
+#~ msgid "more than one file specified (%s and %s)"
+#~ msgstr "s'ha especificat més d'un fitxer (%s i %s)"
+
+#~ msgid "format parser %s not executable"
+#~ msgstr "analitzador de format %s no és executable"
+
+#, fuzzy
+#~| msgid "cannot exec format parser: %s"
+#~ msgid "cannot execute format parser: %s"
+#~ msgstr "no es pot executar l'analitzador de format: %s"
+
+#~ msgid "output of changelog parser"
+#~ msgstr "sortida de l'analitzador del registre de canvis"
+
+#~ msgid "changelog parser %s"
+#~ msgstr "analitzador del registre de canvis %s"
+
 #~ msgid "'%s' is not a legal architecture string."
 #~ msgid_plural "'%s' are not legal architecture strings."
 #~ msgstr[0] "«%s» no és una cadena d'arquitectura vàlida."
diff --git a/scripts/po/de.po b/scripts/po/de.po
index e96627f87..94ecf0fee 100644
--- a/scripts/po/de.po
+++ b/scripts/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-dev 1.18.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2016-05-09 03:21+0200\n"
+"POT-Creation-Date: 2016-07-03 19:11+0200\n"
 "PO-Revision-Date: 2016-05-09 19:14+0200\n"
 "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
 "Language-Team: German <debian-l10n-german@lists.debian.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
 #: scripts/dpkg-mergechangelogs.pl scripts/dpkg-name.pl
 #: scripts/dpkg-parsechangelog.pl scripts/dpkg-scanpackages.pl
 #: scripts/dpkg-scansources.pl scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl
-#: scripts/dpkg-vendor.pl scripts/changelog/debian.pl
+#: scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s Version %s\n"
@@ -33,7 +33,6 @@ msgstr "Debian %s Version %s\n"
 #: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
 #: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
 #: scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl scripts/dpkg-vendor.pl
-#: scripts/changelog/debian.pl
 msgid ""
 "\n"
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -230,54 +229,114 @@ msgid "Usage: %s [<option>...]"
 msgstr "Aufruf: %s [<Option> …]"
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| "  --build=<type>[,...]\n"
+#| "                 specify the build <type>: full, source, binary, any, "
+#| "all\n"
+#| "                   (default is 'full').\n"
+#| "  -F             normal full build (binaries and sources, 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            do not clean source tree (implies -b).\n"
+#| "  -tc            clean source tree when finished.\n"
+#| "  -D             check build dependencies and conflicts (default).\n"
+#| "  -d             do not check build dependencies and conflicts.\n"
+#| "  -P<profiles>   assume given build profiles as active (comma-separated "
+#| "list).\n"
+#| "  -R<rules>      rules file to execute (default is debian/rules).\n"
+#| "  -T<target>     call debian/rules <target> with the proper environment.\n"
+#| "      --as-root  ensure -T calls the target with root rights.\n"
+#| "  -j[<number>]   jobs to run simultaneously (passed to <rules>), forced "
+#| "mode.\n"
+#| "  -J[<number>]   jobs to run simultaneously (passed to <rules>), opt-in "
+#| "mode.\n"
+#| "  -r<gain-root-command>\n"
+#| "                 command to gain root privileges (default is fakeroot).\n"
+#| "  --check-command=<check-command>\n"
+#| "                 command to check the .changes file (no default).\n"
+#| "  --check-option=<opt>\n"
+#| "                 pass <opt> to <check-command>.\n"
+#| "  --hook-<hook-name>=<hook-command>\n"
+#| "                 set <hook-command> as the hook <hook-name>, known "
+#| "hooks:\n"
+#| "                   init preclean source build binary changes postclean\n"
+#| "                   check sign done\n"
+#| "  -p<sign-command>\n"
+#| "                 command to sign .dsc and/or .changes files\n"
+#| "                   (default is gpg2 or gpg).\n"
+#| "  -k<keyid>      the key to use for signing.\n"
+#| "  -ap            add pause before starting signature process.\n"
+#| "  -us            unsigned source package.\n"
+#| "  -uc            unsigned .changes file.\n"
+#| "      --force-sign\n"
+#| "                 force signing the resulting files.\n"
+#| "      --admindir=<directory>\n"
+#| "                 change the administrative directory.\n"
+#| "  -?, --help     show this help message.\n"
+#| "      --version  show the version."
 msgid ""
 "Options:\n"
-"  --build=<type>[,...]\n"
-"                 specify the build <type>: full, source, binary, any, all\n"
-"                   (default is 'full').\n"
-"  -F             normal full build (binaries and sources, 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            do not clean source tree (implies -b).\n"
-"  -tc            clean source tree when finished.\n"
-"  -D             check build dependencies and conflicts (default).\n"
-"  -d             do not check build dependencies and conflicts.\n"
-"  -P<profiles>   assume given build profiles as active (comma-separated "
-"list).\n"
-"  -R<rules>      rules file to execute (default is debian/rules).\n"
-"  -T<target>     call debian/rules <target> with the proper environment.\n"
-"      --as-root  ensure -T calls the target with root rights.\n"
-"  -j[<number>]   jobs to run simultaneously (passed to <rules>), forced "
-"mode.\n"
-"  -J[<number>]   jobs to run simultaneously (passed to <rules>), opt-in "
-"mode.\n"
-"  -r<gain-root-command>\n"
-"                 command to gain root privileges (default is fakeroot).\n"
-"  --check-command=<check-command>\n"
-"                 command to check the .changes file (no default).\n"
-"  --check-option=<opt>\n"
-"                 pass <opt> to <check-command>.\n"
-"  --hook-<hook-name>=<hook-command>\n"
-"                 set <hook-command> as the hook <hook-name>, known hooks:\n"
-"                   init preclean source build binary changes postclean\n"
-"                   check sign done\n"
-"  -p<sign-command>\n"
-"                 command to sign .dsc and/or .changes files\n"
-"                   (default is gpg2 or gpg).\n"
-"  -k<keyid>      the key to use for signing.\n"
-"  -ap            add pause before starting signature process.\n"
-"  -us            unsigned source package.\n"
-"  -uc            unsigned .changes file.\n"
-"      --force-sign\n"
-"                 force signing the resulting files.\n"
-"      --admindir=<directory>\n"
-"                 change the administrative directory.\n"
-"  -?, --help     show this help message.\n"
-"      --version  show the version."
+"      --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"
+"  -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.\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 changes\n"
+"                                postclean check sign done\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"
+"  -uc, --unsigned-changes     unsigned .changes 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."
 msgstr ""
 "Optionen:\n"
 "  --build=<Typ>[,…]\n"
@@ -333,12 +392,19 @@ msgstr ""
 "      --version  die Version anzeigen"
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-architecture:\n"
+#| "  -a, --host-arch <arch>    set the host Debian architecture.\n"
+#| "  -t, --host-type <type>    set the host GNU system type.\n"
+#| "      --target-arch <arch>  set the target Debian architecture.\n"
+#| "      --target-type <type>  set the target GNU system type."
 msgid ""
 "Options passed to dpkg-architecture:\n"
-"  -a, --host-arch <arch>    set the host Debian architecture.\n"
-"  -t, --host-type <type>    set the host GNU system type.\n"
-"      --target-arch <arch>  set the target Debian architecture.\n"
-"      --target-type <type>  set the target GNU system type."
+"  -a, --host-arch <arch>      set the host Debian architecture.\n"
+"  -t, --host-type <type>      set the host GNU system type.\n"
+"      --target-arch <arch>    set the target Debian architecture.\n"
+"      --target-type <type>    set the target GNU system type."
 msgstr ""
 "Optionen, die an dpkg-architecture weitergegeben werden:\n"
 "  -t, --host-type <Typ>    setzt den Host-GNU-Systemtyp.\n"
@@ -346,17 +412,29 @@ msgstr ""
 "      --target-type <Typ>  setzt den Ziel-GNU-Systemtyp."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-genchanges:\n"
+#| "  -si            source includes orig, if new upstream (default).\n"
+#| "  -sa            source includes orig, always.\n"
+#| "  -sd            source is diff and .dsc only.\n"
+#| "  -v<version>    changes since version <version>.\n"
+#| "  -m<maint>      maintainer for package is <maint>.\n"
+#| "  -e<maint>      maintainer for release is <maint>.\n"
+#| "  -C<descfile>   changes are described in <descfile>.\n"
+#| "      --changes-option=<opt>\n"
+#| "                 pass option <opt> to dpkg-genchanges."
 msgid ""
 "Options passed to dpkg-genchanges:\n"
-"  -si            source includes orig, if new upstream (default).\n"
-"  -sa            source includes orig, always.\n"
-"  -sd            source is diff and .dsc only.\n"
-"  -v<version>    changes since version <version>.\n"
-"  -m<maint>      maintainer for package is <maint>.\n"
-"  -e<maint>      maintainer for release is <maint>.\n"
-"  -C<descfile>   changes are described in <descfile>.\n"
-"      --changes-option=<opt>\n"
-"                 pass option <opt> to dpkg-genchanges."
+"  -si                         source includes orig, if new upstream "
+"(default).\n"
+"  -sa                         source includes orig, always.\n"
+"  -sd                         source is diff and .dsc only.\n"
+"  -v<version>                 changes since version <version>.\n"
+"  -m, --release-by=<maint>    maintainer for this release is <maint>.\n"
+"  -e, --build-by=<maint>      maintainer for this build is <maint>.\n"
+"  -C<descfile>                changes are described in <descfile>.\n"
+"      --changes-option=<opt>  pass option <opt> to dpkg-genchanges."
 msgstr ""
 "Optionen, die an Dpkg-Genchanges weitergegeben werden:\n"
 "  -si            Quelle enthält Orig. falls neues Upstream, Standard\n"
@@ -370,16 +448,30 @@ msgstr ""
 "                 <Opt> an Dpkg-Genchanges weitergeben"
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-source:\n"
+#| "  -sn            force Debian native source format.\n"
+#| "  -s[sAkurKUR]   see dpkg-source for explanation.\n"
+#| "  -z<level>      compression level to use for source.\n"
+#| "  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
+#| "  -i[<regex>]    ignore diffs of files matching regex.\n"
+#| "  -I[<pattern>]  filter out files when building tarballs.\n"
+#| "      --source-option=<opt>\n"
+#| "                 pass option <opt> to dpkg-source.\n"
 msgid ""
 "Options passed to dpkg-source:\n"
-"  -sn            force Debian native source format.\n"
-"  -s[sAkurKUR]   see dpkg-source for explanation.\n"
-"  -z<level>      compression level to use for source.\n"
-"  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
-"  -i[<regex>]    ignore diffs of files matching regex.\n"
-"  -I[<pattern>]  filter out files when building tarballs.\n"
-"      --source-option=<opt>\n"
-"                 pass option <opt> to dpkg-source.\n"
+"  -sn                         force Debian native source format.\n"
+"  -s[sAkurKUR]                see dpkg-source for explanation.\n"
+"  -z, --compression-level=<level>\n"
+"                              compression level to use for source.\n"
+"  -Z, --compression=<compressor>\n"
+"                              compression to use for source (gz|xz|bzip2|"
+"lzma).\n"
+"  -i, --diff-ignore[=<regex>] ignore diffs of files matching <regex>.\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                              filter out files when building tarballs.\n"
+"      --source-option=<opt>   pass option <opt> to dpkg-source.\n"
 msgstr ""
 "Optionen, die an Dpkg-Source weitergegeben werden:\n"
 "  -sn            »Debian native«-Quellformat erzwingen\n"
@@ -483,15 +575,6 @@ msgstr ""
 "es mag unerwünschte Dateien enthalten"
 
 #: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid ""
-"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
-"least '%s' seems to be missing)"
-msgstr ""
-"%s muss aktualisiert werden, um die Ziele »build-arch« und »build-indep« zu "
-"unterstützen (zumindest »%s« scheint zu fehlen)."
-
-#: scripts/dpkg-buildpackage.pl
 msgid "parse changes file"
 msgstr "Auswerten der changes-Datei"
 
@@ -568,6 +651,15 @@ msgstr "Binärpakete(e) und Diff hochzuladen (Originalquellen NICHT enthalten)"
 msgid "full upload (original source is included)"
 msgstr "Alles hochzuladen (Originalquellen enthalten)"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
+"least '%s' seems to be missing)"
+msgstr ""
+"%s muss aktualisiert werden, um die Ziele »build-arch« und »build-indep« zu "
+"unterstützen (zumindest »%s« scheint zu fehlen)."
+
 #: scripts/dpkg-checkbuilddeps.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<control-file>]"
@@ -1227,11 +1319,19 @@ msgid "need at least a filename"
 msgstr "mindestens ein Dateiname wird benötigt"
 
 #: scripts/dpkg-parsechangelog.pl
+#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| "  -l <changelog-file>      get per-version info from this file.\n"
+#| "  -F <changelog-format>    force changelog format.\n"
+#| "  -L <libdir>              look for changelog parsers in <libdir>.\n"
+#| "  -S, --show-field <field> show the values for <field>.\n"
+#| "  -?, --help               show this help message.\n"
+#| "      --version            show the version."
 msgid ""
 "Options:\n"
 "  -l <changelog-file>      get per-version info from this file.\n"
 "  -F <changelog-format>    force changelog format.\n"
-"  -L <libdir>              look for changelog parsers in <libdir>.\n"
 "  -S, --show-field <field> show the values for <field>.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
@@ -1282,8 +1382,10 @@ msgstr ""
 "oben (oder von unten, falls <Zahl> kleiner 0 ist)\n"
 
 #: scripts/dpkg-parsechangelog.pl
-msgid "missing library directory"
-msgstr "fehlendes Bibliotheksverzeichnis"
+#, fuzzy
+#| msgid "-i%s is deprecated; it is without effect"
+msgid "-L is obsolete; it is without effect"
+msgstr "-i%s ist veraltet; es hat keine Wirkung"
 
 #: scripts/dpkg-parsechangelog.pl
 msgid "bad changelog format name"
@@ -1342,8 +1444,7 @@ msgstr "  %s (laut Paket %s, nicht %s)"
 msgid "unconditional maintainer override for %s"
 msgstr "bedingungslose Übersteuerung (»override«) des Betreuers für %s"
 
-#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl
-#: scripts/Dpkg/Changelog/Parse.pm scripts/Dpkg/IPC.pm
+#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "cannot fork for %s"
@@ -1861,7 +1962,10 @@ msgstr "--%s akzeptiert nicht mehr als zwei Argumente"
 msgid "--%s needs the .dsc file as first argument, not a directory"
 msgstr "--%s benötigt die .dsc-Datei als erstes Argument, kein Verzeichnis"
 
-#: scripts/dpkg-source.pl
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V1.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Bzr.pm
+#: scripts/Dpkg/Source/Package/V3/Git.pm
+#: scripts/Dpkg/Source/Package/V3/Native.pm
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "Entpackziel existiert: %s"
@@ -1882,6 +1986,12 @@ msgid "extracting %s in %s"
 msgstr "%s wird nach %s extrahiert"
 
 #: scripts/dpkg-source.pl
+#, fuzzy, perl-format
+#| msgid "%s is not a plain file"
+msgid "test control %s is not a regular file"
+msgstr "%s ist keine gewöhnliche Datei."
+
+#: scripts/dpkg-source.pl
 #, perl-format
 msgid "%s field contains value %s, but no tests control file %s"
 msgstr "%s-Feld enthält Wert %s, aber keine Teststeuerdatei %s"
@@ -1918,7 +2028,27 @@ msgstr ""
 "                      Patch speichern."
 
 #: scripts/dpkg-source.pl
-#, perl-format
+#, fuzzy, perl-format
+#| msgid ""
+#| "Build options:\n"
+#| "  -c<control-file>         get control info from this file.\n"
+#| "  -l<changelog-file>       get per-version info from this file.\n"
+#| "  -F<changelog-format>     force changelog format.\n"
+#| "  --format=<source-format> set the format to be used for the source "
+#| "package.\n"
+#| "  -V<name>=<value>         set a substitution variable.\n"
+#| "  -T<substvars-file>       read variables here.\n"
+#| "  -D<field>=<value>        override or add a .dsc field and value.\n"
+#| "  -U<field>                remove a field.\n"
+#| "  -q                       quiet mode.\n"
+#| "  -i[<regex>]              filter out files to ignore diffs of\n"
+#| "                             (defaults to: '%s').\n"
+#| "  -I[<pattern>]            filter out files when building tarballs\n"
+#| "                             (defaults to: %s).\n"
+#| "  -Z<compression>          select compression to use (defaults to '%s',\n"
+#| "                             supported are: %s).\n"
+#| "  -z<level>                compression level to use (defaults to '%d',\n"
+#| "                             supported are: '1'-'9', 'best', 'fast')"
 msgid ""
 "Build options:\n"
 "  -c<control-file>         get control info from this file.\n"
@@ -1930,14 +2060,17 @@ msgid ""
 "  -T<substvars-file>       read variables here.\n"
 "  -D<field>=<value>        override or add a .dsc field and value.\n"
 "  -U<field>                remove a field.\n"
-"  -q                       quiet mode.\n"
-"  -i[<regex>]              filter out files to ignore diffs of\n"
+"  -i, --diff-ignore[=<regex>]\n"
+"                           filter out files to ignore diffs of\n"
 "                             (defaults to: '%s').\n"
-"  -I[<pattern>]            filter out files when building tarballs\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                           filter out files when building tarballs\n"
 "                             (defaults to: %s).\n"
-"  -Z<compression>          select compression to use (defaults to '%s',\n"
+"  -Z, --compression=<compression>\n"
+"                           select compression to use (defaults to '%s',\n"
 "                             supported are: %s).\n"
-"  -z<level>                compression level to use (defaults to '%d',\n"
+"  -z, --compression-level=<level>\n"
+"                           compression level to use (defaults to '%d',\n"
 "                             supported are: '1'-'9', 'best', 'fast')"
 msgstr ""
 "Bauoptionen:\n"
@@ -1966,11 +2099,24 @@ msgstr ""
 "»fast«)"
 
 #: scripts/dpkg-source.pl
+#, fuzzy
+#| msgid ""
+#| "Extract options:\n"
+#| "  --no-copy                don't copy .orig tarballs\n"
+#| "  --no-check               don't check signature and checksums before "
+#| "unpacking\n"
+#| "  --require-valid-signature abort if the package doesn't have a valid "
+#| "signature\n"
+#| "  --require-strong-checksums\n"
+#| "                           abort if the package contains no strong "
+#| "checksums\n"
+#| "  --ignore-bad-version     allow bad source package versions."
 msgid ""
 "Extract options:\n"
 "  --no-copy                don't copy .orig tarballs\n"
 "  --no-check               don't check signature and checksums before "
 "unpacking\n"
+"  --no-overwrite-dir       do not overwrite directory on extraction\n"
 "  --require-valid-signature abort if the package doesn't have a valid "
 "signature\n"
 "  --require-strong-checksums\n"
@@ -1986,14 +2132,20 @@ msgstr ""
 "                           abbrechen, falls das Paket keine gültige\n"
 "                           Signatur hat\n"
 "  --require-strong-checksums\n"
-"                           abbrechen, falls das Paket keine starken"
-"Signaturen\n"
+"                           abbrechen, falls das Paket keine "
+"starkenSignaturen\n"
 "                           enthält\n"
 "  --ignore-bad-version     fehlerhafte Quellpaketversionen erlauben"
 
 #: scripts/dpkg-source.pl
+#, fuzzy
+#| msgid ""
+#| "General options:\n"
+#| "  -?, --help               show this help message.\n"
+#| "      --version            show the version."
 msgid ""
 "General options:\n"
+"  -q                       quiet mode.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
 msgstr ""
@@ -2044,70 +2196,6 @@ msgstr ""
 msgid "vendor %s doesn't exist in %s"
 msgstr "Lieferant %s existiert in %s nicht"
 
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "Usage: %s [<option>...] [<changelog-file>]"
-msgstr "Aufruf: %s [<Option> …] [<Changelog-Datei>]"
-
-#: scripts/changelog/debian.pl
-msgid ""
-"Options:\n"
-"      --file <file>       changelog <file> to parse (defaults to '-').\n"
-"  -l, --label <file>      changelog <file> name to use in error messages.\n"
-"      --format <output-format>\n"
-"                          set the 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 if\n"
-"                            <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"
-"  -?, --help              print usage information.\n"
-"  -V, --version           print version information.\n"
-msgstr ""
-"Optionen:\n"
-"      --file <Datei>     Changelog-<Datei> auswerten (Vorgabe »-«)\n"
-"  -l, --label <Datei>    Changelog-<Datei>name in Fehlermeldungen verwenden\n"
-"      --format <Ausgabeformat>\n"
-"                         das Ausgabeformat setzen (Vorgabe »dpkg«)\n"
-"      --all              alle Änderungen hinzufügen\n"
-"  -s, --since <Version>  alle Änderungen jünger als <Version> hinzufügen\n"
-"  -v <version>           ebenso\n"
-"  -u, --until <Version>  alle Änderungen älter als <Version> hinzufügen\n"
-"  -f, --from <Version>   alle Änderungen jünger oder identisch zu <Version> "
-"hinzufügen\n"
-"  -t, --to <Version>     alle Änderungen älter bis einschließlich <Version> "
-"hinzufügen\n"
-"   -c, --count <Zahl>    <Zahl> Einträge von oben (oder von unten, falls "
-"<Zahl> kleiner 0 ist) hinzufügen\n"
-"  -n <Zahl>              ebenso\n"
-"  -o, --offset <Zahl>    den Startpunkt ändern, gezählt von oben (oder "
-"unten, falls <Zahl> kleiner 0 ist)\n"
-"  -?, --help             Hinweise zum Aufruf anzeigen\n"
-"  -V, --version          die Version anzeigen\n"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "output format %s not supported"
-msgstr "Ausgabeformat %s nicht unterstützt"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "more than one file specified (%s and %s)"
-msgstr "mehr als eine Datei angegeben (%s und %s)"
-
-#: scripts/changelog/debian.pl scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "fatal error occurred while parsing %s"
-msgstr "Fataler Fehler beim Auswerten von %s"
-
 #: scripts/Dpkg/Arch.pm
 msgid ""
 "cannot determine CC system type, falling back to default (native compilation)"
@@ -2329,11 +2417,6 @@ msgstr "der Abspann passte nicht auf den erwarteten regulären Ausdruck"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "unknown output format %s"
-msgstr "unbekanntes Ausgabeformat %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
 msgid "cannot create pipe for %s"
 msgstr "Pipe für %s kann nicht angelegt werden"
 
@@ -2343,28 +2426,20 @@ msgid "tail of %s"
 msgstr "Ende von %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "format parser %s not executable"
-msgstr "Formatauswerter %s nicht ausführbar"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "changelog format %s is unknown"
+#, fuzzy, perl-format
+#| msgid "changelog format %s is unknown"
+msgid "changelog format %s is unknown: %s"
 msgstr "unbekanntes Changelog-Format %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "cannot execute format parser: %s"
-msgstr "Formatauswerter kann nicht ausgeführt werden: %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-msgid "output of changelog parser"
-msgstr "Ausgabe des Changelog-Auswerters"
+msgid "fatal error occurred while parsing %s"
+msgstr "Fataler Fehler beim Auswerten von %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "changelog parser %s"
-msgstr "Changelog-Auswerter %s"
+msgid "unknown output format %s"
+msgstr "unbekanntes Ausgabeformat %s"
 
 #: scripts/Dpkg/Checksums.pm
 #, perl-format
@@ -2441,6 +2516,12 @@ msgid "license stanza of copyright file"
 msgstr "»license«-Anteil der Copyright-Datei"
 
 #: scripts/Dpkg/Control.pm
+#, fuzzy
+#| msgid "package's section of control info file"
+msgid "package's tests control file"
+msgstr "Paketabschnitt der Steuer-Infodatei"
+
+#: scripts/Dpkg/Control.pm
 #, perl-format
 msgid "repository's %s file"
 msgstr "Datei %s des Depots"
@@ -3729,6 +3810,12 @@ msgid "bad line in substvars file %s at line %d"
 msgstr "ungültige Zeile in der substvars-Datei %s in Zeile %d"
 
 #: scripts/Dpkg/Substvars.pm
+#, fuzzy, perl-format
+#| msgid "invalid source field in %s"
+msgid "invalid source version %s"
+msgstr "ungültiges Quell-Feld in %s"
+
+#: scripts/Dpkg/Substvars.pm
 #, perl-format
 msgid "too many substitutions - recursive ? - in '%s'"
 msgstr "zu viele - rekursive? - Substitutionen in »%s«"
@@ -3822,6 +3909,78 @@ 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 "missing library directory"
+#~ msgstr "fehlendes Bibliotheksverzeichnis"
+
+#~ msgid "Usage: %s [<option>...] [<changelog-file>]"
+#~ msgstr "Aufruf: %s [<Option> …] [<Changelog-Datei>]"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "      --file <file>       changelog <file> to parse (defaults to '-').\n"
+#~ "  -l, --label <file>      changelog <file> name to use in error "
+#~ "messages.\n"
+#~ "      --format <output-format>\n"
+#~ "                          set the 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 "
+#~ "if\n"
+#~ "                            <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"
+#~ "  -?, --help              print usage information.\n"
+#~ "  -V, --version           print version information.\n"
+#~ msgstr ""
+#~ "Optionen:\n"
+#~ "      --file <Datei>     Changelog-<Datei> auswerten (Vorgabe »-«)\n"
+#~ "  -l, --label <Datei>    Changelog-<Datei>name in Fehlermeldungen "
+#~ "verwenden\n"
+#~ "      --format <Ausgabeformat>\n"
+#~ "                         das Ausgabeformat setzen (Vorgabe »dpkg«)\n"
+#~ "      --all              alle Änderungen hinzufügen\n"
+#~ "  -s, --since <Version>  alle Änderungen jünger als <Version> hinzufügen\n"
+#~ "  -v <version>           ebenso\n"
+#~ "  -u, --until <Version>  alle Änderungen älter als <Version> hinzufügen\n"
+#~ "  -f, --from <Version>   alle Änderungen jünger oder identisch zu "
+#~ "<Version> hinzufügen\n"
+#~ "  -t, --to <Version>     alle Änderungen älter bis einschließlich "
+#~ "<Version> hinzufügen\n"
+#~ "   -c, --count <Zahl>    <Zahl> Einträge von oben (oder von unten, falls "
+#~ "<Zahl> kleiner 0 ist) hinzufügen\n"
+#~ "  -n <Zahl>              ebenso\n"
+#~ "  -o, --offset <Zahl>    den Startpunkt ändern, gezählt von oben (oder "
+#~ "unten, falls <Zahl> kleiner 0 ist)\n"
+#~ "  -?, --help             Hinweise zum Aufruf anzeigen\n"
+#~ "  -V, --version          die Version anzeigen\n"
+
+#~ msgid "output format %s not supported"
+#~ msgstr "Ausgabeformat %s nicht unterstützt"
+
+#~ msgid "more than one file specified (%s and %s)"
+#~ msgstr "mehr als eine Datei angegeben (%s und %s)"
+
+#~ msgid "format parser %s not executable"
+#~ msgstr "Formatauswerter %s nicht ausführbar"
+
+#~ msgid "cannot execute format parser: %s"
+#~ msgstr "Formatauswerter kann nicht ausgeführt werden: %s"
+
+#~ msgid "output of changelog parser"
+#~ msgstr "Ausgabe des Changelog-Auswerters"
+
+#~ msgid "changelog parser %s"
+#~ msgstr "Changelog-Auswerter %s"
+
 #~ msgid "write original source message"
 #~ msgstr "ursprüngliche Quell-Nachricht schreiben"
 
@@ -4500,9 +4659,6 @@ msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: »%s«"
 #~ msgid "duplicate source field in %s"
 #~ msgstr "doppeltes Quell-Feld in %s"
 
-#~ msgid "invalid source field in %s"
-#~ msgstr "ungültiges Quell-Feld in %s"
-
 #~ msgid "duplicate binary field in %s"
 #~ msgstr "doppeltes Binärfeld in %s"
 
diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 9ac2ed027..25fe2d1a3 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.18.7\n"
+"Project-Id-Version: dpkg 1.18.8\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2016-05-09 03:21+0200\n"
+"POT-Creation-Date: 2016-07-03 19:11+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"
@@ -25,7 +25,7 @@ msgstr ""
 #: scripts/dpkg-mergechangelogs.pl scripts/dpkg-name.pl
 #: scripts/dpkg-parsechangelog.pl scripts/dpkg-scanpackages.pl
 #: scripts/dpkg-scansources.pl scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl
-#: scripts/dpkg-vendor.pl scripts/changelog/debian.pl
+#: scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr ""
@@ -35,7 +35,6 @@ msgstr ""
 #: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
 #: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
 #: scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl scripts/dpkg-vendor.pl
-#: scripts/changelog/debian.pl
 msgid ""
 "\n"
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -173,88 +172,100 @@ msgstr ""
 #: scripts/dpkg-buildpackage.pl
 msgid ""
 "Options:\n"
-"  --build=<type>[,...]\n"
-"                 specify the build <type>: full, source, binary, any, all\n"
-"                   (default is 'full').\n"
-"  -F             normal full build (binaries and sources, 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            do not clean source tree (implies -b).\n"
-"  -tc            clean source tree when finished.\n"
-"  -D             check build dependencies and conflicts (default).\n"
-"  -d             do not check build dependencies and conflicts.\n"
-"  -P<profiles>   assume given build profiles as active (comma-separated "
-"list).\n"
-"  -R<rules>      rules file to execute (default is debian/rules).\n"
-"  -T<target>     call debian/rules <target> with the proper environment.\n"
-"      --as-root  ensure -T calls the target with root rights.\n"
-"  -j[<number>]   jobs to run simultaneously (passed to <rules>), forced "
-"mode.\n"
-"  -J[<number>]   jobs to run simultaneously (passed to <rules>), opt-in "
-"mode.\n"
-"  -r<gain-root-command>\n"
-"                 command to gain root privileges (default is fakeroot).\n"
-"  --check-command=<check-command>\n"
-"                 command to check the .changes file (no default).\n"
-"  --check-option=<opt>\n"
-"                 pass <opt> to <check-command>.\n"
-"  --hook-<hook-name>=<hook-command>\n"
-"                 set <hook-command> as the hook <hook-name>, known hooks:\n"
-"                   init preclean source build binary changes postclean\n"
-"                   check sign done\n"
-"  -p<sign-command>\n"
-"                 command to sign .dsc and/or .changes files\n"
-"                   (default is gpg2 or gpg).\n"
-"  -k<keyid>      the key to use for signing.\n"
-"  -ap            add pause before starting signature process.\n"
-"  -us            unsigned source package.\n"
-"  -uc            unsigned .changes file.\n"
-"      --force-sign\n"
-"                 force signing the resulting files.\n"
-"      --admindir=<directory>\n"
-"                 change the administrative directory.\n"
-"  -?, --help     show this help message.\n"
-"      --version  show the version."
+"      --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"
+"  -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.\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 changes\n"
+"                                postclean check sign done\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"
+"  -uc, --unsigned-changes     unsigned .changes 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."
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl
 msgid ""
 "Options passed to dpkg-architecture:\n"
-"  -a, --host-arch <arch>    set the host Debian architecture.\n"
-"  -t, --host-type <type>    set the host GNU system type.\n"
-"      --target-arch <arch>  set the target Debian architecture.\n"
-"      --target-type <type>  set the target GNU system type."
+"  -a, --host-arch <arch>      set the host Debian architecture.\n"
+"  -t, --host-type <type>      set the host GNU system type.\n"
+"      --target-arch <arch>    set the target Debian architecture.\n"
+"      --target-type <type>    set the target GNU system type."
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl
 msgid ""
 "Options passed to dpkg-genchanges:\n"
-"  -si            source includes orig, if new upstream (default).\n"
-"  -sa            source includes orig, always.\n"
-"  -sd            source is diff and .dsc only.\n"
-"  -v<version>    changes since version <version>.\n"
-"  -m<maint>      maintainer for package is <maint>.\n"
-"  -e<maint>      maintainer for release is <maint>.\n"
-"  -C<descfile>   changes are described in <descfile>.\n"
-"      --changes-option=<opt>\n"
-"                 pass option <opt> to dpkg-genchanges."
+"  -si                         source includes orig, if new upstream "
+"(default).\n"
+"  -sa                         source includes orig, always.\n"
+"  -sd                         source is diff and .dsc only.\n"
+"  -v<version>                 changes since version <version>.\n"
+"  -m, --release-by=<maint>    maintainer for this release is <maint>.\n"
+"  -e, --build-by=<maint>      maintainer for this build is <maint>.\n"
+"  -C<descfile>                changes are described in <descfile>.\n"
+"      --changes-option=<opt>  pass option <opt> to dpkg-genchanges."
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl
 msgid ""
 "Options passed to dpkg-source:\n"
-"  -sn            force Debian native source format.\n"
-"  -s[sAkurKUR]   see dpkg-source for explanation.\n"
-"  -z<level>      compression level to use for source.\n"
-"  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
-"  -i[<regex>]    ignore diffs of files matching regex.\n"
-"  -I[<pattern>]  filter out files when building tarballs.\n"
-"      --source-option=<opt>\n"
-"                 pass option <opt> to dpkg-source.\n"
+"  -sn                         force Debian native source format.\n"
+"  -s[sAkurKUR]                see dpkg-source for explanation.\n"
+"  -z, --compression-level=<level>\n"
+"                              compression level to use for source.\n"
+"  -Z, --compression=<compressor>\n"
+"                              compression to use for source (gz|xz|bzip2|"
+"lzma).\n"
+"  -i, --diff-ignore[=<regex>] ignore diffs of files matching <regex>.\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                              filter out files when building tarballs.\n"
+"      --source-option=<opt>   pass option <opt> to dpkg-source.\n"
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl
@@ -345,13 +356,6 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid ""
-"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
-"least '%s' seems to be missing)"
-msgstr ""
-
-#: scripts/dpkg-buildpackage.pl
 msgid "parse changes file"
 msgstr ""
 
@@ -427,6 +431,13 @@ msgstr ""
 msgid "full upload (original source is included)"
 msgstr ""
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
+"least '%s' seems to be missing)"
+msgstr ""
+
 #: scripts/dpkg-checkbuilddeps.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<control-file>]"
@@ -946,7 +957,6 @@ msgid ""
 "Options:\n"
 "  -l <changelog-file>      get per-version info from this file.\n"
 "  -F <changelog-format>    force changelog format.\n"
-"  -L <libdir>              look for changelog parsers in <libdir>.\n"
 "  -S, --show-field <field> show the values for <field>.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
@@ -973,7 +983,7 @@ msgid ""
 msgstr ""
 
 #: scripts/dpkg-parsechangelog.pl
-msgid "missing library directory"
+msgid "-L is obsolete; it is without effect"
 msgstr ""
 
 #: scripts/dpkg-parsechangelog.pl
@@ -1017,8 +1027,7 @@ msgstr ""
 msgid "unconditional maintainer override for %s"
 msgstr ""
 
-#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl
-#: scripts/Dpkg/Changelog/Parse.pm scripts/Dpkg/IPC.pm
+#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "cannot fork for %s"
@@ -1451,7 +1460,10 @@ msgstr ""
 msgid "--%s needs the .dsc file as first argument, not a directory"
 msgstr ""
 
-#: scripts/dpkg-source.pl
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V1.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Bzr.pm
+#: scripts/Dpkg/Source/Package/V3/Git.pm
+#: scripts/Dpkg/Source/Package/V3/Native.pm
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr ""
@@ -1473,6 +1485,11 @@ msgstr ""
 
 #: scripts/dpkg-source.pl
 #, perl-format
+msgid "test control %s is not a regular file"
+msgstr ""
+
+#: scripts/dpkg-source.pl
+#, perl-format
 msgid "%s field contains value %s, but no tests control file %s"
 msgstr ""
 
@@ -1511,14 +1528,17 @@ msgid ""
 "  -T<substvars-file>       read variables here.\n"
 "  -D<field>=<value>        override or add a .dsc field and value.\n"
 "  -U<field>                remove a field.\n"
-"  -q                       quiet mode.\n"
-"  -i[<regex>]              filter out files to ignore diffs of\n"
+"  -i, --diff-ignore[=<regex>]\n"
+"                           filter out files to ignore diffs of\n"
 "                             (defaults to: '%s').\n"
-"  -I[<pattern>]            filter out files when building tarballs\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                           filter out files when building tarballs\n"
 "                             (defaults to: %s).\n"
-"  -Z<compression>          select compression to use (defaults to '%s',\n"
+"  -Z, --compression=<compression>\n"
+"                           select compression to use (defaults to '%s',\n"
 "                             supported are: %s).\n"
-"  -z<level>                compression level to use (defaults to '%d',\n"
+"  -z, --compression-level=<level>\n"
+"                           compression level to use (defaults to '%d',\n"
 "                             supported are: '1'-'9', 'best', 'fast')"
 msgstr ""
 
@@ -1528,6 +1548,7 @@ msgid ""
 "  --no-copy                don't copy .orig tarballs\n"
 "  --no-check               don't check signature and checksums before "
 "unpacking\n"
+"  --no-overwrite-dir       do not overwrite directory on extraction\n"
 "  --require-valid-signature abort if the package doesn't have a valid "
 "signature\n"
 "  --require-strong-checksums\n"
@@ -1539,6 +1560,7 @@ msgstr ""
 #: scripts/dpkg-source.pl
 msgid ""
 "General options:\n"
+"  -q                       quiet mode.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
 msgstr ""
@@ -1571,50 +1593,6 @@ msgstr ""
 msgid "vendor %s doesn't exist in %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "Usage: %s [<option>...] [<changelog-file>]"
-msgstr ""
-
-#: scripts/changelog/debian.pl
-msgid ""
-"Options:\n"
-"      --file <file>       changelog <file> to parse (defaults to '-').\n"
-"  -l, --label <file>      changelog <file> name to use in error messages.\n"
-"      --format <output-format>\n"
-"                          set the 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 if\n"
-"                            <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"
-"  -?, --help              print usage information.\n"
-"  -V, --version           print version information.\n"
-msgstr ""
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "output format %s not supported"
-msgstr ""
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "more than one file specified (%s and %s)"
-msgstr ""
-
-#: scripts/changelog/debian.pl scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "fatal error occurred while parsing %s"
-msgstr ""
-
 #: scripts/Dpkg/Arch.pm
 msgid ""
 "cannot determine CC system type, falling back to default (native compilation)"
@@ -1826,11 +1804,6 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "unknown output format %s"
-msgstr ""
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
 msgid "cannot create pipe for %s"
 msgstr ""
 
@@ -1841,26 +1814,17 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "format parser %s not executable"
-msgstr ""
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "changelog format %s is unknown"
+msgid "changelog format %s is unknown: %s"
 msgstr ""
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "cannot execute format parser: %s"
-msgstr ""
-
-#: scripts/Dpkg/Changelog/Parse.pm
-msgid "output of changelog parser"
+msgid "fatal error occurred while parsing %s"
 msgstr ""
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "changelog parser %s"
+msgid "unknown output format %s"
 msgstr ""
 
 #: scripts/Dpkg/Checksums.pm
@@ -1937,6 +1901,10 @@ msgid "license stanza of copyright file"
 msgstr ""
 
 #: scripts/Dpkg/Control.pm
+msgid "package's tests control file"
+msgstr ""
+
+#: scripts/Dpkg/Control.pm
 #, perl-format
 msgid "repository's %s file"
 msgstr ""
@@ -3163,6 +3131,11 @@ msgstr ""
 
 #: scripts/Dpkg/Substvars.pm
 #, perl-format
+msgid "invalid source version %s"
+msgstr ""
+
+#: scripts/Dpkg/Substvars.pm
+#, perl-format
 msgid "too many substitutions - recursive ? - in '%s'"
 msgstr ""
 
diff --git a/scripts/po/es.po b/scripts/po/es.po
index 21605bd6b..5f306306b 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: 2016-05-09 03:21+0200\n"
+"POT-Creation-Date: 2016-07-03 19:11+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"
@@ -49,7 +49,7 @@ msgstr ""
 #: scripts/dpkg-mergechangelogs.pl scripts/dpkg-name.pl
 #: scripts/dpkg-parsechangelog.pl scripts/dpkg-scanpackages.pl
 #: scripts/dpkg-scansources.pl scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl
-#: scripts/dpkg-vendor.pl scripts/changelog/debian.pl
+#: scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s versión %s.\n"
@@ -59,7 +59,6 @@ msgstr "Debian %s versión %s.\n"
 #: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
 #: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
 #: scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl scripts/dpkg-vendor.pl
-#: scripts/changelog/debian.pl
 msgid ""
 "\n"
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -311,52 +310,61 @@ msgstr "Uso: %s [<opción>...]"
 #| "      --version  show the version."
 msgid ""
 "Options:\n"
-"  --build=<type>[,...]\n"
-"                 specify the build <type>: full, source, binary, any, all\n"
-"                   (default is 'full').\n"
-"  -F             normal full build (binaries and sources, 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            do not clean source tree (implies -b).\n"
-"  -tc            clean source tree when finished.\n"
-"  -D             check build dependencies and conflicts (default).\n"
-"  -d             do not check build dependencies and conflicts.\n"
-"  -P<profiles>   assume given build profiles as active (comma-separated "
-"list).\n"
-"  -R<rules>      rules file to execute (default is debian/rules).\n"
-"  -T<target>     call debian/rules <target> with the proper environment.\n"
-"      --as-root  ensure -T calls the target with root rights.\n"
-"  -j[<number>]   jobs to run simultaneously (passed to <rules>), forced "
-"mode.\n"
-"  -J[<number>]   jobs to run simultaneously (passed to <rules>), opt-in "
-"mode.\n"
-"  -r<gain-root-command>\n"
-"                 command to gain root privileges (default is fakeroot).\n"
-"  --check-command=<check-command>\n"
-"                 command to check the .changes file (no default).\n"
-"  --check-option=<opt>\n"
-"                 pass <opt> to <check-command>.\n"
-"  --hook-<hook-name>=<hook-command>\n"
-"                 set <hook-command> as the hook <hook-name>, known hooks:\n"
-"                   init preclean source build binary changes postclean\n"
-"                   check sign done\n"
-"  -p<sign-command>\n"
-"                 command to sign .dsc and/or .changes files\n"
-"                   (default is gpg2 or gpg).\n"
-"  -k<keyid>      the key to use for signing.\n"
-"  -ap            add pause before starting signature process.\n"
-"  -us            unsigned source package.\n"
-"  -uc            unsigned .changes file.\n"
-"      --force-sign\n"
-"                 force signing the resulting files.\n"
-"      --admindir=<directory>\n"
-"                 change the administrative directory.\n"
-"  -?, --help     show this help message.\n"
-"      --version  show the version."
+"      --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"
+"  -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.\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 changes\n"
+"                                postclean check sign done\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"
+"  -uc, --unsigned-changes     unsigned .changes 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."
 msgstr ""
 "Opciones:\n"
 "  -F (Predeterminado) construcción completa habitual (binario y fuentes).\n"
@@ -409,12 +417,19 @@ msgstr ""
 "      --version  Muestra la versión."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-architecture:\n"
+#| "  -a, --host-arch <arch>    set the host Debian architecture.\n"
+#| "  -t, --host-type <type>    set the host GNU system type.\n"
+#| "      --target-arch <arch>  set the target Debian architecture.\n"
+#| "      --target-type <type>  set the target GNU system type."
 msgid ""
 "Options passed to dpkg-architecture:\n"
-"  -a, --host-arch <arch>    set the host Debian architecture.\n"
-"  -t, --host-type <type>    set the host GNU system type.\n"
-"      --target-arch <arch>  set the target Debian architecture.\n"
-"      --target-type <type>  set the target GNU system type."
+"  -a, --host-arch <arch>      set the host Debian architecture.\n"
+"  -t, --host-type <type>      set the host GNU system type.\n"
+"      --target-arch <arch>    set the target Debian architecture.\n"
+"      --target-type <type>    set the target GNU system type."
 msgstr ""
 "Ociones que se pasan a dpkg-architecture:\n"
 "  -a, --host-arch <arq>     fija la arquitectura Debian del equipo.\n"
@@ -437,15 +452,15 @@ msgstr ""
 #| "                 pass option <opt> to dpkg-genchanges."
 msgid ""
 "Options passed to dpkg-genchanges:\n"
-"  -si            source includes orig, if new upstream (default).\n"
-"  -sa            source includes orig, always.\n"
-"  -sd            source is diff and .dsc only.\n"
-"  -v<version>    changes since version <version>.\n"
-"  -m<maint>      maintainer for package is <maint>.\n"
-"  -e<maint>      maintainer for release is <maint>.\n"
-"  -C<descfile>   changes are described in <descfile>.\n"
-"      --changes-option=<opt>\n"
-"                 pass option <opt> to dpkg-genchanges."
+"  -si                         source includes orig, if new upstream "
+"(default).\n"
+"  -sa                         source includes orig, always.\n"
+"  -sd                         source is diff and .dsc only.\n"
+"  -v<version>                 changes since version <version>.\n"
+"  -m, --release-by=<maint>    maintainer for this release is <maint>.\n"
+"  -e, --build-by=<maint>      maintainer for this build is <maint>.\n"
+"  -C<descfile>                changes are described in <descfile>.\n"
+"      --changes-option=<opt>  pass option <opt> to dpkg-genchanges."
 msgstr ""
 "Opciones que se introducen a dpkg-genchanges:\n"
 "  -si (por omisión)  La fuente incluye «orig» si hay una nueva versión "
@@ -461,16 +476,30 @@ msgstr ""
 "                     Pasa la <opción> a dpkg-genchanges."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-source:\n"
+#| "  -sn            force Debian native source format.\n"
+#| "  -s[sAkurKUR]   see dpkg-source for explanation.\n"
+#| "  -z<level>      compression level to use for source.\n"
+#| "  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
+#| "  -i[<regex>]    ignore diffs of files matching regex.\n"
+#| "  -I[<pattern>]  filter out files when building tarballs.\n"
+#| "      --source-option=<opt>\n"
+#| "                 pass option <opt> to dpkg-source.\n"
 msgid ""
 "Options passed to dpkg-source:\n"
-"  -sn            force Debian native source format.\n"
-"  -s[sAkurKUR]   see dpkg-source for explanation.\n"
-"  -z<level>      compression level to use for source.\n"
-"  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
-"  -i[<regex>]    ignore diffs of files matching regex.\n"
-"  -I[<pattern>]  filter out files when building tarballs.\n"
-"      --source-option=<opt>\n"
-"                 pass option <opt> to dpkg-source.\n"
+"  -sn                         force Debian native source format.\n"
+"  -s[sAkurKUR]                see dpkg-source for explanation.\n"
+"  -z, --compression-level=<level>\n"
+"                              compression level to use for source.\n"
+"  -Z, --compression=<compressor>\n"
+"                              compression to use for source (gz|xz|bzip2|"
+"lzma).\n"
+"  -i, --diff-ignore[=<regex>] ignore diffs of files matching <regex>.\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                              filter out files when building tarballs.\n"
+"      --source-option=<opt>   pass option <opt> to dpkg-source.\n"
 msgstr ""
 "Opciones que se introducen a dpkg-source:\n"
 "  -sn            Fuerza el formato nativo de Debian.\n"
@@ -580,15 +609,6 @@ msgstr ""
 "ficheros no deseados"
 
 #: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid ""
-"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
-"least '%s' seems to be missing)"
-msgstr ""
-"se debe actualizar %s para la compatibilidad con las tareas «build-arch» y "
-"«build-indep» (en apariencia, falta «%s»)"
-
-#: scripts/dpkg-buildpackage.pl
 msgid "parse changes file"
 msgstr "tratar el fichero de cambios «changes»"
 
@@ -671,6 +691,15 @@ msgstr "subida de binarios y diferencias (NO se incluye la fuente original)"
 msgid "full upload (original source is included)"
 msgstr "subida completa (se incluye la fuente original)"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
+"least '%s' seems to be missing)"
+msgstr ""
+"se debe actualizar %s para la compatibilidad con las tareas «build-arch» y "
+"«build-indep» (en apariencia, falta «%s»)"
+
 #: scripts/dpkg-checkbuilddeps.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<control-file>]"
@@ -1497,7 +1526,6 @@ msgid ""
 "Options:\n"
 "  -l <changelog-file>      get per-version info from this file.\n"
 "  -F <changelog-format>    force changelog format.\n"
-"  -L <libdir>              look for changelog parsers in <libdir>.\n"
 "  -S, --show-field <field> show the values for <field>.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
@@ -1572,8 +1600,10 @@ msgstr ""
 "    --all                       Incluye todos los cambios\n"
 
 #: scripts/dpkg-parsechangelog.pl
-msgid "missing library directory"
-msgstr ""
+#, fuzzy
+#| msgid "-E and -W are deprecated, they are without effect"
+msgid "-L is obsolete; it is without effect"
+msgstr "«-E» y «-W» están obsoletas y no tienen efecto"
 
 #: scripts/dpkg-parsechangelog.pl
 #, fuzzy
@@ -1646,8 +1676,7 @@ msgstr "  %s (el paquete devuelve %s, no %s)"
 msgid "unconditional maintainer override for %s"
 msgstr "Sustitución («override») incondicional del encargado para %s"
 
-#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl
-#: scripts/Dpkg/Changelog/Parse.pm scripts/Dpkg/IPC.pm
+#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "cannot fork for %s"
@@ -2220,7 +2249,10 @@ msgid "--%s needs the .dsc file as first argument, not a directory"
 msgstr ""
 "«-x» requiere el fichero «.dsc» como el primer argumento, no un directorio"
 
-#: scripts/dpkg-source.pl
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V1.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Bzr.pm
+#: scripts/Dpkg/Source/Package/V3/Git.pm
+#: scripts/Dpkg/Source/Package/V3/Native.pm
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "el destino de los datos desempaquetados ya existe: %s"
@@ -2241,6 +2273,12 @@ msgid "extracting %s in %s"
 msgstr "extrayendo %s en %s"
 
 #: scripts/dpkg-source.pl
+#, fuzzy, perl-format
+#| msgid "%s is not a plain file"
+msgid "test control %s is not a regular file"
+msgstr "«%s» no es un fichero simple"
+
+#: scripts/dpkg-source.pl
 #, perl-format
 msgid "%s field contains value %s, but no tests control file %s"
 msgstr ""
@@ -2320,14 +2358,17 @@ msgid ""
 "  -T<substvars-file>       read variables here.\n"
 "  -D<field>=<value>        override or add a .dsc field and value.\n"
 "  -U<field>                remove a field.\n"
-"  -q                       quiet mode.\n"
-"  -i[<regex>]              filter out files to ignore diffs of\n"
+"  -i, --diff-ignore[=<regex>]\n"
+"                           filter out files to ignore diffs of\n"
 "                             (defaults to: '%s').\n"
-"  -I[<pattern>]            filter out files when building tarballs\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                           filter out files when building tarballs\n"
 "                             (defaults to: %s).\n"
-"  -Z<compression>          select compression to use (defaults to '%s',\n"
+"  -Z, --compression=<compression>\n"
+"                           select compression to use (defaults to '%s',\n"
 "                             supported are: %s).\n"
-"  -z<level>                compression level to use (defaults to '%d',\n"
+"  -z, --compression-level=<level>\n"
+"                           compression level to use (defaults to '%d',\n"
 "                             supported are: '1'-'9', 'best', 'fast')"
 msgstr ""
 "Opciones de construcción:\n"
@@ -2366,6 +2407,7 @@ msgid ""
 "  --no-copy                don't copy .orig tarballs\n"
 "  --no-check               don't check signature and checksums before "
 "unpacking\n"
+"  --no-overwrite-dir       do not overwrite directory on extraction\n"
 "  --require-valid-signature abort if the package doesn't have a valid "
 "signature\n"
 "  --require-strong-checksums\n"
@@ -2380,8 +2422,14 @@ msgstr ""
 "  --require-valid-signature Cancela si el paquete no tiene una firma válida."
 
 #: scripts/dpkg-source.pl
+#, fuzzy
+#| msgid ""
+#| "General options:\n"
+#| "  -?, --help               show this help message.\n"
+#| "      --version            show the version."
 msgid ""
 "General options:\n"
+"  -q                       quiet mode.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
 msgstr ""
@@ -2430,92 +2478,6 @@ msgstr ""
 msgid "vendor %s doesn't exist in %s"
 msgstr "%s no existe"
 
-#: scripts/changelog/debian.pl
-#, fuzzy, perl-format
-#| msgid "Usage: %s [<option>...] [<control-file>]"
-msgid "Usage: %s [<option>...] [<changelog-file>]"
-msgstr "Uso: %s [<opción>...] [<fichero-control>]"
-
-#: scripts/changelog/debian.pl
-#, fuzzy
-#| msgid ""
-#| "Parser options:\n"
-#| "    --format <output-format>    see man page for list of available\n"
-#| "                                output formats, defaults to 'dpkg'\n"
-#| "                                for compatibility with dpkg-dev\n"
-#| "    --since <version>,          include all changes later than version\n"
-#| "      -s<version>, -v<version>\n"
-#| "    --until <version>,          include all changes earlier than version\n"
-#| "      -u<version>\n"
-#| "    --from <version>,           include all changes equal or later\n"
-#| "      -f<version>               than version\n"
-#| "    --to <version>, -t<version> include all changes up to or equal\n"
-#| "                                than version\n"
-#| "    --count <number>,           include <number> entries from the top\n"
-#| "      -c<number>, -n<number>    (or the tail if <number> is lower than "
-#| "0)\n"
-#| "    --offset <number>,          change the starting point for --count,\n"
-#| "      -o<number>                counted from the top (or the tail if\n"
-#| "                                <number> is lower than 0)\n"
-#| "    --all                       include all changes\n"
-msgid ""
-"Options:\n"
-"      --file <file>       changelog <file> to parse (defaults to '-').\n"
-"  -l, --label <file>      changelog <file> name to use in error messages.\n"
-"      --format <output-format>\n"
-"                          set the 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 if\n"
-"                            <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"
-"  -?, --help              print usage information.\n"
-"  -V, --version           print version information.\n"
-msgstr ""
-"Opciones de análisis:\n"
-"    --format <formato-de-salida> Para una lista de los formatos de salida\n"
-"                                disponibles, consulte la página de manual.\n"
-"                                El formato predeterminado es «dpkg», para\n"
-"                                la compatibilidad con dpkg-dev\n"
-"    --since <versión>,          Incluye los cambios a partir de la versión\n"
-"      -s<versión>, -v<versión>\n"
-"    --until <versión>,          Incluye los cambios anteriores a la versión\n"
-"      -u<versión>\n"
-"    --from <versión>,           Incluye los cambios de la misma versión o\n"
-"      -f<versión>               posterior\n"
-"    --to <versión>, -t<versión> Incluye los cambios de la misma versión o\n"
-"                                anterior\n"
-"    --count <número>,           Incluye el <número> de entradas desde el\n"
-"                                principio      -c<número>, -n<número>    (o "
-"el final si <número> es menor que cero)\n"
-"    --offset <número>,          Modifica el punto de partida de «--count»,\n"
-"      -o<número>                a partir del principio (o el final si el\n"
-"                                <número> es menor que cero)\n"
-"    --all                       Incluye todos los cambios\n"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "output format %s not supported"
-msgstr "el formato de salida «%s» no es compatible"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "more than one file specified (%s and %s)"
-msgstr "se ha definido más de un fichero (%s y %s)"
-
-#: scripts/changelog/debian.pl scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "fatal error occurred while parsing %s"
-msgstr "se ha detectado un error fatal al analizar %s"
-
 #: scripts/Dpkg/Arch.pm
 #, fuzzy
 #| msgid ""
@@ -2752,12 +2714,6 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
-#| msgid "unknown option or argument %s"
-msgid "unknown output format %s"
-msgstr "el argumento u opción «%s» es desconocido"
-
-#: 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»"
@@ -2768,29 +2724,21 @@ msgid "tail of %s"
 msgstr "final de «%s»"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "format parser %s not executable"
-msgstr "el formato de analizador %s no es ejecutable"
+#, fuzzy, perl-format
+#| msgid "changelog format %s is unknown"
+msgid "changelog format %s is unknown: %s"
+msgstr "el formato %s del registro de cambios es desconocido"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "changelog format %s is unknown"
-msgstr "el formato %s del registro de cambios es desconocido"
+msgid "fatal error occurred while parsing %s"
+msgstr "se ha detectado un error fatal al analizar %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
-#| msgid "cannot exec format parser: %s"
-msgid "cannot execute format parser: %s"
-msgstr "no se puede ejecutar el analizador de formato: %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-msgid "output of changelog parser"
-msgstr "salida del analizador de registro de cambios"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "changelog parser %s"
-msgstr "analizador del registro de cambios %s"
+#| msgid "unknown option or argument %s"
+msgid "unknown output format %s"
+msgstr "el argumento u opción «%s» es desconocido"
 
 #: scripts/Dpkg/Checksums.pm
 #, perl-format
@@ -2876,6 +2824,12 @@ msgid "license stanza of copyright file"
 msgstr ""
 
 #: scripts/Dpkg/Control.pm
+#, fuzzy
+#| msgid "package's section of control info file"
+msgid "package's tests control file"
+msgstr "sección del paquete del fichero de información de control"
+
+#: scripts/Dpkg/Control.pm
 #, fuzzy, perl-format
 #| msgid "entry in repository's %s file"
 msgid "repository's %s file"
@@ -4239,6 +4193,12 @@ msgstr ""
 "%d"
 
 #: scripts/Dpkg/Substvars.pm
+#, fuzzy, perl-format
+#| msgid "source version"
+msgid "invalid source version %s"
+msgstr "versión de las fuentes"
+
+#: scripts/Dpkg/Substvars.pm
 #, perl-format
 msgid "too many substitutions - recursive ? - in '%s'"
 msgstr "demasiadas sustituciones (¿recursivo?) en «%s»"
@@ -4333,6 +4293,108 @@ 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 "Usage: %s [<option>...] [<control-file>]"
+#~ msgid "Usage: %s [<option>...] [<changelog-file>]"
+#~ msgstr "Uso: %s [<opción>...] [<fichero-control>]"
+
+#, fuzzy
+#~| msgid ""
+#~| "Parser options:\n"
+#~| "    --format <output-format>    see man page for list of available\n"
+#~| "                                output formats, defaults to 'dpkg'\n"
+#~| "                                for compatibility with dpkg-dev\n"
+#~| "    --since <version>,          include all changes later than version\n"
+#~| "      -s<version>, -v<version>\n"
+#~| "    --until <version>,          include all changes earlier than "
+#~| "version\n"
+#~| "      -u<version>\n"
+#~| "    --from <version>,           include all changes equal or later\n"
+#~| "      -f<version>               than version\n"
+#~| "    --to <version>, -t<version> include all changes up to or equal\n"
+#~| "                                than version\n"
+#~| "    --count <number>,           include <number> entries from the top\n"
+#~| "      -c<number>, -n<number>    (or the tail if <number> is lower than "
+#~| "0)\n"
+#~| "    --offset <number>,          change the starting point for --count,\n"
+#~| "      -o<number>                counted from the top (or the tail if\n"
+#~| "                                <number> is lower than 0)\n"
+#~| "    --all                       include all changes\n"
+#~ msgid ""
+#~ "Options:\n"
+#~ "      --file <file>       changelog <file> to parse (defaults to '-').\n"
+#~ "  -l, --label <file>      changelog <file> name to use in error "
+#~ "messages.\n"
+#~ "      --format <output-format>\n"
+#~ "                          set the 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 "
+#~ "if\n"
+#~ "                            <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"
+#~ "  -?, --help              print usage information.\n"
+#~ "  -V, --version           print version information.\n"
+#~ msgstr ""
+#~ "Opciones de análisis:\n"
+#~ "    --format <formato-de-salida> Para una lista de los formatos de "
+#~ "salida\n"
+#~ "                                disponibles, consulte la página de "
+#~ "manual.\n"
+#~ "                                El formato predeterminado es «dpkg», "
+#~ "para\n"
+#~ "                                la compatibilidad con dpkg-dev\n"
+#~ "    --since <versión>,          Incluye los cambios a partir de la "
+#~ "versión\n"
+#~ "      -s<versión>, -v<versión>\n"
+#~ "    --until <versión>,          Incluye los cambios anteriores a la "
+#~ "versión\n"
+#~ "      -u<versión>\n"
+#~ "    --from <versión>,           Incluye los cambios de la misma versión "
+#~ "o\n"
+#~ "      -f<versión>               posterior\n"
+#~ "    --to <versión>, -t<versión> Incluye los cambios de la misma versión "
+#~ "o\n"
+#~ "                                anterior\n"
+#~ "    --count <número>,           Incluye el <número> de entradas desde el\n"
+#~ "                                principio      -c<número>, -n<número>    "
+#~ "(o el final si <número> es menor que cero)\n"
+#~ "    --offset <número>,          Modifica el punto de partida de «--"
+#~ "count»,\n"
+#~ "      -o<número>                a partir del principio (o el final si el\n"
+#~ "                                <número> es menor que cero)\n"
+#~ "    --all                       Incluye todos los cambios\n"
+
+#~ msgid "output format %s not supported"
+#~ msgstr "el formato de salida «%s» no es compatible"
+
+#~ msgid "more than one file specified (%s and %s)"
+#~ msgstr "se ha definido más de un fichero (%s y %s)"
+
+#~ msgid "format parser %s not executable"
+#~ msgstr "el formato de analizador %s no es ejecutable"
+
+#, fuzzy
+#~| msgid "cannot exec format parser: %s"
+#~ msgid "cannot execute format parser: %s"
+#~ msgstr "no se puede ejecutar el analizador de formato: %s"
+
+#~ msgid "output of changelog parser"
+#~ msgstr "salida del analizador de registro de cambios"
+
+#~ msgid "changelog parser %s"
+#~ msgstr "analizador del registro de cambios %s"
+
 #~ msgid "'%s' is not a legal architecture string."
 #~ msgid_plural "'%s' are not legal architecture strings."
 #~ msgstr[0] "«%s» no es una cadena de arquitectura legal."
diff --git a/scripts/po/fr.po b/scripts/po/fr.po
index 97c8dec80..8b2dd4d1e 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: 2016-05-09 03:21+0200\n"
+"POT-Creation-Date: 2016-07-03 19:11+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"
@@ -28,7 +28,7 @@ msgstr ""
 #: scripts/dpkg-mergechangelogs.pl scripts/dpkg-name.pl
 #: scripts/dpkg-parsechangelog.pl scripts/dpkg-scanpackages.pl
 #: scripts/dpkg-scansources.pl scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl
-#: scripts/dpkg-vendor.pl scripts/changelog/debian.pl
+#: scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -38,7 +38,6 @@ msgstr "Debian %s version %s.\n"
 #: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
 #: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
 #: scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl scripts/dpkg-vendor.pl
-#: scripts/changelog/debian.pl
 msgid ""
 "\n"
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -294,52 +293,61 @@ msgstr "Utilisation : %s [<option>...]"
 #| "      --version  show the version."
 msgid ""
 "Options:\n"
-"  --build=<type>[,...]\n"
-"                 specify the build <type>: full, source, binary, any, all\n"
-"                   (default is 'full').\n"
-"  -F             normal full build (binaries and sources, 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            do not clean source tree (implies -b).\n"
-"  -tc            clean source tree when finished.\n"
-"  -D             check build dependencies and conflicts (default).\n"
-"  -d             do not check build dependencies and conflicts.\n"
-"  -P<profiles>   assume given build profiles as active (comma-separated "
-"list).\n"
-"  -R<rules>      rules file to execute (default is debian/rules).\n"
-"  -T<target>     call debian/rules <target> with the proper environment.\n"
-"      --as-root  ensure -T calls the target with root rights.\n"
-"  -j[<number>]   jobs to run simultaneously (passed to <rules>), forced "
-"mode.\n"
-"  -J[<number>]   jobs to run simultaneously (passed to <rules>), opt-in "
-"mode.\n"
-"  -r<gain-root-command>\n"
-"                 command to gain root privileges (default is fakeroot).\n"
-"  --check-command=<check-command>\n"
-"                 command to check the .changes file (no default).\n"
-"  --check-option=<opt>\n"
-"                 pass <opt> to <check-command>.\n"
-"  --hook-<hook-name>=<hook-command>\n"
-"                 set <hook-command> as the hook <hook-name>, known hooks:\n"
-"                   init preclean source build binary changes postclean\n"
-"                   check sign done\n"
-"  -p<sign-command>\n"
-"                 command to sign .dsc and/or .changes files\n"
-"                   (default is gpg2 or gpg).\n"
-"  -k<keyid>      the key to use for signing.\n"
-"  -ap            add pause before starting signature process.\n"
-"  -us            unsigned source package.\n"
-"  -uc            unsigned .changes file.\n"
-"      --force-sign\n"
-"                 force signing the resulting files.\n"
-"      --admindir=<directory>\n"
-"                 change the administrative directory.\n"
-"  -?, --help     show this help message.\n"
-"      --version  show the version."
+"      --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"
+"  -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.\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 changes\n"
+"                                postclean check sign done\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"
+"  -uc, --unsigned-changes     unsigned .changes 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."
 msgstr ""
 "Options:\n"
 "  -F             construction complète normale (sources et binaires) "
@@ -396,12 +404,19 @@ msgstr ""
 "      --version  afficher la version."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-architecture:\n"
+#| "  -a, --host-arch <arch>    set the host Debian architecture.\n"
+#| "  -t, --host-type <type>    set the host GNU system type.\n"
+#| "      --target-arch <arch>  set the target Debian architecture.\n"
+#| "      --target-type <type>  set the target GNU system type."
 msgid ""
 "Options passed to dpkg-architecture:\n"
-"  -a, --host-arch <arch>    set the host Debian architecture.\n"
-"  -t, --host-type <type>    set the host GNU system type.\n"
-"      --target-arch <arch>  set the target Debian architecture.\n"
-"      --target-type <type>  set the target GNU system type."
+"  -a, --host-arch <arch>      set the host Debian architecture.\n"
+"  -t, --host-type <type>      set the host GNU system type.\n"
+"      --target-arch <arch>    set the target Debian architecture.\n"
+"      --target-type <type>    set the target GNU system type."
 msgstr ""
 "Options passées à dpkg-architecture :\n"
 "  -a, --host-arch <arch>       définir l'architecture Debian en cours.\n"
@@ -410,17 +425,29 @@ msgstr ""
 "      --target-type <type>     définir le type de système GNU de la cible."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-genchanges:\n"
+#| "  -si            source includes orig, if new upstream (default).\n"
+#| "  -sa            source includes orig, always.\n"
+#| "  -sd            source is diff and .dsc only.\n"
+#| "  -v<version>    changes since version <version>.\n"
+#| "  -m<maint>      maintainer for package is <maint>.\n"
+#| "  -e<maint>      maintainer for release is <maint>.\n"
+#| "  -C<descfile>   changes are described in <descfile>.\n"
+#| "      --changes-option=<opt>\n"
+#| "                 pass option <opt> to dpkg-genchanges."
 msgid ""
 "Options passed to dpkg-genchanges:\n"
-"  -si            source includes orig, if new upstream (default).\n"
-"  -sa            source includes orig, always.\n"
-"  -sd            source is diff and .dsc only.\n"
-"  -v<version>    changes since version <version>.\n"
-"  -m<maint>      maintainer for package is <maint>.\n"
-"  -e<maint>      maintainer for release is <maint>.\n"
-"  -C<descfile>   changes are described in <descfile>.\n"
-"      --changes-option=<opt>\n"
-"                 pass option <opt> to dpkg-genchanges."
+"  -si                         source includes orig, if new upstream "
+"(default).\n"
+"  -sa                         source includes orig, always.\n"
+"  -sd                         source is diff and .dsc only.\n"
+"  -v<version>                 changes since version <version>.\n"
+"  -m, --release-by=<maint>    maintainer for this release is <maint>.\n"
+"  -e, --build-by=<maint>      maintainer for this build is <maint>.\n"
+"  -C<descfile>                changes are described in <descfile>.\n"
+"      --changes-option=<opt>  pass option <opt> to dpkg-genchanges."
 msgstr ""
 "Options passées à dpkg-genchanges:\n"
 "  -si            la source n'inclut le fichier d'origine que si nouvelle "
@@ -436,16 +463,30 @@ msgstr ""
 "                 passer l'option <opt> à dpkg-genchanges."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-source:\n"
+#| "  -sn            force Debian native source format.\n"
+#| "  -s[sAkurKUR]   see dpkg-source for explanation.\n"
+#| "  -z<level>      compression level to use for source.\n"
+#| "  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
+#| "  -i[<regex>]    ignore diffs of files matching regex.\n"
+#| "  -I[<pattern>]  filter out files when building tarballs.\n"
+#| "      --source-option=<opt>\n"
+#| "                 pass option <opt> to dpkg-source.\n"
 msgid ""
 "Options passed to dpkg-source:\n"
-"  -sn            force Debian native source format.\n"
-"  -s[sAkurKUR]   see dpkg-source for explanation.\n"
-"  -z<level>      compression level to use for source.\n"
-"  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
-"  -i[<regex>]    ignore diffs of files matching regex.\n"
-"  -I[<pattern>]  filter out files when building tarballs.\n"
-"      --source-option=<opt>\n"
-"                 pass option <opt> to dpkg-source.\n"
+"  -sn                         force Debian native source format.\n"
+"  -s[sAkurKUR]                see dpkg-source for explanation.\n"
+"  -z, --compression-level=<level>\n"
+"                              compression level to use for source.\n"
+"  -Z, --compression=<compressor>\n"
+"                              compression to use for source (gz|xz|bzip2|"
+"lzma).\n"
+"  -i, --diff-ignore[=<regex>] ignore diffs of files matching <regex>.\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                              filter out files when building tarballs.\n"
+"      --source-option=<opt>   pass option <opt> to dpkg-source.\n"
 msgstr ""
 "Options passées à dpkg-source:\n"
 "  -sn            forcer le format source natif Debian.\n"
@@ -556,15 +597,6 @@ msgstr ""
 "il peut contenir des fichiers non souhaités"
 
 #: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid ""
-"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
-"least '%s' seems to be missing)"
-msgstr ""
-"%s doit être mis à jour pour gérer les cibles « build-arch » et « build-"
-"indep » (au moins « %s » semble manquer)"
-
-#: scripts/dpkg-buildpackage.pl
 msgid "parse changes file"
 msgstr "analyse du fichier changes"
 
@@ -646,6 +678,15 @@ msgstr ""
 msgid "full upload (original source is included)"
 msgstr "envoi complet (inclusion du code source d'origine)"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
+"least '%s' seems to be missing)"
+msgstr ""
+"%s doit être mis à jour pour gérer les cibles « build-arch » et « build-"
+"indep » (au moins « %s » semble manquer)"
+
 #: scripts/dpkg-checkbuilddeps.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<control-file>]"
@@ -1377,11 +1418,19 @@ msgid "need at least a filename"
 msgstr "au moins un nom de fichier est nécessaire"
 
 #: scripts/dpkg-parsechangelog.pl
+#, fuzzy
+#| msgid ""
+#| "Options:\n"
+#| "  -l <changelog-file>      get per-version info from this file.\n"
+#| "  -F <changelog-format>    force changelog format.\n"
+#| "  -L <libdir>              look for changelog parsers in <libdir>.\n"
+#| "  -S, --show-field <field> show the values for <field>.\n"
+#| "  -?, --help               show this help message.\n"
+#| "      --version            show the version."
 msgid ""
 "Options:\n"
 "  -l <changelog-file>      get per-version info from this file.\n"
 "  -F <changelog-format>    force changelog format.\n"
-"  -L <libdir>              look for changelog parsers in <libdir>.\n"
 "  -S, --show-field <field> show the values for <field>.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
@@ -1440,8 +1489,10 @@ msgstr ""
 "est inférieur à 0).\n"
 
 #: scripts/dpkg-parsechangelog.pl
-msgid "missing library directory"
-msgstr "répertoire des bibliothèques manquant"
+#, fuzzy
+#| msgid "-i%s is deprecated; it is without effect"
+msgid "-L is obsolete; it is without effect"
+msgstr "-i%s est obsolète ; ce paramètre est sans effet"
 
 #: scripts/dpkg-parsechangelog.pl
 msgid "bad changelog format name"
@@ -1502,8 +1553,7 @@ msgstr "  %s (le paquet dit %s, pas %s)"
 msgid "unconditional maintainer override for %s"
 msgstr "annulation inconditionnelle du responsable pour %s"
 
-#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl
-#: scripts/Dpkg/Changelog/Parse.pm scripts/Dpkg/IPC.pm
+#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "cannot fork for %s"
@@ -2050,7 +2100,10 @@ msgid "--%s needs the .dsc file as first argument, not a directory"
 msgstr ""
 "--%s requiert le fichier .dsc comme premier paramètre et non un répertoire"
 
-#: scripts/dpkg-source.pl
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V1.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Bzr.pm
+#: scripts/Dpkg/Source/Package/V3/Git.pm
+#: scripts/Dpkg/Source/Package/V3/Native.pm
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "cible non compressée existe : %s"
@@ -2071,6 +2124,12 @@ msgid "extracting %s in %s"
 msgstr "extraction de %s dans %s"
 
 #: scripts/dpkg-source.pl
+#, fuzzy, perl-format
+#| msgid "%s is not a plain file"
+msgid "test control %s is not a regular file"
+msgstr "%s n'est pas un fichier texte"
+
+#: scripts/dpkg-source.pl
 #, perl-format
 msgid "%s field contains value %s, but no tests control file %s"
 msgstr ""
@@ -2109,7 +2168,27 @@ msgstr ""
 "nouveau correctif."
 
 #: scripts/dpkg-source.pl
-#, perl-format
+#, fuzzy, perl-format
+#| msgid ""
+#| "Build options:\n"
+#| "  -c<control-file>         get control info from this file.\n"
+#| "  -l<changelog-file>       get per-version info from this file.\n"
+#| "  -F<changelog-format>     force changelog format.\n"
+#| "  --format=<source-format> set the format to be used for the source "
+#| "package.\n"
+#| "  -V<name>=<value>         set a substitution variable.\n"
+#| "  -T<substvars-file>       read variables here.\n"
+#| "  -D<field>=<value>        override or add a .dsc field and value.\n"
+#| "  -U<field>                remove a field.\n"
+#| "  -q                       quiet mode.\n"
+#| "  -i[<regex>]              filter out files to ignore diffs of\n"
+#| "                             (defaults to: '%s').\n"
+#| "  -I[<pattern>]            filter out files when building tarballs\n"
+#| "                             (defaults to: %s).\n"
+#| "  -Z<compression>          select compression to use (defaults to '%s',\n"
+#| "                             supported are: %s).\n"
+#| "  -z<level>                compression level to use (defaults to '%d',\n"
+#| "                             supported are: '1'-'9', 'best', 'fast')"
 msgid ""
 "Build options:\n"
 "  -c<control-file>         get control info from this file.\n"
@@ -2121,14 +2200,17 @@ msgid ""
 "  -T<substvars-file>       read variables here.\n"
 "  -D<field>=<value>        override or add a .dsc field and value.\n"
 "  -U<field>                remove a field.\n"
-"  -q                       quiet mode.\n"
-"  -i[<regex>]              filter out files to ignore diffs of\n"
+"  -i, --diff-ignore[=<regex>]\n"
+"                           filter out files to ignore diffs of\n"
 "                             (defaults to: '%s').\n"
-"  -I[<pattern>]            filter out files when building tarballs\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                           filter out files when building tarballs\n"
 "                             (defaults to: %s).\n"
-"  -Z<compression>          select compression to use (defaults to '%s',\n"
+"  -Z, --compression=<compression>\n"
+"                           select compression to use (defaults to '%s',\n"
 "                             supported are: %s).\n"
-"  -z<level>                compression level to use (defaults to '%d',\n"
+"  -z, --compression-level=<level>\n"
+"                           compression level to use (defaults to '%d',\n"
 "                             supported are: '1'-'9', 'best', 'fast')"
 msgstr ""
 "Options de construction :\n"
@@ -2171,6 +2253,7 @@ msgid ""
 "  --no-copy                don't copy .orig tarballs\n"
 "  --no-check               don't check signature and checksums before "
 "unpacking\n"
+"  --no-overwrite-dir       do not overwrite directory on extraction\n"
 "  --require-valid-signature abort if the package doesn't have a valid "
 "signature\n"
 "  --require-strong-checksums\n"
@@ -2188,8 +2271,14 @@ msgstr ""
 "                             paquet source."
 
 #: scripts/dpkg-source.pl
+#, fuzzy
+#| msgid ""
+#| "General options:\n"
+#| "  -?, --help               show this help message.\n"
+#| "      --version            show the version."
 msgid ""
 "General options:\n"
+"  -q                       quiet mode.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
 msgstr ""
@@ -2237,77 +2326,6 @@ msgstr ""
 msgid "vendor %s doesn't exist in %s"
 msgstr "le fabriquant %s n'existe pas dans %s"
 
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "Usage: %s [<option>...] [<changelog-file>]"
-msgstr "Syntaxe : %s [<option>...] [<fichier de changements>]"
-
-#: scripts/changelog/debian.pl
-msgid ""
-"Options:\n"
-"      --file <file>       changelog <file> to parse (defaults to '-').\n"
-"  -l, --label <file>      changelog <file> name to use in error messages.\n"
-"      --format <output-format>\n"
-"                          set the 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 if\n"
-"                            <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"
-"  -?, --help              print usage information.\n"
-"  -V, --version           print version information.\n"
-msgstr ""
-"Options :\n"
-"      --file <fichier>          fichier de changements à analyser (« - » par "
-"défaut).\n"
-"  -l, --label <fichier>         nom de fichier de changements à utiliser "
-"dans les messages d'erreur.\n"
-"      --format <format_sortie>\n"
-"                                définir le format de sortie (« dpkg » par "
-"défaut).\n"
-"      --all                     inclure toutes les modifications.\n"
-"  -s, --since<version>          inclure toutes les modifications depuis "
-"<version>.\n"
-"  -v <version>                  idem.\n"
-"  -u, --until <version>         inclure toutes les modifications antérieures "
-"à <version>.\n"
-"  -f, --from <version>          inclure toutes les modifications depuis "
-"<version> incluse.\n"
-"  -t, --to <version>            inclure toutes les modifications antérieures "
-"à <version> incluse.\n"
-"  -c, --count <nombre>          inclure <nombre> entrées depuis le début\n"
-"                                (ou bien les dernières si <nombre> est "
-"inférieur à 0).\n"
-"  -n <nombre>                   idem.\n"
-"  -o, --offset <number>         modifier le point de démarrage de --count,\n"
-"                                à partir du début (ou de la fin si <nombre> "
-"est inférieur à 0).\n"
-"  -?, --help                    afficher l'aide.\n"
-"  -V, --version                 afficher la version.\n"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "output format %s not supported"
-msgstr "format de sortie %s non géré"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "more than one file specified (%s and %s)"
-msgstr "plus d'un fichier indiqué (%s et %s)"
-
-#: scripts/changelog/debian.pl scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "fatal error occurred while parsing %s"
-msgstr "erreur fatale rencontrée lors de l'analyse de %s"
-
 #: scripts/Dpkg/Arch.pm
 #, fuzzy
 #| msgid ""
@@ -2543,11 +2561,6 @@ msgstr ""
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "unknown output format %s"
-msgstr "format de sortie %s inconnu"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
 msgid "cannot create pipe for %s"
 msgstr "impossible de créer le tube pour %s"
 
@@ -2557,28 +2570,20 @@ msgid "tail of %s"
 msgstr "fin de %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "format parser %s not executable"
-msgstr "l'analyseur de format %s n'est pas exécutable"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "changelog format %s is unknown"
+#, fuzzy, perl-format
+#| msgid "changelog format %s is unknown"
+msgid "changelog format %s is unknown: %s"
 msgstr "format de fichier de changements %s inconnu"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "cannot execute format parser: %s"
-msgstr "impossible d'exécuter l'analyseur de format : %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-msgid "output of changelog parser"
-msgstr "affichage de l'analyseur de fichier de changements"
+msgid "fatal error occurred while parsing %s"
+msgstr "erreur fatale rencontrée lors de l'analyse de %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "changelog parser %s"
-msgstr "analyseur de fichier de changements : %s"
+msgid "unknown output format %s"
+msgstr "format de sortie %s inconnu"
 
 #: scripts/Dpkg/Checksums.pm
 #, perl-format
@@ -2657,6 +2662,12 @@ msgid "license stanza of copyright file"
 msgstr ""
 
 #: scripts/Dpkg/Control.pm
+#, fuzzy
+#| msgid "package's section of control info file"
+msgid "package's tests control file"
+msgstr "section du paquet dans le fichier info"
+
+#: scripts/Dpkg/Control.pm
 #, fuzzy, perl-format
 #| msgid "entry in repository's %s file"
 msgid "repository's %s file"
@@ -3995,6 +4006,12 @@ msgid "bad line in substvars file %s at line %d"
 msgstr "fichier substvars %s : ligne %d mal formée"
 
 #: scripts/Dpkg/Substvars.pm
+#, fuzzy, perl-format
+#| msgid "invalid source field in %s"
+msgid "invalid source version %s"
+msgstr "champ source invalide dans %s"
+
+#: scripts/Dpkg/Substvars.pm
 #, perl-format
 msgid "too many substitutions - recursive ? - in '%s'"
 msgstr "trop de substitutions - mode récursif ? - dans « %s »"
@@ -4088,6 +4105,85 @@ 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 "missing library directory"
+#~ msgstr "répertoire des bibliothèques manquant"
+
+#~ msgid "Usage: %s [<option>...] [<changelog-file>]"
+#~ msgstr "Syntaxe : %s [<option>...] [<fichier de changements>]"
+
+#~ msgid ""
+#~ "Options:\n"
+#~ "      --file <file>       changelog <file> to parse (defaults to '-').\n"
+#~ "  -l, --label <file>      changelog <file> name to use in error "
+#~ "messages.\n"
+#~ "      --format <output-format>\n"
+#~ "                          set the 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 "
+#~ "if\n"
+#~ "                            <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"
+#~ "  -?, --help              print usage information.\n"
+#~ "  -V, --version           print version information.\n"
+#~ msgstr ""
+#~ "Options :\n"
+#~ "      --file <fichier>          fichier de changements à analyser (« - » "
+#~ "par défaut).\n"
+#~ "  -l, --label <fichier>         nom de fichier de changements à utiliser "
+#~ "dans les messages d'erreur.\n"
+#~ "      --format <format_sortie>\n"
+#~ "                                définir le format de sortie (« dpkg » par "
+#~ "défaut).\n"
+#~ "      --all                     inclure toutes les modifications.\n"
+#~ "  -s, --since<version>          inclure toutes les modifications depuis "
+#~ "<version>.\n"
+#~ "  -v <version>                  idem.\n"
+#~ "  -u, --until <version>         inclure toutes les modifications "
+#~ "antérieures à <version>.\n"
+#~ "  -f, --from <version>          inclure toutes les modifications depuis "
+#~ "<version> incluse.\n"
+#~ "  -t, --to <version>            inclure toutes les modifications "
+#~ "antérieures à <version> incluse.\n"
+#~ "  -c, --count <nombre>          inclure <nombre> entrées depuis le début\n"
+#~ "                                (ou bien les dernières si <nombre> est "
+#~ "inférieur à 0).\n"
+#~ "  -n <nombre>                   idem.\n"
+#~ "  -o, --offset <number>         modifier le point de démarrage de --"
+#~ "count,\n"
+#~ "                                à partir du début (ou de la fin si "
+#~ "<nombre> est inférieur à 0).\n"
+#~ "  -?, --help                    afficher l'aide.\n"
+#~ "  -V, --version                 afficher la version.\n"
+
+#~ msgid "output format %s not supported"
+#~ msgstr "format de sortie %s non géré"
+
+#~ msgid "more than one file specified (%s and %s)"
+#~ msgstr "plus d'un fichier indiqué (%s et %s)"
+
+#~ msgid "format parser %s not executable"
+#~ msgstr "l'analyseur de format %s n'est pas exécutable"
+
+#~ msgid "cannot execute format parser: %s"
+#~ msgstr "impossible d'exécuter l'analyseur de format : %s"
+
+#~ msgid "output of changelog parser"
+#~ msgstr "affichage de l'analyseur de fichier de changements"
+
+#~ msgid "changelog parser %s"
+#~ msgstr "analyseur de fichier de changements : %s"
+
 #~ msgid "'%s' is not a legal architecture string."
 #~ msgid_plural "'%s' are not legal architecture strings."
 #~ msgstr[0] "« %s » n'est pas une architecture autorisée."
@@ -4693,9 +4789,6 @@ msgstr ""
 #~ msgid "duplicate source field in %s"
 #~ msgstr "champ source en double dans %s"
 
-#~ msgid "invalid source field in %s"
-#~ msgstr "champ source invalide dans %s"
-
 #~ msgid "duplicate binary field in %s"
 #~ msgstr "champ binary en double dans %s"
 
diff --git a/scripts/po/pl.po b/scripts/po/pl.po
index 691aa4657..41d19f82f 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: 2016-05-09 03:21+0200\n"
+"POT-Creation-Date: 2016-07-03 19:11+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"
@@ -29,7 +29,7 @@ msgstr ""
 #: scripts/dpkg-mergechangelogs.pl scripts/dpkg-name.pl
 #: scripts/dpkg-parsechangelog.pl scripts/dpkg-scanpackages.pl
 #: scripts/dpkg-scansources.pl scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl
-#: scripts/dpkg-vendor.pl scripts/changelog/debian.pl
+#: scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s w wersji %s.\n"
@@ -39,7 +39,6 @@ msgstr "Debian %s w wersji %s.\n"
 #: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
 #: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
 #: scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl scripts/dpkg-vendor.pl
-#: scripts/changelog/debian.pl
 msgid ""
 "\n"
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -279,52 +278,61 @@ msgstr "Użycie: %s [<opcja>...]"
 #| "      --version  show the version."
 msgid ""
 "Options:\n"
-"  --build=<type>[,...]\n"
-"                 specify the build <type>: full, source, binary, any, all\n"
-"                   (default is 'full').\n"
-"  -F             normal full build (binaries and sources, 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            do not clean source tree (implies -b).\n"
-"  -tc            clean source tree when finished.\n"
-"  -D             check build dependencies and conflicts (default).\n"
-"  -d             do not check build dependencies and conflicts.\n"
-"  -P<profiles>   assume given build profiles as active (comma-separated "
-"list).\n"
-"  -R<rules>      rules file to execute (default is debian/rules).\n"
-"  -T<target>     call debian/rules <target> with the proper environment.\n"
-"      --as-root  ensure -T calls the target with root rights.\n"
-"  -j[<number>]   jobs to run simultaneously (passed to <rules>), forced "
-"mode.\n"
-"  -J[<number>]   jobs to run simultaneously (passed to <rules>), opt-in "
-"mode.\n"
-"  -r<gain-root-command>\n"
-"                 command to gain root privileges (default is fakeroot).\n"
-"  --check-command=<check-command>\n"
-"                 command to check the .changes file (no default).\n"
-"  --check-option=<opt>\n"
-"                 pass <opt> to <check-command>.\n"
-"  --hook-<hook-name>=<hook-command>\n"
-"                 set <hook-command> as the hook <hook-name>, known hooks:\n"
-"                   init preclean source build binary changes postclean\n"
-"                   check sign done\n"
-"  -p<sign-command>\n"
-"                 command to sign .dsc and/or .changes files\n"
-"                   (default is gpg2 or gpg).\n"
-"  -k<keyid>      the key to use for signing.\n"
-"  -ap            add pause before starting signature process.\n"
-"  -us            unsigned source package.\n"
-"  -uc            unsigned .changes file.\n"
-"      --force-sign\n"
-"                 force signing the resulting files.\n"
-"      --admindir=<directory>\n"
-"                 change the administrative directory.\n"
-"  -?, --help     show this help message.\n"
-"      --version  show the version."
+"      --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"
+"  -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.\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 changes\n"
+"                                postclean check sign done\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"
+"  -uc, --unsigned-changes     unsigned .changes 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."
 msgstr ""
 "Opcje:\n"
 "  -F (domyślna)  normalne, pełne wydanie (pliki binarne i źródłowe).\n"
@@ -371,12 +379,19 @@ msgstr ""
 "      --version  wyświetla wersję."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-architecture:\n"
+#| "  -a, --host-arch <arch>    set the host Debian architecture.\n"
+#| "  -t, --host-type <type>    set the host GNU system type.\n"
+#| "      --target-arch <arch>  set the target Debian architecture.\n"
+#| "      --target-type <type>  set the target GNU system type."
 msgid ""
 "Options passed to dpkg-architecture:\n"
-"  -a, --host-arch <arch>    set the host Debian architecture.\n"
-"  -t, --host-type <type>    set the host GNU system type.\n"
-"      --target-arch <arch>  set the target Debian architecture.\n"
-"      --target-type <type>  set the target GNU system type."
+"  -a, --host-arch <arch>      set the host Debian architecture.\n"
+"  -t, --host-type <type>      set the host GNU system type.\n"
+"      --target-arch <arch>    set the target Debian architecture.\n"
+"      --target-type <type>    set the target GNU system type."
 msgstr ""
 "Opcje przekazywane do dpkg-architecture:\n"
 "  -a, --host-arch <arch>    ustaw architekturę Debiana hosta.\n"
@@ -399,15 +414,15 @@ msgstr ""
 #| "                 pass option <opt> to dpkg-genchanges."
 msgid ""
 "Options passed to dpkg-genchanges:\n"
-"  -si            source includes orig, if new upstream (default).\n"
-"  -sa            source includes orig, always.\n"
-"  -sd            source is diff and .dsc only.\n"
-"  -v<version>    changes since version <version>.\n"
-"  -m<maint>      maintainer for package is <maint>.\n"
-"  -e<maint>      maintainer for release is <maint>.\n"
-"  -C<descfile>   changes are described in <descfile>.\n"
-"      --changes-option=<opt>\n"
-"                 pass option <opt> to dpkg-genchanges."
+"  -si                         source includes orig, if new upstream "
+"(default).\n"
+"  -sa                         source includes orig, always.\n"
+"  -sd                         source is diff and .dsc only.\n"
+"  -v<version>                 changes since version <version>.\n"
+"  -m, --release-by=<maint>    maintainer for this release is <maint>.\n"
+"  -e, --build-by=<maint>      maintainer for this build is <maint>.\n"
+"  -C<descfile>                changes are described in <descfile>.\n"
+"      --changes-option=<opt>  pass option <opt> to dpkg-genchanges."
 msgstr ""
 "Opcje przekazywane do dpkg-genchanges:\n"
 "  -si (domyślna)  źródła zawierają orig, jeśli jest nowa wersja macierz.\n"
@@ -421,16 +436,30 @@ msgstr ""
 "                  przekazuje opcję <opcja> do dpkg-genchanges."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-source:\n"
+#| "  -sn            force Debian native source format.\n"
+#| "  -s[sAkurKUR]   see dpkg-source for explanation.\n"
+#| "  -z<level>      compression level to use for source.\n"
+#| "  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
+#| "  -i[<regex>]    ignore diffs of files matching regex.\n"
+#| "  -I[<pattern>]  filter out files when building tarballs.\n"
+#| "      --source-option=<opt>\n"
+#| "                 pass option <opt> to dpkg-source.\n"
 msgid ""
 "Options passed to dpkg-source:\n"
-"  -sn            force Debian native source format.\n"
-"  -s[sAkurKUR]   see dpkg-source for explanation.\n"
-"  -z<level>      compression level to use for source.\n"
-"  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
-"  -i[<regex>]    ignore diffs of files matching regex.\n"
-"  -I[<pattern>]  filter out files when building tarballs.\n"
-"      --source-option=<opt>\n"
-"                 pass option <opt> to dpkg-source.\n"
+"  -sn                         force Debian native source format.\n"
+"  -s[sAkurKUR]                see dpkg-source for explanation.\n"
+"  -z, --compression-level=<level>\n"
+"                              compression level to use for source.\n"
+"  -Z, --compression=<compressor>\n"
+"                              compression to use for source (gz|xz|bzip2|"
+"lzma).\n"
+"  -i, --diff-ignore[=<regex>] ignore diffs of files matching <regex>.\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                              filter out files when building tarballs.\n"
+"      --source-option=<opt>   pass option <opt> to dpkg-source.\n"
 msgstr ""
 "Opcje przekazywane do dpkg-source:\n"
 "  -sn            wymusza natywny format źródłowy Debiana.\n"
@@ -534,15 +563,6 @@ msgstr ""
 "- może on zawierać niepotrzebne pliki"
 
 #: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid ""
-"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
-"least '%s' seems to be missing)"
-msgstr ""
-"%s musi zostać zaktualizowane w celu obsługi celów \"build-arch\" i 'build-"
-"indep' (brakuje co najmniej \"%s\")"
-
-#: scripts/dpkg-buildpackage.pl
 msgid "parse changes file"
 msgstr "przetwarzanie pliku zmian"
 
@@ -620,6 +640,15 @@ msgstr "wydanie binarne i pliku różnic (oryginalne źródła NIE dołączone)"
 msgid "full upload (original source is included)"
 msgstr "pełne wydanie (oryginalne źródła dołączone)"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
+"least '%s' seems to be missing)"
+msgstr ""
+"%s musi zostać zaktualizowane w celu obsługi celów \"build-arch\" i 'build-"
+"indep' (brakuje co najmniej \"%s\")"
+
 #: scripts/dpkg-checkbuilddeps.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<control-file>]"
@@ -1401,7 +1430,6 @@ msgid ""
 "Options:\n"
 "  -l <changelog-file>      get per-version info from this file.\n"
 "  -F <changelog-format>    force changelog format.\n"
-"  -L <libdir>              look for changelog parsers in <libdir>.\n"
 "  -S, --show-field <field> show the values for <field>.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
@@ -1480,8 +1508,10 @@ msgstr ""
 "    --all                       włącza wszystkie zmiany\n"
 
 #: scripts/dpkg-parsechangelog.pl
-msgid "missing library directory"
-msgstr ""
+#, fuzzy
+#| msgid "-i%s is deprecated; it is without effect"
+msgid "-L is obsolete; it is without effect"
+msgstr "-i%s jest przestarzałe - nie ma żadnego efektu"
 
 #: scripts/dpkg-parsechangelog.pl
 #, fuzzy
@@ -1542,8 +1572,7 @@ msgstr "  %s (pakiet zawiera %s, nie %s)"
 msgid "unconditional maintainer override for %s"
 msgstr "bezwarunkowe nadpisanie opiekuna dla %s"
 
-#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl
-#: scripts/Dpkg/Changelog/Parse.pm scripts/Dpkg/IPC.pm
+#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "cannot fork for %s"
@@ -2083,7 +2112,10 @@ msgstr "--%s pobiera nie więcej niż dwa argumenty"
 msgid "--%s needs the .dsc file as first argument, not a directory"
 msgstr "--%s wymaga pliku .dsc, a nie katalogu, jako pierwszego argumentu"
 
-#: scripts/dpkg-source.pl
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V1.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Bzr.pm
+#: scripts/Dpkg/Source/Package/V3/Git.pm
+#: scripts/Dpkg/Source/Package/V3/Native.pm
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "cel rozpakowania istnieje: %s"
@@ -2104,6 +2136,12 @@ msgid "extracting %s in %s"
 msgstr "rozpakowywanie %s w %s"
 
 #: scripts/dpkg-source.pl
+#, fuzzy, perl-format
+#| msgid "%s is not a plain file"
+msgid "test control %s is not a regular file"
+msgstr " %s nie jest zwykłym plikiem"
+
+#: scripts/dpkg-source.pl
 #, perl-format
 msgid "%s field contains value %s, but no tests control file %s"
 msgstr "pole %s zawiera wartość %s, ale nie zawiera plików kontroli testów %s"
@@ -2141,7 +2179,27 @@ msgstr ""
 "                         jako nową łatkę."
 
 #: scripts/dpkg-source.pl
-#, perl-format
+#, fuzzy, perl-format
+#| msgid ""
+#| "Build options:\n"
+#| "  -c<control-file>         get control info from this file.\n"
+#| "  -l<changelog-file>       get per-version info from this file.\n"
+#| "  -F<changelog-format>     force changelog format.\n"
+#| "  --format=<source-format> set the format to be used for the source "
+#| "package.\n"
+#| "  -V<name>=<value>         set a substitution variable.\n"
+#| "  -T<substvars-file>       read variables here.\n"
+#| "  -D<field>=<value>        override or add a .dsc field and value.\n"
+#| "  -U<field>                remove a field.\n"
+#| "  -q                       quiet mode.\n"
+#| "  -i[<regex>]              filter out files to ignore diffs of\n"
+#| "                             (defaults to: '%s').\n"
+#| "  -I[<pattern>]            filter out files when building tarballs\n"
+#| "                             (defaults to: %s).\n"
+#| "  -Z<compression>          select compression to use (defaults to '%s',\n"
+#| "                             supported are: %s).\n"
+#| "  -z<level>                compression level to use (defaults to '%d',\n"
+#| "                             supported are: '1'-'9', 'best', 'fast')"
 msgid ""
 "Build options:\n"
 "  -c<control-file>         get control info from this file.\n"
@@ -2153,14 +2211,17 @@ msgid ""
 "  -T<substvars-file>       read variables here.\n"
 "  -D<field>=<value>        override or add a .dsc field and value.\n"
 "  -U<field>                remove a field.\n"
-"  -q                       quiet mode.\n"
-"  -i[<regex>]              filter out files to ignore diffs of\n"
+"  -i, --diff-ignore[=<regex>]\n"
+"                           filter out files to ignore diffs of\n"
 "                             (defaults to: '%s').\n"
-"  -I[<pattern>]            filter out files when building tarballs\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                           filter out files when building tarballs\n"
 "                             (defaults to: %s).\n"
-"  -Z<compression>          select compression to use (defaults to '%s',\n"
+"  -Z, --compression=<compression>\n"
+"                           select compression to use (defaults to '%s',\n"
 "                             supported are: %s).\n"
-"  -z<level>                compression level to use (defaults to '%d',\n"
+"  -z, --compression-level=<level>\n"
+"                           compression level to use (defaults to '%d',\n"
 "                             supported are: '1'-'9', 'best', 'fast')"
 msgstr ""
 "Opcje budowania:\n"
@@ -2199,6 +2260,7 @@ msgid ""
 "  --no-copy                don't copy .orig tarballs\n"
 "  --no-check               don't check signature and checksums before "
 "unpacking\n"
+"  --no-overwrite-dir       do not overwrite directory on extraction\n"
 "  --require-valid-signature abort if the package doesn't have a valid "
 "signature\n"
 "  --require-strong-checksums\n"
@@ -2214,8 +2276,14 @@ msgstr ""
 "podpisu  --ignore-bad-version     pozwól na złą wersję pakietu źródłowego."
 
 #: scripts/dpkg-source.pl
+#, fuzzy
+#| msgid ""
+#| "General options:\n"
+#| "  -?, --help               show this help message.\n"
+#| "      --version            show the version."
 msgid ""
 "General options:\n"
+"  -q                       quiet mode.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
 msgstr ""
@@ -2260,94 +2328,6 @@ msgstr ""
 msgid "vendor %s doesn't exist in %s"
 msgstr "dostawca %s nie istnieje w %s"
 
-#: scripts/changelog/debian.pl
-#, fuzzy, perl-format
-#| msgid "Usage: %s [<option>...] [<control-file>]"
-msgid "Usage: %s [<option>...] [<changelog-file>]"
-msgstr "Użycie: %s [<opcja>...] <plik-kontrolny>"
-
-#: scripts/changelog/debian.pl
-#, fuzzy
-#| msgid ""
-#| "Parser options:\n"
-#| "    --format <output-format>    see man page for list of available\n"
-#| "                                output formats, defaults to 'dpkg'\n"
-#| "                                for compatibility with dpkg-dev\n"
-#| "    --since <version>,          include all changes later than version\n"
-#| "      -s<version>, -v<version>\n"
-#| "    --until <version>,          include all changes earlier than version\n"
-#| "      -u<version>\n"
-#| "    --from <version>,           include all changes equal or later\n"
-#| "      -f<version>               than version\n"
-#| "    --to <version>, -t<version> include all changes up to or equal\n"
-#| "                                than version\n"
-#| "    --count <number>,           include <number> entries from the top\n"
-#| "      -c<number>, -n<number>    (or the tail if <number> is lower than "
-#| "0)\n"
-#| "    --offset <number>,          change the starting point for --count,\n"
-#| "      -o<number>                counted from the top (or the tail if\n"
-#| "                                <number> is lower than 0)\n"
-#| "    --all                       include all changes\n"
-msgid ""
-"Options:\n"
-"      --file <file>       changelog <file> to parse (defaults to '-').\n"
-"  -l, --label <file>      changelog <file> name to use in error messages.\n"
-"      --format <output-format>\n"
-"                          set the 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 if\n"
-"                            <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"
-"  -?, --help              print usage information.\n"
-"  -V, --version           print version information.\n"
-msgstr ""
-"Opcje parsera:\n"
-"    --format <format_wyjścia>   listę formatów wyjściowych można znaleźć na\n"
-"                                stronie podręcznika, domyślnym jest \"dpkg"
-"\"\n"
-"                                dla zachowania kompatybilności z dpkg-dev\n"
-"    --since <wersja>,           włącza wszystkie zmiany późniejsze od "
-"wersji\n"
-"      -s<wersja>, -v<wersja>\n"
-"    --until <wersja>,           włącza wszystkie zmiany wcześniejsze od "
-"wersji\n"
-"      -u<wersja>\n"
-"    --from <wersja>,            włącza wszystkie zmiany późniejsze od "
-"wersji\n"
-"      -f<wersja>                lub jej równe\n"
-"    --to <wersja>, -t<wersja>   włącza wszystkie zmiany aż do danej wersji,\n"
-"                                łącznie z tą wersją\n"
-"    --count <liczba>,           włącza <liczba> początkowych wpisów (lub\n"
-"      -c<liczba>, -n<liczba>    końcowych, gdy <liczba> jest mniejsza od 0)\n"
-"    --offset <liczba>,          zmienia punkt początkowy dla --count,\n"
-"      -o<liczba>                licząc od początku pliku (lub końca,\n"
-"                                gdy <liczba> jest mniejsza od 0)\n"
-"    --all                       włącza wszystkie zmiany\n"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "output format %s not supported"
-msgstr "wyjściowy format %s nie jest wspierany"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "more than one file specified (%s and %s)"
-msgstr "podano więcej niż jeden plik (%s i %s)"
-
-#: scripts/changelog/debian.pl scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "fatal error occurred while parsing %s"
-msgstr "wystąpił fatalny błąd podczas przetwarzania %s"
-
 #: scripts/Dpkg/Arch.pm
 #, fuzzy
 #| msgid ""
@@ -2575,12 +2555,6 @@ msgid "the trailer doesn't match the expected regex"
 msgstr "trailer nie pasuje do oczekiwanego wyrażenia regularnego"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, fuzzy, perl-format
-#| msgid "unknown option or argument %s"
-msgid "unknown output format %s"
-msgstr "niepoprawna opcja lub argument %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
 msgid "cannot create pipe for %s"
 msgstr "nie można utworzyć potoku dla %s"
@@ -2591,29 +2565,21 @@ msgid "tail of %s"
 msgstr "tail na %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "format parser %s not executable"
-msgstr "parsera formatu %s nie jest plikiem wykonywalnym"
+#, fuzzy, perl-format
+#| msgid "changelog format %s is unknown"
+msgid "changelog format %s is unknown: %s"
+msgstr "nieznany format %s pliku zmian"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "changelog format %s is unknown"
-msgstr "nieznany format %s pliku zmian"
+msgid "fatal error occurred while parsing %s"
+msgstr "wystąpił fatalny błąd podczas przetwarzania %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
-#| msgid "cannot exec format parser: %s"
-msgid "cannot execute format parser: %s"
-msgstr "nie można uruchomić parsera formatu: %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-msgid "output of changelog parser"
-msgstr "wyjście parsera pliku zmian"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "changelog parser %s"
-msgstr "parser pliku zmian %s"
+#| msgid "unknown option or argument %s"
+msgid "unknown output format %s"
+msgstr "niepoprawna opcja lub argument %s"
 
 #: scripts/Dpkg/Checksums.pm
 #, perl-format
@@ -2690,6 +2656,12 @@ msgid "license stanza of copyright file"
 msgstr ""
 
 #: scripts/Dpkg/Control.pm
+#, fuzzy
+#| msgid "package's section of control info file"
+msgid "package's tests control file"
+msgstr "sekcja pakietu pliku z informacjami kontrolnymi"
+
+#: scripts/Dpkg/Control.pm
 #, fuzzy, perl-format
 #| msgid "entry in repository's %s file"
 msgid "repository's %s file"
@@ -4006,6 +3978,12 @@ msgid "bad line in substvars file %s at line %d"
 msgstr "błędna linia w pliku podstawień %s, w linii %d"
 
 #: scripts/Dpkg/Substvars.pm
+#, fuzzy, perl-format
+#| msgid "invalid source field in %s"
+msgid "invalid source version %s"
+msgstr "niepoprawne pole źródłowe w %s"
+
+#: scripts/Dpkg/Substvars.pm
 #, perl-format
 msgid "too many substitutions - recursive ? - in '%s'"
 msgstr "za dużo podstawień - rekursja? - w \"%s\""
@@ -4099,6 +4077,106 @@ 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\""
 
+#, fuzzy
+#~| msgid "Usage: %s [<option>...] [<control-file>]"
+#~ msgid "Usage: %s [<option>...] [<changelog-file>]"
+#~ msgstr "Użycie: %s [<opcja>...] <plik-kontrolny>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Parser options:\n"
+#~| "    --format <output-format>    see man page for list of available\n"
+#~| "                                output formats, defaults to 'dpkg'\n"
+#~| "                                for compatibility with dpkg-dev\n"
+#~| "    --since <version>,          include all changes later than version\n"
+#~| "      -s<version>, -v<version>\n"
+#~| "    --until <version>,          include all changes earlier than "
+#~| "version\n"
+#~| "      -u<version>\n"
+#~| "    --from <version>,           include all changes equal or later\n"
+#~| "      -f<version>               than version\n"
+#~| "    --to <version>, -t<version> include all changes up to or equal\n"
+#~| "                                than version\n"
+#~| "    --count <number>,           include <number> entries from the top\n"
+#~| "      -c<number>, -n<number>    (or the tail if <number> is lower than "
+#~| "0)\n"
+#~| "    --offset <number>,          change the starting point for --count,\n"
+#~| "      -o<number>                counted from the top (or the tail if\n"
+#~| "                                <number> is lower than 0)\n"
+#~| "    --all                       include all changes\n"
+#~ msgid ""
+#~ "Options:\n"
+#~ "      --file <file>       changelog <file> to parse (defaults to '-').\n"
+#~ "  -l, --label <file>      changelog <file> name to use in error "
+#~ "messages.\n"
+#~ "      --format <output-format>\n"
+#~ "                          set the 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 "
+#~ "if\n"
+#~ "                            <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"
+#~ "  -?, --help              print usage information.\n"
+#~ "  -V, --version           print version information.\n"
+#~ msgstr ""
+#~ "Opcje parsera:\n"
+#~ "    --format <format_wyjścia>   listę formatów wyjściowych można znaleźć "
+#~ "na\n"
+#~ "                                stronie podręcznika, domyślnym jest \"dpkg"
+#~ "\"\n"
+#~ "                                dla zachowania kompatybilności z dpkg-"
+#~ "dev\n"
+#~ "    --since <wersja>,           włącza wszystkie zmiany późniejsze od "
+#~ "wersji\n"
+#~ "      -s<wersja>, -v<wersja>\n"
+#~ "    --until <wersja>,           włącza wszystkie zmiany wcześniejsze od "
+#~ "wersji\n"
+#~ "      -u<wersja>\n"
+#~ "    --from <wersja>,            włącza wszystkie zmiany późniejsze od "
+#~ "wersji\n"
+#~ "      -f<wersja>                lub jej równe\n"
+#~ "    --to <wersja>, -t<wersja>   włącza wszystkie zmiany aż do danej "
+#~ "wersji,\n"
+#~ "                                łącznie z tą wersją\n"
+#~ "    --count <liczba>,           włącza <liczba> początkowych wpisów (lub\n"
+#~ "      -c<liczba>, -n<liczba>    końcowych, gdy <liczba> jest mniejsza od "
+#~ "0)\n"
+#~ "    --offset <liczba>,          zmienia punkt początkowy dla --count,\n"
+#~ "      -o<liczba>                licząc od początku pliku (lub końca,\n"
+#~ "                                gdy <liczba> jest mniejsza od 0)\n"
+#~ "    --all                       włącza wszystkie zmiany\n"
+
+#~ msgid "output format %s not supported"
+#~ msgstr "wyjściowy format %s nie jest wspierany"
+
+#~ msgid "more than one file specified (%s and %s)"
+#~ msgstr "podano więcej niż jeden plik (%s i %s)"
+
+#~ msgid "format parser %s not executable"
+#~ msgstr "parsera formatu %s nie jest plikiem wykonywalnym"
+
+#, fuzzy
+#~| msgid "cannot exec format parser: %s"
+#~ msgid "cannot execute format parser: %s"
+#~ msgstr "nie można uruchomić parsera formatu: %s"
+
+#~ msgid "output of changelog parser"
+#~ msgstr "wyjście parsera pliku zmian"
+
+#~ msgid "changelog parser %s"
+#~ msgstr "parser pliku zmian %s"
+
 #~ msgid "'%s' is not a legal architecture string."
 #~ msgid_plural "'%s' are not legal architecture strings."
 #~ msgstr[0] "\"%s\" nie jest poprawnym łańcuchem określającym architekturę."
@@ -4672,9 +4750,6 @@ msgstr "częśc epoki w numerze wersji nie jest liczbą: \"%s\""
 #~ msgid "duplicate source field in %s"
 #~ msgstr "zduplikowane pole źródłowe w %s"
 
-#~ msgid "invalid source field in %s"
-#~ msgstr "niepoprawne pole źródłowe w %s"
-
 #~ msgid "duplicate binary field in %s"
 #~ msgstr "zduplikowane pole binarne w %s"
 
diff --git a/scripts/po/ru.po b/scripts/po/ru.po
index 0d848f5ae..e3ab7824f 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: 2016-05-09 03:21+0200\n"
+"POT-Creation-Date: 2016-07-03 19:11+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"
@@ -26,7 +26,7 @@ msgstr ""
 #: scripts/dpkg-mergechangelogs.pl scripts/dpkg-name.pl
 #: scripts/dpkg-parsechangelog.pl scripts/dpkg-scanpackages.pl
 #: scripts/dpkg-scansources.pl scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl
-#: scripts/dpkg-vendor.pl scripts/changelog/debian.pl
+#: scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s, версия %s.\n"
@@ -36,7 +36,6 @@ msgstr "Debian %s, версия %s.\n"
 #: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
 #: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
 #: scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl scripts/dpkg-vendor.pl
-#: scripts/changelog/debian.pl
 msgid ""
 "\n"
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -280,52 +279,61 @@ msgstr "Использование: %s [<параметр>...]"
 #| "      --version  show the version."
 msgid ""
 "Options:\n"
-"  --build=<type>[,...]\n"
-"                 specify the build <type>: full, source, binary, any, all\n"
-"                   (default is 'full').\n"
-"  -F             normal full build (binaries and sources, 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            do not clean source tree (implies -b).\n"
-"  -tc            clean source tree when finished.\n"
-"  -D             check build dependencies and conflicts (default).\n"
-"  -d             do not check build dependencies and conflicts.\n"
-"  -P<profiles>   assume given build profiles as active (comma-separated "
-"list).\n"
-"  -R<rules>      rules file to execute (default is debian/rules).\n"
-"  -T<target>     call debian/rules <target> with the proper environment.\n"
-"      --as-root  ensure -T calls the target with root rights.\n"
-"  -j[<number>]   jobs to run simultaneously (passed to <rules>), forced "
-"mode.\n"
-"  -J[<number>]   jobs to run simultaneously (passed to <rules>), opt-in "
-"mode.\n"
-"  -r<gain-root-command>\n"
-"                 command to gain root privileges (default is fakeroot).\n"
-"  --check-command=<check-command>\n"
-"                 command to check the .changes file (no default).\n"
-"  --check-option=<opt>\n"
-"                 pass <opt> to <check-command>.\n"
-"  --hook-<hook-name>=<hook-command>\n"
-"                 set <hook-command> as the hook <hook-name>, known hooks:\n"
-"                   init preclean source build binary changes postclean\n"
-"                   check sign done\n"
-"  -p<sign-command>\n"
-"                 command to sign .dsc and/or .changes files\n"
-"                   (default is gpg2 or gpg).\n"
-"  -k<keyid>      the key to use for signing.\n"
-"  -ap            add pause before starting signature process.\n"
-"  -us            unsigned source package.\n"
-"  -uc            unsigned .changes file.\n"
-"      --force-sign\n"
-"                 force signing the resulting files.\n"
-"      --admindir=<directory>\n"
-"                 change the administrative directory.\n"
-"  -?, --help     show this help message.\n"
-"      --version  show the version."
+"      --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"
+"  -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.\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 changes\n"
+"                                postclean check sign done\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"
+"  -uc, --unsigned-changes     unsigned .changes 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."
 msgstr ""
 "Параметры:\n"
 "  -F (по умолчанию) обычная полная сборка (двоичные и с исх.кодом)\n"
@@ -376,12 +384,19 @@ msgstr ""
 "     --version      показать версию"
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-architecture:\n"
+#| "  -a, --host-arch <arch>    set the host Debian architecture.\n"
+#| "  -t, --host-type <type>    set the host GNU system type.\n"
+#| "      --target-arch <arch>  set the target Debian architecture.\n"
+#| "      --target-type <type>  set the target GNU system type."
 msgid ""
 "Options passed to dpkg-architecture:\n"
-"  -a, --host-arch <arch>    set the host Debian architecture.\n"
-"  -t, --host-type <type>    set the host GNU system type.\n"
-"      --target-arch <arch>  set the target Debian architecture.\n"
-"      --target-type <type>  set the target GNU system type."
+"  -a, --host-arch <arch>      set the host Debian architecture.\n"
+"  -t, --host-type <type>      set the host GNU system type.\n"
+"      --target-arch <arch>    set the target Debian architecture.\n"
+"      --target-type <type>    set the target GNU system type."
 msgstr ""
 "Параметры, передаваемые dpkg-architecture:\n"
 "  -a, --host-arch <арх>     задать архитектуру узла Debian\n"
@@ -404,15 +419,15 @@ msgstr ""
 #| "                 pass option <opt> to dpkg-genchanges."
 msgid ""
 "Options passed to dpkg-genchanges:\n"
-"  -si            source includes orig, if new upstream (default).\n"
-"  -sa            source includes orig, always.\n"
-"  -sd            source is diff and .dsc only.\n"
-"  -v<version>    changes since version <version>.\n"
-"  -m<maint>      maintainer for package is <maint>.\n"
-"  -e<maint>      maintainer for release is <maint>.\n"
-"  -C<descfile>   changes are described in <descfile>.\n"
-"      --changes-option=<opt>\n"
-"                 pass option <opt> to dpkg-genchanges."
+"  -si                         source includes orig, if new upstream "
+"(default).\n"
+"  -sa                         source includes orig, always.\n"
+"  -sd                         source is diff and .dsc only.\n"
+"  -v<version>                 changes since version <version>.\n"
+"  -m, --release-by=<maint>    maintainer for this release is <maint>.\n"
+"  -e, --build-by=<maint>      maintainer for this build is <maint>.\n"
+"  -C<descfile>                changes are described in <descfile>.\n"
+"      --changes-option=<opt>  pass option <opt> to dpkg-genchanges."
 msgstr ""
 "Параметры, передаваемые dpkg-genchanges:\n"
 "  -si (по умолч.)   src включают orig, если новый автор\n"
@@ -426,16 +441,30 @@ msgstr ""
 "                    передать параметр <opt> в dpkg-genchanges"
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-source:\n"
+#| "  -sn            force Debian native source format.\n"
+#| "  -s[sAkurKUR]   see dpkg-source for explanation.\n"
+#| "  -z<level>      compression level to use for source.\n"
+#| "  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
+#| "  -i[<regex>]    ignore diffs of files matching regex.\n"
+#| "  -I[<pattern>]  filter out files when building tarballs.\n"
+#| "      --source-option=<opt>\n"
+#| "                 pass option <opt> to dpkg-source.\n"
 msgid ""
 "Options passed to dpkg-source:\n"
-"  -sn            force Debian native source format.\n"
-"  -s[sAkurKUR]   see dpkg-source for explanation.\n"
-"  -z<level>      compression level to use for source.\n"
-"  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
-"  -i[<regex>]    ignore diffs of files matching regex.\n"
-"  -I[<pattern>]  filter out files when building tarballs.\n"
-"      --source-option=<opt>\n"
-"                 pass option <opt> to dpkg-source.\n"
+"  -sn                         force Debian native source format.\n"
+"  -s[sAkurKUR]                see dpkg-source for explanation.\n"
+"  -z, --compression-level=<level>\n"
+"                              compression level to use for source.\n"
+"  -Z, --compression=<compressor>\n"
+"                              compression to use for source (gz|xz|bzip2|"
+"lzma).\n"
+"  -i, --diff-ignore[=<regex>] ignore diffs of files matching <regex>.\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                              filter out files when building tarballs.\n"
+"      --source-option=<opt>   pass option <opt> to dpkg-source.\n"
 msgstr ""
 "Параметры, передаваемые dpkg-source:\n"
 "  -sn               исходный код в родном формате Debian\n"
@@ -539,15 +568,6 @@ msgstr ""
 "могут добавиться нежелательные файлы"
 
 #: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid ""
-"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
-"least '%s' seems to be missing)"
-msgstr ""
-"для поддержки целей «build-arch» и «build-indep» требуется обновить %s (во "
-"всяком случае, будет отсутствовать «%s»)"
-
-#: scripts/dpkg-buildpackage.pl
 msgid "parse changes file"
 msgstr "разбор файла изменений"
 
@@ -633,6 +653,15 @@ msgstr ""
 msgid "full upload (original source is included)"
 msgstr "закачка всего (с пакетом оригинального исходного кода)"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
+"least '%s' seems to be missing)"
+msgstr ""
+"для поддержки целей «build-arch» и «build-indep» требуется обновить %s (во "
+"всяком случае, будет отсутствовать «%s»)"
+
 #: scripts/dpkg-checkbuilddeps.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<control-file>]"
@@ -1417,7 +1446,6 @@ msgid ""
 "Options:\n"
 "  -l <changelog-file>      get per-version info from this file.\n"
 "  -F <changelog-format>    force changelog format.\n"
-"  -L <libdir>              look for changelog parsers in <libdir>.\n"
 "  -S, --show-field <field> show the values for <field>.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
@@ -1491,8 +1519,10 @@ msgstr ""
 "    --all                  включить все изменения\n"
 
 #: scripts/dpkg-parsechangelog.pl
-msgid "missing library directory"
-msgstr ""
+#, fuzzy
+#| msgid "-i%s is deprecated; it is without effect"
+msgid "-L is obsolete; it is without effect"
+msgstr "-i%s устарел, ничего не изменится"
 
 #: scripts/dpkg-parsechangelog.pl
 #, fuzzy
@@ -1553,8 +1583,7 @@ msgstr "  %s (в пакете указано %s, а не %s)"
 msgid "unconditional maintainer override for %s"
 msgstr "безусловное переназначение сопровождающего для %s"
 
-#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl
-#: scripts/Dpkg/Changelog/Parse.pm scripts/Dpkg/IPC.pm
+#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "cannot fork for %s"
@@ -2098,7 +2127,10 @@ msgstr "--%s может иметь не более двух значений"
 msgid "--%s needs the .dsc file as first argument, not a directory"
 msgstr "--%s принимает .dsc файл первым значением, а не каталог"
 
-#: scripts/dpkg-source.pl
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V1.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Bzr.pm
+#: scripts/Dpkg/Source/Package/V3/Git.pm
+#: scripts/Dpkg/Source/Package/V3/Native.pm
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "цель распаковки существует: %s"
@@ -2119,6 +2151,12 @@ msgid "extracting %s in %s"
 msgstr "извлечение %s в %s"
 
 #: scripts/dpkg-source.pl
+#, fuzzy, perl-format
+#| msgid "%s is not a plain file"
+msgid "test control %s is not a regular file"
+msgstr "%s не является простым файлом"
+
+#: scripts/dpkg-source.pl
 #, perl-format
 msgid "%s field contains value %s, but no tests control file %s"
 msgstr "поле %s содержит значение %s, но не проверяется управляющим файлом %s"
@@ -2155,7 +2193,27 @@ msgstr ""
 "                           сохранить изменения оригинала в новой заплате"
 
 #: scripts/dpkg-source.pl
-#, perl-format
+#, fuzzy, perl-format
+#| msgid ""
+#| "Build options:\n"
+#| "  -c<control-file>         get control info from this file.\n"
+#| "  -l<changelog-file>       get per-version info from this file.\n"
+#| "  -F<changelog-format>     force changelog format.\n"
+#| "  --format=<source-format> set the format to be used for the source "
+#| "package.\n"
+#| "  -V<name>=<value>         set a substitution variable.\n"
+#| "  -T<substvars-file>       read variables here.\n"
+#| "  -D<field>=<value>        override or add a .dsc field and value.\n"
+#| "  -U<field>                remove a field.\n"
+#| "  -q                       quiet mode.\n"
+#| "  -i[<regex>]              filter out files to ignore diffs of\n"
+#| "                             (defaults to: '%s').\n"
+#| "  -I[<pattern>]            filter out files when building tarballs\n"
+#| "                             (defaults to: %s).\n"
+#| "  -Z<compression>          select compression to use (defaults to '%s',\n"
+#| "                             supported are: %s).\n"
+#| "  -z<level>                compression level to use (defaults to '%d',\n"
+#| "                             supported are: '1'-'9', 'best', 'fast')"
 msgid ""
 "Build options:\n"
 "  -c<control-file>         get control info from this file.\n"
@@ -2167,14 +2225,17 @@ msgid ""
 "  -T<substvars-file>       read variables here.\n"
 "  -D<field>=<value>        override or add a .dsc field and value.\n"
 "  -U<field>                remove a field.\n"
-"  -q                       quiet mode.\n"
-"  -i[<regex>]              filter out files to ignore diffs of\n"
+"  -i, --diff-ignore[=<regex>]\n"
+"                           filter out files to ignore diffs of\n"
 "                             (defaults to: '%s').\n"
-"  -I[<pattern>]            filter out files when building tarballs\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                           filter out files when building tarballs\n"
 "                             (defaults to: %s).\n"
-"  -Z<compression>          select compression to use (defaults to '%s',\n"
+"  -Z, --compression=<compression>\n"
+"                           select compression to use (defaults to '%s',\n"
 "                             supported are: %s).\n"
-"  -z<level>                compression level to use (defaults to '%d',\n"
+"  -z, --compression-level=<level>\n"
+"                           compression level to use (defaults to '%d',\n"
 "                             supported are: '1'-'9', 'best', 'fast')"
 msgstr ""
 "Параметры сборки:\n"
@@ -2212,6 +2273,7 @@ msgid ""
 "  --no-copy                don't copy .orig tarballs\n"
 "  --no-check               don't check signature and checksums before "
 "unpacking\n"
+"  --no-overwrite-dir       do not overwrite directory on extraction\n"
 "  --require-valid-signature abort if the package doesn't have a valid "
 "signature\n"
 "  --require-strong-checksums\n"
@@ -2228,8 +2290,14 @@ msgstr ""
 "                              исходного кода"
 
 #: scripts/dpkg-source.pl
+#, fuzzy
+#| msgid ""
+#| "General options:\n"
+#| "  -?, --help               show this help message.\n"
+#| "      --version            show the version."
 msgid ""
 "General options:\n"
+"  -q                       quiet mode.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
 msgstr ""
@@ -2279,91 +2347,6 @@ msgstr ""
 msgid "vendor %s doesn't exist in %s"
 msgstr "поставщик %s не существует в %s"
 
-#: scripts/changelog/debian.pl
-#, fuzzy, perl-format
-#| msgid "Usage: %s [<option>...] [<control-file>]"
-msgid "Usage: %s [<option>...] [<changelog-file>]"
-msgstr "Использование: %s [<параметр>...] <управ.файл>"
-
-#: scripts/changelog/debian.pl
-#, fuzzy
-#| msgid ""
-#| "Parser options:\n"
-#| "    --format <output-format>    see man page for list of available\n"
-#| "                                output formats, defaults to 'dpkg'\n"
-#| "                                for compatibility with dpkg-dev\n"
-#| "    --since <version>,          include all changes later than version\n"
-#| "      -s<version>, -v<version>\n"
-#| "    --until <version>,          include all changes earlier than version\n"
-#| "      -u<version>\n"
-#| "    --from <version>,           include all changes equal or later\n"
-#| "      -f<version>               than version\n"
-#| "    --to <version>, -t<version> include all changes up to or equal\n"
-#| "                                than version\n"
-#| "    --count <number>,           include <number> entries from the top\n"
-#| "      -c<number>, -n<number>    (or the tail if <number> is lower than "
-#| "0)\n"
-#| "    --offset <number>,          change the starting point for --count,\n"
-#| "      -o<number>                counted from the top (or the tail if\n"
-#| "                                <number> is lower than 0)\n"
-#| "    --all                       include all changes\n"
-msgid ""
-"Options:\n"
-"      --file <file>       changelog <file> to parse (defaults to '-').\n"
-"  -l, --label <file>      changelog <file> name to use in error messages.\n"
-"      --format <output-format>\n"
-"                          set the 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 if\n"
-"                            <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"
-"  -?, --help              print usage information.\n"
-"  -V, --version           print version information.\n"
-msgstr ""
-"Параметры анализатора:\n"
-"    --format <формат-вывода>    в справочной странице есть список возможных\n"
-"                                выходных форматов, по умолчанию исп. «dpkg»\n"
-"                                для совместимости с dpkg-dev\n"
-"    --since <версия>       включить все изменения после этой версии\n"
-"    s<версия>, -v <версия>\n"
-"    --until <версия>       включить все изменения до этой версии\n"
-"    -u<версия>\n"
-"    --from <версия>        включить изменения этой и всех поздних версий\n"
-"    -f<версия>\n"
-"    --to<версия>           включить все изменения до этой версии "
-"включительно\n"
-"    -t<версия>\n"
-"    --count <число>        включить <число> записей от начала\n"
-"    -c<число>, -n <число>  (или конца, если <число> отрицательное)\n"
-"    --offset <число>       изменить начальную точку для --count,\n"
-"    -o<число>              отсчитывать от начала (или конца, если\n"
-"                           <число> отрицательное)\n"
-"    --all                  включить все изменения\n"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "output format %s not supported"
-msgstr "выходной формат %s не поддерживается"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "more than one file specified (%s and %s)"
-msgstr "указано более одного файла (%s и %s)"
-
-#: scripts/changelog/debian.pl scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "fatal error occurred while parsing %s"
-msgstr "неустранимая ошибка при анализе %s"
-
 #: scripts/Dpkg/Arch.pm
 #, fuzzy
 #| msgid ""
@@ -2595,12 +2578,6 @@ msgid "the trailer doesn't match the expected regex"
 msgstr "концевик не подходит под ожидаемое регулярное выражение"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, fuzzy, perl-format
-#| msgid "unknown option or argument %s"
-msgid "unknown output format %s"
-msgstr "неизвестный параметр или аргумент %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
 msgid "cannot create pipe for %s"
 msgstr "невозможно создать канал для %s"
@@ -2611,29 +2588,21 @@ msgid "tail of %s"
 msgstr "конец %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "format parser %s not executable"
-msgstr "анализатор формата %s не является исполняемым файлом"
+#, fuzzy, perl-format
+#| msgid "changelog format %s is unknown"
+msgid "changelog format %s is unknown: %s"
+msgstr "неизвестный формат файла изменений %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "changelog format %s is unknown"
-msgstr "неизвестный формат файла изменений %s"
+msgid "fatal error occurred while parsing %s"
+msgstr "неустранимая ошибка при анализе %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
-#| msgid "cannot exec format parser: %s"
-msgid "cannot execute format parser: %s"
-msgstr "не удалось запустить анализатор формата: %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-msgid "output of changelog parser"
-msgstr "вывод анализатора файла изменений"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "changelog parser %s"
-msgstr "анализатор файла изменений %s"
+#| msgid "unknown option or argument %s"
+msgid "unknown output format %s"
+msgstr "неизвестный параметр или аргумент %s"
 
 #: scripts/Dpkg/Checksums.pm
 #, perl-format
@@ -2711,6 +2680,12 @@ msgid "license stanza of copyright file"
 msgstr ""
 
 #: scripts/Dpkg/Control.pm
+#, fuzzy
+#| msgid "package's section of control info file"
+msgid "package's tests control file"
+msgstr "секция пакета управляющего информационного файла"
+
+#: scripts/Dpkg/Control.pm
 #, fuzzy, perl-format
 #| msgid "entry in repository's %s file"
 msgid "repository's %s file"
@@ -4040,6 +4015,12 @@ msgid "bad line in substvars file %s at line %d"
 msgstr "неправильная строка в файле подстановок %s у строки %d"
 
 #: scripts/Dpkg/Substvars.pm
+#, fuzzy, perl-format
+#| msgid "source version"
+msgid "invalid source version %s"
+msgstr "версия исходного кода"
+
+#: scripts/Dpkg/Substvars.pm
 #, perl-format
 msgid "too many substitutions - recursive ? - in '%s'"
 msgstr "слишком много подстановок (рекурсия?) в «%s»"
@@ -4132,6 +4113,101 @@ msgstr "номер версии содержит недопустимый сим
 msgid "epoch part of the version number is not a number: '%s'"
 msgstr "часть эпохи в номере версии не является числом: «%s»"
 
+#, fuzzy
+#~| msgid "Usage: %s [<option>...] [<control-file>]"
+#~ msgid "Usage: %s [<option>...] [<changelog-file>]"
+#~ msgstr "Использование: %s [<параметр>...] <управ.файл>"
+
+#, fuzzy
+#~| msgid ""
+#~| "Parser options:\n"
+#~| "    --format <output-format>    see man page for list of available\n"
+#~| "                                output formats, defaults to 'dpkg'\n"
+#~| "                                for compatibility with dpkg-dev\n"
+#~| "    --since <version>,          include all changes later than version\n"
+#~| "      -s<version>, -v<version>\n"
+#~| "    --until <version>,          include all changes earlier than "
+#~| "version\n"
+#~| "      -u<version>\n"
+#~| "    --from <version>,           include all changes equal or later\n"
+#~| "      -f<version>               than version\n"
+#~| "    --to <version>, -t<version> include all changes up to or equal\n"
+#~| "                                than version\n"
+#~| "    --count <number>,           include <number> entries from the top\n"
+#~| "      -c<number>, -n<number>    (or the tail if <number> is lower than "
+#~| "0)\n"
+#~| "    --offset <number>,          change the starting point for --count,\n"
+#~| "      -o<number>                counted from the top (or the tail if\n"
+#~| "                                <number> is lower than 0)\n"
+#~| "    --all                       include all changes\n"
+#~ msgid ""
+#~ "Options:\n"
+#~ "      --file <file>       changelog <file> to parse (defaults to '-').\n"
+#~ "  -l, --label <file>      changelog <file> name to use in error "
+#~ "messages.\n"
+#~ "      --format <output-format>\n"
+#~ "                          set the 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 "
+#~ "if\n"
+#~ "                            <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"
+#~ "  -?, --help              print usage information.\n"
+#~ "  -V, --version           print version information.\n"
+#~ msgstr ""
+#~ "Параметры анализатора:\n"
+#~ "    --format <формат-вывода>    в справочной странице есть список "
+#~ "возможных\n"
+#~ "                                выходных форматов, по умолчанию исп. "
+#~ "«dpkg»\n"
+#~ "                                для совместимости с dpkg-dev\n"
+#~ "    --since <версия>       включить все изменения после этой версии\n"
+#~ "    s<версия>, -v <версия>\n"
+#~ "    --until <версия>       включить все изменения до этой версии\n"
+#~ "    -u<версия>\n"
+#~ "    --from <версия>        включить изменения этой и всех поздних версий\n"
+#~ "    -f<версия>\n"
+#~ "    --to<версия>           включить все изменения до этой версии "
+#~ "включительно\n"
+#~ "    -t<версия>\n"
+#~ "    --count <число>        включить <число> записей от начала\n"
+#~ "    -c<число>, -n <число>  (или конца, если <число> отрицательное)\n"
+#~ "    --offset <число>       изменить начальную точку для --count,\n"
+#~ "    -o<число>              отсчитывать от начала (или конца, если\n"
+#~ "                           <число> отрицательное)\n"
+#~ "    --all                  включить все изменения\n"
+
+#~ msgid "output format %s not supported"
+#~ msgstr "выходной формат %s не поддерживается"
+
+#~ msgid "more than one file specified (%s and %s)"
+#~ msgstr "указано более одного файла (%s и %s)"
+
+#~ msgid "format parser %s not executable"
+#~ msgstr "анализатор формата %s не является исполняемым файлом"
+
+#, fuzzy
+#~| msgid "cannot exec format parser: %s"
+#~ msgid "cannot execute format parser: %s"
+#~ msgstr "не удалось запустить анализатор формата: %s"
+
+#~ msgid "output of changelog parser"
+#~ msgstr "вывод анализатора файла изменений"
+
+#~ msgid "changelog parser %s"
+#~ msgstr "анализатор файла изменений %s"
+
 #~ msgid "'%s' is not a legal architecture string."
 #~ msgid_plural "'%s' are not legal architecture strings."
 #~ msgstr[0] "Неправильная строка архитектуры «%s»."
diff --git a/scripts/po/sv.po b/scripts/po/sv.po
index c9af54f14..0ad507e3c 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: 2016-05-09 03:21+0200\n"
+"POT-Creation-Date: 2016-07-03 19:11+0200\n"
 "PO-Revision-Date: 2014-10-30 15:04+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Svenska <debian-l10n-swedish@lists.debian.org>\n"
@@ -24,7 +24,7 @@ msgstr ""
 #: scripts/dpkg-mergechangelogs.pl scripts/dpkg-name.pl
 #: scripts/dpkg-parsechangelog.pl scripts/dpkg-scanpackages.pl
 #: scripts/dpkg-scansources.pl scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl
-#: scripts/dpkg-vendor.pl scripts/changelog/debian.pl
+#: scripts/dpkg-vendor.pl
 #, perl-format
 msgid "Debian %s version %s.\n"
 msgstr "Debian %s version %s.\n"
@@ -34,7 +34,6 @@ msgstr "Debian %s version %s.\n"
 #: scripts/dpkg-genchanges.pl scripts/dpkg-gencontrol.pl
 #: scripts/dpkg-gensymbols.pl scripts/dpkg-parsechangelog.pl
 #: scripts/dpkg-shlibdeps.pl scripts/dpkg-source.pl scripts/dpkg-vendor.pl
-#: scripts/changelog/debian.pl
 msgid ""
 "\n"
 "This is free software; see the GNU General Public License version 2 or\n"
@@ -270,52 +269,61 @@ msgstr "Användning: %s [<flagga>...]"
 #| "      --version  show the version."
 msgid ""
 "Options:\n"
-"  --build=<type>[,...]\n"
-"                 specify the build <type>: full, source, binary, any, all\n"
-"                   (default is 'full').\n"
-"  -F             normal full build (binaries and sources, 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            do not clean source tree (implies -b).\n"
-"  -tc            clean source tree when finished.\n"
-"  -D             check build dependencies and conflicts (default).\n"
-"  -d             do not check build dependencies and conflicts.\n"
-"  -P<profiles>   assume given build profiles as active (comma-separated "
-"list).\n"
-"  -R<rules>      rules file to execute (default is debian/rules).\n"
-"  -T<target>     call debian/rules <target> with the proper environment.\n"
-"      --as-root  ensure -T calls the target with root rights.\n"
-"  -j[<number>]   jobs to run simultaneously (passed to <rules>), forced "
-"mode.\n"
-"  -J[<number>]   jobs to run simultaneously (passed to <rules>), opt-in "
-"mode.\n"
-"  -r<gain-root-command>\n"
-"                 command to gain root privileges (default is fakeroot).\n"
-"  --check-command=<check-command>\n"
-"                 command to check the .changes file (no default).\n"
-"  --check-option=<opt>\n"
-"                 pass <opt> to <check-command>.\n"
-"  --hook-<hook-name>=<hook-command>\n"
-"                 set <hook-command> as the hook <hook-name>, known hooks:\n"
-"                   init preclean source build binary changes postclean\n"
-"                   check sign done\n"
-"  -p<sign-command>\n"
-"                 command to sign .dsc and/or .changes files\n"
-"                   (default is gpg2 or gpg).\n"
-"  -k<keyid>      the key to use for signing.\n"
-"  -ap            add pause before starting signature process.\n"
-"  -us            unsigned source package.\n"
-"  -uc            unsigned .changes file.\n"
-"      --force-sign\n"
-"                 force signing the resulting files.\n"
-"      --admindir=<directory>\n"
-"                 change the administrative directory.\n"
-"  -?, --help     show this help message.\n"
-"      --version  show the version."
+"      --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"
+"  -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.\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 changes\n"
+"                                postclean check sign done\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"
+"  -uc, --unsigned-changes     unsigned .changes 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."
 msgstr ""
 "Flaggor:\n"
 "  -F (förval)    normalt komplett bygge (binärer och källkod).\n"
@@ -362,12 +370,19 @@ msgstr ""
 "      --version  visa versionsnummer."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-architecture:\n"
+#| "  -a, --host-arch <arch>    set the host Debian architecture.\n"
+#| "  -t, --host-type <type>    set the host GNU system type.\n"
+#| "      --target-arch <arch>  set the target Debian architecture.\n"
+#| "      --target-type <type>  set the target GNU system type."
 msgid ""
 "Options passed to dpkg-architecture:\n"
-"  -a, --host-arch <arch>    set the host Debian architecture.\n"
-"  -t, --host-type <type>    set the host GNU system type.\n"
-"      --target-arch <arch>  set the target Debian architecture.\n"
-"      --target-type <type>  set the target GNU system type."
+"  -a, --host-arch <arch>      set the host Debian architecture.\n"
+"  -t, --host-type <type>      set the host GNU system type.\n"
+"      --target-arch <arch>    set the target Debian architecture.\n"
+"      --target-type <type>    set the target GNU system type."
 msgstr ""
 "Flaggor som sänds till dpkg-architecture:\n"
 "  -a, --host-arch <ark>     sätt värd-Debianarkitektur.\n"
@@ -390,15 +405,15 @@ msgstr ""
 #| "                 pass option <opt> to dpkg-genchanges."
 msgid ""
 "Options passed to dpkg-genchanges:\n"
-"  -si            source includes orig, if new upstream (default).\n"
-"  -sa            source includes orig, always.\n"
-"  -sd            source is diff and .dsc only.\n"
-"  -v<version>    changes since version <version>.\n"
-"  -m<maint>      maintainer for package is <maint>.\n"
-"  -e<maint>      maintainer for release is <maint>.\n"
-"  -C<descfile>   changes are described in <descfile>.\n"
-"      --changes-option=<opt>\n"
-"                 pass option <opt> to dpkg-genchanges."
+"  -si                         source includes orig, if new upstream "
+"(default).\n"
+"  -sa                         source includes orig, always.\n"
+"  -sd                         source is diff and .dsc only.\n"
+"  -v<version>                 changes since version <version>.\n"
+"  -m, --release-by=<maint>    maintainer for this release is <maint>.\n"
+"  -e, --build-by=<maint>      maintainer for this build is <maint>.\n"
+"  -C<descfile>                changes are described in <descfile>.\n"
+"      --changes-option=<opt>  pass option <opt> to dpkg-genchanges."
 msgstr ""
 "Flaggor som sänds till dpkg-genchanges:\n"
 "  -si (standard) källkod innehåller original, om ny uppström.\n"
@@ -412,16 +427,30 @@ msgstr ""
 "                 sänd flaggan <flagga> till dpkg-genchanges."
 
 #: scripts/dpkg-buildpackage.pl
+#, fuzzy
+#| msgid ""
+#| "Options passed to dpkg-source:\n"
+#| "  -sn            force Debian native source format.\n"
+#| "  -s[sAkurKUR]   see dpkg-source for explanation.\n"
+#| "  -z<level>      compression level to use for source.\n"
+#| "  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
+#| "  -i[<regex>]    ignore diffs of files matching regex.\n"
+#| "  -I[<pattern>]  filter out files when building tarballs.\n"
+#| "      --source-option=<opt>\n"
+#| "                 pass option <opt> to dpkg-source.\n"
 msgid ""
 "Options passed to dpkg-source:\n"
-"  -sn            force Debian native source format.\n"
-"  -s[sAkurKUR]   see dpkg-source for explanation.\n"
-"  -z<level>      compression level to use for source.\n"
-"  -Z<compressor> compression to use for source (gz|xz|bzip2|lzma).\n"
-"  -i[<regex>]    ignore diffs of files matching regex.\n"
-"  -I[<pattern>]  filter out files when building tarballs.\n"
-"      --source-option=<opt>\n"
-"                 pass option <opt> to dpkg-source.\n"
+"  -sn                         force Debian native source format.\n"
+"  -s[sAkurKUR]                see dpkg-source for explanation.\n"
+"  -z, --compression-level=<level>\n"
+"                              compression level to use for source.\n"
+"  -Z, --compression=<compressor>\n"
+"                              compression to use for source (gz|xz|bzip2|"
+"lzma).\n"
+"  -i, --diff-ignore[=<regex>] ignore diffs of files matching <regex>.\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                              filter out files when building tarballs.\n"
+"      --source-option=<opt>   pass option <opt> to dpkg-source.\n"
 msgstr ""
 "Flaggor som sänds till dpkg-source:\n"
 "  -sn            tvinga Debianeget källkodsformat.\n"
@@ -525,15 +554,6 @@ msgstr ""
 "innehålla oönskade filer."
 
 #: scripts/dpkg-buildpackage.pl
-#, perl-format
-msgid ""
-"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
-"least '%s' seems to be missing)"
-msgstr ""
-"%s måste uppdateras för att stöda målen \"build-arch\" och \"build-indep"
-"\" (åtminstone \"%s\" verkar saknas)"
-
-#: scripts/dpkg-buildpackage.pl
 msgid "parse changes file"
 msgstr "tolka ändringsfil"
 
@@ -613,6 +633,15 @@ msgstr "binär- och diffinsändning (originalkällkod tas EJ med)"
 msgid "full upload (original source is included)"
 msgstr "komplett insändning (originalkällkod tas med)"
 
+#: scripts/dpkg-buildpackage.pl
+#, perl-format
+msgid ""
+"%s must be updated to support the 'build-arch' and 'build-indep' targets (at "
+"least '%s' seems to be missing)"
+msgstr ""
+"%s måste uppdateras för att stöda målen \"build-arch\" och \"build-indep"
+"\" (åtminstone \"%s\" verkar saknas)"
+
 #: scripts/dpkg-checkbuilddeps.pl
 #, perl-format
 msgid "Usage: %s [<option>...] [<control-file>]"
@@ -1383,7 +1412,6 @@ msgid ""
 "Options:\n"
 "  -l <changelog-file>      get per-version info from this file.\n"
 "  -F <changelog-format>    force changelog format.\n"
-"  -L <libdir>              look for changelog parsers in <libdir>.\n"
 "  -S, --show-field <field> show the values for <field>.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
@@ -1457,8 +1485,10 @@ msgstr ""
 "    --all                       ta med alla ändringar\n"
 
 #: scripts/dpkg-parsechangelog.pl
-msgid "missing library directory"
-msgstr ""
+#, fuzzy
+#| msgid "-i%s is deprecated; it is without effect"
+msgid "-L is obsolete; it is without effect"
+msgstr "-i%s rekommenderas ej; det har ingen effekt"
 
 #: scripts/dpkg-parsechangelog.pl
 #, fuzzy
@@ -1519,8 +1549,7 @@ msgstr "  %s (paketet säger %s, inte %s)"
 msgid "unconditional maintainer override for %s"
 msgstr "ovillkorlig överstyrning från paketansvariga för %s"
 
-#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl
-#: scripts/Dpkg/Changelog/Parse.pm scripts/Dpkg/IPC.pm
+#: scripts/dpkg-scanpackages.pl scripts/dpkg-shlibdeps.pl scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Shlibs/Objdump.pm
 #, perl-format
 msgid "cannot fork for %s"
@@ -2051,7 +2080,10 @@ msgstr "--%s tar maximalt två argument"
 msgid "--%s needs the .dsc file as first argument, not a directory"
 msgstr "--%s måste ha .dsc-filen som första argument, inte en katalog"
 
-#: scripts/dpkg-source.pl
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V1.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Bzr.pm
+#: scripts/Dpkg/Source/Package/V3/Git.pm
+#: scripts/Dpkg/Source/Package/V3/Native.pm
 #, perl-format
 msgid "unpack target exists: %s"
 msgstr "mål för uppackning finns redan: %s"
@@ -2072,6 +2104,12 @@ msgid "extracting %s in %s"
 msgstr "extraherar %s i %s"
 
 #: scripts/dpkg-source.pl
+#, fuzzy, perl-format
+#| msgid "%s is not a plain file"
+msgid "test control %s is not a regular file"
+msgstr "%s är inte en vanlig fil"
+
+#: scripts/dpkg-source.pl
 #, perl-format
 msgid "%s field contains value %s, but no tests control file %s"
 msgstr "Fältet %s innehåller värdet %s, men ingen teststyrfil %s"
@@ -2107,7 +2145,27 @@ msgstr ""
 "                           spara uppströmsändringar som en ny patch."
 
 #: scripts/dpkg-source.pl
-#, perl-format
+#, fuzzy, perl-format
+#| msgid ""
+#| "Build options:\n"
+#| "  -c<control-file>         get control info from this file.\n"
+#| "  -l<changelog-file>       get per-version info from this file.\n"
+#| "  -F<changelog-format>     force changelog format.\n"
+#| "  --format=<source-format> set the format to be used for the source "
+#| "package.\n"
+#| "  -V<name>=<value>         set a substitution variable.\n"
+#| "  -T<substvars-file>       read variables here.\n"
+#| "  -D<field>=<value>        override or add a .dsc field and value.\n"
+#| "  -U<field>                remove a field.\n"
+#| "  -q                       quiet mode.\n"
+#| "  -i[<regex>]              filter out files to ignore diffs of\n"
+#| "                             (defaults to: '%s').\n"
+#| "  -I[<pattern>]            filter out files when building tarballs\n"
+#| "                             (defaults to: %s).\n"
+#| "  -Z<compression>          select compression to use (defaults to '%s',\n"
+#| "                             supported are: %s).\n"
+#| "  -z<level>                compression level to use (defaults to '%d',\n"
+#| "                             supported are: '1'-'9', 'best', 'fast')"
 msgid ""
 "Build options:\n"
 "  -c<control-file>         get control info from this file.\n"
@@ -2119,14 +2177,17 @@ msgid ""
 "  -T<substvars-file>       read variables here.\n"
 "  -D<field>=<value>        override or add a .dsc field and value.\n"
 "  -U<field>                remove a field.\n"
-"  -q                       quiet mode.\n"
-"  -i[<regex>]              filter out files to ignore diffs of\n"
+"  -i, --diff-ignore[=<regex>]\n"
+"                           filter out files to ignore diffs of\n"
 "                             (defaults to: '%s').\n"
-"  -I[<pattern>]            filter out files when building tarballs\n"
+"  -I, --tar-ignore[=<pattern>]\n"
+"                           filter out files when building tarballs\n"
 "                             (defaults to: %s).\n"
-"  -Z<compression>          select compression to use (defaults to '%s',\n"
+"  -Z, --compression=<compression>\n"
+"                           select compression to use (defaults to '%s',\n"
 "                             supported are: %s).\n"
-"  -z<level>                compression level to use (defaults to '%d',\n"
+"  -z, --compression-level=<level>\n"
+"                           compression level to use (defaults to '%d',\n"
 "                             supported are: '1'-'9', 'best', 'fast')"
 msgstr ""
 "Byggflaggor:\n"
@@ -2167,6 +2228,7 @@ msgid ""
 "  --no-copy                don't copy .orig tarballs\n"
 "  --no-check               don't check signature and checksums before "
 "unpacking\n"
+"  --no-overwrite-dir       do not overwrite directory on extraction\n"
 "  --require-valid-signature abort if the package doesn't have a valid "
 "signature\n"
 "  --require-strong-checksums\n"
@@ -2182,8 +2244,14 @@ msgstr ""
 "  --ignore-bad-version     tillåt felaktiga versionsnummer i källkodspaket."
 
 #: scripts/dpkg-source.pl
+#, fuzzy
+#| msgid ""
+#| "General options:\n"
+#| "  -?, --help               show this help message.\n"
+#| "      --version            show the version."
 msgid ""
 "General options:\n"
+"  -q                       quiet mode.\n"
 "  -?, --help               show this help message.\n"
 "      --version            show the version."
 msgstr ""
@@ -2227,91 +2295,6 @@ msgstr ""
 msgid "vendor %s doesn't exist in %s"
 msgstr "leverantören %s finns inte i %s"
 
-#: scripts/changelog/debian.pl
-#, fuzzy, perl-format
-#| msgid "Usage: %s [<option>...] [<control-file>]"
-msgid "Usage: %s [<option>...] [<changelog-file>]"
-msgstr "Användning: %s [<flagga>...] [<control-fil>]"
-
-#: scripts/changelog/debian.pl
-#, fuzzy
-#| msgid ""
-#| "Parser options:\n"
-#| "    --format <output-format>    see man page for list of available\n"
-#| "                                output formats, defaults to 'dpkg'\n"
-#| "                                for compatibility with dpkg-dev\n"
-#| "    --since <version>,          include all changes later than version\n"
-#| "      -s<version>, -v<version>\n"
-#| "    --until <version>,          include all changes earlier than version\n"
-#| "      -u<version>\n"
-#| "    --from <version>,           include all changes equal or later\n"
-#| "      -f<version>               than version\n"
-#| "    --to <version>, -t<version> include all changes up to or equal\n"
-#| "                                than version\n"
-#| "    --count <number>,           include <number> entries from the top\n"
-#| "      -c<number>, -n<number>    (or the tail if <number> is lower than "
-#| "0)\n"
-#| "    --offset <number>,          change the starting point for --count,\n"
-#| "      -o<number>                counted from the top (or the tail if\n"
-#| "                                <number> is lower than 0)\n"
-#| "    --all                       include all changes\n"
-msgid ""
-"Options:\n"
-"      --file <file>       changelog <file> to parse (defaults to '-').\n"
-"  -l, --label <file>      changelog <file> name to use in error messages.\n"
-"      --format <output-format>\n"
-"                          set the 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 if\n"
-"                            <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"
-"  -?, --help              print usage information.\n"
-"  -V, --version           print version information.\n"
-msgstr ""
-"Parserflaggor:\n"
-"    --format <utdataformat>     se manualsidan för en lista över "
-"tillgängliga\n"
-"                                utdataformat, standard är \"dpkg\" för\n"
-"                                kompatibilitet med dpkg-dev\n"
-"    --since <version>,          ta med alla ändringar efter version\n"
-"      -s<version>, -v<version>\n"
-"    --until <version>,          ta med alla ändringar föreversion\n"
-"      -u<version>\n"
-"    --from <version>,           ta med alla ändringar från och med\n"
-"      -f<version>               version\n"
-"    --to <version>, -t<version> ta med alla ändringar till och med\n"
-"                                version\n"
-"    --count <antal>,            ta med <antal> poster från början\n"
-"      -c<antal>, -n<antal>      (eller slutet om <antal> är lägre än 0)\n"
-"    --offset <antal> ,          byt startpunkt för --count, räknat\n"
-"      -o<antal>                 från början (eller slutet om <antal>\n"
-"                                är lägre än 0)\n"
-"    --all                       ta med alla ändringar\n"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "output format %s not supported"
-msgstr "utdataformatet %s stöds inte"
-
-#: scripts/changelog/debian.pl
-#, perl-format
-msgid "more than one file specified (%s and %s)"
-msgstr "mer än en fil angavs (%s och %s)"
-
-#: scripts/changelog/debian.pl scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "fatal error occurred while parsing %s"
-msgstr "ödesdigert fel vid tolkning av %s"
-
 #: scripts/Dpkg/Arch.pm
 #, fuzzy
 #| msgid ""
@@ -2541,12 +2524,6 @@ 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
-#, fuzzy, perl-format
-#| msgid "unknown option or argument %s"
-msgid "unknown output format %s"
-msgstr "okänd flagga eller argument %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
 msgid "cannot create pipe for %s"
 msgstr "kan inte skapa rör för %s"
@@ -2557,29 +2534,21 @@ msgid "tail of %s"
 msgstr "tail för %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "format parser %s not executable"
-msgstr "formattolk %s ej körbar"
+#, fuzzy, perl-format
+#| msgid "changelog format %s is unknown"
+msgid "changelog format %s is unknown: %s"
+msgstr "ändringsloggformatet %s okänt"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, perl-format
-msgid "changelog format %s is unknown"
-msgstr "ändringsloggformatet %s okänt"
+msgid "fatal error occurred while parsing %s"
+msgstr "ödesdigert fel vid tolkning av %s"
 
 #: scripts/Dpkg/Changelog/Parse.pm
 #, fuzzy, perl-format
-#| msgid "cannot exec format parser: %s"
-msgid "cannot execute format parser: %s"
-msgstr "kan inte exekvera formattolk: %s"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-msgid "output of changelog parser"
-msgstr "utdata från ändringsloggparser"
-
-#: scripts/Dpkg/Changelog/Parse.pm
-#, perl-format
-msgid "changelog parser %s"
-msgstr "ändringsloggparser %s"
+#| msgid "unknown option or argument %s"
+msgid "unknown output format %s"
+msgstr "okänd flagga eller argument %s"
 
 #: scripts/Dpkg/Checksums.pm
 #, perl-format
@@ -2656,6 +2625,12 @@ msgid "license stanza of copyright file"
 msgstr ""
 
 #: scripts/Dpkg/Control.pm
+#, fuzzy
+#| msgid "package's section of control info file"
+msgid "package's tests control file"
+msgstr "paketets sektion av styrinfofilen"
+
+#: scripts/Dpkg/Control.pm
 #, fuzzy, perl-format
 #| msgid "entry in repository's %s file"
 msgid "repository's %s file"
@@ -3953,6 +3928,12 @@ msgid "bad line in substvars file %s at line %d"
 msgstr "felaktig rad i substvars-filen %s på rad %d"
 
 #: scripts/Dpkg/Substvars.pm
+#, fuzzy, perl-format
+#| msgid "invalid source field in %s"
+msgid "invalid source version %s"
+msgstr "ogiltigt källkodsfält i %s"
+
+#: scripts/Dpkg/Substvars.pm
 #, perl-format
 msgid "too many substitutions - recursive ? - in '%s'"
 msgstr "för många substitueringar - rekursivt? - i \"%s\""
@@ -4047,6 +4028,99 @@ 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\""
 
+#, fuzzy
+#~| msgid "Usage: %s [<option>...] [<control-file>]"
+#~ msgid "Usage: %s [<option>...] [<changelog-file>]"
+#~ msgstr "Användning: %s [<flagga>...] [<control-fil>]"
+
+#, fuzzy
+#~| msgid ""
+#~| "Parser options:\n"
+#~| "    --format <output-format>    see man page for list of available\n"
+#~| "                                output formats, defaults to 'dpkg'\n"
+#~| "                                for compatibility with dpkg-dev\n"
+#~| "    --since <version>,          include all changes later than version\n"
+#~| "      -s<version>, -v<version>\n"
+#~| "    --until <version>,          include all changes earlier than "
+#~| "version\n"
+#~| "      -u<version>\n"
+#~| "    --from <version>,           include all changes equal or later\n"
+#~| "      -f<version>               than version\n"
+#~| "    --to <version>, -t<version> include all changes up to or equal\n"
+#~| "                                than version\n"
+#~| "    --count <number>,           include <number> entries from the top\n"
+#~| "      -c<number>, -n<number>    (or the tail if <number> is lower than "
+#~| "0)\n"
+#~| "    --offset <number>,          change the starting point for --count,\n"
+#~| "      -o<number>                counted from the top (or the tail if\n"
+#~| "                                <number> is lower than 0)\n"
+#~| "    --all                       include all changes\n"
+#~ msgid ""
+#~ "Options:\n"
+#~ "      --file <file>       changelog <file> to parse (defaults to '-').\n"
+#~ "  -l, --label <file>      changelog <file> name to use in error "
+#~ "messages.\n"
+#~ "      --format <output-format>\n"
+#~ "                          set the 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 "
+#~ "if\n"
+#~ "                            <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"
+#~ "  -?, --help              print usage information.\n"
+#~ "  -V, --version           print version information.\n"
+#~ msgstr ""
+#~ "Parserflaggor:\n"
+#~ "    --format <utdataformat>     se manualsidan för en lista över "
+#~ "tillgängliga\n"
+#~ "                                utdataformat, standard är \"dpkg\" för\n"
+#~ "                                kompatibilitet med dpkg-dev\n"
+#~ "    --since <version>,          ta med alla ändringar efter version\n"
+#~ "      -s<version>, -v<version>\n"
+#~ "    --until <version>,          ta med alla ändringar föreversion\n"
+#~ "      -u<version>\n"
+#~ "    --from <version>,           ta med alla ändringar från och med\n"
+#~ "      -f<version>               version\n"
+#~ "    --to <version>, -t<version> ta med alla ändringar till och med\n"
+#~ "                                version\n"
+#~ "    --count <antal>,            ta med <antal> poster från början\n"
+#~ "      -c<antal>, -n<antal>      (eller slutet om <antal> är lägre än 0)\n"
+#~ "    --offset <antal> ,          byt startpunkt för --count, räknat\n"
+#~ "      -o<antal>                 från början (eller slutet om <antal>\n"
+#~ "                                är lägre än 0)\n"
+#~ "    --all                       ta med alla ändringar\n"
+
+#~ msgid "output format %s not supported"
+#~ msgstr "utdataformatet %s stöds inte"
+
+#~ msgid "more than one file specified (%s and %s)"
+#~ msgstr "mer än en fil angavs (%s och %s)"
+
+#~ msgid "format parser %s not executable"
+#~ msgstr "formattolk %s ej körbar"
+
+#, fuzzy
+#~| msgid "cannot exec format parser: %s"
+#~ msgid "cannot execute format parser: %s"
+#~ msgstr "kan inte exekvera formattolk: %s"
+
+#~ msgid "output of changelog parser"
+#~ msgstr "utdata från ändringsloggparser"
+
+#~ msgid "changelog parser %s"
+#~ msgstr "ändringsloggparser %s"
+
 #~ msgid "'%s' is not a legal architecture string."
 #~ msgid_plural "'%s' are not legal architecture strings."
 #~ msgstr[0] "\"%s\" är inte en giltig arkitektursträng."
@@ -4632,9 +4706,6 @@ msgstr "epokdelen av versionsnumret är inte ett tal: \"%s\""
 #~ msgid "duplicate source field in %s"
 #~ msgstr "duplicerat källkodsfält i %s"
 
-#~ msgid "invalid source field in %s"
-#~ msgstr "ogiltigt källkodsfält i %s"
-
 #~ msgid "duplicate binary field in %s"
 #~ msgstr "duplicerat binärfält i %s"