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

1 files changed, 95 insertions, 70 deletions

diff --git a/man/po/zh_CN.po b/man/po/zh_CN.po
index cb2ab70d4..c8997b0a4 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: 2015-04-06 09:37+0200\n"
+"POT-Creation-Date: 2015-05-18 15:17+0200\n"
 "PO-Revision-Date: 2015-04-18 18:11+0200\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
@@ -515,15 +515,16 @@ msgid ""
 "This field is used to indicate how this package should behave on a multi-"
 "arch installations. The value B<same> means that the package is co-"
 "installable with itself, but it must not be used to satisfy the dependency "
-"of any package of a different architecture from itself. The value B<foreign> "
-"means that the package is not co-installable with itself, but should be "
-"allowed to satisfy the dependency of a package of a different arch from "
-"itself. The value B<allowed> allows reverse-dependencies to indicate in "
-"their B<Depends> field that they accept a package from a foreign "
-"architecture by qualifying the package name with B<:any>, but has no effect "
-"otherwise.  The value B<no> is the default when the field is omitted, in "
-"which case adding the field with an explicit B<no> value is generally not "
-"needed."
+"of any package of a different architecture from itself.  The value "
+"B<foreign> means that the package is not co-installable with itself, but "
+"should be allowed to satisfy a non-arch-qualified dependency of a package of "
+"a different arch from itself (if a dependency has an explicit arch-qualifier "
+"then the value B<foreign> is ignored).  The value B<allowed> allows reverse-"
+"dependencies to indicate in their B<Depends> field that they accept a "
+"package from a foreign architecture by qualifying the package name with B<:"
+"any>, but has no effect otherwise.  The value B<no> is the default when the "
+"field is omitted, in which case adding the field with an explicit B<no> "
+"value is generally not needed."
 msgstr ""
 
 #. type: TP
@@ -706,6 +707,18 @@ msgid ""
 "package, if this one also has the same files as the conflicted package."
 msgstr ""
 
+#. type: Plain text
+#: deb-control.5
+msgid ""
+"The syntax of B<Breaks>, B<Conflicts> and B<Replaces> is a list of package "
+"names, separated by commas (and optional whitespace).  In the B<Breaks> and "
+"B<Conflicts> fields, the comma should be read as \\(lqOR\\(rq.  An optional "
+"architecture qualifier can also be appended to the package name with the "
+"same syntax as above, but the default is B<any> instead of the binary "
+"package architecture.  An optional version can also be given with the same "
+"syntax as above for the B<Breaks>, B<Conflicts> and B<Replaces> fields."
+msgstr ""
+
 #. type: TQ
 #: deb-control.5 deb-src-control.5
 #, no-wrap
@@ -715,12 +728,12 @@ msgstr ""
 #. type: Plain text
 #: deb-control.5
 msgid ""
-"This is a list of virtual packages that this one provides. Usually this is "
+"This is a list of virtual packages that this one provides.  Usually this is "
 "used in the case of several packages all providing the same service.  For "
 "example, sendmail and exim can serve as a mail server, so they provide a "
 "common package (\\(lqmail-transport-agent\\(rq) on which other packages can "
 "depend.  This will allow sendmail or exim to serve as a valid option to "
-"satisfy the dependency. This prevents the packages that depend on a mail "
+"satisfy the dependency.  This prevents the packages that depend on a mail "
 "server from having to know the package names for all of them, and using "
 "\\(oqB<|>\\(cq to separate the list."
 msgstr ""
@@ -728,16 +741,12 @@ msgstr ""
 #. type: Plain text
 #: deb-control.5
 msgid ""
-"The syntax of B<Breaks>, B<Conflicts>, B<Replaces> and B<Provides> is a list "
-"of package names, separated by commas (and optional whitespace).  In the "
-"B<Breaks> and B<Conflicts> fields, the comma should be read as \\(lqOR"
-"\\(rq.  An optional architecture qualifier can also be appended to the "
-"package name with the same syntax as above, but the default is B<any> "
-"instead of the binary package architecture.  An optional version can also be "
-"given with the same syntax as above for the B<Breaks>, B<Conflicts> and "
-"B<Replaces> fields, and an optional exact (equal to) version can also be "
-"given with the same syntax as above for the B<Provides> field (since dpkg "
-"1.17.11)."
+"The syntax of B<Provides> is a list of package names, separated by commas "
+"(and optional whitespace).  An optional architecture qualifier can also be "
+"appended to the package name with the same syntax as above.  If omitted, the "
+"default is the current binary package architecture.  An optional exact "
+"(equal to) version can also be given with the same syntax as above (honored "
+"since dpkg 1.17.11)."
 msgstr ""
 
 #. type: TQ
