zh_CN.po: update simplified chinese translation

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0362d11bdb737dafa18c0a81ec6aba3069468040..30c2f0e7ae58aa007d56a6775617dd39b7c82f76 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgstr ""
 "Project-Id-Version: apt 1.2.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2016-06-11 17:24+0200\n"
 "Project-Id-Version: apt 1.2.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
 "POT-Creation-Date: 2016-06-11 17:24+0200\n"

-"PO-Revision-Date: 2016-03-27 07:00+0000\n"
+"PO-Revision-Date: 2016-06-21 03:00+0000\n"

 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"


@@ -1891,6 +1891,10 @@ msgid ""
 "apt-dump-solver is an interface to store an EDSP scenario in\n"
 "a file and optionally forwards it to another solver.\n"
 msgstr ""
 "apt-dump-solver is an interface to store an EDSP scenario in\n"
 "a file and optionally forwards it to another solver.\n"
 msgstr ""

+"用法：apt-dump-solver\n"
+"\n"
+"apt-dump-solver 是一个在文件中存储EDSP情景的接口，\n"
+"并可将其传送到另一个解决器。\n"

 
 #: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
 #: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc
 
 #: cmdline/apt-dump-solver.cc apt-pkg/contrib/fileutl.cc
 #: apt-pkg/contrib/gpgv.cc apt-pkg/deb/debsystem.cc


@@ -3172,9 +3176,9 @@ msgid "Invalid value set for option %s regarding source %s %s (%s)"
 msgstr "软件源 %2$s %3$s (%4$s) 的选项 %1$s 中含有无效值"
 
 #: apt-pkg/deb/debmetaindex.cc
 msgstr "软件源 %2$s %3$s (%4$s) 的选项 %1$s 中含有无效值"
 
 #: apt-pkg/deb/debmetaindex.cc

-#, fuzzy, c-format
+#, c-format

 msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
 msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"

-msgstr "软件源 %2$s %3$s 的选项 %1$s 中含有互相冲突的值"
+msgstr "软件源 %2$s %3$s 的选项 %1$s 中含有互相冲突的值：%4$s != %5$s"

 
 #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
 #, c-format
 
 #: apt-pkg/deb/debrecords.cc apt-pkg/tagfile.cc
 #, c-format