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

1 files changed, 208 insertions, 53 deletions

diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index 1460d2b5b..2355ec2c0 100644
--- a/man/po/zh_CN.po
+++ b/man/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: dpkg-man 1.17.21\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2018-10-08 11:37+0200\n"
+"POT-Creation-Date: 2019-01-22 14:25+0100\n"
 "PO-Revision-Date: 2016-12-17 16:42+0100\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -633,7 +633,7 @@ msgid ""
 msgstr ""
 
 #. type: TP
-#: deb-buildinfo.man deb-changes.man
+#: deb-buildinfo.man
 #, fuzzy, no-wrap
 #| msgid "B<Package:>I< package-name>"
 msgid "B<Binary:> I<binary-package-list> (required)"
@@ -1150,16 +1150,16 @@ msgstr ""
 #: deb-changelog.man
 msgid ""
 "Any line that consists entirely (i.e., no leading whitespace) of B<#> or B</"
-"* */> style comments, RCS keywords, Vim modelines or Emacs local variables "
-"should be ignored."
+"* */> style comments or RCS keywords."
 msgstr ""
 
 #. type: Plain text
 #: deb-changelog.man
 msgid ""
-"Ancient changelog entries with other formats at the end of the file should "
-"be accepted and preserved on output, but their contents might be otherwise "
-"ignored and parsing stopped at that point."
+"Vim modelines or Emacs local variables, and ancient changelog entries with "
+"other formats at the end of the file should be accepted and preserved on "
+"output, but their contents might be otherwise ignored and parsing stopped at "
+"that point."
 msgstr ""
 
 #. type: Plain text
@@ -1310,10 +1310,18 @@ msgid ""
 "non-maintainer upload."
 msgstr ""
 
+#. type: TP
+#: deb-changes.man
+#, fuzzy, no-wrap
+#| msgid "B<Package:>I< package-name>"
+msgid "B<Binary:> I<binary-package-list> (required in context)"
+msgstr "B<Package:>I< package-name>"
+
 #. type: Plain text
 #: deb-changes.man
 msgid ""
-"This folded field is a space-separated list of binary packages to upload."
+"This folded field is a space-separated list of binary packages to upload.  "
+"If the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -1403,7 +1411,8 @@ msgstr ""
 #: deb-changes.man
 msgid ""
 "This multiline field contains a list of binary package names followed by a "
-"space, a dash (‘B<->’) and their possibly truncated short descriptions."
+"space, a dash (‘B<->’) and their possibly truncated short descriptions.  If "
+"the upload is source-only, then the field is omitted (since dpkg 1.19.3)."
 msgstr ""
 
 #. type: TP
@@ -2176,7 +2185,6 @@ msgstr "示例"
 #: deb-control.man
 #, no-wrap
 msgid ""
-"# Comment\n"
 "Package: grep\n"
 "Essential: yes\n"
 "Priority: required\n"
@@ -2211,7 +2219,8 @@ msgstr ""
 #, fuzzy
 #| msgid "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 msgid ""
-"B<deb>(5), B<deb-version>(7), B<debtags>(1), B<dpkg>(1), B<dpkg-deb>(1)."
+"B<deb-src-control>(5), B<deb>(5), B<deb-version>(7), B<debtags>(1), "
+"B<dpkg>(1), B<dpkg-deb>(1)."
 msgstr "B<deb-old>(5), B<dpkg-deb>(1), B<deb-control>(5)."
 
 #. type: TH
@@ -2319,9 +2328,10 @@ msgstr ""
 msgid ""
 "The value of this field is the name of the source package, and should match "
 "the name of the source package in the debian/changelog file. A package name "
-"must consist only of lower case letters (a-z), digits (0-9), plus (+) and "
+"must consist only of lowercase letters (a-z), digits (0-9), plus (+) and "
 "minus (-) signs, and periods (.). Package names must be at least two "
-"characters long and must start with an alphanumeric character."
+"characters long and must start with a lowercase alphanumeric character (a-"
+"z0-9)."
 msgstr ""
 
 #. type: Plain text
@@ -3908,10 +3918,11 @@ msgstr ""
 #: deb-substvars.man
 msgid ""
 "A variable substitution has the form B<${>I<variable-name>B<}>.  Variable "