@@ -3250,8 +3259,16 @@ msgstr ""
 
 #. type: TP
 #: dpkg.1
-#, no-wrap
-msgid "B<--update-avail>, B<--merge-avail> [I<Packages-file>]"
+#, fuzzy, no-wrap
+#| msgid "B<--update-avail>, B<--merge-avail> [I<Packages-file>]"
+msgid "B<--update-avail> [I<Packages-file>]"
+msgstr "B<--update-avail>, B<--merge-avail> [I<Packages-file>]"
+
+#. type: TQ
+#: dpkg.1
+#, fuzzy, no-wrap
+#| msgid "B<--update-avail>, B<--merge-avail> [I<Packages-file>]"
+msgid "B<--merge-avail> [I<Packages-file>]"
 msgstr "B<--update-avail>, B<--merge-avail> [I<Packages-file>]"
 
 #. type: Plain text
@@ -3650,7 +3667,7 @@ msgid ""
 "    Build a deb package.\n"
 "B<-c>, B<--contents> I<archive>\n"
 "    List contents of a deb package.\n"
-"B<-e>, B<--control> I<filename> [I<directory>]\n"
+"B<-e>, B<--control> I<archive> [I<directory>]\n"
 "    Extract control-information from a package.\n"
 "B<-x>, B<--extract> I<archive directory>\n"
 "    Extract the files contained by package.\n"
@@ -3662,8 +3679,7 @@ msgid ""
 "B<--ctrl-tarfile> I<archive>\n"
 "    Output the control tar-file contained in a Debian package.\n"
 "B<--fsys-tarfile> I<archive>\n"
-"    Display the filesystem tar-file contained by a\n"
-"    Debian package.\n"
+"    Output the filesystem tar-file contained by a Debian package.\n"
 "B<-I>, B<--info> I<archive> [I<control-file>...]\n"
 "    Show information about a package.\n"
 msgstr ""
@@ -3830,8 +3846,16 @@ msgstr ""
 
 #. type: TP
 #: dpkg.1
-#, no-wrap
-msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
+#, fuzzy, no-wrap
+#| msgid "B<--force-help>"
+msgid "B<--force->I<things>"
+msgstr "B<--force-help>"
+
+#. type: TQ
+#: dpkg.1
+#, fuzzy, no-wrap
+#| msgid "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
+msgid "B<--no-force->I<things>, B<--refuse->I<things>"
 msgstr "B<--force->I<things>, B<--no-force->I<things>, B<--refuse->I<things>"
 
 #. type: Plain text
@@ -7476,15 +7500,18 @@ msgid ""
 "unlimited number if I<jobs> is not specified, equivalent to the B<make>(1)  "
 "option of the same name (since dpkg 1.14.7).  Will add itself to the B<\\"
 "%MAKEFLAGS> environment variable, which should cause all subsequent make "
-"invocations to inherit the option. Also adds B<parallel=>I<jobs> or "
-"B<parallel=> to the B<DEB_BUILD_OPTIONS> environment variable which allows "
-"debian/rules files to use this information for their own purposes.  The B<\\"
-"%parallel=>I<jobs> or B<parallel=> option in B<DEB_BUILD_OPTIONS> "
-"environment variable will override the B<-j> value if this option is given.  "
-"Note that the B<auto> value will get replaced by the actual number of "
-"currently active processors, and as such will not get propagated to any "
-"child process. If the number of online processors cannot be inferred then "
-"the code will fallback to using an unlimited number."
+"invocations to inherit the option, thus forcing the parallel setting on the "
+"packaging (and possibly the upstream build system if that uses make)  "
+"regardless of their support for parallel builds, which might cause build "
+"failures.  Also adds B<parallel=>I<jobs> or B<parallel=> to the "
+"B<DEB_BUILD_OPTIONS> environment variable which allows debian/rules files to "
+"use this information for their own purposes.  The B<\\%parallel=>I<jobs> or "
+"B<parallel=> option in B<DEB_BUILD_OPTIONS> environment variable will "
+"override the B<-j> value if this option is given.  Note that the B<auto> "
+"value will get replaced by the actual number of currently active processors, "
+"and as such will not get propagated to any child process. If the number of "
+"online processors cannot be inferred then the code will fallback to using an "
+"unlimited number."
 msgstr ""
 
 #. type: TP
