X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/ff5318caf714c3b26fa37aa4debf138ccf416fc1..af81a46102237236f25d12c370beb7e461be9086:/po/zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 400fd9df2..56100d404 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgid ""
 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-03-15 19:21+0100\n"
-"PO-Revision-Date: 2016-03-19 08:00+0000\n"
+"POT-Creation-Date: 2016-05-11 10:50+0200\n"
+"PO-Revision-Date: 2016-03-27 07:00+0000\n"
 "Last-Translator: Zhou Mo <cdluminate@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -235,10 +235,10 @@ msgid ""
 msgstr ""
 "存在未认证的软件包同时使用了 -y 选项，然而未搭配  --allow-unauthenticated"
 
-#: apt-private/private-download.cc
+#: apt-private/private-download.cc apt-pkg/update.cc
 #, c-format
-msgid "Failed to fetch %s  %s\n"
-msgstr "下载 %s  %s 失败\n"
+msgid "Failed to fetch %s  %s"
+msgstr "无法下载 %s  %s"
 
 #: apt-private/private-download.cc
 #, c-format
@@ -736,10 +736,6 @@ msgstr "缓存尚未同步，无法交差引证(x-ref)一个软件包文件"
 msgid "Pinned packages:"
 msgstr "被锁定的软件包："
 
-#: apt-private/private-show.cc
-msgid "(not found)"
-msgstr "(没有找到)"
-
 #. Print the package name and the version we are forcing to
 #: apt-private/private-show.cc
 #, c-format
@@ -758,10 +754,6 @@ msgstr "  候选："
 msgid "(none)"
 msgstr "(无)"
 
-#: apt-private/private-show.cc
-msgid "  Package pin: "
-msgstr "  软件包锁："
-
 #. Show the priority tables
 #: apt-private/private-show.cc
 msgid "  Version table:"
@@ -1020,7 +1012,7 @@ msgid ""
 "displayed information may therefore be outdated if the last update was\n"
 "too long ago, but in exchange apt-cache works independently of the\n"
 "availability of the configured sources (e.g. offline).\n"
-msgstr "" 
+msgstr ""
 "用法： apt-cache [选项] 命令\n"
 "       apt-cache [选项] show 软件包1 [软件包2 ...]\n"
 "\n"
@@ -1678,6 +1670,21 @@ msgstr "查询"
 msgid "Unable to invoke "
 msgstr "无法调用 "
 
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc apt-pkg/acquire-item.cc
+#, c-format
+msgid ""
+"Clearsigned file isn't valid, got '%s' (does the network require "
+"authentication?)"
+msgstr "明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"
+
+#. TRANSLATORS: %s is a single techy word like 'NODATA'
+#: methods/gpgv.cc
+#, c-format
+msgid ""
+"Signed file isn't valid, got '%s' (does the network require authentication?)"
+msgstr "明文签署文件不可用，结果为‘%s’（您的网络接入需要认证吗？）"
+
 #: methods/gpgv.cc
 msgid "At least one invalid signature was encountered."
 msgstr "至少发现一个无效的签名。"
@@ -1691,14 +1698,6 @@ msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！
 msgid "Could not execute 'apt-key' to verify signature (is gnupg installed?)"
 msgstr "无法运行 apt-key 以验证签名(您安装了 gnupg 吗？)"
 
-#. TRANSLATORS: %s is a single techy word like 'NODATA'
-#: methods/gpgv.cc apt-pkg/acquire-item.cc
-#, c-format
-msgid ""
-"Clearsigned file isn't valid, got '%s' (does the network require "
-"authentication?)"
-msgstr "明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"
-
 #: methods/gpgv.cc
 msgid "Unknown error executing apt-key"
 msgstr "运行 apt-key 时发生未知错误"
@@ -1706,8 +1705,8 @@ msgstr "运行 apt-key 时发生未知错误"
 #. TRANSLATORS: The second %s is the reason and is untranslated for repository owners.
 #: methods/gpgv.cc
 #, c-format
-msgid "The repository is insufficiently signed by key %s (%s)"
-msgstr "仓库 “%s” 数字签名不完整。"
+msgid "Signature by key %s uses weak digest algorithm (%s)"
+msgstr "密钥 %s 生成的数字签名使用了弱安全性摘要算法(%s)"
 
 #: methods/gpgv.cc
 msgid "The following signatures were invalid:\n"
