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

1 files changed, 231 insertions, 46 deletions

diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index cf4c87050..1460d2b5b 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.21\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-09-26 04:22+0200\n"
+"POT-Creation-Date: 2018-10-08 11:37+0200\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -1527,8 +1527,8 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: deb-changes.man dsc.man dpkg.man dpkg-buildpackage.man dpkg-deb.man
-#: dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
+#: deb-changes.man deb-control.man dsc.man dpkg.man dpkg-buildpackage.man
+#: dpkg-deb.man dpkg-name.man dpkg-source.man dpkg-split.man dselect.man
 #, no-wrap
 msgid "BUGS"
 msgstr ""
@@ -2144,6 +2144,27 @@ msgid ""
 "used reason is B<debug-symbols>."
 msgstr ""
 
+#. type: TP
+#: deb-control.man
+#, fuzzy, no-wrap
+#| msgid "B<--abort-after=>I<number>"
+msgid "B<Build-Ids:>I< elf-build-id-list>"
+msgstr "B<--abort-after=>I<number>"
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"This field specifies a whitespace separated list of ELF build-ids. These are "
+"unique identifiers for semantically identical ELF objects, for each of these "
+"within the package."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
+msgid ""
+"The format or the way to compute each build-id is not defined by design."
+msgstr ""
+
 #. type: SH
 #: deb-control.man deb-conffiles.man deb-src-control.man deb-origin.man
 #: start-stop-daemon.man
@@ -2179,6 +2200,14 @@ msgstr ""
 
 #. type: Plain text
 #: deb-control.man
+msgid ""
+"The B<Build-Ids> field uses a rather generic name out of its original "
+"context within an ELF object, which serves a very specific purpose and "
+"executable format."
+msgstr ""
+
+#. type: Plain text
+#: deb-control.man
 #, fuzzy
 #| msgid "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgid ""
@@ -4987,7 +5016,8 @@ msgstr ""
 #: dsc.man
 msgid ""
 "The source formats currently supported by B<dpkg> are B<1.0>, B<2.0>, B<3.0 "
-"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>."
+"(native)>, B<3.0 (quilt)>, B<3.0 (git)>, B<3.0 (bzr)> and B<3.0 (custom)>.  "
+"See B<dpkg-source>(1) for their description."
 msgstr ""
 
 #. type: TP
@@ -5093,8 +5123,9 @@ msgstr ""
 msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
-"removed, and OR dependencies flattened, except for binaries generated by "
-"this source package and meta-dependencies such as B<@> or B<@builddeps@>."
+"removed, and OR dependencies flattened (that is, converted to separate AND "
+"relationships), except for binaries generated by this source package and "
+"meta-dependencies such as B<@> or B<@builddeps@>."
 msgstr ""
 
 #. type: Plain text
@@ -6709,13 +6740,21 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "B<depends>: Turn all dependency problems into warnings."
+#, fuzzy
+#| msgid "B<depends>: Turn all dependency problems into warnings."
+msgid ""
+"B<depends>: Turn all dependency problems into warnings.  This affects the "
+"B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends>: 将所有依赖问题转为警告。"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<depends-version>: Don't care about versions when checking dependencies."
 msgid ""
-"B<depends-version>: Don't care about versions when checking dependencies."
+"B<depends-version>: Don't care about versions when checking dependencies.  "
+"This affects the B<Pre-Depends> and B<Depends> fields."
 msgstr "B<depends-version>: 检查依赖关系时忽略版本。"
 
 #. type: Plain text
@@ -6724,14 +6763,19 @@ msgstr "B<depends-version>: 检查依赖关系时忽略版本。"
 #| msgid "B<breaks>: Install, even if this would break another package."
 msgid ""
 "B<breaks>: Install, even if this would break another package (since dpkg "
-"1.14.6)."
+"1.14.6).  This affects the B<Breaks> field."
 msgstr "B<breaks>: 即使会破坏别的软件包也坚持安装。"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "B<conflicts>: Install, even if it conflicts with another package. This is "
+#| "dangerous, for it will usually cause overwriting of some files."
 msgid ""
 "B<conflicts>: Install, even if it conflicts with another package. This is "
-"dangerous, for it will usually cause overwriting of some files."
+"dangerous, for it will usually cause overwriting of some files.  This "
+"affects the B<Conflicts> field."
 msgstr ""
 "B<conflicts>: 即使与别的软件包冲突也坚持安装。不过这很危险，因为很有可能会导"
 "致一些文件被覆盖。"