@@ -8285,7 +8312,7 @@ msgstr ""
 #. type: Plain text
 #: dpkg-deb.1
 msgid ""
-"If no B<control-file-field>s are specified then it will print the whole "
+"If no I<control-field-name>s are specified then it will print the whole "
 "control file."
 msgstr ""
 
@@ -8293,8 +8320,8 @@ msgstr ""
 #: dpkg-deb.1
 msgid ""
 "If any are specified then B<dpkg-deb> will print their contents, in the "
-"order in which they appear in the control file. If more than one B<control-"
-"file-field> is specified then B<dpkg-deb> will precede each with its field "
+"order in which they appear in the control file. If more than one I<control-"
+"field-name> is specified then B<dpkg-deb> will precede each with its field "
 "name (and a colon and space)."
 msgstr ""
 
@@ -8367,8 +8394,8 @@ msgstr ""
 #: dpkg-deb.1
 msgid ""
 "Extracts the filesystem tree from a package archive into a specified "
-"directory, and the control information files into a DEBIAN subdirectory of "
-"the specified directory (since dpkg 1.16.1)."
+"directory, and the control information files into a B<DEBIAN> subdirectory "
+"of the specified directory (since dpkg 1.16.1)."
 msgstr ""
 
 #. type: Plain text
@@ -8488,9 +8515,9 @@ msgstr ""
 #: dpkg-deb.1
 msgid ""
 "Specify which compression strategy to use on the compressor backend, when "
-"building a package (since dpkg 1.16.2). Allowed values are I<none> (since "
-"dpkg 1.16.4), I<filtered>, I<huffman>, I<rle> and I<fixed> for gzip (since "
-"dpkg 1.17.0) and I<extreme> for xz."
+"building a package (since dpkg 1.16.2). Allowed values are B<none> (since "
+"dpkg 1.16.4), B<filtered>, B<huffman>, B<rle> and B<fixed> for gzip (since "
+"dpkg 1.17.0) and B<extreme> for xz."
 msgstr ""
 
 #. type: TP
@@ -8503,8 +8530,8 @@ msgstr ""
 #: dpkg-deb.1
 msgid ""
 "Specify which compression type to use when building a package.  Allowed "
-"values are I<gzip>, I<xz> (since dpkg 1.15.6), I<bzip2> (deprecated), "
-"I<lzma> (since dpkg 1.14.0; deprecated), and I<none> (default is I<xz>)."
+"values are B<gzip>, B<xz> (since dpkg 1.15.6), B<bzip2> (deprecated), "
+"B<lzma> (since dpkg 1.14.0; deprecated), and B<none> (default is B<xz>)."
 msgstr ""
 
 #. type: TP
@@ -8519,8 +8546,8 @@ msgid ""
 "Specify that the same compression parameters should be used for all archive "
 "members (i.e. B<control.tar> and B<data.tar>; since dpkg 1.17.6).  Otherwise "
 "only the B<data.tar> member will use those parameters. The only supported "
-"compression types allowed to be uniformly used are I<none>, I<gzip> and "
-"I<xz>."
+"compression types allowed to be uniformly used are B<none>, B<gzip> and "
+"B<xz>."
 msgstr ""
 
 #. type: TP
@@ -8533,8 +8560,8 @@ msgstr ""
 #: dpkg-deb.1
 msgid ""
 "Set the archive format version used when building (since dpkg 1.17.0).  "
-"Allowed values are I<2.0> for the new format, and I<0.939000> for the old "
-"one (default is I<2.0>)."
+"Allowed values are B<2.0> for the new format, and B<0.939000> for the old "
+"one (default is B<2.0>)."
 msgstr ""
 
 #. type: Plain text
@@ -12068,10 +12095,10 @@ msgstr ""
 #: dpkg-scanpackages.1
 msgid ""
 "B<Note:> If you want to access the generated Packages file with B<apt> you "
