Merge remote-tracking branch 'upstream/debian/experimental' into feature/srv-records

1 files changed, 31 insertions, 27 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2ff5bcf01..7e0bcd406 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,7 +4,7 @@
 # Tchaikov <tchaikov@sjtu.org>, 2005, 2007.
 # Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004, 2006.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
-# Zhou Mo <cdluminate@gmail.com>, 2014.
+# Zhou Mo <cdluminate@gmail.com>, 2014, 2015.
 #
 msgid ""
 msgstr ""
@@ -55,7 +55,7 @@ msgstr "  缺失："
 
 #: cmdline/apt-cache.cc:368
 msgid "Total distinct versions: "
-msgstr "按版本共计："
+msgstr "按不同的版本共计："
 
 #: cmdline/apt-cache.cc:370
 msgid "Total distinct descriptions: "
@@ -108,12 +108,12 @@ msgstr "您必须明确地给出至少一个表达式"
 
 #: cmdline/apt-cache.cc:1505
 msgid "This command is deprecated. Please use 'apt-mark showauto' instead."
-msgstr "该命令已废弃。请使用‘apt-mark showauto’代替。"
+msgstr "该命令已废弃。请使用‘apt-mark showauto’。"
 
 #: cmdline/apt-cache.cc:1600 apt-pkg/cacheset.cc:653
 #, c-format
 msgid "Unable to locate package %s"
-msgstr "未发现软件包 %s"
+msgstr "无法定位软件包 %s"
 
 #: cmdline/apt-cache.cc:1630
 msgid "Package files:"
@@ -138,7 +138,7 @@ msgstr "  已安装："
 
 #: cmdline/apt-cache.cc:1672
 msgid "  Candidate: "
-msgstr "  候选软件包："
+msgstr "  候选："
 
 #: cmdline/apt-cache.cc:1690 cmdline/apt-cache.cc:1698
 msgid "(none)"
@@ -160,7 +160,7 @@ msgstr "  版本列表："
 #: cmdline/apt-sortpkgs.cc:149
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s，用于 %s 构架，编译于 %s %s\n"
+msgstr "%s %s，用于 %s 体系结构，编译于 %s %s\n"
 
 #: cmdline/apt-cache.cc:1834
 msgid ""
@@ -202,8 +202,8 @@ msgstr ""
 "　　　 apt-cache [选项] showpkg 软件包1 [软件包2 ...]\n"
 "　　　 apt-cache [选项] showsrc 软件包1 [软件包2 ...]\n"
 "\n"
-"apt-cache 是一个底层的工具，可以用来\n"
-"在 APT 的二进制缓存文件中查询信息\n"
+"apt-cache 是一个底层的工具，它可以在 APT 的\n"
+"二进制缓存文件中查询信息\n"
 "\n"
 "命令：\n"
 "   gencaches - 同时生成软件包和源代码包的缓存\n"
@@ -262,7 +262,7 @@ msgstr "请对您的盘片套件中的其它盘片重复相同的操作。"
 
 #: cmdline/apt-config.cc:48
 msgid "Arguments not in pairs"
-msgstr "参数没有成对"
+msgstr "参数不成对"
 
 #: cmdline/apt-config.cc:89
 msgid ""
@@ -320,24 +320,24 @@ msgstr "找不到 %2$s 软件包的 %1$s 版本"
 #: cmdline/apt-get.cc:445
 #, c-format
 msgid "Couldn't find package %s"
-msgstr "无法找到软件包 %s"
+msgstr "找不到软件包 %s"
 
 #: cmdline/apt-get.cc:450 cmdline/apt-mark.cc:78
 #: apt-private/private-install.cc:863
 #, c-format
 msgid "%s set to manually installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已设置为手动安装。\n"
 
 #: cmdline/apt-get.cc:452 cmdline/apt-mark.cc:80
 #, c-format
 msgid "%s set to automatically installed.\n"
-msgstr "%s 被设置为手动安装。\n"
+msgstr "%s 已设置为自动安装。\n"
 
 #: cmdline/apt-get.cc:460 cmdline/apt-mark.cc:124
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
-msgstr "该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’替代。"
+msgstr "该命令已废弃。请用‘apt-mark auto’或‘apt-mark manual’。"
 
 #: cmdline/apt-get.cc:529 cmdline/apt-get.cc:537
 msgid "Internal error, problem resolver broke stuff"
@@ -636,15 +636,15 @@ msgid ""
 "                       This APT helper has Super Meep Powers.\n"
 msgstr ""
 "用法： apt-helper [选项] 命令\n"
-"       apt-helper [选项] download-file uri target-path\n"
+"       apt-helper [选项] download-file URI 目标路径\n"
 "\n"
-"apt-helper 是一个 apt 的内部帮助程序\n"
+"apt-helper 是一个 apt 的内部助手\n"
 "\n"
 "命令：\n"
-"   download-file - 将uri指定的文件下载到指定目标目录\n"
+"   download-file - 将 URI 指定的文件下载到目标路径\n"
 "   auto-detect-proxy - 用 apt.conf 检测代理设置\n"
 "\n"
-"                       This APT helper has Super Meep Powers.\n"
+"                       本 APT 助手具有超级喵力。\n"
 
 #: cmdline/apt-mark.cc:65
 #, c-format
@@ -1289,8 +1289,8 @@ msgstr "下列被要求保持版本不变的软件包将被改变："
 
 #: apt-private/private-output.cc:688
 #, c-format
-msgid "%s (due to %s) "
-msgstr "%s (是由于 %s) "
+msgid "%s (due to %s)"
+msgstr "%s (是由于 %s)"
 
 #: apt-private/private-output.cc:696
 msgid ""
@@ -1693,20 +1693,24 @@ msgid "Full Text Search"
 msgstr "全文搜索"
 
 #: apt-private/acqprogress.cc:66
-msgid "Hit "
-msgstr "命中 "
+#, c-format
+msgid "Hit:%lu %s"
+msgstr "命中:%lu %s"
 
 #: apt-private/acqprogress.cc:88
-msgid "Get:"
-msgstr "获取："
+#, c-format
+msgid "Get:%lu %s"
+msgstr "获取:%lu %s"
 
 #: apt-private/acqprogress.cc:119
-msgid "Ign "
-msgstr "忽略 "
+#, c-format
+msgid "Ign:%lu %s"
+msgstr "忽略:%lu %s"
 
 #: apt-private/acqprogress.cc:126
-msgid "Err "
-msgstr "错误 "
+#, c-format
+msgid "Err:%lu %s"
+msgstr "错误:%lu %s"
 
 #: apt-private/acqprogress.cc:150
 #, c-format