@@ -6908,9 +6952,14 @@ msgstr "B<--ignore-depends>=I<package>,..."
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Ignore dependency-checking for specified packages (actually, checking is "
+#| "performed, but only warnings about conflicts are given, nothing else)."
 msgid ""
 "Ignore dependency-checking for specified packages (actually, checking is "
-"performed, but only warnings about conflicts are given, nothing else)."
+"performed, but only warnings about conflicts are given, nothing else).  This "
+"affects the B<Pre-Depends>, B<Depends> and B<Breaks> fields."
 msgstr ""
 "忽略对指定软件包的依赖检查（实际上进行了检查，只是当且仅当发生冲突时才会发出"
 "警告）。"
@@ -6984,9 +7033,9 @@ msgstr "B<--admindir=>I<dir>"
 #| "give information about status of installed or uninstalled packages, etc.  "
 #| "(Defaults to I<%ADMINDIR%>)"
 msgid ""
-"Change default administrative directory, which contains many files that give "
-"information about status of installed or uninstalled packages, etc.  "
-"(Defaults to «I<%ADMINDIR%>»)"
+"Set the administrative directory to I<directory>.  This directory contains "
+"many files that give information about status of installed or uninstalled "
+"packages, etc.  Defaults to «I<%ADMINDIR%>»."
 msgstr ""
 "变更默认管理目录，这个目录包含着许多已安装和未安装软件包的状态记录文件等。"
 "（默认为 I<%ADMINDIR%>）"
@@ -7006,10 +7055,10 @@ msgstr "B<--instdir=>I<dir>"
 #| "B<chroot>(2) before running package's installation scripts, which means "
 #| "that the scripts see B<instdir> as a root directory.  (Defaults to I</>)"
 msgid ""
-"Change default installation directory which refers to the directory where "
-"packages are to be installed. B<instdir> is also the directory passed to "
-"B<chroot>(2) before running package's installation scripts, which means that "
-"the scripts see B<instdir> as a root directory.  (Defaults to «I</>»)"
+"Set the installation directory, which refers to the directory where packages "
+"are to be installed. B<instdir> is also the directory passed to B<chroot>(2) "
+"before running package's installation scripts, which means that the scripts "
+"see B<instdir> as a root directory.  Defaults to «I</>»."
 msgstr ""
 "变更默认的软件包安装目录。在执行软件包的安装脚本之前，目录 B<instdir> 同样会"
 "传递给 B<chroot>(2)，这意味着那些脚本会视 B<instdir> 为根目录。（默认为 I</"
@@ -7028,8 +7077,9 @@ msgstr "B<--root=>I<dir>"
 #| "Changing B<root> changes B<instdir> to I<dir> and B<admindir> to I<dir>B</"
 #| "var/lib/dpkg>."
 msgid ""
-"Changing B<root> changes B<instdir> to «I<dir>» and B<admindir> to «I<dir>B<"
-"%ADMINDIR%>»."
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<dir>» and the administrative directory to «I<dir>B<%ADMINDIR"
+"%>»."
 msgstr ""
 "对 B<root> 的更改会将 B<instdir> 迁至 I<dir> 并把 B<admindir> 迁至 I<dir>B</"
 "var/lib/dpkg> 。"
@@ -7344,6 +7394,19 @@ msgid "For conffile changes where I<decision> is either B<install> or B<keep>."
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<--version>"
+msgid "B<--no-pager>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: dpkg.man dpkg-query.man
+msgid ""
+"Disables the use of any pager when showing information (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: TP
 #: dpkg.man
 #, no-wrap
 msgid "B<--no-debsig>"
@@ -7461,7 +7524,7 @@ msgid "ENVIRONMENT"
 msgstr ""
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "External environment"
 msgstr ""
@@ -7507,25 +7570,37 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<PAGER>"
+msgid "B<SHELL>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when displaying the conffiles."
+msgid ""
+"The program B<dpkg> will execute when starting a new interactive shell, or "
+"when spawning a command via a shell."
 msgstr ""
 
 #. type: TP
-#: dpkg.man
+#: dpkg.man dpkg-query.man
 #, no-wrap
-msgid "B<SHELL>"
+msgid "B<PAGER>"
+msgstr ""
+
+#. type: TQ
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<DPKG_PAGER>"
 msgstr ""
 
 #. type: Plain text
 #: dpkg.man
-msgid "The program B<dpkg> will execute when starting a new interactive shell."
+msgid ""
+"The program B<dpkg> will execute when running a pager, for example when "
+"displaying the conffile differences.  If B<SHELL> is not set, «B<sh>» will "
+"be used instead.  The B<DPKG_PAGER> overrides the B<PAGER> environment "
+"variable (since dpkg 1.19.2)."
 msgstr ""
 
 #. type: TP
@@ -7567,13 +7642,29 @@ msgid ""
 msgstr ""
 
 #. type: SS
-#: dpkg.man dpkg-buildpackage.man
+#: dpkg.man dpkg-buildpackage.man dpkg-query.man
 #, no-wrap
 msgid "Internal environment"
 msgstr ""
 
 #. type: TP
+#: dpkg.man dpkg-query.man
+#, no-wrap
+msgid "B<LESS>"
+msgstr ""
+
+#. type: Plain text
 #: dpkg.man
+msgid ""
+"Defined by B<dpkg> to “B<-FRSXMQ>”, if not already set, when spawning a "
+"pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
+#. type: TP
+#: dpkg.man dpkg-divert.man dpkg-statoverride.man
 #, no-wrap
 msgid "B<DPKG_ROOT>"
 msgstr ""
@@ -10713,9 +10804,10 @@ msgstr "dpkg-source"
 #: dpkg-buildpackage.man
 msgid ""
 "Builds the source package.  Note: when using this value standalone and if "
-"what you want is simply to (re-)build the source package, using B<dpkg-"
-"source> is always better as it does not require any build dependencies to be "
-"installed to be able to call the B<clean> target."
+"what you want is simply to (re-)build the source package from a clean source "
+"tree, using B<dpkg-source> directly is always a better option as it does not "
+"require any build dependencies to be installed which are otherwise needed to "
+"be able to call the B<clean> target."
 msgstr ""
 
 #. type: TP
@@ -12827,7 +12919,37 @@ msgstr ""
 #. type: Plain text
 #: dpkg-divert.man
 msgid ""
-"Set the B<dpkg> data directory to I<directory> (default: I<%ADMINDIR%>)."
+"Set the administrative directory to I<directory>.  Defaults to «I<%ADMINDIR"
+"%>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--instdir=>I<dir>"
+msgid "B<--instdir>I< directory>"
+msgstr "B<--instdir=>I<dir>"
+
+#. type: Plain text
+#: dpkg-divert.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2). Defaults to «I</>»."
+msgstr ""
+
+#. type: TP
+#: dpkg-divert.man dpkg-statoverride.man
+#, fuzzy, no-wrap
+#| msgid "B<--root=>I<dir>"
+msgid "B<--root>I< directory>"
+msgstr "B<--root=>I<dir>"
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"Set the root directory to B<directory>, which sets the installation "
+"directory to «I<directory>» and the administrative directory to "
+"«I<directory>B<%ADMINDIR%>» (since dpkg 1.19.2)."
 msgstr ""
 
 #. type: TP
@@ -12927,10 +13049,17 @@ msgid "Test mode, i.e. don't actually perform any changes, just demonstrate."
 msgstr ""
 
 #. type: Plain text
-#: dpkg-divert.man dpkg-query.man dpkg-statoverride.man dpkg-trigger.man
+#: dpkg-divert.man dpkg-statoverride.man
 msgid ""
-"If set and the B<--admindir> option has not been specified, it will be used "
-"as the B<dpkg> data directory."
+"If set and the B<--instdir> or B<--root> options have not been specified, it "
+"will be used as the filesystem root directory (since dpkg 1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-divert.man dpkg-statoverride.man
+msgid ""
+"If set and the B<--admindir> or B<--root> options have not been specified, "
+"it will be used as the B<dpkg> data directory."
 msgstr ""
 
 #. type: Plain text
@@ -16127,6 +16256,39 @@ msgid ""
 "control-show> were such errors are fatal)."
 msgstr ""
 
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the program to execute when spawning a command via a shell (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Sets the pager command to use (since dpkg 1.19.1), which will be executed "
+"with «B<$SHELL -c>».  If B<SHELL> is not set, «B<sh>» will be used instead.  "
+"The B<DPKG_PAGER> overrides the B<PAGER> environment variable (since dpkg "
+"1.19.2)."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man dpkg-trigger.man
+msgid ""
+"If set and the B<--admindir> option has not been specified, it will be used "
+"as the B<dpkg> data directory."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"Defined by B<dpkg-query> to “B<-FRSXMQ>”, if not already set, when spawning "
+"a pager (since dpkg 1.19.2).  To change the default behavior, this variable "
+"can be preset to some other value including an empty string, or the B<PAGER> "
+"or B<DPKG_PAGER> variables can be set to disable specific options with «B<-"
+"+>», for example B<DPKG_PAGER=\"less -+F\">."
+msgstr ""
+
 #. type: TH
 #: dpkg-scanpackages.man
 #, no-wrap
@@ -17769,11 +17931,18 @@ msgstr ""
 #. type: Plain text
 #: dpkg-source.man
 msgid ""
-"All patches listed in B<debian/patches/debian.series> or B<debian/patches/"
-"series> are then applied.  If the former file is used and the latter one "
-"doesn't exist (or is a symlink), then the latter is replaced with a symlink "
-"to the former. This is meant to simplify usage of B<quilt> to manage the set "
-"of patches. Note however that while B<dpkg-source> parses correctly series "
+"All patches listed in B<debian/patches/>I<vendor>B<.series> or B<debian/"
+"patches/series> are then applied, where I<vendor> will be the lowercase name "
+"of the current vendor, or B<debian> if there is no vendor defined.  If the "
+"former file is used and the latter one doesn't exist (or is a symlink), then "
+"the latter is replaced with a symlink to the former.  This is meant to "
+"simplify usage of B<quilt> to manage the set of patches.  Vendor-specific "
+"series files are intended to make it possible to serialize multiple "
+"development branches based on the vendor, in a declarative way, in "
+"preference to open-coding this handling in B<debian/rules>.  This is "
+"particularly useful when the source would need to be patched conditionally "
+"because the affected files do not have built-in conditional occlusion "
+"support.  Note however that while B<dpkg-source> parses correctly series "
 "files with explicit options used for patch application (stored on each line "
 "after the patch filename and one or more spaces), it does ignore those "
 "options and always expect patches that can be applied with the B<-p1> option "
@@ -18482,6 +18651,12 @@ msgstr ""
 #. type: SS
 #: dpkg-source.man
 #, no-wrap
+msgid "debian/patches/I<vendor>.series"
+msgstr ""
+
+#. type: SS
+#: dpkg-source.man
+#, no-wrap
 msgid "debian/patches/series"
 msgstr ""
 
@@ -18490,10 +18665,13 @@ msgstr ""
 msgid ""
 "This file lists all patches that have to be applied (in the given order)  on "
 "top of the upstream source package. Leading and trailing spaces are "
-"stripped.  Lines starting with ‘B<#>’ are comments and are skipped.  Empty "
-"lines are ignored.  Remaining lines start with a patch filename (relative to "
-"the B<debian/patches/> directory) up to the first space character or the end "
-"of line. Optional B<quilt> options can follow up to the end of line or the "
+"stripped.  The I<vendor> will be the lowercase name of the current vendor, "
+"or B<debian> if there is no vendor defined.  If the vendor-specific series "
+"file does not exist, the vendor-less series file will be used.  Lines "
+"starting with ‘B<#>’ are comments and are skipped.  Empty lines are "
+"ignored.  Remaining lines start with a patch filename (relative to the "
+"B<debian/patches/> directory) up to the first space character or the end of "
+"line. Optional B<quilt> options can follow up to the end of line or the "
 "first ‘B<#>’ preceded by one or more spaces (which marks the start of a "
 "comment up to the end of line)."
 msgstr ""
@@ -18967,8 +19145,15 @@ msgstr ""
 #. type: Plain text
 #: dpkg-statoverride.man
 msgid ""
-"Change the I<directory> of the B<dpkg> database where the statoverride file "
-"is also stored. Defaults to I<%ADMINDIR%>."
+"Set the administrative directory to I<directory>.  This is where the "
+"I<statoverride> file is stored.  Defaults to «I<%ADMINDIR%>»."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-statoverride.man
+msgid ""
+"Set the installation directory, which refers to the directory where packages "
+"get installed (since dpkg 1.19.2).  Defaults to «I</>»."
 msgstr ""
 
 #. type: TP