-"names consist of alphanumerics, hyphens and colons and start with an "
-"alphanumeric. Variable substitutions are performed repeatedly until none are "
-"left; the full text of the field after the substitution is rescanned to look "
-"for more substitutions."
+"names consist of alphanumerics (a-zA-Z0-9), hyphens (-) and colons (:) and "
+"start with an alphanumeric, and are case-sensitive, even though they might "
+"refer to other entities which are case-preserving.  Variable substitutions "
+"are performed repeatedly until none are left; the full text of the field "
+"after the substitution is rescanned to look for more substitutions."
 msgstr ""
 
 #. type: Plain text
@@ -5006,10 +5017,11 @@ msgid ""
 "The value of this field declares the format version of the source package.  "
 "The field value is used by programs acting on a source package to interpret "
 "the list of files in the source package and determine how to unpack it.  The "
-"syntax of the field value is a numeric major revision, a period, a numeric "
-"minor revision, and then an optional subtype after whitespace, which if "
-"specified is an alphanumeric word in parentheses.  The subtype is optional "
-"in the syntax but may be mandatory for particular source format revisions."
+"syntax of the field value is a numeric major revision (“0-9”), a period "
+"(“.”), a numeric minor revision (“0-9”), and then an optional subtype after "
+"whitespace (“\\ \\et”), which if specified is a lowercase alphanumeric (“a-"
+"z0-9”) word in parentheses (“()”).  The subtype is optional in the syntax "
+"but may be mandatory for particular source format revisions."
 msgstr ""
 
 #. type: Plain text
@@ -5124,8 +5136,8 @@ msgid ""
 "This field declares the comma-separated union of all test dependencies "
 "(B<Depends> fields in I<debian/tests/control> file), with all restrictions "
 "removed, and OR dependencies flattened (that is, converted to separate AND "
-"relationships), except for binaries generated by this source package and "
-"meta-dependencies such as B<@> or B<@builddeps@>."
+"relationships), except for binaries generated by this source package and its "
+"meta-dependency equivalent B<@>."
 msgstr ""
 
 #. type: Plain text
@@ -5718,13 +5730,23 @@ msgstr "B<-r>, B<--remove> I<package>B<...|-a|--pending>"
 
 #. type: Plain text
 #: dpkg.man
-msgid ""
-"Remove an installed package. This removes everything except conffiles, which "
-"may avoid having to reconfigure the package if it is reinstalled later "
-"(conffiles are configuration files that are listed in the I<DEBIAN/"
-"conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
-"package name, then all packages unpacked, but marked to be removed in file I<"
-"%ADMINDIR%/status>, are removed."
+#, fuzzy
+#| msgid ""
+#| "Remove an installed package. This removes everything except conffiles, "
+#| "which may avoid having to reconfigure the package if it is reinstalled "
+#| "later (conffiles are configuration files that are listed in the I<DEBIAN/"
+#| "conffiles> control file).  If B<-a> or B<--pending> is given instead of a "
+#| "package name, then all packages unpacked, but marked to be removed in "
+#| "file I<%ADMINDIR%/status>, are removed."
+msgid ""
+"Remove an installed package.  This removes everything except conffiles and "
+"other data cleaned up by the I<postrm> script, which may avoid having to "
+"reconfigure the package if it is reinstalled later (conffiles are "
+"configuration files that are listed in the I<DEBIAN/conffiles> control "
+"file).  If there is no I<DEBIAN/conffiles> control file nor I<DEBIAN/postrm> "
+"script, this command is equivalent to calling B<--purge>.  If B<-a> or B<--"
+"pending> is given instead of a package name, then all packages unpacked, but "
+"marked to be removed in file I<%ADMINDIR%/status>, are removed."
 msgstr ""
 "移除一个已安装的软件包。此操作会移除配置文件之外的所有文件，如果稍后要重新安"
 "装该包，这可以避免重新配置它（conffiles 是在 I<DEBIAN/conffiles> 中列出的配置"
@@ -5761,11 +5783,18 @@ msgstr "B<-P>, B<--purge >I<package>...|B<-a>|B<--pending>"
 
 #. type: Plain text
 #: dpkg.man
+#, fuzzy
+#| msgid ""
+#| "Purge an installed or already removed package. This removes everything, "
+#| "including conffiles.  If B<-a> or B<--pending> is given instead of a "
+#| "package name, then all packages unpacked or removed, but marked to be "
+#| "purged in file I<%ADMINDIR%/status>, are purged."
 msgid ""
 "Purge an installed or already removed package. This removes everything, "