-"will probably need to compress the file with B<bzip2>(1)  (generating a "
-"Packages.bz2 file) or B<gzip>(1)  (generating a Packages.gz file). apt "
-"ignores uncompressed Packages files except on local access (i.e.  B<file://> "
-"sources)."
+"will probably need to compress the file with B<xz>(1)  (generating a "
+"Packages.xz file), B<bzip2>(1)  (generating a Packages.bz2 file) or "
+"B<gzip>(1)  (generating a Packages.gz file). apt ignores uncompressed "
+"Packages files except on local access (i.e.  B<file://> sources)."
 msgstr ""
 
 #. type: Plain text
@@ -15379,8 +15406,8 @@ msgid ""
 "Optionally, after the color specification is another colon, and an attribute "
 "specification. This is a list of one or more attributes, separated by plus "
 "(\\(oq+\\(cq) characters.  Available attributes include (not all of these "
-"will work on all terminals): normal, standout, underline, reverse, blink, "
-"bright, dim, bold"
+"will work on all terminals): B<normal>, B<standout>, B<underline>, "
+"B<reverse>, B<blink>, B<bright>, B<dim>, B<bold>"
 msgstr ""
 
 #. type: Plain text
@@ -15567,7 +15594,7 @@ msgstr ""
 
 #. type: Plain text
 #: dselect.1
-msgid "Quit B<dselect>"
+msgid "Quit B<dselect>."
 msgstr ""
 
 #. type: Plain text
@@ -16410,7 +16437,7 @@ msgstr ""
 msgid ""
 "Typically used with programs that don't detach on their own. This option "
 "will force B<start-stop-daemon> to fork before starting the process, and "
-"force it into the background.  B<WARNING: start-stop-daemon> cannot check "
+"force it into the background.  B<Warning: start-stop-daemon> cannot check "
 "the exit status if the process fails to execute for B<any> reason. This is a "
 "last resort, and is only meant for programs that either make no sense "
 "forking on their own, or where it's not feasible to add the code for them to "
@@ -16501,7 +16528,7 @@ msgid ""
 "option will make B<start-stop-daemon> create the file referenced with B<--"
 "pidfile> and place the pid into it just before executing the process. Note, "
 "the file will only be removed when stopping the program if B<--remove-"
-"pidfile> is used.  B<NOTE:> This feature may not work in all cases. Most "
+"pidfile> is used.  B<Note:> This feature may not work in all cases. Most "
 "notably when the program being executed forks from its main process. Because "
 "of this, it is usually only useful when combined with the B<--background> "
 "option."
@@ -17056,8 +17083,7 @@ msgstr ""
 #: update-alternatives.1
 msgid ""
 "Read configuration of alternatives on standard input in the format generated "
-"by B<update-alternatives --get-selections> and reconfigure them accordingly "
-"(since version 1.15.0)."
+"by --get-selections and reconfigure them accordingly (since version 1.15.0)."
 msgstr ""
 
 #. type: TP
@@ -17134,8 +17160,8 @@ msgstr ""
 #. type: Plain text
 #: update-alternatives.1
 msgid ""
-"Let B<update-alternatives> replace or drop any real file that is installed "
-"where an alternative link has to be installed or removed."
+"Allow replacing or dropping any real file that is installed where an "
+"alternative link has to be installed or removed."
 msgstr ""
 
 #. type: TP
@@ -17159,7 +17185,7 @@ msgstr ""
 
 #. type: Plain text
 #: update-alternatives.1
-msgid "Generate more comments about what B<update-alternatives> is doing."
+msgid "Generate more comments about what is being done."
 msgstr ""
 
 #. type: Plain text
@@ -17221,10 +17247,9 @@ msgstr ""
 #. type: Plain text
 #: update-alternatives.1
 msgid ""
-"The B<update-alternatives --query> format is using an RFC822-like flat "
-"format. It's made of I<n> + 1 blocks where I<n> is the number of "
-"alternatives available in the queried link group. The first block contains "
-"the following fields:"
+"The B<--query> format is using an RFC822-like flat format. It's made of I<n> "
+"+ 1 blocks where I<n> is the number of alternatives available in the queried "
+"link group. The first block contains the following fields:"
 msgstr ""
 
 #. type: TP