@@ -2408,15 +2407,15 @@ msgid ""
 "details."
 msgstr "参见 apt-secure(8) 手册以了解仓库创建和用户配置方面的细节。"
 
+#: apt-pkg/acquire-item.cc
+msgid "Hash Sum mismatch"
+msgstr "Hash 校验和不符"
+
 #: apt-pkg/acquire-item.cc apt-pkg/contrib/fileutl.cc
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc
-msgid "Hash Sum mismatch"
-msgstr "Hash 校验和不符"
-
 #: apt-pkg/acquire-item.cc
 msgid "Size mismatch"
 msgstr "大小不符"
@@ -2449,8 +2448,7 @@ msgstr "GPG 错误：%s: %s"
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' doesn't support "
 "architecture '%s'"
-msgstr ""
-"鉴于仓库 '%2$s' 不支持 '%3$s' 体系结构，跳过配置文件 '%1$s' 的捕获。"
+msgstr "鉴于仓库 '%2$s' 不支持 '%3$s' 体系结构，跳过配置文件 '%1$s' 的捕获。"
 
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -2465,12 +2463,7 @@ msgstr ""
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' provides only "
 "weak security information for it"
-msgstr ""
-"鉴于仓库 '%2$s' 提供的安全信息强度太低，跳过配置文件 '%1$s' 的acquire."
-
-#: apt-pkg/acquire-item.cc
-msgid "There is no public key available for the following key IDs:\n"
-msgstr "以下 ID 的密钥没有可用的公钥：\n"
+msgstr "鉴于仓库 '%2$s' 提供的安全信息强度太低，跳过配置文件 '%1$s' 的acquire."
 
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formatted in the same way as in
@@ -2514,9 +2507,8 @@ msgid ""
 "This is normally not allowed, but the option Acquire::"
 "AllowDowngradeToInsecureRepositories was given to override it."
 msgstr ""
-"一般不可以这样做，但选项 "
-"Acquire:: AllowDowngradeToInsecureRepositories "
-"可以用于覆盖默认设置。"
+"一般不可以这样做，但选项 Acquire:: AllowDowngradeToInsecureRepositories 可以"
+"用于覆盖默认设置。"
 
 #: apt-pkg/acquire-item.cc
 #, c-format
@@ -3152,18 +3144,12 @@ msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 msgid ""
 "No Hash entry in Release file %s which is considered strong enough for "
 "security purposes"
-msgstr ""
-"Release 文件 %s 中不含散列字段，该文件用于保证足够的安全性。"
-
-#: apt-pkg/deb/debmetaindex.cc
-#, c-format
-msgid "Invalid 'Date' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Date 条目无效"
+msgstr "Release 文件 %s 中不含散列项，该文件用于保证足够的安全性。"
 
 #: apt-pkg/deb/debmetaindex.cc
 #, c-format
-msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "软件包仓库 Release 文件 %s 内 Valid-Until 条目无效"
+msgid "Invalid '%s' entry in Release file %s"
+msgstr "软件包仓库 Release 文件 %2$s 内 %1$s 条目无效"
 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
 #: apt-pkg/deb/debmetaindex.cc
@@ -3650,11 +3636,6 @@ msgstr "您必须在 sources.list 中指定代码源(deb-src) URI"
 msgid "Cannot convert %s to integer: out of range"
 msgstr "无法将 %s 转换为整数：超出范围"
 
-#: apt-pkg/update.cc
-#, c-format
-msgid "Failed to fetch %s  %s"
-msgstr "无法下载 %s  %s"
-
 #: apt-pkg/update.cc
 msgid ""
 "Some index files failed to download. They have been ignored, or old ones "
@@ -3665,6 +3646,18 @@ msgstr "部分索引文件下载失败。如果忽略它们，那将转而使用
 msgid "Calculating upgrade"
 msgstr "正在计算更新"
 
+#~ msgid "(not found)"
+#~ msgstr "(没有找到)"
+
+#~ msgid "  Package pin: "
+#~ msgstr "  软件包锁："
+
+#~ msgid "There is no public key available for the following key IDs:\n"
+#~ msgstr "以下 ID 的密钥没有可用的公钥：\n"
+
+#~ msgid "The repository is insufficiently signed by key %s (%s)"
+#~ msgstr "仓库 “%s” 数字签名不完整。"
+
 #~ msgid ""
 #~ "%s dependency for %s can't be satisfied because %s is not allowed on '%s' "
 #~ "packages"