-"including conffiles.  If B<-a> or B<--pending> is given instead of a package "
-"name, then all packages unpacked or removed, but marked to be purged in file "
-"I<%ADMINDIR%/status>, are purged."
+"including conffiles, and anything else cleaned up from I<postrm>.  If B<-a> "
+"or B<--pending> is given instead of a package name, then all packages "
+"unpacked or removed, but marked to be purged in file I<%ADMINDIR%/status>, "
+"are purged."
 msgstr ""
 "彻底清除已安装或已移除的软件包。这会删除所有有关的文件，包括所有配置文件。如"
 "果给定 B<-a> 或 B<--pending> 选项而不是软件包名，那么在 I<%ADMINDIR%/status> "
@@ -6063,6 +6092,13 @@ msgid ""
 "still haven't been installed."
 msgstr "搜索那些已选择安装，但因某种缘故仍未安装完成的软件包。"
 
+#. type: Plain text
+#: dpkg.man
+msgid ""
+"Note: This command makes use of both the available file and the package "
+"selections."
+msgstr ""
+
 #. type: TP
 #: dpkg.man
 #, fuzzy, no-wrap
@@ -8499,7 +8535,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-architecture.man
-msgid "The following variables are set by B<dpkg-architecture>:"
+msgid ""
+"The following variables are set by B<dpkg-architecture> (see the B<TERMS> "
+"section for a description of the naming scheme):"
 msgstr ""
 
 #. type: IP
@@ -12600,7 +12638,7 @@ msgid "B<--showformat=>I<format>"
 msgstr ""
 
 #. type: Plain text
-#: dpkg-deb.man dpkg-query.man
+#: dpkg-deb.man
 msgid ""
 "This option is used to specify the format of the output B<--show> will "
 "produce. The format is a string that will be output for each package listed."
@@ -15054,8 +15092,8 @@ msgstr ""
 #: dpkg-mergechangelogs.man
 msgid ""
 "Anything that is not parsed by Dpkg::Changelog is lost during the merge.  "
-"This might include stuff like Vim modelines, Emacs variables, comments which "
-"were not supposed to be there, etc."
+"This might include stuff like comments which were not supposed to be there, "
+"etc."
 msgstr ""
 
 #. type: SH
@@ -15634,7 +15672,9 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-parsechangelog.man
-msgid "Changelog format names are non-empty strings of alphanumerics."
+msgid ""
+"Changelog format names are non-empty strings of lowercase alphanumerics (“a-"
+"z0-9”)."
 msgstr ""
 
 #. type: Plain text
@@ -15750,13 +15790,16 @@ msgstr ""
 #. type: Plain text
 #: dpkg-query.man
 msgid ""
-"List packages matching given pattern. If no I<package-name-pattern> is "
-"given, list all packages in I<%ADMINDIR%/status>, excluding the ones marked "
-"as not-installed (i.e. those which have been previously purged). Normal "
-"shell wildcard characters are allowed in I<package-name-pattern>. Please "
-"note you will probably have to quote I<package-name-pattern> to prevent the "
-"shell from performing filename expansion. For example this will list all "
-"package names starting with ``libc6'':"
+"List all known packages matching one or more patterns, regardless of their "
+"status, which includes any real or virtual package referenced in any "
+"dependency relationship field (such as B<Breaks>, B<Enhances>, etc.).  If no "
+"I<package-name-pattern> is given, list all packages in I<%ADMINDIR%/status>, "
+"excluding the ones marked as not-installed (i.e.  those which have been "
+"previously purged).  Normal shell wildcard characters are allowed in "
+"I<package-name-pattern>.  Please note you will probably have to quote "
+"I<package-name-pattern> to prevent the shell from performing filename "
+"expansion.  For example this will list all package names starting with "
+"``libc6'':"
 msgstr ""
 
 #. type: Plain text
@@ -16027,6 +16070,14 @@ msgstr ""
 
 #. type: Plain text
 #: dpkg-query.man
+msgid ""
+"This option is used to specify the format of the output B<--show> will "
+"produce (short option since dpkg 1.13.1).  The format is a string that will "
+"be output for each package listed."
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
 msgid "In the format string, “B<\\e>” introduces escapes:"
 msgstr ""
 
@@ -16200,6 +16251,35 @@ msgstr ""
 
 #. type: TP
 #: dpkg-query.man
+#, fuzzy, no-wrap
+#| msgid "B<--unpack >I<package-file>..."
+msgid "B<db-fsys:Files>"
+msgstr "B<--unpack >I<package-file>..."
+
+#. type: Plain text
+#: dpkg-query.man
+#, fuzzy
+#| msgid "B<bad-version>: Process even packages with wrong versions."
+msgid ""
+"It contains the list of the package filesystem entries separated by newlines "
+"(since dpkg 1.19.3)."
+msgstr "B<bad-version>: 容忍错误的软件包版本并继续。"
+
+#. type: TP
+#: dpkg-query.man
+#, no-wrap
+msgid "B<db-fsys:Last-Modified>"
+msgstr ""
+
+#. type: Plain text
+#: dpkg-query.man
+msgid ""
+"It contains the timestamp in seconds of the last time the package filesystem "
+"entries were modified (since dpkg 1.19.3)."
+msgstr ""
+
+#. type: TP
+#: dpkg-query.man
 #, no-wrap
 msgid "B<source:Package>"
 msgstr ""
@@ -16560,8 +16640,8 @@ msgid ""
 "the source override takes precedence for setting the section."
 msgstr ""
 
-#. type: IP
-#: dpkg-scansources.man
+#. type: TP
+#: dpkg-scansources.man update-alternatives.man
 #, no-wrap
 msgid "B<--debug>"
 msgstr ""
@@ -17909,11 +17989,11 @@ msgid ""
 "least an original tarball (B<.orig.tar.>I<ext> where I<ext> can be B<gz>, "
 "B<bz2>, B<lzma> and B<xz>) and a debian tarball (B<.debian.tar.>I<ext>). It "
 "can also contain additional original tarballs (B<.orig->I<component>B<.tar."
-">I<ext>).  I<component> can only contain alphanumeric characters and hyphens "
-"(‘-’).  Optionally each original tarball can be accompanied by a detached "
-"upstream signature (B<.orig.tar.>I<ext>B<.asc> and B<.orig->I<component>B<."
-"tar.>I<ext>B<.asc>), extraction supported since dpkg 1.17.20, building "
-"supported since dpkg 1.18.5."
+">I<ext>).  I<component> can only contain alphanumeric (‘a-zA-Z0-9’) "
+"characters and hyphens (‘-’).  Optionally each original tarball can be "
+"accompanied by a detached upstream signature (B<.orig.tar.>I<ext>B<.asc> and "
+"B<.orig->I<component>B<.tar.>I<ext>B<.asc>), extraction supported since dpkg "
+"1.17.20, building supported since dpkg 1.18.5."
 msgstr ""
 
 #. type: Plain text
@@ -20736,6 +20816,74 @@ msgstr ""
 
 #. type: TP
 #: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<--version>"
+msgid "B<--notify-await>"
+msgstr "B<--version>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Wait for the background process to send a readiness notification before "
+"considering the service started (since version 1.19.3).  This implements "
+"parts of the systemd readiness procotol, as specified in the B<sd_notify>(3) "
+"man page.  The following variables are supported:"
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<READY=1>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid "The program is ready to give service, so we can exit safely."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<EXTEND_TIMEOUT_USEC=>I<number>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program requests to extend the timeout by I<number> microseconds.  This "
+"will reset the current timeout to the specified value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, fuzzy, no-wrap
+#| msgid "B<--abort-after=>I<number>"
+msgid "B<ERRNO=>I<number>"
+msgstr "B<--abort-after=>I<number>"
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"The program is exiting with an error.  Do the same and print the user-"
+"friendly string for the B<errno> value."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
+#, no-wrap
+msgid "B<--notify-timeout>I<timeout>"
+msgstr ""
+
+#. type: Plain text
+#: start-stop-daemon.man
+msgid ""
+"Set a timeout for the B<--notify-await> option (since version 1.19.3).  When "
+"the timeout is reached, B<start-stop-daemon> will exit with an error code, "
+"and no readiness notification will be awaited.  The default is B<60> seconds."
+msgstr ""
+
+#. type: TP
+#: start-stop-daemon.man
 #, no-wrap
 msgid "B<-C>, B<--no-close>"
 msgstr ""
@@ -21463,6 +21611,11 @@ msgid ""
 "automatic mode. This option is only relevant with B<--config> or B<--all>."
 msgstr ""
 
+#. type: Plain text
+#: update-alternatives.man
+msgid "Do not generate any comments unless errors occur."
+msgstr ""
+
 #. type: TP
 #: update-alternatives.man
 #, no-wrap
@@ -21476,7 +21629,9 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.man
-msgid "Don't generate any comments unless errors occur."
+msgid ""
+"Generate even more comments, helpful for debugging, about what is being done "
+"(since version 1.19.3)."
 msgstr ""
 
 #. type: Plain text